Fix critical bug: func_start.start() is char index, not line index. Use line number properly.

patch_models.py

@@ -59,29 +59,34 @@ def replace_available_models(content):
     # Strategy 1: Find the function via regex and replace its body
     func_start = re.search(r'def _available_models\(', content)
     if func_start:
-        # Find 'return models' at the same indent level
-        func_def_line = content[:func_start.start()].count('\n')
         lines = content.split('\n')
-        # Find function end (next def at same level or end of file)
-        func_indent = len(lines[func_start.start()]) - len(lines[func_start.start()].lstrip()) if lines[func_start.start()] else 0
-        end_line = func_start.start()
-        for i in range(func_start.start(), len(lines)):
-            line = lines[i]
-            stripped = line.lstrip()
-            if stripped.startswith('def ') and i > func_start.start():
-                end_line = i - 1
+        # Convert char position to line number
+        func_line_num = 0
+        pos = 0
+        for i, line in enumerate(lines):
+            pos += len(line) + 1  # +1 for newline
+            if pos > func_start.start():
+                func_line_num = i
                 break
-            if stripped.startswith('class ') and i > func_start.start():
+        
+        func_indent = len(lines[func_line_num]) - len(lines[func_line_num].lstrip())
+        
+        # Find function end: next `def ` at same or lesser indent, or end of file
+        end_line = len(lines) - 1
+        for i in range(func_line_num + 1, len(lines)):
+            stripped = lines[i].lstrip()
+            line_indent = len(lines[i]) - len(stripped)
+            if stripped and line_indent <= func_indent and (stripped.startswith('def ') or stripped.startswith('class ')):
                 end_line = i - 1
                 break
-        else:
-            end_line = len(lines) - 1
         
-        old_func_text = '\n'.join(lines[func_start.start():end_line + 1])
-        if old_func_text:
+        old_func_text = '\n'.join(lines[func_line_num:end_line + 1])
+        if old_func_text and len(old_func_text) > 50:
             content = content.replace(old_func_text, NEW_FUNC_BODY)
-            print(f"OK: Replaced _available_models() via line-based search (lines {func_start.start()}-{end_line})")
+            print(f"OK: Replaced _available_models() via line-based search (lines {func_line_num + 1}-{end_line + 1})")
             return content
+        else:
+            print(f"WARN: Line-based search found function but body too short ({len(old_func_text)} chars), trying other strategies")
 
     # Strategy 2: Try exact string match (various known patterns)
     known_old_funcs = [
@@ -174,20 +179,17 @@ def replace_available_models(content):
         print("OK: Used extend approach")
         return content
 
-    # Strategy 5: Last resort — just append at the right location
-    print("WARN: Could not find AVAILABLE_MODELS, trying _valid_model_ids...")
-    # Find where AVAILABLE_MODELS is defined and replace
+    # Strategy 5: Last resort — just find AVAILABLE_MODELS assignment
+    print("WARN: Trying AVAILABLE_MODELS regex...")
     avail_match = re.search(r'AVAILABLE_MODELS\s*=\s*_available_models\(\)', content)
     if avail_match:
         content = content[:avail_match.start()] + "AVAILABLE_MODELS = []\n" + NEW_MODELS_CODE + content[avail_match.end():]
-        content = content.replace("AVAILABLE_MODELS = []\nAVAILABLE_MODELS = _available_models()\n", "")
         print("OK: Used regex fallback")
         return content
 
     print("FAIL: Cannot patch agent.py — none of 5 strategies matched!")
-    # Print debug info
-    print("--- First 3000 chars of agent.py ---")
-    print(content[:3000])
+    print("--- First 2000 chars of agent.py ---")
+    print(content[:2000])
     print("--- END ---")
     raise RuntimeError("Could not patch _available_models")
 
@@ -262,15 +264,12 @@ def patch_llm_params(llm_content):
     # Strategy 3: Find HF_ROUTER_BASE_URL in params and inject before it
     idx = llm_content.find('"api_base": HF_ROUTER_BASE_URL')
     if idx >= 0:
-        # Find the containing params block and insert before it
-        param_start = llm_content.rfind('params = {', 0, idx)
-        if param_start >= 0:
-            hf_model_line = llm_content.rfind('hf_model = normalized_model', 0, param_start)
-            if hf_model_line >= 0:
-                insert_point = llm_content.find('\n', hf_model_line)
-                insert_point = llm_content.find('\n', insert_point + 1)  # skip api_key line too
-                patch_code = """
-
+        hf_model_line = llm_content.rfind('hf_model = normalized_model', 0, idx)
+        if hf_model_line >= 0:
+            # Find the line end after hf_model and api_key lines
+            after_hf = llm_content.find('\n', hf_model_line) + 1
+            after_key = llm_content.find('\n', after_hf) + 1
+            patch_code = """
     # === PATCH: Route ALL openai/-prefixed models to OpenRouter ===
     if normalized_model.startswith("openai/"):
         return {
@@ -280,9 +279,9 @@ def patch_llm_params(llm_content):
         }
     # === END PATCH ===
 """
-                llm_content = llm_content[:insert_point] + patch_code + llm_content[insert_point:]
-                print("OK: Patched _resolve_llm_params (inject before HF_ROUTER_BASE_URL)")
-                return llm_content
+            llm_content = llm_content[:after_key] + patch_code + llm_content[after_key:]
+            print("OK: Patched _resolve_llm_params (inject before HF_ROUTER_BASE_URL)")
+            return llm_content
 
     # Strategy 4: Check if already patched
     if "normalized_model.startswith(\"openai/\")" in llm_content:
@@ -305,7 +304,8 @@ def patch_llm_params(llm_content):
             print("OK: Already correctly routed")
         return llm_content
 
-    print("FAIL: Cannot patch llm_params.py! content (first 1000 chars):")
+    print("FAIL: Cannot patch llm_params.py!")
+    print("--- First 1000 chars of llm_params.py ---")
     print(llm_content[:1000])
     print("--- END ---")
     raise RuntimeError("Could not patch _resolve_llm_params")
@@ -321,7 +321,6 @@ try:
     ast.parse(content)
 except SyntaxError as e:
     print(f"FAIL: Syntax error in agent.py after patch: {e}")
-    # Dump the relevant section for debugging
     lines = content.split('\n')
     err_line = e.lineno or 0
     for i in range(max(0, err_line - 5), min(len(lines), err_line + 5)):