From 5c7eb8a60a99b0d5f3eba600b86d93ee32233a10 Mon Sep 17 00:00:00 2001
From: saloui <saifeddine.aloui@cea.fr>
Date: Mon, 12 Jun 2023 15:45:59 +0200
Subject: [PATCH] enhanced configuration loading

---
 app.py                      | 24 +++---------------------
 configs/config.yaml         |  2 +-
 shared/.keep                |  0
 web/src/clip                |  1 +
 web/src/taming-transformers |  1 +
 5 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 shared/.keep
 create mode 160000 web/src/clip
 create mode 160000 web/src/taming-transformers

diff --git a/app.py b/app.py
index 0853589b..9d7021e4 100644
--- a/app.py
+++ b/app.py
@@ -1181,26 +1181,8 @@ if __name__ == "__main__":
     )
     args = parser.parse_args()
 
-    # The default configuration must be kept unchanged as it is committed to the repository, 
-    # so we have to make a copy that is not comitted
-    default_config = load_config("configs/config.yaml")
-
-    if args.config!="local_config":
-        args.config = "local_config"
-        if not lollms_paths.personal_configuration_path/f"local_config.yaml".exists():
-            print("No local configuration file found. Building from scratch")
-            shutil.copy(default_config, lollms_paths.personal_configuration_path/f"local_config.yaml")
-
-    config_file_path = lollms_paths.personal_configuration_path/f"local_config.yaml"
-    config = LOLLMSConfig(config_file_path)
-
-    
-    if "version" not in config or int(config["version"])<int(default_config["version"]):
-        #Upgrade old configuration files to new format
-        ASCIIColors.error("Configuration file is very old.\nReplacing with default configuration")
-        config, added, removed = sync_cfg(default_config, config)
-        print(f"Added entries : {added}, removed entries:{removed}")
-        config.save_config(config_file_path)
+    # Configuration loading part
+    config = LOLLMSConfig.autoload(lollms_paths)
 
     # Override values in config with command-line arguments
     for arg_name, arg_value in vars(args).items():
@@ -1209,7 +1191,7 @@ if __name__ == "__main__":
 
     # executor = ThreadPoolExecutor(max_workers=1)
     # app.config['executor'] = executor
-    bot = LoLLMsWebUI(app, socketio, config, config_file_path, lollms_paths)
+    bot = LoLLMsWebUI(app, socketio, config, config.file_path, lollms_paths)
 
     # chong Define custom WebSocketHandler with error handling 
     class CustomWebSocketHandler(WebSocketHandler):
diff --git a/configs/config.yaml b/configs/config.yaml
index 6b4fe33e..5d79ce8b 100644
--- a/configs/config.yaml
+++ b/configs/config.yaml
@@ -1,7 +1,7 @@
 # =================== Lord Of Large Language Models Configuration file =========================== 
 version: 7
 binding_name: llama_cpp_official
-model_name: Wizard-Vicuna-7B-Uncensored.ggmlv3.q4_0.bin
+model_name: airoboros-13b-gpt4.ggmlv3.q4_0.bin
 
 # Host information
 host: localhost
diff --git a/shared/.keep b/shared/.keep
deleted file mode 100644
index e69de29b..00000000
diff --git a/web/src/clip b/web/src/clip
new file mode 160000
index 00000000..a9b1bf59
--- /dev/null
+++ b/web/src/clip
@@ -0,0 +1 @@
+Subproject commit a9b1bf5920416aaeaec965c25dd9e8f98c864f16
diff --git a/web/src/taming-transformers b/web/src/taming-transformers
new file mode 160000
index 00000000..3ba01b24
--- /dev/null
+++ b/web/src/taming-transformers
@@ -0,0 +1 @@
+Subproject commit 3ba01b241669f5ade541ce990f7650a3b8f65318