mirror of
https://github.com/nexy7574/LCC-bot.git
synced 2024-09-19 18:16:34 +01:00
Fix ollama server selector [pt 1]
This commit is contained in:
parent
487def9693
commit
0ec616ea3f
1 changed files with 9 additions and 3 deletions
|
@ -1904,7 +1904,7 @@ class OtherCog(commands.Cog):
|
||||||
except ValueError:
|
except ValueError:
|
||||||
model = model + ":latest"
|
model = model + ":latest"
|
||||||
|
|
||||||
servers = {
|
servers: dict[str, dict[str, str, list[str] | int]] = {
|
||||||
"100.106.34.86:11434": {
|
"100.106.34.86:11434": {
|
||||||
"name": "NexTop",
|
"name": "NexTop",
|
||||||
"allow": [
|
"allow": [
|
||||||
|
@ -1926,7 +1926,7 @@ class OtherCog(commands.Cog):
|
||||||
},
|
},
|
||||||
"100.66.187.46:11434": {
|
"100.66.187.46:11434": {
|
||||||
"name": "NexBox",
|
"name": "NexBox",
|
||||||
"restrict-to": [
|
"allow": [
|
||||||
"orca-mini:latest",
|
"orca-mini:latest",
|
||||||
"orca-mini:3b",
|
"orca-mini:3b",
|
||||||
"orca-mini:7b",
|
"orca-mini:7b",
|
||||||
|
@ -1935,6 +1935,12 @@ class OtherCog(commands.Cog):
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def model_is_allowed(model_name: str, srv: dict[str, str | list[str] | int]) -> bool:
|
||||||
|
for pat in srv.get("allow", ['*']):
|
||||||
|
if not fnmatch.fnmatch(model_name.casefold(), pat.casefold()):
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
class ServerSelector(discord.ui.View):
|
class ServerSelector(discord.ui.View):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super().__init__(
|
super().__init__(
|
||||||
|
@ -1951,7 +1957,7 @@ class OtherCog(commands.Cog):
|
||||||
value=x
|
value=x
|
||||||
)
|
)
|
||||||
for x, y in servers.items()
|
for x, y in servers.items()
|
||||||
if fnmatch.fnmatch(model, y.get("restrict-to", ['*']))
|
if model_is_allowed(model, y)
|
||||||
] + [
|
] + [
|
||||||
discord.SelectOption(
|
discord.SelectOption(
|
||||||
label="Custom",
|
label="Custom",
|
||||||
|
|
Loading…
Reference in a new issue