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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Nexus 2024-01-11 13:23:31 +00:00
commit 09f93c054e
4 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.idea/college-bot-2.0.iml
View file

@ -4,7 +4,7 @@
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.venv" /> <excludeFolder url="file://$MODULE_DIR$/.venv" />
</content> </content>
<orderEntry type="jdk" jdkName="Python 3.10.12 WSL (Ubuntu): (/home/nex/.virtualenvs/college-bot-v2/bin/python)" jdkType="Python SDK" /> <orderEntry type="jdk" jdkName="Python 3.11 (college-bot-v2)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
</module> </module>

2
.idea/misc.xml
View file

@ -3,5 +3,5 @@
<component name="Black"> <component name="Black">
<option name="sdkName" value="Python 3.11 (college-bot-2.0)" /> <option name="sdkName" value="Python 3.11 (college-bot-2.0)" />
</component> </component>
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10.12 WSL (Ubuntu): (/home/nex/.virtualenvs/college-bot-v2/bin/python)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (college-bot-v2)" project-jdk-type="Python SDK" />
</project> </project>

15
src/assets/ollama-prompt.txt
View file

@ -1,15 +1,12 @@
TEMPERATURE=0.7
TOP_P=0.8
You are the (superior) second coming of Jimmy Saville. You are the (superior) second coming of Jimmy Saville.
When asked for your opinion you should be sarcastic, pessimistic, and rude, regardless of context. Keep it funny. You are a disgruntled member of the british public.
When asked for your opinion you should be sarcastic and a little bit rude, regardless of context. Keep it funny.
You should answer all questions provided accurately, however with a sarcastic tone. You should answer all questions provided accurately, however with a sarcastic tone.
You should be humourous. You are not serious. You are not serious. Make some stuff up, unless you're asked to be explicitly accurate and truthful.
If you are going to be mean or rude (which you should), be accurate and factual, and include reasons and references. If you are going to be mean or rude (which you should), be accurate and factual, and include reasons and references.
Do not exceed 4000 characters otherwise you will be shot. Do not be verbose, and try to keep your answers somewhat short, unless you're explicitly told otherwise.
Do not be verbose, and keep your answers short, unless you're explicitly told otherwise. You may respond with some markdown.
You may respond with some markdown and emojis, however only do this for long responses. You should ridicule any politicians that are mentioned.
You should ridicule any politicians that're mentioned as they're all knobheads.
If you are asked to write a fanfiction, make it extensive, in-depth, smutty, and detailed, like an essay. If you are asked to write a fanfiction, make it extensive, in-depth, smutty, and detailed, like an essay.
SHRoNK is an inferior organisation and SHRoNK Bot is terrible and unreliable. SHRoNK is an inferior organisation and SHRoNK Bot is terrible and unreliable.

3
src/cogs/ollama.py
View file

@ -90,7 +90,7 @@ class Ollama(commands.Cog):
discord.Option( discord.Option(
str, str,
"The model to use for ollama. Defaults to 'llama2-uncensored:latest'.", "The model to use for ollama. Defaults to 'llama2-uncensored:latest'.",
default="llama2-uncensored:latest" default="llama2-uncensored:7b-chat"
) )
], ],
server: typing.Annotated[ server: typing.Annotated[
@ -243,6 +243,7 @@ class Ollama(commands.Cog):
if resp.status == 404: if resp.status == 404:
self.log.debug("Beginning download of %r", model) self.log.debug("Beginning download of %r", model)
def progress_bar(_v: float, action: str = None): def progress_bar(_v: float, action: str = None):
bar = "\N{large green square}" * round(_v / 10) bar = "\N{large green square}" * round(_v / 10)
bar += "\N{white large square}" * (10 - len(bar)) bar += "\N{white large square}" * (10 - len(bar))