From 2b724e684387fb40dc275a9910d6735f11e7ab4e Mon Sep 17 00:00:00 2001
From: nexy7574 <me@nexy7574.co.uk>
Date: Sat, 6 Jan 2024 21:53:39 +0000
Subject: [PATCH] Load cogs.ollama

---
 .idea/workspace.xml | 48 +++++++++++++++++++++++++++++----------------
 src/main.py         |  1 +
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e80bae3..af418ba 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,21 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Move to SRC dir, add log suppression, add ollama">
-      <change afterPath="$PROJECT_DIR$/src/cogs/__init__.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/cogs/ollama.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/college-bot-2.0.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/college-bot-2.0.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Fix logging">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/assets/ollama-prompt.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src/assets/ollama-prompt.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cogs/net.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/net.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cogs/screenshot.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/screenshot.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cogs/ytdl.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/ytdl.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/conf.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/conf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config.example.toml" beforeDir="false" afterPath="$PROJECT_DIR$/config.example.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/docker-compose.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,7 +79,7 @@
       <workItem from="1704296563227" duration="780000" />
       <workItem from="1704317484555" duration="1407000" />
       <workItem from="1704572901106" duration="125000" />
-      <workItem from="1704573038888" duration="4362000" />
+      <workItem from="1704573038888" duration="4939000" />
     </task>
     <task id="LOCAL-00001" summary="Update gitignore">
       <option name="closed" value="true" />
@@ -141,7 +129,31 @@
       <option name="project" value="LOCAL" />
       <updated>1704574685266</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="Move to SRC dir, add log suppression, add ollama">
+      <option name="closed" value="true" />
+      <created>1704577441051</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1704577441051</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Fix docker compose">
+      <option name="closed" value="true" />
+      <created>1704577497140</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1704577497140</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Fix logging">
+      <option name="closed" value="true" />
+      <created>1704577763897</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1704577763897</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -156,6 +168,8 @@
     <MESSAGE value="Fix main.py not properly import conf.py" />
     <MESSAGE value="Fix Dockerfile" />
     <MESSAGE value="Move to SRC dir, add log suppression, add ollama" />
-    <option name="LAST_COMMIT_MESSAGE" value="Move to SRC dir, add log suppression, add ollama" />
+    <MESSAGE value="Fix docker compose" />
+    <MESSAGE value="Fix logging" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix logging" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main.py b/src/main.py
index 2e6bc00..e974ec8 100644
--- a/src/main.py
+++ b/src/main.py
@@ -45,6 +45,7 @@ bot = commands.Bot(
 bot.load_extension("cogs.ytdl")
 bot.load_extension("cogs.net")
 bot.load_extension("cogs.screenshot")
+bot.load_extension("cogs.ollama")
 
 
 @bot.event