nex/college-bot-v1
1
0
Fork 0
mirror of https://github.com/nexy7574/LCC-bot.git synced 2024-09-19 18:16:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix ollama server selector [pt 3]

Browse source
This commit is contained in:
Nexus 2023-11-22 16:01:11 +00:00
parent bc0123be24
commit c785c22800
Signed by: nex
GPG key ID: 0FA334385D0B689F
1 changed files with 38 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
cogs/other.py
View file

@ -34,6 +34,7 @@ import httpx
import psutil
import pytesseract
import pyttsx3
from discord import Interaction
from discord.ext import commands
from dns import asyncresolver
from PIL import Image
@ -1934,15 +1935,22 @@ class OtherCog(commands.Cog):
"owner": 421698654189912064
},
}
H_DEFAULT = {
"name": "Other",
"allow": ["*"],
"owner": 1019217990111199243
}
def model_is_allowed(model_name: str, srv: dict[str, str | list[str] | int]) -> bool:
for pat in srv.get("allow", ['*']):
def model_is_allowed(model_name: str, _srv: dict[str, str | list[str] | int]) -> bool:
if _srv["owner"] == ctx.user.id:
return True
for pat in _srv.get("allow", ['*']):
if not fnmatch.fnmatch(model_name.casefold(), pat.casefold()):
print(
"Server %r does not support %r (only %r.)" % (
srv['name'],
_srv['name'],
model_name,
', '.join(srv['allow'])
', '.join(_srv['allow'])
)
)
return False
@ -1955,6 +1963,9 @@ class OtherCog(commands.Cog):
)
self.chosen_server = None
async def interaction_check(self, interaction: Interaction) -> bool:
return interaction.user == ctx.user
@discord.ui.select(
placeholder="Choose a server.",
custom_id="select",
@ -2010,17 +2021,33 @@ class OtherCog(commands.Cog):
self.chosen_server = f"{_modal.hostname}:{_modal.port}"
else:
self.chosen_server = item.values[0]
await interaction.response.defer(ephemeral=True)
await interaction.followup.send(
f"\N{white heavy check mark} Selected server {self.chosen_server}/",
ephemeral=True
)
self.stop()
if server == "auto":
selector = ServerSelector()
await ctx.send("Select a server:", view=selector)
selector_message = await ctx.respond("Select a server:", view=selector)
await selector.wait()
if not selector.chosen_server:
return
host = selector.chosen_server
await selector_message.delete(delay=1)
else:
host = server
srv = servers.get(host, H_DEFAULT)
if not model_is_allowed(model, srv):
return await ctx.respond(
":x: <@{!s}> does not allow you to run that model on the server {!r}. You can, however, use"
" any of the following: {}".format(
srv["owner"],
srv["name"],
", ".join(srv.get("allowed", ["*"]))
)
)
content = None
embed = discord.Embed(
@ -2031,7 +2058,12 @@ class OtherCog(commands.Cog):
url=f"http://{host}",
icon_url="https://cdn.discordapp.com/emojis/1101463077586735174.gif"
)
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
embed.set_footer(
text="Using server {} ({})".format(
host,
servers.get(host, H_DEFAULT)['name']
)
)
msg = await ctx.respond(embed=embed, ephemeral=False)
async with httpx.AsyncClient(follow_redirects=True) as client: