Update modules/config_settings_public.py

modules/config_settings_public.py

@@ -1,4 +1,4 @@
-# FILE: modules/config_settings_public.py
+# FILE: modules/config_settings_public.py (Final Verified Version)
 
 import os
 import sys
@@ -13,125 +13,68 @@ if not logger.handlers:
     logger.addHandler(handler)
     logger.setLevel(logging.INFO)
 
-# --- ✅ FORCE WEB MODE ---
-IS_WEB_MODE = True  # 🚨 Hugging Face Spaces override
-_is_frozen = getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS')
-
-if _is_frozen:
-    APP_DIR = os.path.dirname(sys.executable)
-else:
-    try:
-        APP_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-    except NameError:
-        APP_DIR = os.getcwd()
-        logger.warning(f"__file__ not defined, APP_DIR set to CWD: {APP_DIR}")
-
-BASE_MODELS_DIR = os.path.join(APP_DIR, "models")
-BASE_DATA_SUBDIR = "zotheos_public_data"
-BASE_DATA_PATH = os.path.join(APP_DIR, BASE_DATA_SUBDIR)
-
-CORE_DIRS_TO_VERIFY = {
-    "data_base": BASE_DATA_PATH,
-    "memory": os.path.join(BASE_DATA_PATH, "zotheos_memory"),
-    "cache": os.path.join(BASE_DATA_PATH, "cache"),
-    "cache_transformers": os.path.join(BASE_DATA_PATH, "cache", "transformers"),
-    "cache_huggingface": os.path.join(BASE_DATA_PATH, "cache", "huggingface"),
-    "cache_hf_hub": os.path.join(BASE_DATA_PATH, "cache", "huggingface", "hub"),
-    "logs": os.path.join(BASE_DATA_PATH, "logs"),
-    "temp": os.path.join(BASE_DATA_PATH, "temp_files"),
-    "models_root": BASE_MODELS_DIR
+IS_WEB_MODE = os.path.exists("/home/user/app")
+
+# --- ✅✅✅ VERIFIED AND CORRECTED REPO IDS ✅✅✅ ---
+MODEL_DEFINITIONS = {
+    "mistral": {
+        "repo_id": "TheBloke/Mistral-7B-Instruct-v0.2-GGUF",
+        "filename": "mistral-7b-instruct-v0.2.Q4_K_M.gguf"
+    },
+    "gemma": {
+        "repo_id": "TheBloke/Gemma-2B-IT-GGUF", # Corrected: Capital 'G' and 'IT'
+        "filename": "gemma-2b-it.Q4_K_M.gguf"
+    },
+    "qwen": {
+        "repo_id": "TheBloke/Qwen1.5-1.8B-Chat-GGUF", # Corrected to use TheBloke's repo
+        "filename": "qwen1.5-1.8b-chat.Q4_K_M.gguf"
+    }
 }
 
-for dir_key, dir_path in CORE_DIRS_TO_VERIFY.items():
-    if dir_key == "models_root" and (_is_frozen or IS_WEB_MODE):
-        continue
-    os.makedirs(dir_path, exist_ok=True)
+MODEL_PATHS = {}
 
-# --- ✅ MODEL PATHS CONFIG ---
 if IS_WEB_MODE:
     logger.info("✅✅✅ RUNNING IN WEB MODE (Hugging Face Space) ✅✅✅")
-    logger.info("Model paths will be resolved via hf_hub_download.")
-    
-    MODEL_PATHS = {
-        "mistral": hf_hub_download(repo_id="TheBloke/Mistral-7B-Instruct-v0.2-GGUF", filename="mistral-7b-instruct-v0.2.Q4_K_M.gguf"),
-        "qwen": hf_hub_download(repo_id="Qwen/Qwen1.5-1.8B-Chat-GGUF", filename="qwen1.5-1.8b-chat.Q4_K_M.gguf")
-    }
     N_GPU_LAYERS_FALLBACK = 0
-    logger.info("N_GPU_LAYERS_FALLBACK forced to 0 for web/CPU-only environment.")
-
-else:
-    logger.info("✅✅✅ RUNNING IN LOCAL MODE (Desktop) ✅✅✅")
-    MODEL_PATHS = {
-        "mistral": os.path.join(BASE_MODELS_DIR, "mistral-7b-instruct-v0.2.Q4_K_M.gguf"),
-        "qwen": os.path.join(BASE_MODELS_DIR, "qwen1.5-1.8b-chat.Q4_K_M.gguf")
-    }
+    for name, model_info in MODEL_DEFINITIONS.items():
+        logger.info(f"Downloading model: {name} from repo: {model_info['repo_id']}")
+        try:
+            MODEL_PATHS[name] = hf_hub_download(repo_id=model_info["repo_id"], filename=model_info["filename"])
+            logger.info(f"✅ Successfully downloaded {name}.")
+        except Exception as e:
+            logger.error(f"❌ FAILED to download model {name}. Error: {e}")
+            raise e
+else: # LOCAL MODE
+    logger.info("✅✅✅ RUNNING IN LOCAL MODE (Desktop/PC) ✅✅✅")
+    APP_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    BASE_MODELS_DIR = os.path.join(APP_DIR, "models")
+    for name, model_info in MODEL_DEFINITIONS.items():
+        MODEL_PATHS[name] = os.path.join(BASE_MODELS_DIR, model_info["filename"])
     N_GPU_LAYERS_FALLBACK = -1
-    logger.info("N_GPU_LAYERS_FALLBACK set to -1 for local GPU acceleration.")
 
-# --- ✅ UNIVERSAL SETTINGS ---
-MAX_RAM_MODELS_GB = 23.8
+# --- Shared Configurations ---
 MAX_CONCURRENT_MODELS = 3
 N_CTX_FALLBACK = 2048
-N_THREADS_FALLBACK = 8
 VERBOSE_LLAMA_CPP = True
-
 MODEL_SPECIFIC_PARAMS = {
-    "mistral": { "chat_format": "mistral-instruct", "n_ctx": N_CTX_FALLBACK },
-    "qwen":    { "chat_format": "chatml", "n_ctx": N_CTX_FALLBACK },
     "_default": {
-        "f16_kv": True, "use_mmap": True, "use_mlock": False,
-        "verbose": VERBOSE_LLAMA_CPP,
-        "n_gpu_layers": N_GPU_LAYERS_FALLBACK,
-        "n_threads": N_THREADS_FALLBACK,
-        "n_ctx": N_CTX_FALLBACK
-    }
+        "n_gpu_layers": N_GPU_LAYERS_FALLBACK, "n_ctx": N_CTX_FALLBACK, "f16_kv": True,
+        "use_mmap": True, "verbose": VERBOSE_LLAMA_CPP
+    },
+    "mistral": {"chat_format": "mistral-instruct"}, "gemma": {"chat_format": "gemma"},
+    "qwen": {"chat_format": "chatml"}
 }
-
 INFERENCE_PRESETS = {
-    "balanced": {"temperature": 0.7, "top_p": 0.9, "top_k": 40, "repeat_penalty": 1.1, "mirostat_mode": 0, "max_tokens": 1024},
-    "precise":  {"temperature": 0.2, "top_p": 0.7, "top_k": 20, "repeat_penalty": 1.05, "mirostat_mode": 0, "max_tokens": 1536},
-    "creative": {"temperature": 0.9, "top_p": 0.95, "top_k": 60, "repeat_penalty": 1.15, "mirostat_mode": 2, "mirostat_tau": 4.0, "mirostat_eta": 0.1, "max_tokens": 1024},
-    "passthrough": {}
+    "balanced": {"temperature": 0.7, "top_p": 0.9, "top_k": 40, "repeat_penalty": 1.1, "max_tokens": 1024},
+    "precise": {"temperature": 0.2, "top_p": 0.7, "top_k": 20, "repeat_penalty": 1.05, "max_tokens": 1536},
+    "creative": {"temperature": 0.9, "top_p": 0.95, "top_k": 60, "repeat_penalty": 1.15, "max_tokens": 1024}
 }
 DEFAULT_INFERENCE_PRESET = "balanced"
-
-DEFAULT_SYSTEM_PROMPT = "You are ZOTHEOS, an ethical AI developed to help humanity. Provide clear, concise, and helpful responses. Be respectful and avoid harmful content."
-
-SYSTEM_PERSONAS = {
-    "default": DEFAULT_SYSTEM_PROMPT,
-    "helpful_assistant": "You are a helpful AI assistant.",
-    "philosopher": "You are a philosopher. Engage deeply and explore ideas.",
-    "coder": "You are an expert AI developer. Provide great code and reasoning.",
-    "concise_summarizer": "Summarize in bullet points. Be concise."
-}
-
-MODEL_ROLES = {
-    "mistral": "analyst",
-    "qwen": "skeptic"
-}
-
+DEFAULT_SYSTEM_PROMPT = "You are ZOTHEOS, an ethical AI developed to help humanity."
+MODEL_ROLES = {"mistral": "analyst", "gemma": "humanist", "qwen": "skeptic"}
 MODEL_ROLE_SYSTEM_PROMPTS = {
-    "analyst": "You are an impartial analyst. Focus on evidence and logic.",
-    "skeptic": "You are a respectful skeptic. Point out flaws and explore alternate views.",
-    "general": DEFAULT_SYSTEM_PROMPT
-}
-
-MODEL_WEIGHTS = {
-    "mistral": 1.0,
-    "qwen": 1.1
+    "analyst": "You are an impartial analyst.", "humanist": "You are a human-centered assistant.",
+    "skeptic": "You are a critical evaluator and a respectful skeptic.", "general": DEFAULT_SYSTEM_PROMPT
 }
-
-LOG_LEVEL = "INFO"
-LOG_FORMAT = '%(asctime)s - %(name)s - %(levelname)s - [%(funcName)s] - %(message)s'
-
-ENV_VARS_TO_SET = {
-    "TRANSFORMERS_CACHE": CORE_DIRS_TO_VERIFY["cache_transformers"],
-    "HF_HOME": CORE_DIRS_TO_VERIFY["cache_huggingface"],
-    "HF_HUB_CACHE": CORE_DIRS_TO_VERIFY["cache_hf_hub"],
-    "TOKENIZERS_PARALLELISM": "false"
-}
-
-ZOTHEOS_VERSION = "Public Beta 1.4 (Web Enabled)"
-
-logger.info(f"Config settings loaded. Version: {ZOTHEOS_VERSION}")
-logger.info(f"APP_DIR: {APP_DIR} (Frozen: {_is_frozen}) | Web Mode: {IS_WEB_MODE}")
+ZOTHEOS_VERSION = "2.2 (Live and Corrected)"
+logger.info(f"Config loaded. Version: {ZOTHEOS_VERSION}, Web Mode: {IS_WEB_MODE}")