made proxy cleaner

app/config.py

@@ -41,6 +41,5 @@ SAFETY_SCORE = os.environ.get("SAFETY_SCORE", "false").lower() == "true"
 # Validation logic moved to app/auth.py
 
 # Proxy settings
-HTTPS_PROXY = os.environ.get("HTTPS_PROXY")
-SOCKS_PROXY = os.environ.get("SOCKS_PROXY")
+PROXY_URL = os.environ.get("PROXY_URL")
 SSL_CERT_FILE = os.environ.get("SSL_CERT_FILE")

app/openai_handler.py

@@ -81,10 +81,11 @@ class ExpressClientWrapper:
             payload.update(payload.pop('extra_body'))
 
         proxies = None
-        if app_config.SOCKS_PROXY:
-            proxies = {"all://": app_config.SOCKS_PROXY}
-        elif app_config.HTTPS_PROXY:
-            proxies = {"https://": app_config.HTTPS_PROXY}
+        if app_config.PROXY_URL:
+            if app_config.PROXY_URL.startswith("socks"):
+                proxies = {"all://": app_config.PROXY_URL}
+            else:
+                proxies = {"https://": app_config.PROXY_URL}
 
         client_args = {'timeout': 300}
         if proxies:
@@ -118,10 +119,11 @@ class ExpressClientWrapper:
             payload.update(payload.pop('extra_body'))
 
         proxies = None
-        if app_config.SOCKS_PROXY:
-            proxies = {"all://": app_config.SOCKS_PROXY}
-        elif app_config.HTTPS_PROXY:
-            proxies = {"https://": app_config.HTTPS_PROXY}
+        if app_config.PROXY_URL:
+            if app_config.PROXY_URL.startswith("socks"):
+                proxies = {"all://": app_config.PROXY_URL}
+            else:
+                proxies = {"https://": app_config.PROXY_URL}
 
         client_args = {'timeout': 300}
         if proxies:
@@ -157,10 +159,11 @@ class OpenAIDirectHandler:
         )
         
         proxies = None
-        if app_config.SOCKS_PROXY:
-            proxies = {"all://": app_config.SOCKS_PROXY}
-        elif app_config.HTTPS_PROXY:
-            proxies = {"https://": app_config.HTTPS_PROXY}
+        if app_config.PROXY_URL:
+            if app_config.PROXY_URL.startswith("socks"):
+                proxies = {"all://": app_config.PROXY_URL}
+            else:
+                proxies = {"https://": app_config.PROXY_URL}
 
         client_args = {}
         if proxies:

app/project_id_discovery.py

@@ -10,11 +10,7 @@ PROJECT_ID_CACHE: Dict[str, str] = {}
 
 def _get_proxy_url() -> Optional[str]:
     """Get proxy URL from config."""
-    if config.SOCKS_PROXY:
-        return config.SOCKS_PROXY
-    if config.HTTPS_PROXY:
-        return config.HTTPS_PROXY
-    return None
+    return config.PROXY_URL
 
 
 async def discover_project_id(api_key: str) -> str:

app/vertex_ai_init.py

@@ -14,10 +14,10 @@ from model_loader import refresh_models_config_cache # Import new model loader f
 
 def _get_http_options() -> Optional[types.HttpOptions]:
     """Get http options from config."""
-    if app_config.SOCKS_PROXY:
+    if app_config.PROXY_URL and app_config.PROXY_URL.startswith("socks"):
         return types.HttpOptions(
-            client_args={'proxy': app_config.SOCKS_PROXY},
-            async_client_args={'proxy': app_config.SOCKS_PROXY},
+            client_args={'proxy': app_config.PROXY_URL},
+            async_client_args={'proxy': app_config.PROXY_URL},
         )
     return None