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

Update ollama command
All checks were successful
Build and Publish Jimmy.2 / build_and_publish (push) Successful in 7s
Details

Browse source
This commit is contained in:
Nexus 2024-04-25 19:33:34 +01:00
parent c9602263d4
commit 415a9ed21b
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -1,7 +1,7 @@
services: services:
jimmy: jimmy:
container_name: jimmy-v2 container_name: jimmy-v2
build: . image: git.i-am.nexus/nex/college-bot:latest
restart: unless-stopped restart: unless-stopped
tty: true tty: true
volumes: volumes:
@ -9,8 +9,6 @@ services:
- ./jimmy.log:/app/jimmy.log - ./jimmy.log:/app/jimmy.log
- /dev/dri:/dev/dri - /dev/dri:/dev/dri
- jimmy-data:/app/data - jimmy-data:/app/data
ports:
- 11444:8080
extra_hosts: extra_hosts:
- host.docker.internal:host-gateway - host.docker.internal:host-gateway
ollama: ollama:

7
src/cogs/ollama.py
View file

@ -507,6 +507,8 @@ class Ollama(commands.Cog):
discord.Option(discord.Attachment, "An image to feed into ollama. Only works with llava.", default=None), discord.Option(discord.Attachment, "An image to feed into ollama. Only works with llava.", default=None),
], ],
): ):
if not SERVER_KEYS:
return await ctx.respond("No servers available. Please try again later.")
system_query = None system_query = None
if context is not None: if context is not None:
if not self.history.get_thread(context): if not self.history.get_thread(context):
@ -834,7 +836,8 @@ class Ollama(commands.Cog):
], ],
): ):
"""Shows the history for a thread.""" """Shows the history for a thread."""
# await ctx.defer(ephemeral=True) if not SERVER_KEYS:
return await ctx.respond("No servers available. Please try again later.")
paginator = commands.Paginator("", "", 4000, "\n\n") paginator = commands.Paginator("", "", 4000, "\n\n")
thread = self.history.load_thread(thread_id) thread = self.history.load_thread(thread_id)
@ -859,6 +862,8 @@ class Ollama(commands.Cog):
@commands.message_command(name="Ask AI") @commands.message_command(name="Ask AI")
async def ask_ai(self, ctx: discord.ApplicationContext, message: discord.Message): async def ask_ai(self, ctx: discord.ApplicationContext, message: discord.Message):
if not SERVER_KEYS:
return await ctx.respond("No servers available. Please try again later.")
thread = self.history.create_thread(message.author) thread = self.history.create_thread(message.author)
content = message.clean_content content = message.clean_content
if not content: if not content: