✨ Feature: Add feature: Support socks5 proxy

README.md

@@ -101,6 +101,7 @@ providers:
         gemini-1.5-pro: 10 # Model gemini-1.5-pro timeout is 10 seconds
         gemini-1.5-flash: 10 # Model gemini-1.5-flash timeout is 10 seconds
         default: 10 # Model does not have a timeout set, use the default timeout of 10 seconds, when requesting a model not in model_timeout, the timeout is also 10 seconds, if default is not set, uni-api will use the default timeout set by the environment variable TIMEOUT, the default timeout is 100 seconds
+      proxy: socks5://[username]:[password]@[ip]:[port] # Proxy address, optional. Supports socks5 and http proxies, default is not used.
 
   - provider: vertex
     project_id: gen-lang-client-xxxxxxxxxxxxxx # Description: Your Google Cloud project ID. Format: String, usually composed of lowercase letters, numbers, and hyphens. How to obtain: You can find your project ID in the project selector of the Google Cloud Console.

README_CN.md

@@ -101,6 +101,7 @@ providers:
         gemini-1.5-pro: 10 # 模型 gemini-1.5-pro 的超时时间为 10 秒
         gemini-1.5-flash: 10 # 模型 gemini-1.5-flash 的超时时间为 10 秒
         default: 10 # 模型没有设置超时时间，使用默认的超时时间 10 秒，当请求的不在 model_timeout 里面的模型时，超时时间默认是 10 秒，不设置 default，uni-api 会使用全局配置的模型超时时间。
+      proxy: socks5://[用户名]:[密码]@[IP地址]:[端口] # 代理地址，选填。支持 socks5 和 http 代理，默认不使用代理。
 
   - provider: vertex
     project_id: gen-lang-client-xxxxxxxxxxxxxx #    描述： 您的Google Cloud项目ID。格式： 字符串，通常由小写字母、数字和连字符组成。获取方式： 在Google Cloud Console的项目选择器中可以找到您的项目ID。

main.py

@@ -600,7 +600,7 @@ class ClientManager:
         self.default_config = default_config
 
     @asynccontextmanager
-    async def get_client(self, timeout_value):
+    async def get_client(self, timeout_value, proxy=None):
         # 直接获取或创建客户端,不使用锁
         timeout_value = int(timeout_value)
         if timeout_value not in self.clients:
@@ -610,11 +610,42 @@ class ClientManager:
                 write=30.0,
                 pool=self.pool_size
             )
-            self.clients[timeout_value] = httpx.AsyncClient(
-                timeout=timeout,
-                limits=httpx.Limits(max_connections=self.pool_size),
-                **self.default_config
-            )
+            limits = httpx.Limits(max_connections=self.pool_size)
+
+            client_config = {
+                **self.default_config,
+                "timeout": timeout,
+                "limits": limits
+            }
+
+            if proxy:
+                # 解析代理URL
+                from urllib.parse import urlparse
+                parsed = urlparse(proxy)
+
+                # 修改这里: 将 socks5h 转换为 socks5
+                scheme = parsed.scheme.rstrip('h')
+                # print("scheme", scheme)
+
+                if scheme == 'socks5':
+                    try:
+                        from httpx_socks import AsyncProxyTransport
+                        # 使用修改后的scheme创建代理URL
+                        proxy = proxy.replace('socks5h://', 'socks5://')
+                        # 创建SOCKS5代理传输
+                        transport = AsyncProxyTransport.from_url(proxy)
+                        client_config["transport"] = transport
+                    except ImportError:
+                        logger.error("httpx-socks package is required for SOCKS proxy support")
+                        raise ImportError("Please install httpx-socks package for SOCKS proxy support: pip install httpx-socks")
+                else:
+                    # 对于HTTP/HTTPS代理使用原有方式
+                    client_config["proxies"] = {
+                        "http://": proxy,
+                        "https://": proxy
+                    }
+
+            self.clients[timeout_value] = httpx.AsyncClient(**client_config)
 
         try:
             yield self.clients[timeout_value]
@@ -795,8 +826,24 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
         timeout_value = app.state.timeouts.get("default", DEFAULT_TIMEOUT)
     # print("timeout_value", timeout_value)
 
+    proxy = safe_get(provider, "preferences", "proxy", default=None)
+    # print("proxy", proxy)
+
     try:
-        async with app.state.client_manager.get_client(timeout_value) as client:
+        async with app.state.client_manager.get_client(timeout_value, proxy) as client:
+            # 打印client配置信息
+            # logger.info(f"Client config - Timeout: {client.timeout}")
+            # logger.info(f"Client config - Headers: {client.headers}")
+            # if hasattr(client, '_transport'):
+            #     if hasattr(client._transport, 'proxy_url'):
+            #         logger.info(f"Client config - Proxy: {client._transport.proxy_url}")
+            #     elif hasattr(client._transport, 'proxies'):
+            #         logger.info(f"Client config - Proxies: {client._transport.proxies}")
+            #     else:
+            #         logger.info("Client config - No proxy configured")
+            # else:
+            #     logger.info("Client config - No transport configured")
+            # logger.info(f"Client config - Follow Redirects: {client.follow_redirects}")
             if request.stream:
                 generator = fetch_response_stream(client, url, headers, payload, engine, original_model)
                 wrapped_generator, first_response_time = await error_handling_wrapper(generator, channel_id)

requirements.txt

@@ -9,5 +9,6 @@ sqlalchemy
 watchfiles
 ruamel.yaml
 httpx[http2]
+httpx-socks
 cryptography
 python-multipart