Merge pull request #342 from one-some/model-structure-and-maybe-rwkv

Move overrides to better places

aiserver.py

@@ -1916,9 +1916,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
     if koboldai_vars.model == "ReadOnly":
         koboldai_vars.noai = True
 
-    loadmodelsettings()
-    loadsettings()
-
     # TODO: InferKit
     if koboldai_vars.model == "ReadOnly" or koboldai_vars.noai:
         pass
@@ -1984,6 +1981,9 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
     if model:
         tokenizer = model.tokenizer
 
+    loadmodelsettings()
+    loadsettings()
+
     lua_startup()
     # Load scripts
     load_lua_scripts()