From 4b2d591354b0d2626e9193445514b38ca5dbe445 Mon Sep 17 00:00:00 2001 From: db0 Date: Fri, 25 Aug 2023 15:05:36 +0200 Subject: [PATCH 1/3] avoid conflictinng sys args --- koboldai_settings.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/koboldai_settings.py b/koboldai_settings.py index e0cbe619..c9acdfcf 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1359,7 +1359,11 @@ class system_settings(settings): self._horde_pid = "Pending" # Hack to make sure we don't launch twice while it loads logger.info("Starting Horde bridge") bd_module = importlib.import_module("AI-Horde-Worker.worker.bridge_data.scribe") + logger.debug("Clearing command line args in sys.argv before AI Horde Scribe load") + sys_arg_bkp = sys.argv.copy() + sys.argv = sys.argv[:1] bridge_data = bd_module.KoboldAIBridgeData() + sys.argv = sys_arg_bkp bridge_data.reload_data() bridge_data.kai_url = f'http://127.0.0.1:{self.port}' bridge_data.horde_url = self._koboldai_var.horde_url From 31161409f664d25be61fd6e41dc2164e18a63016 Mon Sep 17 00:00:00 2001 From: db0 Date: Mon, 28 Aug 2023 17:47:52 +0200 Subject: [PATCH 2/3] fix argsv placement --- koboldai_settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/koboldai_settings.py b/koboldai_settings.py index c9acdfcf..b75ed63a 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1358,10 +1358,11 @@ class system_settings(settings): if self._horde_pid is None: self._horde_pid = "Pending" # Hack to make sure we don't launch twice while it loads logger.info("Starting Horde bridge") - bd_module = importlib.import_module("AI-Horde-Worker.worker.bridge_data.scribe") logger.debug("Clearing command line args in sys.argv before AI Horde Scribe load") + logger.info(args) sys_arg_bkp = sys.argv.copy() sys.argv = sys.argv[:1] + bd_module = importlib.import_module("AI-Horde-Worker.worker.bridge_data.scribe") bridge_data = bd_module.KoboldAIBridgeData() sys.argv = sys_arg_bkp bridge_data.reload_data() From b20b910568e656d40dc9d5737fa7ad0d11b0856d Mon Sep 17 00:00:00 2001 From: db0 Date: Mon, 28 Aug 2023 17:49:34 +0200 Subject: [PATCH 3/3] remove debug --- koboldai_settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/koboldai_settings.py b/koboldai_settings.py index b75ed63a..ccaadfbc 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -1359,7 +1359,6 @@ class system_settings(settings): self._horde_pid = "Pending" # Hack to make sure we don't launch twice while it loads logger.info("Starting Horde bridge") logger.debug("Clearing command line args in sys.argv before AI Horde Scribe load") - logger.info(args) sys_arg_bkp = sys.argv.copy() sys.argv = sys.argv[:1] bd_module = importlib.import_module("AI-Horde-Worker.worker.bridge_data.scribe")