Upload patch_models.py

patch_models.py

@@ -211,9 +211,9 @@ with open(AGENT_FILE, "w") as f:
     f.write(content)
 
 # === Step 2: Patch _resolve_llm_params for OpenRouter routing ===
-# IMPORTANT: Strip the "openai/" prefix before sending to OpenRouter!
-# The "openai/" prefix is needed by LiteLLM for provider detection,
-# but OpenRouter expects bare model slugs like "openrouter/owl-alpha".
+# IMPORTANT: Keep the "openai/" prefix when sending to OpenRouter!
+# OpenRouter accepts the full slug like "openai/openrouter/owl-alpha".
+# LiteLLM needs "openai/" for provider detection.
 with open(LLM_PARAMS_FILE) as f:
     llm_content = f.read()
 
@@ -229,12 +229,11 @@ old_block = """    hf_model = normalized_model
 new_block = """    hf_model = normalized_model
     api_key = _resolve_hf_router_token(session_hf_token)
 
-    # === PATCH: Route openai/-prefixed models to OpenRouter ===
-    # Strip the "openai/" prefix — OpenRouter expects bare slugs like "openrouter/owl-alpha"
+    # === PATCH: Route ALL openai/-prefixed models to OpenRouter ===
+    # Keep the "openai/" prefix — both LiteLLM and OpenRouter need it.
     if normalized_model.startswith("openai/"):
-        actual_model = normalized_model[len("openai/"):]
         return {
-            "model": actual_model,
+            "model": normalized_model,
             "api_base": "https://openrouter.ai/api/v1",
             "api_key": os.environ.get("OPENROUTER_API_KEY") or api_key or "",
         }
@@ -248,30 +247,37 @@ new_block = """    hf_model = normalized_model
 
 if old_block in llm_content:
     llm_content = llm_content.replace(old_block, new_block)
-    print("OK: Patched _resolve_llm_params (strips openai/ prefix)")
-else:
-    # Already patched — update the OR routing to strip the prefix
+    print("OK: Patched _resolve_llm_params (catch-all openai/ -> OR, keep prefix)")
+elif "normalized_model[len" in llm_content or "actual_model" in llm_content:
+    # Revert the strip approach — keep openai/ prefix
     idx = llm_content.find("if normalized_model.startswith(\"openai/\"):")
     if idx >= 0:
-        # Find the return block
-        return_start = llm_content.find('"model":', idx)
-        if return_start >= 0:
-            line_start = llm_content.rfind('\n', 0, return_start) + 1
-            line_end = llm_content.find('\n', line_start)
-            old_model_line = llm_content[line_start:line_end]
-            
-            # Check if it already strips prefix
-            if "normalized_model[len" in old_model_line or "actual_model" in old_model_line:
-                print("OK: Already strips openai/ prefix")
-            else:
-                # Replace the model line to strip prefix
-                new_model_line = '            "model": normalized_model[len("openai/"):],'
+        or_start = llm_content.find("# === PATCH:", idx)
+        if or_start < 0:
+            or_start = idx
+        or_end = llm_content.find("# === END PATCH", or_start)
+        if or_end < 0:
+            or_end = llm_content.find("params = {", or_start)
+        
+        # Find the return block and fix it
+        ret_line = llm_content.find("return {", or_start, or_end)
+        if ret_line > 0:
+            model_line_start = llm_content.find('"model":', ret_line)
+            if model_line_start > 0:
+                line_start = llm_content.rfind('\n', 0, model_line_start) + 1
+                line_end = llm_content.find('\n', line_start)
+                old_model_line = llm_content[line_start:line_end]
+                new_model_line = '            "model": normalized_model,'
                 llm_content = llm_content.replace(old_model_line, new_model_line)
-                print("OK: Fixed to strip openai/ prefix before sending to OpenRouter")
+                print("OK: Reverted to keep openai/ prefix for OpenRouter")
+            else:
+                print("OK: Could not find model line")
+        else:
+            print("OK: Could not find return block")
     else:
-        print("FAIL: Could not find routing condition!")
-        import sys
-        sys.exit(1)
+        print("OK: Already using correct routing")
+else:
+    print("OK: Routing already correct")
 
 try:
     ast.parse(llm_content)
@@ -283,4 +289,4 @@ except SyntaxError as e:
 with open(LLM_PARAMS_FILE, "w") as f:
     f.write(llm_content)
 
-print("OK: Backend patched - 16 models, OR strips openai/ prefix, GPT-5.5→gpt-oss-120b, Riverflow→north-mini-code:free")
+print("OK: Backend patched - 16 models, ALL openai/ -> OR (keep prefix), GPT-5.5→gpt-oss-120b, Riverflow→north-mini-code:free")