Upload patch_models.py

patch_models.py

@@ -12,10 +12,12 @@ IDS_FILE = "/app/agent/core/model_ids.py"
 with open(IDS_FILE) as f:
     content = f.read()
 
+# --- Remove any previous NO_TOOLS_MODELS addition first (clean slate) ---
+if "NO_TOOLS_MODELS" in content:
+    content = re.sub(r'NO_TOOLS_MODELS\s*=\s*\{[^}]*\}\n?', '', content)
+    print("OK: Removed old NO_TOOLS_MODELS")
+
 # Swap out old model definitions for new ones
-content = content.replace(
-    "CLAUDE_OPUS_48_MODEL_ID", "__DELETED_CLAUDE"
-)
 content = content.replace(
     'KIMI_K27_CODE_MODEL_ID = "moonshotai/Kimi-K2.7-Code:novita"',
     'KIMI_K27_CODE_MODEL_ID = "deepseek-ai/DeepSeek-V4-Pro"',
@@ -33,37 +35,54 @@ content = content.replace(
     'DEEPSEEK_V4_PRO_MODEL_ID = "nvidia/nemotron-3-super-120b-a12b:free"',
 )
 
-# Add new model IDs
-new_ids = """
-GEMMA_4_31B_FREE_MODEL_ID = "openai/google/gemma-4-31b-it:free"
+# Replace all existing deepseek model IDs with 0731 version
+content = content.replace(
+    '~deepseek/deepseek-v4-flash-latest',
+    '~deepseek/deepseek-v4-flash-0731'
+)
+content = content.replace(
+    'deepseek/deepseek-v4-flash-latest',
+    '~deepseek/deepseek-v4-flash-0731'
+)
+content = content.replace(
+    'deepseek/deepseek-v4-flash',
+    'deepseek/deepseek-v4-flash'  # keep as-is
+)
+
+# Add missing model ID constants if not present
+if "GEMMA_4_31B_FREE_MODEL_ID" not in content:
+    # Find where model constants end (after DEEPSEEK_V4_PRO_MODEL_ID)
+    pos = content.find('DEEPSEEK_V4_PRO_MODEL_ID')
+    if pos >= 0:
+        # Find the next line break after this constant definition
+        next_newline = content.find('\n', pos)
+        if next_newline >= 0:
+            before = content[:next_newline + 1]
+            after = content[next_newline + 1:]
+            new_constants = '''
 TENCENT_HY3_FREE_MODEL_ID = "openai/tencent/hy3:free"
+GEMMA_4_31B_FREE_MODEL_ID = "openai/google/gemma-4-31b-it:free"
 LLAMA_3_3_70B_FREE_MODEL_ID = "openai/meta-llama/llama-3.3-70b-instruct:free"
 LLAMA_3_1_8B_MODEL_ID = "openai/meta-llama/llama-3.1-8b-instruct"
 LAGUNA_M1_FREE_MODEL_ID = "openai/poolside/laguna-m.1:free"
 LAGUNA_S21_FREE_MODEL_ID = "openai/poolside/laguna-s-2.1:free"
 NEX_N2_MINI_MODEL_ID = "openai/nex-agi/nex-n2-mini"
 LING_3_0_FLASH_FREE_MODEL_ID = "openai/inclusionai/ling-3.0-flash:free"
-DEEPSEEK_V4_FLASH_LATEST_MODEL_ID = "~deepseek/deepseek-v4-flash-0731"
-NO_TOOLS_MODELS = {"~deepseek/deepseek-v4-flash-0731", "openai/deepseek/deepseek-v4-flash"}
-"""
-if "GEMMA_4_31B_FREE_MODEL_ID" not in content:
-    content = content.replace(
-        "DEEPSEEK_V4_PRO_MODEL_ID",
-        new_ids + "\nDEEPSEEK_V4_PRO_MODEL_ID"
-    )
-
-# Update HOSTED_MODEL_IDS
-hosted_start = content.find("HOSTED_MODEL_IDS = {")
-if hosted_start >= 0:
-    hosted_end = content.find("}", hosted_start) + 1
-    hosted_block = content[hosted_start:hosted_end]
-    new_hosted = "HOSTED_MODEL_IDS = {\n    GPT_55_MODEL_ID,\n    KIMI_K27_CODE_MODEL_ID,\n    MINIMAX_M3_MODEL_ID,\n    GLM_52_MODEL_ID,\n    DEEPSEEK_V4_PRO_MODEL_ID,\n    GEMMA_4_31B_FREE_MODEL_ID,\n    TENCENT_HY3_FREE_MODEL_ID,\n    LLAMA_3_3_70B_FREE_MODEL_ID,\n    LLAMA_3_1_8B_MODEL_ID,\n    LAGUNA_M1_FREE_MODEL_ID,\n    LAGUNA_S21_FREE_MODEL_ID,\n    NEX_N2_MINI_MODEL_ID,\n    LING_3_0_FLASH_FREE_MODEL_ID,\n    DEEPSEEK_V4_FLASH_LATEST_MODEL_ID,\n}"
-    content = content.replace(hosted_block, new_hosted)
+'''
+            content = before + new_constants + after
 
 with open(IDS_FILE, "w") as f:
     f.write(content)
 print("OK: model_ids.py patched")
 
+# Validate syntax
+try:
+    ast.parse(content)
+    print("OK: model_ids.py syntax OK")
+except SyntaxError as e:
+    print(f"FAIL: model_ids.py syntax error: {e}")
+    raise
+
 # === Step 2: Patch agent.py ===
 with open(AGENT_FILE) as f:
     content = f.read()
@@ -96,16 +115,14 @@ new_import = (
     "    GPT_55_MODEL_ID,\n"
     "    KIMI_K27_CODE_MODEL_ID,\n"
     "    MINIMAX_M3_MODEL_ID,\n"
-    "    GEMMA_4_31B_FREE_MODEL_ID,\n"
     "    TENCENT_HY3_FREE_MODEL_ID,\n"
+    "    GEMMA_4_31B_FREE_MODEL_ID,\n"
     "    LLAMA_3_3_70B_FREE_MODEL_ID,\n"
     "    LLAMA_3_1_8B_MODEL_ID,\n"
     "    LAGUNA_M1_FREE_MODEL_ID,\n"
     "    LAGUNA_S21_FREE_MODEL_ID,\n"
     "    NEX_N2_MINI_MODEL_ID,\n"
     "    LING_3_0_FLASH_FREE_MODEL_ID,\n"
-    "    DEEPSEEK_V4_FLASH_LATEST_MODEL_ID,\n"
-    "    NO_TOOLS_MODELS,\n"
     "    strip_huggingface_model_prefix,\n"
     ")"
 )
@@ -127,12 +144,10 @@ new_func = (
     '        {"id": MINIMAX_M3_MODEL_ID, "label": "DeepSeek V4 Flash"},\n'
     '        {"id": DEFAULT_MODEL_ID, "label": "DeepSeek V4 Flash"},\n'
     '        {"id": DEEPSEEK_V4_PRO_MODEL_ID, "label": "Nemotron 3 Super 120B"},\n'
-    '        {"id": DEEPSEEK_V4_FLASH_LATEST_MODEL_ID, "label": "DeepSeek V4 Flash latest"},\n'
     "    ]\n"
     "    return models"
 )
 
-# Find the old function by pattern
 func_match = re.search(
     r"def _available_models\(\)\s*->\s*list\[dict\[str,\s*Any\]\]:.*?return models",
     content, re.DOTALL
@@ -141,7 +156,6 @@ if func_match:
     content = content[:func_match.start()] + new_func + content[func_match.end():]
     print("OK: Replaced _available_models()")
 else:
-    # Fallback: try exact match
     old_func = (
         "def _available_models() -> list[dict[str, Any]]:\n"
         "    models = [\n"
@@ -158,12 +172,7 @@ else:
         content = content.replace(old_func, new_func)
         print("OK: String replace of _available_models()")
     else:
-        print("FAIL: Cannot find _available_models()")
-        print("Content excerpt around 'def _available_models':")
-        idx = content.find("def _available_models")
-        if idx >= 0:
-            print(content[idx:idx+500])
-        import sys; sys.exit(1)
+        print("WARN: Cannot find _available_models(), skipping")
 
 # Update title gen model
 content = content.replace(
@@ -183,7 +192,7 @@ with open(AGENT_FILE, "w") as f:
     f.write(content)
 print("OK: agent.py patched")
 
-# === Step 3: Patch _resolve_llm_params to auto-disable tools for DeepSeek ===
+# === Step 3: Patch _resolve_llm_params ===
 with open(LLM_PARAMS_FILE) as f:
     llm_content = f.read()
 
@@ -192,13 +201,6 @@ if "normalized_model.startswith" not in llm_content:
     if api_key_find in llm_content:
         line_end = llm_content.find("\n", llm_content.find(api_key_find) + len(api_key_find)) + 1
         routing_insert = (
-            '    # Route deepseek/-prefixed models to OpenRouter (no tool use)\n'
-            '    if normalized_model.startswith("~deepseek/") or normalized_model.startswith("deepseek/"):\n'
-            '        return {\n'
-            '            "model": normalized_model,\n'
-            '            "api_base": "https://openrouter.ai/api/v1",\n'
-            '            "api_key": os.environ.get("OPENROUTER_API_KEY") or api_key or "",\n'
-            '        }\n\n'
             '    # Route openai/-prefixed models to OpenRouter\n'
             '    if normalized_model.startswith("openai/"):\n'
             '        return {\n'