Added proxy configuration

Author: IgorChvyrov-sm

src/conductor/asyncio_client/configuration/configuration.py

@@ -73,6 +73,8 @@ def __init__(
         ssl_ca_cert: Optional[str] = None,
         retries: Optional[int] = None,
         ca_cert_data: Optional[Union[str, bytes]] = None,
+        proxy: Optional[str] = None,
+        proxy_headers: Optional[Dict[str, str]] = None,
         **kwargs: Any,
     ):
         """
@@ -137,6 +139,9 @@ def __init__(
         if self.__ui_host is None:
             self.__ui_host = self.server_url.replace("/api", "")
 
+        self.proxy = proxy
+        self.proxy_headers = proxy_headers
+
         self.logger_format = "%(asctime)s %(name)-12s %(levelname)-8s %(message)s"
 
         # Create the underlying HTTP configuration

src/conductor/client/adapters/api_client_adapter.py

@@ -16,7 +16,8 @@ def __init__(
         """Initialize the API client adapter with httpx-based REST client."""
         super().__init__(configuration, header_name, header_value, cookie)
         self.rest_client = RESTClientObjectAdapter(
-            connection=configuration.http_connection if configuration else None
+            connection=configuration.http_connection if configuration else None,
+            configuration=configuration,
         )
 
     def __call_api(

src/conductor/client/adapters/rest_adapter.py

@@ -23,11 +23,13 @@ def __init__(self, response: Response):
         self.reason = response.reason_phrase
         self.resp = response
         self.headers = response.headers
-        
+
         # Log HTTP protocol version
-        http_version = getattr(response, 'http_version', 'Unknown')
-        logger.debug(f"HTTP response received - Status: {self.status}, Protocol: {http_version}")
-        
+        http_version = getattr(response, "http_version", "Unknown")
+        logger.debug(
+            f"HTTP response received - Status: {self.status}, Protocol: {http_version}"
+        )
+
         # Log HTTP/2 usage
         if http_version == "HTTP/2":
             logger.info(f"HTTP/2 connection established - URL: {response.url}")
@@ -53,12 +55,12 @@ def data(self) -> bytes:
     def text(self) -> str:
         """Get response data as text."""
         return self.resp.text
-    
+
     @property
     def http_version(self) -> str:
         """Get the HTTP protocol version used."""
-        return getattr(self.resp, 'http_version', 'Unknown')
-    
+        return getattr(self.resp, "http_version", "Unknown")
+
     def is_http2(self) -> bool:
         """Check if HTTP/2 was used for this response."""
         return self.http_version == "HTTP/2"
@@ -67,32 +69,61 @@ def is_http2(self) -> bool:
 class RESTClientObjectAdapter(RESTClientObject):
     """HTTP client adapter using httpx instead of requests."""
 
-    def __init__(self, connection: Optional[httpx.Client] = None):
-        """Initialize the REST client with httpx."""
-        # Don't call super().__init__() to avoid requests initialization
-        self.connection = connection or httpx.Client(
-            timeout=httpx.Timeout(120.0),
-            follow_redirects=True,
-            limits=httpx.Limits(max_keepalive_connections=20, max_connections=100),
-        )
+    def __init__(self, connection: Optional[httpx.Client] = None, configuration=None):
+        """
+        Initialize the REST client with httpx.
+
+        Args:
+            connection: Pre-configured httpx.Client instance. If provided,
+                       proxy settings from configuration will be ignored.
+            configuration: Configuration object containing proxy settings.
+                          Expected attributes: proxy (str), proxy_headers (dict)
+        """
+        if connection is not None:
+            self.connection = connection
+        else:
+            client_kwargs = {
+                "timeout": httpx.Timeout(120.0),
+                "follow_redirects": True,
+                "limits": httpx.Limits(
+                    max_keepalive_connections=20, max_connections=100
+                ),
+            }
+
+            if (
+                configuration
+                and hasattr(configuration, "proxy")
+                and configuration.proxy
+            ):
+                client_kwargs["proxy"] = configuration.proxy
+            if (
+                configuration
+                and hasattr(configuration, "proxy_headers")
+                and configuration.proxy_headers
+            ):
+                client_kwargs["proxy_headers"] = configuration.proxy_headers
+
+            self.connection = httpx.Client(**client_kwargs)
 
     def close(self):
         """Close the HTTP client connection."""
         if hasattr(self, "connection") and self.connection:
             self.connection.close()
-    
+
     def check_http2_support(self, url: str) -> bool:
         """Check if the server supports HTTP/2 by making a test request."""
         try:
             logger.info(f"Checking HTTP/2 support for: {url}")
             response = self.GET(url)
             is_http2 = response.is_http2()
-            
+
             if is_http2:
                 logger.info(f"✓ HTTP/2 supported by {url}")
             else:
-                logger.info(f"✗ HTTP/2 not supported by {url}, using {response.http_version}")
-            
+                logger.info(
+                    f"✗ HTTP/2 not supported by {url}, using {response.http_version}"
+                )
+
             return is_http2
         except Exception as e:
             logger.error(f"Failed to check HTTP/2 support for {url}: {e}")
@@ -151,7 +182,7 @@ def request(
         try:
             # Log the request attempt
             logger.debug(f"Making HTTP request - Method: {method}, URL: {url}")
-            
+
             # Prepare request parameters
             request_kwargs = {
                 "method": method,

src/conductor/client/configuration/configuration.py

@@ -3,7 +3,7 @@
 import logging
 import os
 import time
-from typing import Optional
+from typing import Optional, Dict
 
 from conductor.shared.configuration.settings.authentication_settings import (
     AuthenticationSettings,
@@ -20,7 +20,21 @@ def __init__(
         authentication_settings: AuthenticationSettings = None,
         server_api_url: Optional[str] = None,
         auth_token_ttl_min: int = 45,
+        proxy: Optional[str] = None,
+        proxy_headers: Optional[Dict[str, str]] = None,
     ):
+        """
+        Initialize Conductor client configuration.
+        
+        Args:
+            base_url: Base URL of the Conductor server (will append /api)
+            debug: Enable debug logging
+            authentication_settings: Authentication configuration for Orkes
+            server_api_url: Full API URL (overrides base_url)
+            auth_token_ttl_min: Authentication token time-to-live in minutes
+            proxy: Proxy URL for HTTP requests (supports http, https, socks4, socks5)
+            proxy_headers: Headers to send with proxy requests (e.g., authentication)
+        """
         if server_api_url is not None:
             self.host = server_api_url
         elif base_url is not None:
@@ -68,7 +82,9 @@ def __init__(
         self.assert_hostname = None
 
         # Proxy URL
-        self.proxy = None
+        self.proxy = proxy
+        # Proxy headers
+        self.proxy_headers = proxy_headers
         # Safe chars for path_param
         self.safe_chars_for_path_param = ""