Fix default server
All checks were successful
Build and Publish Jimmy.2 / build_and_publish (push) Successful in 5s
All checks were successful
Build and Publish Jimmy.2 / build_and_publish (push) Successful in 5s
This commit is contained in:
parent
3ce2bbfdaa
commit
ac86cd3b4a
1 changed files with 7 additions and 2 deletions
|
@ -369,6 +369,8 @@ class ChatHistory:
|
|||
|
||||
|
||||
SERVER_KEYS = list(CONFIG["ollama"].keys())
|
||||
SERVER_KEYS_AUTOCOMPLETE = SERVER_KEYS.copy()
|
||||
SERVER_KEYS_AUTOCOMPLETE.remove("order")
|
||||
|
||||
|
||||
class OllamaGetPrompt(discord.ui.Modal):
|
||||
|
@ -444,7 +446,8 @@ class Ollama(commands.Cog):
|
|||
self.servers = {
|
||||
server: asyncio.Lock() for server in CONFIG["ollama"]
|
||||
}
|
||||
if CONFIG["ollama"].get("order"):
|
||||
self.servers.pop("order", None)
|
||||
if CONFIG["ollama"].pop("order"):
|
||||
self.servers = {}
|
||||
for key in CONFIG["ollama"]["order"]:
|
||||
self.servers[key] = asyncio.Lock()
|
||||
|
@ -497,7 +500,7 @@ class Ollama(commands.Cog):
|
|||
),
|
||||
],
|
||||
server: typing.Annotated[
|
||||
str, discord.Option(str, "The server to use for ollama.", default="next", choices=SERVER_KEYS)
|
||||
str, discord.Option(str, "The server to use for ollama.", default="next", choices=SERVER_KEYS_AUTOCOMPLETE)
|
||||
],
|
||||
context: typing.Annotated[
|
||||
str, discord.Option(str, "The context key of a previous ollama response to use as context.", default=None)
|
||||
|
@ -513,6 +516,8 @@ class Ollama(commands.Cog):
|
|||
discord.Option(discord.Attachment, "An image to feed into ollama. Only works with llava.", default=None),
|
||||
],
|
||||
):
|
||||
if server == "next":
|
||||
server = tuple(self.servers.keys())[0]
|
||||
if not SERVER_KEYS:
|
||||
return await ctx.respond("No servers available. Please try again later.")
|
||||
system_query = None
|
||||
|
|
Loading…
Reference in a new issue