jaf-py 2.2.2__py3-none-any.whl → 2.2.3__py3-none-any.whl

jaf/core/__init__.py

@@ -13,6 +13,7 @@ from .agent_tool import (
     get_current_run_config,
     set_current_run_config,
 )
+from .proxy import ProxyConfig, ProxyAuth, create_proxy_config, get_default_proxy_config
 
 __all__ = [
     "Agent",
@@ -22,6 +23,8 @@ __all__ = [
     "Message",
     "ModelConfig",
     "ModelProvider",
+    "ProxyAuth",
+    "ProxyConfig",
     "RunConfig",
     "RunId",
     "RunResult",
@@ -39,9 +42,11 @@ __all__ = [
     "create_conditional_enabler",
     "create_default_output_extractor",
     "create_json_output_extractor",
+    "create_proxy_config",
     "create_run_id",
     "create_trace_id",
     "get_current_run_config",
+    "get_default_proxy_config",
     "require_permissions",
     "run",
     "set_current_run_config",

jaf/core/engine.py

@@ -631,7 +631,7 @@ async def _execute_tool_calls(
                     result=result_string,
                     trace_id=state.trace_id,
                     run_id=state.run_id,
-                    tool_result=tool_result_obj,
+                    tool_result=tool_result,
                     status='success'
                 ))))
 

jaf/core/proxy.py

@@ -0,0 +1,141 @@
+"""
+Proxy configuration for JAF agents and HTTP clients.
+
+This module provides unified proxy configuration that can be used across
+different HTTP clients (httpx, OpenAI, etc.) in the JAF framework.
+"""
+
+import os
+from dataclasses import dataclass
+from typing import Optional, Dict, Any, Union
+from urllib.parse import urlparse
+
+
+@dataclass
+class ProxyAuth:
+    """Proxy authentication configuration."""
+    username: str
+    password: str
+
+
+@dataclass
+class ProxyConfig:
+    """Proxy configuration for HTTP clients."""
+    http_proxy: Optional[str] = None
+    https_proxy: Optional[str] = None
+    no_proxy: Optional[str] = None
+    auth: Optional[ProxyAuth] = None
+    
+    @classmethod
+    def from_environment(cls) -> 'ProxyConfig':
+        """Create proxy configuration from environment variables."""
+        return cls(
+            http_proxy=os.getenv('HTTP_PROXY') or os.getenv('http_proxy'),
+            https_proxy=os.getenv('HTTPS_PROXY') or os.getenv('https_proxy'),
+            no_proxy=os.getenv('NO_PROXY') or os.getenv('no_proxy'),
+            auth=ProxyAuth(
+                username=os.getenv('PROXY_USERNAME', ''),
+                password=os.getenv('PROXY_PASSWORD', '')
+            ) if os.getenv('PROXY_USERNAME') else None
+        )
+    
+    @classmethod
+    def from_url(cls, proxy_url: str, auth: Optional[ProxyAuth] = None) -> 'ProxyConfig':
+        """Create proxy configuration from a single URL."""
+        return cls(
+            http_proxy=proxy_url,
+            https_proxy=proxy_url,
+            auth=auth
+        )
+    
+    def to_httpx_proxies(self) -> Optional[Dict[str, str]]:
+        """Convert to httpx proxies format."""
+        if not self.http_proxy and not self.https_proxy:
+            return None
+        
+        proxies = {}
+        
+        if self.http_proxy:
+            proxies['http://'] = self._add_auth_to_url(self.http_proxy)
+        
+        if self.https_proxy:
+            proxies['https://'] = self._add_auth_to_url(self.https_proxy)
+        
+        return proxies if proxies else None
+    
+    def to_openai_proxies(self) -> Optional[Dict[str, str]]:
+        """Convert to OpenAI client proxies format."""
+        # OpenAI client supports httpx-style proxy configuration
+        return self.to_httpx_proxies()
+    
+    def _add_auth_to_url(self, url: str) -> str:
+        """Add authentication to proxy URL if configured."""
+        if not self.auth or not self.auth.username:
+            return url
+        
+        parsed = urlparse(url)
+        
+        # If URL already has auth, don't override
+        if '@' in parsed.netloc:
+            return url
+        
+        auth_string = f"{self.auth.username}:{self.auth.password}"
+        
+        # Reconstruct URL with auth
+        if parsed.port:
+            netloc = f"{auth_string}@{parsed.hostname}:{parsed.port}"
+        else:
+            netloc = f"{auth_string}@{parsed.hostname}"
+        
+        return f"{parsed.scheme}://{netloc}{parsed.path}"
+    
+    def should_bypass_proxy(self, host: str) -> bool:
+        """Check if a host should bypass the proxy based on no_proxy settings."""
+        if not self.no_proxy:
+            return False
+        
+        no_proxy_hosts = [h.strip() for h in self.no_proxy.split(',')]
+        
+        for no_proxy_host in no_proxy_hosts:
+            if not no_proxy_host:
+                continue
+            
+            # Exact match
+            if host == no_proxy_host:
+                return True
+            
+            # Wildcard match (e.g., *.example.com)
+            if no_proxy_host.startswith('*'):
+                suffix = no_proxy_host[1:]
+                if host.endswith(suffix):
+                    return True
+            
+            # Domain suffix match
+            if no_proxy_host.startswith('.'):
+                if host.endswith(no_proxy_host) or host == no_proxy_host[1:]:
+                    return True
+        
+        return False
+
+
+def create_proxy_config(
+    proxy_url: Optional[str] = None,
+    username: Optional[str] = None,
+    password: Optional[str] = None,
+    no_proxy: Optional[str] = None
+) -> ProxyConfig:
+    """Create a proxy configuration with optional parameters."""
+    auth = ProxyAuth(username, password) if username else None
+    
+    if proxy_url:
+        config = ProxyConfig.from_url(proxy_url, auth)
+        if no_proxy:
+            config.no_proxy = no_proxy
+        return config
+    
+    return ProxyConfig.from_environment()
+
+
+def get_default_proxy_config() -> ProxyConfig:
+    """Get the default proxy configuration from environment variables."""
+    return ProxyConfig.from_environment()

jaf/core/proxy_helpers.py

@@ -0,0 +1,126 @@
+"""
+Helper functions for creating JAF core components with proxy support.
+
+This module provides convenience functions to easily create model providers
+with proxy configuration.
+"""
+
+from typing import Optional, Dict, Any
+from .proxy import ProxyConfig, get_default_proxy_config
+from ..providers.model import make_litellm_provider
+
+
+def make_proxy_enabled_litellm_provider(
+    base_url: str,
+    api_key: str = "anything",
+    default_timeout: Optional[float] = None,
+    proxy_url: Optional[str] = None,
+    proxy_username: Optional[str] = None,
+    proxy_password: Optional[str] = None,
+    use_env_proxy: bool = True
+):
+    """
+    Create a LiteLLM provider with proxy support.
+    
+    Args:
+        base_url: Base URL for the LiteLLM server
+        api_key: API key (defaults to "anything" for local servers)
+        default_timeout: Default timeout for model API calls in seconds
+        proxy_url: Proxy URL (if not using environment variables)
+        proxy_username: Proxy username for authentication
+        proxy_password: Proxy password for authentication
+        use_env_proxy: Whether to use proxy settings from environment variables
+        
+    Returns:
+        ModelProvider with proxy configuration
+    """
+    proxy_config = None
+    
+    if proxy_url:
+        # Use explicitly provided proxy settings
+        from .proxy import ProxyAuth, create_proxy_config
+        proxy_config = create_proxy_config(
+            proxy_url=proxy_url,
+            username=proxy_username,
+            password=proxy_password
+        )
+    elif use_env_proxy:
+        # Use environment-based proxy settings
+        proxy_config = get_default_proxy_config()
+        # Only use proxy if actually configured in environment
+        if not proxy_config.http_proxy and not proxy_config.https_proxy:
+            proxy_config = None
+    
+    return make_litellm_provider(
+        base_url=base_url,
+        api_key=api_key,
+        default_timeout=default_timeout,
+        proxy_config=proxy_config
+    )
+
+
+
+
+def get_proxy_info() -> Dict[str, Any]:
+    """
+    Get information about current proxy configuration from environment.
+    
+    Returns:
+        Dictionary with proxy configuration details
+    """
+    proxy_config = get_default_proxy_config()
+    
+    return {
+        "http_proxy": proxy_config.http_proxy,
+        "https_proxy": proxy_config.https_proxy,
+        "no_proxy": proxy_config.no_proxy,
+        "has_auth": proxy_config.auth is not None,
+        "auth_username": proxy_config.auth.username if proxy_config.auth else None,
+        "is_configured": bool(proxy_config.http_proxy or proxy_config.https_proxy)
+    }
+
+
+def validate_proxy_config(proxy_config: ProxyConfig) -> Dict[str, Any]:
+    """
+    Validate proxy configuration and return validation results.
+    
+    Args:
+        proxy_config: Proxy configuration to validate
+        
+    Returns:
+        Dictionary with validation results
+    """
+    results = {
+        "valid": True,
+        "warnings": [],
+        "errors": []
+    }
+    
+    # Check if at least one proxy is configured
+    if not proxy_config.http_proxy and not proxy_config.https_proxy:
+        results["warnings"].append("No proxy URLs configured")
+    
+    # Validate proxy URLs if configured
+    for proxy_type, proxy_url in [("HTTP", proxy_config.http_proxy), ("HTTPS", proxy_config.https_proxy)]:
+        if proxy_url:
+            try:
+                from urllib.parse import urlparse
+                parsed = urlparse(proxy_url)
+                if not parsed.scheme:
+                    results["errors"].append(f"{proxy_type} proxy URL missing scheme: {proxy_url}")
+                    results["valid"] = False
+                if not parsed.netloc:
+                    results["errors"].append(f"{proxy_type} proxy URL missing host: {proxy_url}")
+                    results["valid"] = False
+            except Exception as e:
+                results["errors"].append(f"Invalid {proxy_type} proxy URL: {e}")
+                results["valid"] = False
+    
+    # Check authentication consistency
+    if proxy_config.auth:
+        if not proxy_config.auth.username:
+            results["warnings"].append("Proxy authentication configured but username is empty")
+        if not proxy_config.auth.password:
+            results["warnings"].append("Proxy authentication configured but password is empty")
+    
+    return results

jaf/providers/model.py

@@ -6,18 +6,21 @@ starting with LiteLLM for multi-provider support.
 """
 
 from typing import Any, Dict, Optional, TypeVar
+import httpx
 
 from openai import OpenAI
 from pydantic import BaseModel
 
 from ..core.types import Agent, ContentRole, Message, ModelProvider, RunConfig, RunState
+from ..core.proxy import ProxyConfig
 
 Ctx = TypeVar('Ctx')
 
 def make_litellm_provider(
     base_url: str,
     api_key: str = "anything",
-    default_timeout: Optional[float] = None
+    default_timeout: Optional[float] = None,
+    proxy_config: Optional[ProxyConfig] = None
 ) -> ModelProvider[Ctx]:
     """
     Create a LiteLLM-compatible model provider.
@@ -26,6 +29,7 @@ def make_litellm_provider(
         base_url: Base URL for the LiteLLM server
         api_key: API key (defaults to "anything" for local servers)
         default_timeout: Default timeout for model API calls in seconds
+        proxy_config: Optional proxy configuration
         
     Returns:
         ModelProvider instance
@@ -35,11 +39,25 @@ def make_litellm_provider(
         def __init__(self):
             # Default to "anything" if api_key is not provided, for local servers
             effective_api_key = api_key if api_key is not None else "anything"
-            self.client = OpenAI(
-                base_url=base_url,
-                api_key=effective_api_key,
-                # Note: dangerouslyAllowBrowser is JavaScript-specific
-            )
+            
+            # Configure HTTP client with proxy support
+            client_kwargs = {
+                "base_url": base_url,
+                "api_key": effective_api_key,
+            }
+            
+            if proxy_config:
+                proxies = proxy_config.to_httpx_proxies()
+                if proxies:
+                    # Create httpx client with proxy configuration
+                    try:
+                        http_client = httpx.Client(proxies=proxies)
+                        client_kwargs["http_client"] = http_client
+                    except Exception as e:
+                        print(f"Warning: Could not configure proxy: {e}")
+                        # Fall back to environment variables for proxy
+            
+            self.client = OpenAI(**client_kwargs)
             self.default_timeout = default_timeout
 
         async def get_completion(

{jaf_py-2.2.2.dist-info → jaf_py-2.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.2.2
+Version: 2.2.3
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors
@@ -110,6 +110,7 @@ A purely functional agent framework with immutable state and composable tools, p
 - ✅ **Output Guardrails**: Response sanitization
 - ✅ **Permission System**: Role-based access control
 - ✅ **Audit Logging**: Complete interaction tracing
+- ✅ **Proxy Support**: Corporate proxy integration with authentication
 
 ### 📊 **Observability & Monitoring**
 - ✅ **Real-time Tracing**: Event-driven observability

{jaf_py-2.2.2.dist-info → jaf_py-2.2.3.dist-info}/RECORD

@@ -38,13 +38,15 @@ jaf/a2a/tests/test_client.py,sha256=L5h7DtQRVlULiRhRLtrmaCoYdvmbXsgLTy3QQ6KgmNM,
 jaf/a2a/tests/test_integration.py,sha256=I7LdgwN99mAOljM9kYtK7dGMMntTSWKMw_oLOcJjinU,18454
 jaf/a2a/tests/test_protocol.py,sha256=He3vGlBfIazpppAnuSybutrvjIN3VGxEleAohrVd9hc,23287
 jaf/a2a/tests/test_types.py,sha256=PgRjDVJrHSXuu05z0B5lsSUUY5qEdQLFJbLBIExyVgI,18384
-jaf/core/__init__.py,sha256=jpeow6G3SpDtYaY4hdEoTQ2ZgPUSUZTDR_AFwrs2cRE,1155
+jaf/core/__init__.py,sha256=rBvP_7TGbJICDJnA7a3qyX8yQErCDWaGAn5WzpyH4gU,1339
 jaf/core/agent_tool.py,sha256=8TcBuSxGmDTW5F_GhBU_m5S43nYqkjO4qTrNERraAig,11656
 jaf/core/analytics.py,sha256=NrUfOLLTDIhOzdfc65ZqS9AJ4ZAP9BtNtga69q0YdYw,23265
 jaf/core/composition.py,sha256=IVxRO1Q9nK7JRH32qQ4p8WMIUu66BhqPNrlTNMGFVwE,26317
-jaf/core/engine.py,sha256=KqY87WFpmfU-mPzTzLXnlncyq2xKDSYONJiz0tYJZfI,26861
+jaf/core/engine.py,sha256=wakHo9DcNSVH7N5FC_6vi4Nc0yO15YJpNvNTLyyGM_E,26857
 jaf/core/errors.py,sha256=5fwTNhkojKRQ4wZj3lZlgDnAsrYyjYOwXJkIr5EGNUc,5539
 jaf/core/performance.py,sha256=jedQmTEkrKMD6_Aw1h8PdG-5TsdYSFFT7Or6k5dmN2g,9974
+jaf/core/proxy.py,sha256=_WM3cpRlSQLYpgSBrnY30UPMe2iZtlqDQ65kppE-WY0,4609
+jaf/core/proxy_helpers.py,sha256=i7a5fAX9rLmO4FMBX51-yRkTFwfWedzQNgnLmeLUd_A,4370
 jaf/core/streaming.py,sha256=c5o9iqpjoYV2LrUpG6qLWCYrWcP-DCcZsvMbyqKunp8,16089
 jaf/core/tool_results.py,sha256=-bTOqOX02lMyslp5Z4Dmuhx0cLd5o7kgR88qK2HO_sw,11323
 jaf/core/tools.py,sha256=SbJRRr4y_xxNYNTulZg6OiyNaHBlo_qXWYY510jxQEs,16489
@@ -66,7 +68,7 @@ jaf/policies/handoff.py,sha256=KJYYuL9T6v6DECRhnsS2Je6q4Aj9_zC5d_KBnvEnZNE,8318
 jaf/policies/validation.py,sha256=wn-7ynH10E5nk-_r1_kHIYHrBGmLX0EFr-FUTHrsxvc,10903
 jaf/providers/__init__.py,sha256=j_o-Rubr8d9tNYlFWb6fvzkxIBl3JKK_iabj9wTFia0,2114
 jaf/providers/mcp.py,sha256=WxcC8gUFpDBBYyhorMcc1jHq3xMDMBtnwyRPthfL0S0,13074
-jaf/providers/model.py,sha256=hKDLLE4sMqCiQT03VcNSgsvMp3phMvFQewRDDsP-qWw,6781
+jaf/providers/model.py,sha256=9kCisPgppBeVKXS7JtXeOyA5791Tdh6z0vcJbENAQNs,7535
 jaf/server/__init__.py,sha256=K0vSgTfzn3oM54UX9BeAROpaksYY43mFtfjSXoQrhXA,339
 jaf/server/main.py,sha256=CTb0ywbPIq9ELfay5MKChVR7BpIQOoEbPjPfpzo2aBQ,2152
 jaf/server/server.py,sha256=o-n6dPWmlu4_v5ozVW3BTOm1b5kHBQhqRYlHh5sXL-k,8048
@@ -77,9 +79,9 @@ jaf/visualization/functional_core.py,sha256=zedMDZbvjuOugWwnh6SJ2stvRNQX1Hlkb9Ab
 jaf/visualization/graphviz.py,sha256=WTOM6UP72-lVKwI4_SAr5-GCC3ouckxHv88ypCDQWJ0,12056
 jaf/visualization/imperative_shell.py,sha256=GpMrAlMnLo2IQgyB2nardCz09vMvAzaYI46MyrvJ0i4,2593
 jaf/visualization/types.py,sha256=QQcbVeQJLuAOXk8ynd08DXIS-PVCnv3R-XVE9iAcglw,1389
-jaf_py-2.2.2.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
-jaf_py-2.2.2.dist-info/METADATA,sha256=08sGQ4y4S6KFtf5_ay-VnraZ14z5lR4qIqqBkT_xMNw,23077
-jaf_py-2.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jaf_py-2.2.2.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
-jaf_py-2.2.2.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
-jaf_py-2.2.2.dist-info/RECORD,,
+jaf_py-2.2.3.dist-info/licenses/LICENSE,sha256=LXUQBJxdyr-7C4bk9cQBwvsF_xwA-UVstDTKabpcjlI,1063
+jaf_py-2.2.3.dist-info/METADATA,sha256=IqS2qTIVxsXrYE0GLCKRRVv5H4MjwBCbg0UgWuqsZHE,23150
+jaf_py-2.2.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jaf_py-2.2.3.dist-info/entry_points.txt,sha256=OtIJeNJpb24kgGrqRx9szGgDx1vL9ayq8uHErmu7U5w,41
+jaf_py-2.2.3.dist-info/top_level.txt,sha256=Xu1RZbGaM4_yQX7bpalo881hg7N_dybaOW282F15ruE,4
+jaf_py-2.2.3.dist-info/RECORD,,