diff --git a/aiserver.py b/aiserver.py index c1c12843..f552c7dd 100644 --- a/aiserver.py +++ b/aiserver.py @@ -1866,6 +1866,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal global GPT2TokenizerFast global tokenizer koboldai_vars.aibusy = True + koboldai_vars.horde_share = False if(initial_load): use_breakmodel_args = True reset_model_settings() diff --git a/koboldai_settings.py b/koboldai_settings.py index 998caba7..50ec7f34 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -799,17 +799,18 @@ class system_settings(settings): if self.on_colab == False: if os.path.exists("./KoboldAI-Horde"): if value == True: - import subprocess - import random - random.seed() - if os.path.exists('./KoboldAI-Horde/venv/scripts/python.exe'): - self._horde_pid = subprocess.Popen(['./KoboldAI-Horde/venv/scripts/python.exe', './KoboldAI-Horde/bridge.py', - '--username', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--password', '{}'.format(random.randint(-1000000000000, 1000000000000)), - '--kai_name', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--kai_url', 'http://127.0.0.1:{}'.format(self.port), '--cluster_url', "http://koboldai.net"]) - else: - self._horde_pid = subprocess.Popen(['./KoboldAI-Horde/venv/bin/python', './KoboldAI-Horde/bridge.py', - '--username', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--password', '{}'.format(random.randint(-1000000000000, 1000000000000)), - '--kai_name', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--kai_url', 'http://127.0.0.1:{}'.format(self.port), '--cluster_url', "http://koboldai.net"]) + if self._horde_pid is None: + import subprocess + import random + random.seed() + if os.path.exists('./KoboldAI-Horde/venv/scripts/python.exe'): + self._horde_pid = subprocess.Popen(['./KoboldAI-Horde/venv/scripts/python.exe', './KoboldAI-Horde/bridge.py', + '--username', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--password', '{}'.format(random.randint(-1000000000000, 1000000000000)), + '--kai_name', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--kai_url', 'http://127.0.0.1:{}'.format(self.port), '--cluster_url', "http://koboldai.net"]) + else: + self._horde_pid = subprocess.Popen(['./KoboldAI-Horde/venv/bin/python', './KoboldAI-Horde/bridge.py', + '--username', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--password', '{}'.format(random.randint(-1000000000000, 1000000000000)), + '--kai_name', '{}'.format(random.randint(-1000000000000, 1000000000000)), '--kai_url', 'http://127.0.0.1:{}'.format(self.port), '--cluster_url', "http://koboldai.net"]) else: if self._horde_pid is not None: print("kill bridge")