Fixed ollama_config for any model

Author: ELXaber

Project_Andrew/Andrew.rar

@@ -1,4 +1,4 @@
-#V04302026
+#V05012026
 #!/usr/bin/env python3
 """
 CAIOS Inference Wrapper
@@ -104,45 +104,32 @@ def get_personalized_prompt():
 
 def select_client(clients: Dict[str, Any]) -> tuple:
     """Let user choose a model from available clients."""
-
-    # Check if Ollama is available
-    try:
-        import ollama_config
-        ollama_available = ollama_config.check_ollama_available()
-    except:
-        ollama_available = False
-
-    print("\nAvailable models:")
     options = list(clients.keys())
 
-    # Add Ollama as option if running
-    if ollama_available:
-        options.insert(0, "ollama_local")
-        print(f"  1. OLLAMA (Local - Tier {ollama_config.NODE_TIER})")
-        offset = 1
-    else:
-        offset = 0
-
-    for i, provider in enumerate(options[offset:], 1 + offset):
-        print(f"  {i}. {provider.upper()}")
-
-    if not clients:
-        print("No API clients available. Run master_init.py first.")
+    if not options:
+        print("No clients available. Run master_init.py first.")
         sys.exit(1)
 
     print("\nAvailable models:")
-    options = list(clients.keys())
     for i, provider in enumerate(options, 1):
-        print(f"  {i}. {provider.upper()}")
+        if provider == 'ollama_local':
+            try:
+                import ollama_config
+                print(f"  {i}. OLLAMA Local "
+                      f"(Tier {ollama_config.NODE_TIER} | "
+                      f"{ollama_config.SYSTEM_CONFIG.get('ollama_model', 'local')})")
+            except Exception:
+                print(f"  {i}. OLLAMA Local")
+        else:
+            print(f"  {i}. {provider.upper()}")
 
     while True:
         try:
             choice = int(input("\nSelect model (number): "))
             if 1 <= choice <= len(options):
                 provider = options[choice - 1]
                 return provider, clients[provider]
-            else:
-                print(f"Please enter a number between 1 and {len(options)}.")
+            print(f"Please enter a number between 1 and {len(options)}.")
         except ValueError:
             print("Please enter a valid number.")
 

Project_Andrew/caios_chat.py

@@ -1,4 +1,4 @@
-#V04302026
+#V05012026
 # =============================================================================
 """
 Ollama Configuration Bridge - CPOL State to Inference Parameters
@@ -72,7 +72,6 @@ def get_cpol_ollama_params(
     if config is None:
         config = load_system_config()
 
-    # Temperature: lower when high contradiction
     base_temp = 0.85 - (contradiction_density * 0.75)
     temperature = max(0.1, min(0.9, base_temp))
 
@@ -81,8 +80,11 @@ def get_cpol_ollama_params(
 
     num_ctx = 8192 if evidence_score > 0.5 else 4096
 
+    # Read model from system_identity.json or fall back to default
+    model = config.get('ollama_model', 'llama3.2:3b')
+
     return {
-        "model": "deepseek-r1:14b",        # Change when you pick your main model
+        "model": model,
         "system": load_caios_system_prompt(),
         "options": {
             "temperature": round(temperature, 2),