agnt5 0.2.8a5__cp310-abi3-macosx_10_12_x86_64.whl → 0.2.8a7__cp310-abi3-macosx_10_12_x86_64.whl

agnt5/_telemetry.py

@@ -73,10 +73,17 @@ class OpenTelemetryHandler(logging.Handler):
                 exc_text = self.formatException(record.exc_info)
                 message = f"{message}\n{exc_text}"
 
+            # Extract correlation IDs from LogRecord attributes (added by _CorrelationFilter)
+            # These ensure logs can be correlated with distributed traces in observability backends
+            trace_id = getattr(record, 'trace_id', None)
+            span_id = getattr(record, 'span_id', None)
+            run_id = getattr(record, 'run_id', None)
+
             # Forward to Rust tracing system
             # Rust side will:
             # - Add to current span context (inherits invocation.id)
-            # - Send to OTLP exporter
+            # - Attach correlation IDs as span attributes for OTLP export
+            # - Send to OTLP exporter with trace context
             # - Print to console via fmt layer
             self._log_from_python(
                 level=record.levelname,
@@ -84,7 +91,10 @@ class OpenTelemetryHandler(logging.Handler):
                 target=record.name,
                 module_path=record.module,
                 filename=record.pathname,
-                line=record.lineno
+                line=record.lineno,
+                trace_id=trace_id,
+                span_id=span_id,
+                run_id=run_id,
             )
         except Exception:
             # Don't let logging errors crash the application

agnt5/agent.py

@@ -10,7 +10,7 @@ import functools
 import json
 import logging
 import time
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Union
 
 from .context import Context
 from . import lm
@@ -86,7 +86,6 @@ class AgentContext(Context):
         if state_manager:
             # Explicit state adapter provided (parameter name kept for backward compat)
             self._state_adapter = state_manager
-            logger.debug(f"AgentContext using provided state adapter")
         elif parent_context:
             # Try to inherit state adapter from parent
             try:
@@ -94,38 +93,30 @@ class AgentContext(Context):
                 if hasattr(parent_context, '_workflow_entity'):
                     # WorkflowContext - get state adapter from worker context
                     self._state_adapter = _get_state_adapter()
-                    logger.debug(f"AgentContext inheriting state from WorkflowContext")
                 elif hasattr(parent_context, '_state_adapter'):
                     # Parent AgentContext - share state adapter
                     self._state_adapter = parent_context._state_adapter
-                    logger.debug(f"AgentContext inheriting state from parent AgentContext")
                 elif hasattr(parent_context, '_state_manager'):
                     # Backward compatibility: parent has old _state_manager
                     self._state_adapter = parent_context._state_manager
-                    logger.debug(f"AgentContext inheriting state from parent (legacy)")
                 else:
                     # FunctionContext or base Context - create new state adapter
                     self._state_adapter = EntityStateAdapter()
-                    logger.debug(f"AgentContext created new state adapter (parent has no state)")
             except RuntimeError as e:
                 # _get_state_adapter() failed (not in worker context) - create standalone
                 self._state_adapter = EntityStateAdapter()
-                logger.debug(f"AgentContext created standalone state adapter (not in worker context)")
         else:
             # Try to get from worker context first
             try:
                 self._state_adapter = _get_state_adapter()
-                logger.debug(f"AgentContext got state adapter from worker context")
             except RuntimeError as e:
                 # Standalone - create new state adapter
                 self._state_adapter = EntityStateAdapter()
-                logger.debug(f"AgentContext created standalone state adapter")
 
         # Conversation key for state storage (used for in-memory state)
         self._conversation_key = f"agent:{agent_name}:{self._session_id}:messages"
         # Entity key for database persistence (without :messages suffix to match API expectations)
         self._entity_key = f"agent:{agent_name}:{self._session_id}"
-        logger.debug(f"AgentContext initialized - session_id={self._session_id}")
 
     @property
     def state(self):
@@ -174,15 +165,12 @@ class AgentContext(Context):
         if isinstance(session_data, dict) and "messages" in session_data:
             # New format with session metadata
             messages_data = session_data["messages"]
-            logger.debug(f"Loaded {len(messages_data)} messages from session {entity_key}")
         elif isinstance(session_data, list):
             # Old format - just messages array
             messages_data = session_data
-            logger.debug(f"Loaded {len(messages_data)} messages (legacy format)")
         else:
             # No messages found
             messages_data = []
-            logger.debug(f"No conversation history found for {entity_key}")
 
         # Convert dict representations back to Message objects
         messages = []
@@ -215,8 +203,6 @@ class AgentContext(Context):
         Args:
             messages: List of Message objects to persist
         """
-        logger.debug(f"Saving {len(messages)} messages to conversation history")
-
         # Convert Message objects to dict for JSON serialization
         messages_data = []
         for msg in messages:
@@ -360,16 +346,23 @@ class Handoff:
         ```python
         specialist = Agent(name="specialist", ...)
 
-        # Create handoff configuration
-        handoff_to_specialist = Handoff(
-            agent=specialist,
-            description="Transfer to specialist for detailed analysis"
+        # Simple: Pass agent directly (auto-wrapped with defaults)
+        coordinator = Agent(
+            name="coordinator",
+            handoffs=[specialist]  # Agent auto-converted to Handoff
         )
 
-        # Use in coordinator agent
+        # Advanced: Use Handoff for custom configuration
         coordinator = Agent(
             name="coordinator",
-            handoffs=[handoff_to_specialist]
+            handoffs=[
+                Handoff(
+                    agent=specialist,
+                    description="Custom description for LLM",
+                    tool_name="custom_transfer_name",
+                    pass_full_history=False
+                )
+            ]
         )
         ```
     """
@@ -447,7 +440,6 @@ class AgentRegistry:
         if agent.name in _AGENT_REGISTRY:
             logger.warning(f"Overwriting existing agent '{agent.name}'")
         _AGENT_REGISTRY[agent.name] = agent
-        logger.debug(f"Registered agent '{agent.name}'")
 
     @staticmethod
     def get(name: str) -> Optional["Agent"]:
@@ -463,7 +455,6 @@ class AgentRegistry:
     def clear() -> None:
         """Clear all registered agents."""
         _AGENT_REGISTRY.clear()
-        logger.debug("Cleared agent registry")
 
 
 class AgentResult:
@@ -528,7 +519,7 @@ class Agent:
         model: Any,  # Can be string like "openai/gpt-4o-mini" OR LanguageModel instance
         instructions: str,
         tools: Optional[List[Any]] = None,
-        handoffs: Optional[List[Handoff]] = None,
+        handoffs: Optional[List[Union["Agent", Handoff]]] = None,  # Accept Agent or Handoff instances
         temperature: float = 0.7,
         max_tokens: Optional[int] = None,
         top_p: Optional[float] = None,
@@ -543,7 +534,7 @@ class Agent:
             model: Model string with provider prefix (e.g., "openai/gpt-4o-mini") OR LanguageModel instance
             instructions: System instructions for the agent
             tools: List of tools available to the agent (functions, Tool instances, or Agent instances)
-            handoffs: List of Handoff configurations for agent-to-agent delegation
+            handoffs: List of handoff configurations - can be Agent instances (auto-wrapped) or Handoff instances for custom config
             temperature: LLM temperature (0.0 to 1.0)
             max_tokens: Maximum tokens to generate
             top_p: Nucleus sampling parameter
@@ -573,8 +564,18 @@ class Agent:
         else:
             raise TypeError(f"model must be a string or LanguageModel instance, got {type(model)}")
 
-        # Store handoffs for building handoff tools
-        self.handoffs = handoffs or []
+        # Normalize handoffs: convert Agent instances to Handoff instances
+        self.handoffs: List[Handoff] = []
+        if handoffs:
+            for handoff_item in handoffs:
+                if isinstance(handoff_item, Agent):
+                    # Auto-wrap Agent in Handoff with sensible defaults
+                    self.handoffs.append(Handoff(agent=handoff_item))
+                    logger.info(f"Auto-wrapped agent '{handoff_item.name}' in Handoff for '{self.name}'")
+                elif isinstance(handoff_item, Handoff):
+                    self.handoffs.append(handoff_item)
+                else:
+                    raise TypeError(f"handoffs must contain Agent or Handoff instances, got {type(handoff_item)}")
 
         # Build tool registry (includes regular tools, agent-as-tools, and handoff tools)
         self.tools: Dict[str, Tool] = {}

agnt5/worker.py

@@ -612,7 +612,6 @@ class Worker:
             elif component_type == "function":
                 function_config = FunctionRegistry.get(component_name)
                 if function_config:
-                    logger.info(f"🔥 WORKER: Received request for function: {component_name}")
                     # Return coroutine, don't await it
                     return self._execute_function(function_config, input_data, request)
 
@@ -637,7 +636,6 @@ class Worker:
         from ._core import PyExecuteComponentResponse
 
         exec_start = time.time()
-        logger.info(f"🔥 WORKER: Executing function {config.name}")
 
         try:
             # Parse input data
@@ -655,26 +653,15 @@ class Worker:
                 runtime_context=request.runtime_context,
             )
 
-            # Create span for function execution with trace linking
-            from ._core import create_span
-
-            with create_span(
-                config.name,
-                "function",
-                request.runtime_context,
-                {
-                    "function.name": config.name,
-                    "service.name": self.service_name,
-                },
-            ) as span:
-                # Execute function
-                if input_dict:
-                    result = config.handler(ctx, **input_dict)
-                else:
-                    result = config.handler(ctx)
-
-                # Debug: Log what type result is
-                logger.info(f"🔥 WORKER: Function result type: {type(result).__name__}, isasyncgen: {inspect.isasyncgen(result)}, iscoroutine: {inspect.iscoroutine(result)}")
+            # Execute function directly - Rust bridge handles tracing
+            # Note: Removed Python-level span creation to avoid duplicate spans.
+            # The Rust worker bridge (sdk-python/rust-src/worker.rs:413-659) already
+            # creates a comprehensive OpenTelemetry span with all necessary attributes.
+            # See DUPLICATE_SPANS_FIX.md for details.
+            if input_dict:
+                result = config.handler(ctx, **input_dict)
+            else:
+                result = config.handler(ctx)
 
             # Note: Removed flush_telemetry_py() call here - it was causing 2-second blocking delay!
             # The batch span processor handles flushing automatically with 5s timeout
@@ -842,23 +829,14 @@ class Worker:
                 runtime_context=request.runtime_context,
             )
 
-            # Create span for workflow execution with trace linking
-            from ._core import create_span
-
-            with create_span(
-                config.name,
-                "workflow",
-                request.runtime_context,
-                {
-                    "workflow.name": config.name,
-                    "service.name": self.service_name,
-                },
-            ) as span:
-                # Execute workflow
-                if input_dict:
-                    result = await config.handler(ctx, **input_dict)
-                else:
-                    result = await config.handler(ctx)
+            # Execute workflow directly - Rust bridge handles tracing
+            # Note: Removed Python-level span creation to avoid duplicate spans.
+            # The Rust worker bridge creates comprehensive OpenTelemetry spans.
+            # See DUPLICATE_SPANS_FIX.md for details.
+            if input_dict:
+                result = await config.handler(ctx, **input_dict)
+            else:
+                result = await config.handler(ctx)
 
             # Note: Removed flush_telemetry_py() call here - it was causing 2-second blocking delay!
             # The batch span processor handles flushing automatically with 5s timeout

{agnt5-0.2.8a5.dist-info → agnt5-0.2.8a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agnt5
-Version: 0.2.8a5
+Version: 0.2.8a7
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: Programming Language :: Python :: 3

{agnt5-0.2.8a5.dist-info → agnt5-0.2.8a7.dist-info}/RECORD

@@ -1,12 +1,12 @@
-agnt5-0.2.8a5.dist-info/METADATA,sha256=0yneaLrJFbpRR65wwR3XBaUy-KsJDFoi191gMrC1558,996
-agnt5-0.2.8a5.dist-info/WHEEL,sha256=eZxluNosN814qqPoiTnB1GwMrzvnR_7wE3Goh6BHRg8,105
+agnt5-0.2.8a7.dist-info/METADATA,sha256=QrRLobueytjiXx54BwGSm85R9hTLSXoE1CMf4I8-8eE,996
+agnt5-0.2.8a7.dist-info/WHEEL,sha256=eZxluNosN814qqPoiTnB1GwMrzvnR_7wE3Goh6BHRg8,105
 agnt5/__init__.py,sha256=liMb9egh56qvgY4Xvs9s7grOzF3lXSE8-nIksJLNAy4,2195
 agnt5/_compat.py,sha256=BGuy3v5VDOHVa5f3Z-C22iMN19lAt0mPmXwF3qSSWxI,369
-agnt5/_core.abi3.so,sha256=ArUWjUY6gmhAl70OyRIBDlrqHl6a6xGbip8lMofYAig,12852128
+agnt5/_core.abi3.so,sha256=tO7UsopesF7tyRW_ao3nvK_Hf5NB6BsdsKDhVpxYj8c,12810632
 agnt5/_retry_utils.py,sha256=loHsWY5BR4wZy57IzcDEjQAy88DHVwVIr25Cn1d9GPA,5801
 agnt5/_schema_utils.py,sha256=MR67RW757T4Oq2Jqf4kB61H_b51zwaf3CLWELnkngRo,9572
-agnt5/_telemetry.py,sha256=bIY9AvBRjJBTHoBPbfR6X1OgaiUf-T0vCoi0_snsWXA,5957
-agnt5/agent.py,sha256=PuRq4cA8kJrBgrjRuDu62GBKJwefEjvndJZOj78_OGg,43293
+agnt5/_telemetry.py,sha256=gx4TQNqxeQwpyPWvgVVknPjx5NbenmR6E-DGCj18Ssw,6510
+agnt5/agent.py,sha256=ccV0rLj_9eF_G2VfrY8GWDBbNBadmDAYPrBJ6hMeuTE,43089
 agnt5/client.py,sha256=kXksazgxdVXWaG9OkjJA4cWruNtcS-ENhtnkrIdw-Nk,23212
 agnt5/context.py,sha256=S2OzPkhn_jnqSWfT21mSYOux8vHaLKQxcAvggZDHQek,2378
 agnt5/entity.py,sha256=AlHmSHVxQD5EYBvkmERKUkwv0ERrKaT8rvRK611hv_I,28941
@@ -17,6 +17,6 @@ agnt5/tool.py,sha256=dkShd97Y1cwSOUnTwvL2gr0CW-usRlaq4frki9kREXI,18008
 agnt5/tracing.py,sha256=Mh2-OfnQM61lM_P8gxJstafdsUA8Gxoo1lP-Joxhub8,5980
 agnt5/types.py,sha256=Zb71ZMwvrt1p4SH18cAKunp2y5tao_W5_jGYaPDejQo,2840
 agnt5/version.py,sha256=rOq1mObLihnnKgKqBrwZA0zwOPudEKVFcW1a48ynkqc,573
-agnt5/worker.py,sha256=W5_yvy1vcflYjoPAGcIirbHXMbEXijXPJtGQOgl6oz4,51815
+agnt5/worker.py,sha256=jRguDRF0uTjYAmmAgmn3GtdEvIxgTuUoIOsme3ba6mU,51172
 agnt5/workflow.py,sha256=cDxKK21mLrsgjLGmosinhKnAme30CoQqs_fUFvRsyI0,23456
-agnt5-0.2.8a5.dist-info/RECORD,,
+agnt5-0.2.8a7.dist-info/RECORD,,