Fix

Author: mpfaffenberger

code_puppy/model_factory.py

@@ -14,6 +14,8 @@
 from pydantic_ai.providers.openai import OpenAIProvider
 from pydantic_ai.providers.openrouter import OpenRouterProvider
 
+from code_puppy.tools.common import console
+
 # Environment variables used in this module:
 # - GEMINI_API_KEY: API key for Google's Gemini models. Required when using Gemini models.
 # - OPENAI_API_KEY: API key for OpenAI models. Required when using OpenAI models or custom_openai endpoints.
@@ -46,6 +48,9 @@ def build_httpx_proxy(proxy):
     proxy_url = f"http://{ip}:{port}"
     proxy_auth = (username, password)
 
+    # Log the proxy being used
+    console.log(f"Using proxy: {proxy_url} with username: {username}")
+    
     return httpx.Proxy(url=proxy_url, auth=proxy_auth)
 
 
@@ -61,7 +66,11 @@ def get_random_proxy_from_file(file_path):
         raise ValueError(f"Proxy file '{file_path}' is empty or contains only whitespace.")
 
     selected_proxy = random.choice(proxies)
-    return build_httpx_proxy(selected_proxy)
+    try:
+        return build_httpx_proxy(selected_proxy)
+    except ValueError as e:
+        console.log(f"Warning: Malformed proxy '{selected_proxy}' found in file '{file_path}', ignoring and continuing without proxy.")
+        return None
 
 
 def get_custom_config(model_config):
@@ -145,7 +154,11 @@ def get_model(model_name: str, config: Dict[str, Any]) -> Any:
             if proxy_file_path:
                 proxy = get_random_proxy_from_file(proxy_file_path)
 
-            client = httpx.AsyncClient(headers=headers, verify=ca_certs_path, proxy=proxy)
+            # Only pass proxy to client if it's valid
+            client_args = {"headers": headers, "verify": ca_certs_path}
+            if proxy is not None:
+                client_args["proxy"] = proxy
+            client = httpx.AsyncClient(**client_args)
             anthropic_client = AsyncAnthropic(
                 base_url=url,
                 http_client=client,
@@ -217,7 +230,11 @@ def get_model(model_name: str, config: Dict[str, Any]) -> Any:
             if proxy_file_path:
                 proxy = get_random_proxy_from_file(proxy_file_path)
 
-            client = httpx.AsyncClient(headers=headers, verify=ca_certs_path, proxy=proxy)
+            # Only pass proxy to client if it's valid
+            client_args = {"headers": headers, "verify": ca_certs_path}
+            if proxy is not None:
+                client_args["proxy"] = proxy
+            client = httpx.AsyncClient(**client_args)
             provider_args = dict(
                 base_url=url,
                 http_client=client,

tests/test_model_factory.py

@@ -182,3 +182,22 @@ def test_custom_anthropic_missing_url():
     }
     with pytest.raises(ValueError):
         ModelFactory.get_model("x", config)
+
+
+def test_get_random_proxy_from_file_with_malformed_proxy(monkeypatch, tmp_path):
+    from code_puppy.model_factory import get_random_proxy_from_file
+    
+    # Create a proxy file with both valid and malformed proxies
+    proxy_file = tmp_path / "proxies.txt"
+    proxy_file.write_text("192.168.1.1:8080:user:pass\nmalformed_proxy_without_correct_format\n10.0.0.1:3128:admin:secret")
+    
+    # Mock console.log to avoid printing warnings during test
+    monkeypatch.setattr("code_puppy.model_factory.console.log", lambda x: None)
+    
+    # Should return None for malformed proxy instead of raising ValueError
+    proxy = get_random_proxy_from_file(str(proxy_file))
+    # Either a valid proxy object or None (if the malformed one was selected)
+    # We're fine with either outcome as long as no ValueError is raised
+    
+    # If we get here without exception, the test passes
+    assert proxy is None or hasattr(proxy, 'url')