jaf-py 2.5.11__tar.gz → 2.5.13__tar.gz

{jaf_py-2.5.11 → jaf_py-2.5.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.5.11
+Version: 2.5.13
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors
@@ -82,7 +82,7 @@ Dynamic: license-file
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.5.11-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.5.13-blue.svg)](https://github.com/xynehq/jaf-py)
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)](https://www.python.org/)
 [![Docs](https://img.shields.io/badge/Docs-Live-brightgreen)](https://xynehq.github.io/jaf-py/)
 

{jaf_py-2.5.11 → jaf_py-2.5.13}/README.md

@@ -2,7 +2,7 @@
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.5.11-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.5.13-blue.svg)](https://github.com/xynehq/jaf-py)
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)](https://www.python.org/)
 [![Docs](https://img.shields.io/badge/Docs-Live-brightgreen)](https://xynehq.github.io/jaf-py/)
 

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf/__init__.py

@@ -201,7 +201,7 @@ def generate_run_id() -> RunId:
     return create_run_id(str(uuid.uuid4()))
 
 
-__version__ = "2.5.11"
+__version__ = "2.5.13"
 __all__ = [
     # Core types and functions
     "TraceId",

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf/core/agent_tool.py

@@ -189,6 +189,8 @@ def create_agent_tool(
             initial_input_guardrails=parent_config.initial_input_guardrails,
             final_output_guardrails=parent_config.final_output_guardrails,
             on_event=parent_config.on_event,
+            before_llm_call=parent_config.before_llm_call,
+            after_llm_call=parent_config.after_llm_call,
             memory=parent_config.memory if preserve_session else None,
             conversation_id=parent_config.conversation_id if preserve_session else None,
             default_tool_timeout=parent_config.default_tool_timeout,

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf/core/tracing.py

@@ -467,7 +467,7 @@ class LangfuseTraceCollector:
             public_key=public_key,
             secret_key=secret_key,
             host=host,
-            release="jaf-py-v2.5.11",
+            release="jaf-py-v2.5.13",
             httpx_client=client,
         )
         self._httpx_client = client
@@ -1069,6 +1069,47 @@ class LangfuseTraceCollector:
                 )
                 print(f"[LANGFUSE] Handoff event created")
 
+            elif event.type == "retry":
+                # Create an event for retry attempts
+                attempt = self._get_event_data(event, "attempt", 1)
+                max_retries = self._get_event_data(event, "max_retries", 3)
+                reason = self._get_event_data(event, "reason", "Unknown")
+                operation = self._get_event_data(event, "operation", "llm_call")
+                delay = self._get_event_data(event, "delay")
+                error_details = self._get_event_data(event, "error_details", {})
+
+                print(
+                    f"[LANGFUSE] Recording retry event: attempt {attempt}/{max_retries} for {operation}, reason: {reason}"
+                )
+
+                # Create comprehensive retry event data
+                retry_input = {
+                    "attempt": attempt,
+                    "max_retries": max_retries,
+                    "reason": reason,
+                    "operation": operation,
+                    "delay_seconds": delay,
+                    "error_details": error_details,
+                    "timestamp": datetime.now().isoformat(),
+                }
+
+                # Use compatibility layer to create event (works with both v2 and v3)
+                self._create_event(
+                    parent_span=self.trace_spans[trace_id],
+                    name=f"retry-{operation}",
+                    input=retry_input,
+                    metadata={
+                        "framework": "jaf",
+                        "event_type": "retry",
+                        "retry_attempt": attempt,
+                        "max_retries": max_retries,
+                        "operation": operation,
+                        "reason": reason,
+                        "is_final_retry": attempt >= max_retries,
+                    },
+                )
+                print(f"[LANGFUSE] Retry event created for attempt {attempt}/{max_retries}")
+
             else:
                 # Create a generic event for other event types
                 print(f"[LANGFUSE] Creating generic event for: {event.type}")

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf/core/types.py

@@ -978,6 +978,37 @@ class OutputParseEvent:
     data: OutputParseEventData = field(default_factory=lambda: OutputParseEventData("", "start"))
 
 
+@dataclass(frozen=True)
+class RetryEventData:
+    """Data for retry events."""
+
+    attempt: int  # Current retry attempt (1-indexed)
+    max_retries: int  # Maximum number of retries configured
+    reason: str  # Reason for retry (e.g., "HTTP 429 - Rate Limit", "HTTP 500 - Server Error")
+    operation: Literal["llm_call", "tool_call", "workflow_step"]  # What operation is being retried
+    trace_id: TraceId
+    run_id: RunId
+    delay: Optional[float] = None  # Backoff delay in seconds before next retry
+    error_details: Optional[Dict[str, Any]] = None  # Additional error context
+
+
+@dataclass(frozen=True)
+class RetryEvent:
+    """Event emitted when a retry occurs."""
+
+    type: Literal["retry"] = "retry"
+    data: RetryEventData = field(
+        default_factory=lambda: RetryEventData(
+            attempt=1,
+            max_retries=3,
+            reason="",
+            operation="llm_call",
+            trace_id=TraceId(""),
+            run_id=RunId(""),
+        )
+    )
+
+
 # Union type for all trace events
 TraceEvent = Union[
     RunStartEvent,
@@ -992,6 +1023,7 @@ TraceEvent = Union[
     ToolCallEndEvent,
     HandoffEvent,
     RunEndEvent,
+    RetryEvent,
 ]
 
 

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf/providers/model.py

@@ -10,6 +10,7 @@ import httpx
 import time
 import os
 import base64
+import asyncio
 
 from openai import AsyncOpenAI
 from pydantic import BaseModel
@@ -27,6 +28,8 @@ from ..core.types import (
     ToolCallFunctionDelta,
     MessageContentPart,
     get_text_content,
+    RetryEvent,
+    RetryEventData,
 )
 from ..core.proxy import ProxyConfig
 from ..utils.document_processor import (
@@ -110,6 +113,102 @@ async def _is_vision_model(model: str, base_url: str) -> bool:
     return is_known_vision_model
 
 
+async def _retry_with_events(
+    operation_func,
+    state: RunState,
+    config: RunConfig,
+    operation_name: str = "llm_call",
+    max_retries: int = 3,
+    backoff_factor: float = 1.0,
+):
+    """
+    Wrapper that retries an async operation and emits retry events.
+
+    Args:
+        operation_func: Async function to execute (should accept no arguments)
+        state: Current run state
+        config: Run configuration with event handler
+        operation_name: Name of the operation for logging
+        max_retries: Maximum number of retry attempts
+        backoff_factor: Exponential backoff multiplier
+
+    Returns:
+        Result from operation_func
+
+    Raises:
+        Last exception if all retries are exhausted
+    """
+    last_exception = None
+
+    for attempt in range(max_retries + 1):
+        try:
+            return await operation_func()
+        except Exception as e:
+            last_exception = e
+
+            # Check if this is a retryable HTTP error
+            is_retryable = False
+            reason = str(e)
+            error_details = {"error_type": type(e).__name__, "error_message": str(e)}
+
+            # Check for HTTP errors (common in OpenAI/LiteLLM)
+            if hasattr(e, "status_code"):
+                status_code = e.status_code
+                error_details["status_code"] = status_code
+
+                # Retry on rate limits (429) and server errors (5xx)
+                if status_code == 429:
+                    is_retryable = True
+                    reason = f"HTTP {status_code} - Rate Limit"
+                elif 500 <= status_code < 600:
+                    is_retryable = True
+                    reason = f"HTTP {status_code} - Server Error"
+                else:
+                    reason = f"HTTP {status_code}"
+
+            # Check for common exception names
+            elif "RateLimitError" in type(e).__name__:
+                is_retryable = True
+                reason = "Rate Limit Error"
+            elif "ServiceUnavailableError" in type(e).__name__ or "APIError" in type(e).__name__:
+                is_retryable = True
+                reason = "API Error"
+            elif "Timeout" in type(e).__name__:
+                is_retryable = True
+                reason = "Timeout"
+
+            # If not last attempt and is retryable, retry with backoff
+            if attempt < max_retries and is_retryable:
+                delay = backoff_factor * (2**attempt)  # Exponential backoff
+
+                # Emit retry event
+                if config.on_event:
+                    retry_event = RetryEvent(
+                        data=RetryEventData(
+                            attempt=attempt + 1,
+                            max_retries=max_retries,
+                            reason=reason,
+                            operation=operation_name,
+                            trace_id=state.trace_id,
+                            run_id=state.run_id,
+                            delay=delay,
+                            error_details=error_details,
+                        )
+                    )
+                    config.on_event(retry_event)
+
+                print(
+                    f"[JAF:RETRY] Attempt {attempt + 1}/{max_retries} failed: {reason}. Retrying in {delay}s..."
+                )
+                await asyncio.sleep(delay)
+            else:
+                # Not retryable or last attempt, re-raise
+                raise
+
+    # Should never reach here, but just in case
+    raise last_exception
+
+
 def make_litellm_provider(
     base_url: str,
     api_key: str = "anything",
@@ -248,8 +347,14 @@ def make_litellm_provider(
             if agent.output_codec:
                 request_params["response_format"] = {"type": "json_object"}
 
-            # Make the API call
-            response = await self.client.chat.completions.create(**request_params)
+            # Make the API call with retry handling
+            async def _api_call():
+                return await self.client.chat.completions.create(**request_params)
+
+            # Use retry wrapper to track retries in Langfuse
+            response = await _retry_with_events(
+                _api_call, state, config, operation_name="llm_call", max_retries=3, backoff_factor=1.0
+            )
 
             # Return in the expected format that the engine expects
             choice = response.choices[0]
@@ -577,8 +682,14 @@ def make_litellm_sdk_provider(
             if self.base_url:
                 request_params["api_base"] = self.base_url
 
-            # Make the API call using litellm
-            response = await litellm.acompletion(**request_params)
+            # Make the API call using litellm with retry handling
+            async def _api_call():
+                return await litellm.acompletion(**request_params)
+
+            # Use retry wrapper to track retries in Langfuse
+            response = await _retry_with_events(
+                _api_call, state, config, operation_name="llm_call", max_retries=3, backoff_factor=1.0
+            )
 
             # Return in the expected format that the engine expects
             choice = response.choices[0]

{jaf_py-2.5.11 → jaf_py-2.5.13}/jaf_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.5.11
+Version: 2.5.13
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors
@@ -82,7 +82,7 @@ Dynamic: license-file
 
 <!-- ![JAF Banner](docs/cover.png) -->
 
-[![Version](https://img.shields.io/badge/version-2.5.11-blue.svg)](https://github.com/xynehq/jaf-py)
+[![Version](https://img.shields.io/badge/version-2.5.13-blue.svg)](https://github.com/xynehq/jaf-py)
 [![Python](https://img.shields.io/badge/python-3.10%2B-blue.svg)](https://www.python.org/)
 [![Docs](https://img.shields.io/badge/Docs-Live-brightgreen)](https://xynehq.github.io/jaf-py/)
 

{jaf_py-2.5.11 → jaf_py-2.5.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jaf-py"
-version = "2.5.11"
+version = "2.5.13"
 description = "A purely functional agent framework with immutable state and composable tools - Python implementation"
 readme = "README.md"
 license = "MIT"