mirror of
https://github.com/nexy7574/LCC-bot.git
synced 2024-09-19 18:16:34 +01:00
Finish other.py
This commit is contained in:
parent
fc1255d5c9
commit
fb27f67c36
1 changed files with 23 additions and 8 deletions
|
@ -1948,7 +1948,7 @@ class OtherCog(commands.Cog):
|
||||||
options=[
|
options=[
|
||||||
discord.SelectOption(
|
discord.SelectOption(
|
||||||
label="%s (%s)" % (y['name'], x),
|
label="%s (%s)" % (y['name'], x),
|
||||||
label=x
|
value=x
|
||||||
)
|
)
|
||||||
for x, y in servers.items()
|
for x, y in servers.items()
|
||||||
if fnmatch.fnmatch(model, y.get("restrict-to", ['*']))
|
if fnmatch.fnmatch(model, y.get("restrict-to", ['*']))
|
||||||
|
@ -1992,7 +1992,22 @@ class OtherCog(commands.Cog):
|
||||||
_modal = ServerSelectionModal()
|
_modal = ServerSelectionModal()
|
||||||
await interaction.response.send_modal(_modal)
|
await interaction.response.send_modal(_modal)
|
||||||
await _modal.wait()
|
await _modal.wait()
|
||||||
if not all()
|
if not all((_modal.hostname, _modal.port)):
|
||||||
|
return
|
||||||
|
self.chosen_server = f"{_modal.hostname}:{_modal.port}"
|
||||||
|
else:
|
||||||
|
self.chosen_server = item.values[0]
|
||||||
|
self.stop()
|
||||||
|
|
||||||
|
if server == "auto":
|
||||||
|
selector = ServerSelector()
|
||||||
|
await ctx.send("Select a server:", view=selector)
|
||||||
|
await selector.wait()
|
||||||
|
if not selector.chosen_server:
|
||||||
|
return
|
||||||
|
host = selector.chosen_server
|
||||||
|
else:
|
||||||
|
host = server
|
||||||
|
|
||||||
content = None
|
content = None
|
||||||
embed = discord.Embed(
|
embed = discord.Embed(
|
||||||
|
@ -2003,7 +2018,7 @@ class OtherCog(commands.Cog):
|
||||||
url=f"http://{host}",
|
url=f"http://{host}",
|
||||||
icon_url="https://cdn.discordapp.com/emojis/1101463077586735174.gif"
|
icon_url="https://cdn.discordapp.com/emojis/1101463077586735174.gif"
|
||||||
)
|
)
|
||||||
embed.set_footer(text="Using server {} ({})".format(host, try_hosts.get(host, "Other")))
|
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
|
||||||
|
|
||||||
msg = await ctx.respond(embed=embed, ephemeral=False)
|
msg = await ctx.respond(embed=embed, ephemeral=False)
|
||||||
async with httpx.AsyncClient(follow_redirects=True) as client:
|
async with httpx.AsyncClient(follow_redirects=True) as client:
|
||||||
|
@ -2044,7 +2059,7 @@ class OtherCog(commands.Cog):
|
||||||
description=str(e),
|
description=str(e),
|
||||||
colour=discord.Colour.red()
|
colour=discord.Colour.red()
|
||||||
)
|
)
|
||||||
embed.set_footer(text="Using server {} ({})".format(host, try_hosts.get(host, "Other")))
|
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
|
||||||
return await msg.edit(embed=embed)
|
return await msg.edit(embed=embed)
|
||||||
if response.status_code == 404:
|
if response.status_code == 404:
|
||||||
embed.title = f"Downloading {model}"
|
embed.title = f"Downloading {model}"
|
||||||
|
@ -2064,7 +2079,7 @@ class OtherCog(commands.Cog):
|
||||||
colour=discord.Colour.red(),
|
colour=discord.Colour.red(),
|
||||||
url=str(response.url)
|
url=str(response.url)
|
||||||
)
|
)
|
||||||
embed.set_footer(text="Using server {} ({})".format(host, try_hosts.get(host, "Other")))
|
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
|
||||||
return await msg.edit(embed=embed)
|
return await msg.edit(embed=embed)
|
||||||
lines: dict[str, str] = {}
|
lines: dict[str, str] = {}
|
||||||
last_edit = time()
|
last_edit = time()
|
||||||
|
@ -2099,7 +2114,7 @@ class OtherCog(commands.Cog):
|
||||||
colour=discord.Colour.red(),
|
colour=discord.Colour.red(),
|
||||||
url=str(response.url)
|
url=str(response.url)
|
||||||
)
|
)
|
||||||
embed.set_footer(text="Using server {} ({})".format(host, try_hosts.get(host, "Other")))
|
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
|
||||||
return await msg.edit(embed=embed)
|
return await msg.edit(embed=embed)
|
||||||
|
|
||||||
embed = discord.Embed(
|
embed = discord.Embed(
|
||||||
|
@ -2108,7 +2123,7 @@ class OtherCog(commands.Cog):
|
||||||
colour=discord.Colour.blurple(),
|
colour=discord.Colour.blurple(),
|
||||||
timestamp=discord.utils.utcnow()
|
timestamp=discord.utils.utcnow()
|
||||||
)
|
)
|
||||||
embed.set_footer(text=f"Powered by Ollama • {host} ({try_hosts.get(host, 'Other')})")
|
embed.set_footer(text=f"Powered by Ollama • {host} ({servers.get(host, 'Other')})")
|
||||||
await msg.edit(embed=embed)
|
await msg.edit(embed=embed)
|
||||||
async with ctx.channel.typing():
|
async with ctx.channel.typing():
|
||||||
payload = {
|
payload = {
|
||||||
|
@ -2133,7 +2148,7 @@ class OtherCog(commands.Cog):
|
||||||
description=f"HTTP {response.status_code}:\n```{error or '<no body>'}\n```",
|
description=f"HTTP {response.status_code}:\n```{error or '<no body>'}\n```",
|
||||||
colour=discord.Colour.red()
|
colour=discord.Colour.red()
|
||||||
)
|
)
|
||||||
embed.set_footer(text="Using server {} ({})".format(host, try_hosts.get(host, "Other")))
|
embed.set_footer(text="Using server {} ({})".format(host, servers.get(host, "Other")))
|
||||||
return await msg.edit(embed=embed)
|
return await msg.edit(embed=embed)
|
||||||
self.ollama_locks[msg] = asyncio.Event()
|
self.ollama_locks[msg] = asyncio.Event()
|
||||||
view = self.OllamaKillSwitchView(ctx, msg)
|
view = self.OllamaKillSwitchView(ctx, msg)
|
||||||
|
|
Loading…
Reference in a new issue