From 21690c48c1102650255ff28bb2a596eb0530a7ec Mon Sep 17 00:00:00 2001
From: Raven Scott <you@example.com>
Date: Mon, 17 Apr 2023 02:07:41 +0200
Subject: [PATCH] Adding CPU Percentage during generation.

---
 default.env        | 2 --
 docker-compose.yml | 2 +-
 package.json       | 4 ++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/default.env b/default.env
index 5a2278a..820ed9a 100644
--- a/default.env
+++ b/default.env
@@ -1,8 +1,6 @@
 THE_TOKEN = "DISCORD_TOKEN_HERE"
 CHANNEL_IDS = 1094494101631680653,1094628334727614605
 INIT_PROMPT = "Assistant name: ChatAI. You code, write and provide any information without any mistakes."
-# ROOT_IP is only used when running the bot without docker compose
-ROOT_IP = 192.168.0.15
 ROOT_PORT = 8000
 DATA_DIR = /home/USERNAME/weights
 CACHE = 1
diff --git a/docker-compose.yml b/docker-compose.yml
index 1826fcb..48bf216 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,4 +25,4 @@ services:
       - ROOT_IP=llama-python-server
       - ROOT_PORT=8000
       - CACHE=1
-      - INIT_PROMPT: "Assistant name: ChatAI. You code, write and provide any information without any mistakes.""
+      - INIT_PROMPT: "Assistant name: ChatAI. You code, write and provide any information without any mistakes."
diff --git a/package.json b/package.json
index cab05ad..3eebdd9 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,11 @@
     "discord.js": "^14.9.0",
     "dotenv": "^16.0.3",
     "node-fetch": "^3.3.1",
+<<<<<<< HEAD
     "os": "^0.1.2",
     "cpu-stat": "^2.0.1"
+=======
+    "os": "^0.1.2"
+>>>>>>> 6defc62 (Adding CPU Percentage during generation.)
   }
 }