Remove old worker API

This commit is contained in:
Henk
2023-03-04 18:27:02 +01:00
committed by somebody
parent 9ee6adb35c
commit 6857d2f7e1
2 changed files with 2 additions and 8 deletions

View File

@@ -1354,29 +1354,23 @@ class system_settings(settings):
try: try:
bridge_cd = importlib.import_module("KoboldAI-Horde-Bridge.clientData") bridge_cd = importlib.import_module("KoboldAI-Horde-Bridge.clientData")
cluster_url = bridge_cd.cluster_url cluster_url = bridge_cd.cluster_url
old_api_url = bridge_cd.old_api_url
serve_old_api = bridge_cd.serve_old_api
kai_name = bridge_cd.kai_name kai_name = bridge_cd.kai_name
if kai_name == "My Awesome Instance": if kai_name == "My Awesome Instance":
kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}" kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}"
api_key = bridge_cd.api_key api_key = bridge_cd.api_key
old_api_key = bridge_cd.old_api_key
priority_usernames = bridge_cd.priority_usernames priority_usernames = bridge_cd.priority_usernames
except: except:
cluster_url = "https://horde.koboldai.net" cluster_url = "https://horde.koboldai.net"
old_api_url = "https://koboldai.net"
serve_old_api = True
kai_name = self._koboldai_var.horde_worker_name kai_name = self._koboldai_var.horde_worker_name
if kai_name == "My Awesome Instance": if kai_name == "My Awesome Instance":
kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}" kai_name = f"KoboldAI UI Instance #{random.randint(-100000000, 100000000)}"
api_key = self._koboldai_var.horde_api_key api_key = self._koboldai_var.horde_api_key
old_api_key = "0000000000"
priority_usernames = [] priority_usernames = []
# Always use the local URL & port # Always use the local URL & port
kai_url = f'http://127.0.0.1:{self.port}' kai_url = f'http://127.0.0.1:{self.port}'
logger.info(f"Name: {kai_name} on {kai_url}") logger.info(f"Name: {kai_name} on {kai_url}")
threading.Thread(target=self._horde_pid.bridge, args=(1, api_key, kai_name, kai_url, cluster_url, priority_usernames, serve_old_api, old_api_url, old_api_key)).run() threading.Thread(target=self._horde_pid.bridge, args=(1, api_key, kai_name, kai_url, cluster_url, priority_usernames)).run()
else: else:
if self._horde_pid is not None: if self._horde_pid is not None:
logger.info("Killing Horde bridge") logger.info("Killing Horde bridge")