nex/college-bot-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Load cogs.ollama

Browse source
This commit is contained in:
Nexus 2024-01-06 21:53:39 +00:00
parent bac7ffb13f
commit 2b724e6843
2 changed files with 32 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
.idea/workspace.xml
View file

@ -4,21 +4,9 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Move to SRC dir, add log suppression, add ollama"> <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Fix logging">
<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" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <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$/src/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" 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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -91,7 +79,7 @@
<workItem from="1704296563227" duration="780000" /> <workItem from="1704296563227" duration="780000" />
<workItem from="1704317484555" duration="1407000" /> <workItem from="1704317484555" duration="1407000" />
<workItem from="1704572901106" duration="125000" /> <workItem from="1704572901106" duration="125000" />
<workItem from="1704573038888" duration="4362000" /> <workItem from="1704573038888" duration="4939000" />
</task> </task>
<task id="LOCAL-00001" summary="Update gitignore"> <task id="LOCAL-00001" summary="Update gitignore">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -141,7 +129,31 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1704574685266</updated> <updated>1704574685266</updated>
</task> </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 /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -156,6 +168,8 @@
<MESSAGE value="Fix main.py not properly import conf.py" /> <MESSAGE value="Fix main.py not properly import conf.py" />
<MESSAGE value="Fix Dockerfile" /> <MESSAGE value="Fix Dockerfile" />
<MESSAGE value="Move to SRC dir, add log suppression, add ollama" /> <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> </component>
</project> </project>

1
src/main.py
View file

@ -45,6 +45,7 @@ bot = commands.Bot(
bot.load_extension("cogs.ytdl") bot.load_extension("cogs.ytdl")
bot.load_extension("cogs.net") bot.load_extension("cogs.net")
bot.load_extension("cogs.screenshot") bot.load_extension("cogs.screenshot")
bot.load_extension("cogs.ollama")
@bot.event @bot.event