jaf-py 2.4.8__tar.gz → 2.5.1__tar.gz

{jaf_py-2.4.8/jaf_py.egg-info → jaf_py-2.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.4.8
+Version: 2.5.1
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors

{jaf_py-2.4.8 → jaf_py-2.5.1}/jaf/core/engine.py

@@ -279,8 +279,9 @@ async def _load_conversation_history(state: RunState[Ctx], config: RunConfig[Ctx
                 try:
                     content = json.loads(msg.content)
                     status = content.get('status')
-                    # Filter out ALL halted messages (they're for audit only)
-                    if status == 'halted':
+                    hitl_status = content.get('hitl_status')
+                    # Filter out ALL halted/pending approval messages (they're for audit only)
+                    if status == 'halted' or hitl_status == 'pending_approval':
                         filtered_count += 1
                         continue  # Skip this halted message
                     else:
@@ -765,7 +766,7 @@ async def _run_internal(
                 else:
                     try:
                         content = json.loads(msg.content)
-                        if content.get('status') == 'halted':
+                        if content.get('status') == 'halted' or content.get('hitl_status') == 'pending_approval':
                             # Remove this halted message if we have a new result for the same tool_call_id
                             if not any(result['message'].tool_call_id == msg.tool_call_id for result in tool_results):
                                 cleaned_new_messages.append(msg)
@@ -793,7 +794,7 @@ async def _run_internal(
             else:
                 try:
                     content = json.loads(msg.content)
-                    if content.get('status') == 'halted':
+                    if content.get('status') == 'halted' or content.get('hitl_status') == 'pending_approval':
                         # Remove this halted message if we have a new result for the same tool_call_id
                         if not any(result['message'].tool_call_id == msg.tool_call_id for result in tool_results):
                             cleaned_new_messages.append(msg)
@@ -1011,7 +1012,7 @@ async def _execute_tool_calls(
 
             if not tool:
                 error_result = json.dumps({
-                    'status': 'tool_not_found',
+                    'hitl_status': 'tool_not_found',  # HITL workflow status
                     'message': f'Tool {tool_call.function.name} not found',
                     'tool_name': tool_call.function.name,
                 })
@@ -1022,7 +1023,7 @@ async def _execute_tool_calls(
                         result=error_result,
                         trace_id=state.trace_id,
                         run_id=state.run_id,
-                        status='error',
+                        execution_status='error',  # Tool execution failed
                         tool_result={'error': 'tool_not_found'},
                         call_id=tool_call.id
                     ))))
@@ -1045,7 +1046,7 @@ async def _execute_tool_calls(
                     validated_args = raw_args
             except ValidationError as e:
                 error_result = json.dumps({
-                    'status': 'validation_error',
+                    'hitl_status': 'validation_error',  # HITL workflow status
                     'message': f'Invalid arguments for {tool_call.function.name}: {e!s}',
                     'tool_name': tool_call.function.name,
                     'validation_errors': e.errors()
@@ -1057,7 +1058,7 @@ async def _execute_tool_calls(
                         result=error_result,
                         trace_id=state.trace_id,
                         run_id=state.run_id,
-                        status='error',
+                        execution_status='error',  # Tool execution failed due to validation
                         tool_result={'error': 'validation_error', 'details': e.errors()},
                         call_id=tool_call.id
                     ))))
@@ -1114,7 +1115,7 @@ async def _execute_tool_calls(
                 
                 # Return interrupted result with halted message
                 halted_result = json.dumps({
-                    'status': 'halted',
+                    'hitl_status': 'pending_approval',  # HITL workflow status: waiting for approval
                     'message': f'Tool {tool_call.function.name} requires approval.',
                 })
                 
@@ -1131,7 +1132,7 @@ async def _execute_tool_calls(
             if derived_status == 'rejected':
                 rejection_reason = approval_status.additional_context.get('rejection_reason', 'User declined the action') if approval_status.additional_context else 'User declined the action'
                 rejection_result = json.dumps({
-                    'status': 'approval_denied',
+                    'hitl_status': 'rejected',  # HITL workflow status: user rejected the action
                     'message': f'Action was not approved. {rejection_reason}. Please ask if you can help with something else or suggest an alternative approach.',
                     'tool_name': tool_call.function.name,
                     'rejection_reason': rejection_reason,
@@ -1184,7 +1185,7 @@ async def _execute_tool_calls(
                 )
             except asyncio.TimeoutError:
                 timeout_error_result = json.dumps({
-                    'error': 'timeout_error',
+                    'hitl_status': 'execution_timeout',  # HITL workflow status
                     'message': f'Tool {tool_call.function.name} timed out after {timeout} seconds',
                     'tool_name': tool_call.function.name,
                     'timeout_seconds': timeout
@@ -1196,8 +1197,8 @@ async def _execute_tool_calls(
                         result=timeout_error_result,
                         trace_id=state.trace_id,
                         run_id=state.run_id,
-                        status='timeout',
-                        tool_result={'error': 'timeout_error'},
+                        execution_status='timeout',  # Tool execution timed out
+                        tool_result={'error': 'timeout'},
                         call_id=tool_call.id
                     ))))
 
@@ -1222,7 +1223,7 @@ async def _execute_tool_calls(
             # Wrap tool result with status information for approval context
             if approval_status and approval_status.additional_context:
                 final_content = json.dumps({
-                    'status': 'approved_and_executed',
+                    'hitl_status': 'approved_and_executed',  # HITL workflow status: approved by user and executed
                     'result': result_string,
                     'tool_name': tool_call.function.name,
                     'approval_context': approval_status.additional_context,
@@ -1230,14 +1231,14 @@ async def _execute_tool_calls(
                 })
             elif needs_approval:
                 final_content = json.dumps({
-                    'status': 'approved_and_executed',
+                    'hitl_status': 'approved_and_executed',  # HITL workflow status: approved by user and executed
                     'result': result_string,
                     'tool_name': tool_call.function.name,
                     'message': 'Tool was approved and executed successfully.'
                 })
             else:
                 final_content = json.dumps({
-                    'status': 'executed',
+                    'hitl_status': 'executed',  # HITL workflow status: executed normally (no approval needed)
                     'result': result_string,
                     'tool_name': tool_call.function.name,
                     'message': 'Tool executed successfully.'
@@ -1250,7 +1251,7 @@ async def _execute_tool_calls(
                     trace_id=state.trace_id,
                     run_id=state.run_id,
                     tool_result=tool_result,
-                    status='success',
+                    execution_status='success',  # Tool execution succeeded
                     call_id=tool_call.id
                 ))))
 
@@ -1277,7 +1278,7 @@ async def _execute_tool_calls(
 
         except Exception as error:
             error_result = json.dumps({
-                'status': 'execution_error',
+                'hitl_status': 'execution_error',  # HITL workflow status
                 'message': str(error),
                 'tool_name': tool_call.function.name,
             })
@@ -1288,7 +1289,7 @@ async def _execute_tool_calls(
                     result=error_result,
                     trace_id=state.trace_id,
                     run_id=state.run_id,
-                    status='error',
+                    execution_status='error',  # Tool execution failed with exception
                     tool_result={'error': 'execution_error', 'detail': str(error)},
                     call_id=tool_call.id
                 ))))

{jaf_py-2.4.8 → jaf_py-2.5.1}/jaf/core/tracing.py

@@ -341,7 +341,7 @@ class LangfuseTraceCollector:
             public_key=public_key,
             secret_key=secret_key,
             host=host,
-            release="jaf-py-v2.4.8"
+            release="jaf-py-v2.5.1"
         )
         self.active_spans: Dict[str, Any] = {}
         self.trace_spans: Dict[TraceId, Any] = {}
@@ -509,19 +509,23 @@ class LangfuseTraceCollector:
                         "user_id": user_id or event.data.get("user_id")
                     }
                 }
-                
+
+                # Extract agent_name for tagging
+                agent_name = event.data.get("agent_name") or "analytics_agent_jaf"
+
                 trace = self.langfuse.trace(
-                    name=f"jaf-run-{trace_id}",
+                    name=agent_name,
                     user_id=user_id or event.data.get("user_id"),
                     session_id=event.data.get("session_id"),
                     input=trace_input,
+                    tags=[agent_name],  # Add agent_name as a tag for dashboard filtering
                     metadata={
                         "framework": "jaf",
                         "event_type": "run_start",
                         "trace_id": str(trace_id),
                         "user_query": user_query,
                         "user_id": user_id or event.data.get("user_id"),
-                        "agent_name": event.data.get("agent_name", "analytics_agent_jaf"),
+                        "agent_name": agent_name,
                         "conversation_history": conversation_history,
                         "tool_calls": [],
                         "tool_results": [],
@@ -716,7 +720,8 @@ class LangfuseTraceCollector:
                         "result": tool_result,
                         "call_id": call_id,
                         "timestamp": datetime.now().isoformat(),
-                        "status": event.data.get("status", "completed"),
+                        "execution_status": event.data.get("execution_status", "completed"),
+                        "status": event.data.get("execution_status", "completed"),  # DEPRECATED: backward compatibility
                         "tool_result": event.data.get("tool_result")
                     }
                     
@@ -731,7 +736,8 @@ class LangfuseTraceCollector:
                         "result": tool_result,
                         "call_id": call_id,
                         "timestamp": datetime.now().isoformat(),
-                        "status": event.data.get("status", "completed")
+                        "execution_status": event.data.get("execution_status", "completed"),
+                        "status": event.data.get("execution_status", "completed")  # DEPRECATED: backward compatibility
                     }
                     
                     # End the span with detailed output

{jaf_py-2.4.8 → jaf_py-2.5.1}/jaf/core/types.py

@@ -619,15 +619,43 @@ class ToolCallStartEvent:
 
 @dataclass(frozen=True)
 class ToolCallEndEventData:
-    """Data for tool call end events."""
+    """
+    Data for tool call end events.
+
+    IMPORTANT: There are two different status concepts:
+    1. execution_status (this field): Indicates whether the tool execution itself succeeded or failed
+       - 'success': Tool executed without errors
+       - 'error': Tool execution failed due to validation, not found, or runtime errors
+       - 'timeout': Tool execution timed out
+
+    2. hitl_status (in result JSON): Indicates HITL workflow status
+       - 'executed': Tool ran normally (no approval needed)
+       - 'approved_and_executed': Tool required approval, was approved, and executed
+       - 'pending_approval': Tool requires approval and is waiting
+       - 'rejected': Tool was rejected by user
+       - 'execution_error', 'validation_error', etc.: Various error states
+    """
     tool_name: str
     result: str
     trace_id: TraceId
     run_id: RunId
     tool_result: Optional[Any] = None
-    status: Optional[str] = None
+    execution_status: Optional[str] = None  # success/error/timeout - indicates if tool executed successfully
+    status: Optional[str] = None  # DEPRECATED: maintained for backward-compatible initialization/serialization
     call_id: Optional[str] = None
 
+    def __post_init__(self) -> None:
+        # Handle backward compatibility with explicit conflict detection
+        if self.execution_status is not None and self.status is not None and self.execution_status != self.status:
+            raise ValueError(
+                f"Conflicting values for execution_status ('{self.execution_status}') and status ('{self.status}'). "
+                f"Please use only execution_status for new code."
+            )
+
+        # Prefer execution_status (new field) over status (deprecated field)
+        canonical = self.execution_status if self.execution_status is not None else self.status
+        object.__setattr__(self, 'execution_status', canonical)
+        object.__setattr__(self, 'status', canonical)
 @dataclass(frozen=True)
 class ToolCallEndEvent:
     type: Literal['tool_call_end'] = 'tool_call_end'

{jaf_py-2.4.8 → jaf_py-2.5.1/jaf_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaf-py
-Version: 2.4.8
+Version: 2.5.1
 Summary: A purely functional agent framework with immutable state and composable tools - Python implementation
 Author: JAF Contributors
 Maintainer: JAF Contributors

{jaf_py-2.4.8 → jaf_py-2.5.1}/pyproject.toml

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