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

Adjust ollama timeouts

Browse source
This commit is contained in:
Nexus 2024-06-05 16:08:38 +01:00
parent 6fb9bb839b
commit 19bd4030d0
Signed by: nex
GPG key ID: 0FA334385D0B689F
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/cogs/ollama.py
View file

@ -487,7 +487,9 @@ class Ollama(commands.Cog):
"""Checks that a server is online and responding.""" """Checks that a server is online and responding."""
if url in SERVER_KEYS: if url in SERVER_KEYS:
url = CONFIG["ollama"][url]["base_url"] url = CONFIG["ollama"][url]["base_url"]
async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(10)) as session: async with aiohttp.ClientSession(
timeout=aiohttp.ClientTimeout(connect=3, sock_connect=3, sock_read=10, total=3)
) as session:
self.log.info("Checking if %r is online.", url) self.log.info("Checking if %r is online.", url)
try: try:
async with session.get(url + "/api/tags") as resp: async with session.get(url + "/api/tags") as resp:
@ -550,7 +552,11 @@ class Ollama(commands.Cog):
if query == "$": if query == "$":
v = PromptSelector(ctx) v = PromptSelector(ctx)
await ctx.respond("Select edit your prompts, as desired. Click done when you want to continue.", view=v) await ctx.respond(
"Select edit your prompts, as desired. Click done when you want to continue.",
view=v,
ephemeral=True
)
await v.wait() await v.wait()
query = v.user_prompt or query query = v.user_prompt or query
system_query = v.system_prompt system_query = v.system_prompt
@ -606,7 +612,7 @@ class Ollama(commands.Cog):
async with aiohttp.ClientSession( async with aiohttp.ClientSession(
base_url=server_config["base_url"], base_url=server_config["base_url"],
timeout=aiohttp.ClientTimeout(connect=30, sock_read=10800, sock_connect=30, total=10830), timeout=aiohttp.ClientTimeout(connect=5, sock_read=10800, sock_connect=5, total=10830),
) as session: ) as session:
embed = discord.Embed( embed = discord.Embed(
title="Checking server...", title="Checking server...",
@ -992,7 +998,6 @@ class Ollama(commands.Cog):
) )
msg = await ctx.reply(embed=embed) msg = await ctx.reply(embed=embed)
last_edit = time.time()
tasks = {} tasks = {}
for server in self.servers.keys(): for server in self.servers.keys():