kalibr 1.2.8__py3-none-any.whl → 1.2.9__py3-none-any.whl

kalibr/router.py

@@ -8,6 +8,8 @@ import uuid
 from typing import Any, Callable, Dict, List, Optional, Union
 
 from opentelemetry import trace as otel_trace
+from opentelemetry.trace import SpanContext, TraceFlags, NonRecordingSpan, set_span_in_context
+from opentelemetry.context import Context
 
 logger = logging.getLogger(__name__)
 
@@ -15,6 +17,34 @@ logger = logging.getLogger(__name__)
 PathSpec = Union[str, Dict[str, Any]]
 
 
+def _create_context_with_trace_id(trace_id_hex: str) -> Optional[Context]:
+    """Create an OTel context with a specific trace_id.
+
+    This allows child spans to inherit the intelligence service's trace_id,
+    enabling JOINs between outcomes and traces tables.
+    """
+    try:
+        # Convert 32-char hex string to 128-bit int
+        trace_id_int = int(trace_id_hex, 16)
+        if trace_id_int == 0:
+            return None
+
+        # Create span context with our trace_id
+        span_context = SpanContext(
+            trace_id=trace_id_int,
+            span_id=0xDEADBEEF,  # Placeholder, real span will have its own
+            is_remote=True,  # Treat as remote parent so new span_id is generated
+            trace_flags=TraceFlags(TraceFlags.SAMPLED),
+        )
+
+        # Create a non-recording parent span and set in context
+        parent_span = NonRecordingSpan(span_context)
+        return set_span_in_context(parent_span)
+    except (ValueError, TypeError) as e:
+        logger.warning(f"Could not create OTel context with trace_id: {e}")
+        return None
+
+
 class Router:
     """
     Routes LLM requests to the best model based on learned outcomes.
@@ -145,78 +175,73 @@ class Router:
         Returns:
             OpenAI-compatible ChatCompletion response with added attribute:
                 - kalibr_trace_id: Trace ID for explicit outcome reporting
-
-        Raises:
-            openai.OpenAIError: If OpenAI API call fails
-            anthropic.AnthropicError: If Anthropic API call fails
-            google.generativeai.GenerativeAIError: If Google API call fails
-            ImportError: If required provider SDK is not installed
         """
         from kalibr.intelligence import decide
 
+        # Reset state for new request
+        self._outcome_reported = False
+
+        # Step 1: Get routing decision FIRST (before creating span)
+        decision = None
+        model_id = None
+        tool_id = None
+        params = {}
+
+        if force_model:
+            model_id = force_model
+            self._last_decision = {"model_id": model_id, "forced": True}
+        else:
+            try:
+                decision = decide(goal=self.goal)
+                model_id = decision.get("model_id") or self._paths[0]["model"]
+                tool_id = decision.get("tool_id")
+                params = decision.get("params") or {}
+                self._last_decision = decision
+            except Exception as e:
+                logger.warning(f"Routing failed, using fallback: {e}")
+                model_id = self._paths[0]["model"]
+                tool_id = self._paths[0].get("tools")
+                params = self._paths[0].get("params") or {}
+                self._last_decision = {"model_id": model_id, "fallback": True, "error": str(e)}
+
+        # Step 2: Determine trace_id
+        decision_trace_id = self._last_decision.get("trace_id") if self._last_decision else None
+
+        if decision_trace_id:
+            trace_id = decision_trace_id
+        else:
+            trace_id = uuid.uuid4().hex  # Fallback: generate OTel-compatible format
+
+        self._last_trace_id = trace_id
+        self._last_model_id = model_id
+
+        # Step 3: Create OTel context with intelligence trace_id
+        otel_context = _create_context_with_trace_id(trace_id) if decision_trace_id else None
+
+        # Step 4: Create span with custom context (child spans inherit trace_id)
         tracer = otel_trace.get_tracer("kalibr.router")
 
         with tracer.start_as_current_span(
             "kalibr.router.completion",
+            context=otel_context,
             attributes={
                 "kalibr.goal": self.goal,
+                "kalibr.trace_id": trace_id,
+                "kalibr.model_id": model_id,
             }
         ) as router_span:
-            # Reset state for new request
-            self._outcome_reported = False
-
-            # Get routing decision (or use forced model)
+            # Add decision attributes
             if force_model:
-                model_id = force_model
-                tool_id = None
-                params = {}
-                self._last_decision = {"model_id": model_id, "forced": True}
-                router_span.set_attribute("kalibr.model_id", model_id)
                 router_span.set_attribute("kalibr.forced", True)
+            elif decision:
+                router_span.set_attribute("kalibr.path_id", decision.get("path_id", ""))
+                router_span.set_attribute("kalibr.reason", decision.get("reason", ""))
+                router_span.set_attribute("kalibr.exploration", decision.get("exploration", False))
+                router_span.set_attribute("kalibr.confidence", decision.get("confidence", 0.0))
             else:
-                try:
-                    decision = decide(goal=self.goal)
-                    model_id = decision.get("model_id") or self._paths[0]["model"]
-                    tool_id = decision.get("tool_id")
-                    params = decision.get("params") or {}
-                    self._last_decision = decision
-
-                    # Add decision attributes to span
-                    router_span.set_attribute("kalibr.path_id", decision.get("path_id", ""))
-                    router_span.set_attribute("kalibr.model_id", model_id)
-                    router_span.set_attribute("kalibr.reason", decision.get("reason", ""))
-                    router_span.set_attribute("kalibr.exploration", decision.get("exploration", False))
-                    router_span.set_attribute("kalibr.confidence", decision.get("confidence", 0.0))
-                except Exception as e:
-                    # Fallback to first path if routing fails
-                    logger.warning(f"Routing failed, using fallback: {e}")
-                    model_id = self._paths[0]["model"]
-                    tool_id = self._paths[0].get("tools")
-                    params = self._paths[0].get("params") or {}
-                    self._last_decision = {"model_id": model_id, "fallback": True, "error": str(e)}
-                    router_span.set_attribute("kalibr.model_id", model_id)
-                    router_span.set_attribute("kalibr.fallback", True)
-                    router_span.set_attribute("kalibr.fallback_reason", str(e))
-
-            # Use trace_id from decision if available (links outcome to routing decision)
-            # Fall back to OTel span trace_id for backwards compatibility
-            decision_trace_id = self._last_decision.get("trace_id") if self._last_decision else None
-
-            if decision_trace_id:
-                trace_id = decision_trace_id
-            else:
-                # Fallback: generate from OTel span or UUID
-                span_context = router_span.get_span_context()
-                trace_id = format(span_context.trace_id, "032x")
-                if trace_id == "0" * 32:
-                    trace_id = uuid.uuid4().hex
-
-            logger.debug(f"Using trace_id={trace_id} (from_decision={bool(decision_trace_id)})")
-            self._last_trace_id = trace_id
-            self._last_model_id = model_id
-            router_span.set_attribute("kalibr.trace_id", trace_id)
-
-            # Dispatch to provider (will be child span via auto-instrumentation)
+                router_span.set_attribute("kalibr.fallback", True)
+
+            # Step 5: Dispatch to provider
             try:
                 response = self._dispatch(model_id, messages, tool_id, **{**params, **kwargs})
 
@@ -234,7 +259,6 @@ class Router:
                 return response
 
             except Exception as e:
-                # Record error on span
                 router_span.set_attribute("error", True)
                 router_span.set_attribute("error.type", type(e).__name__)
 

{kalibr-1.2.8.dist-info → kalibr-1.2.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kalibr
-Version: 1.2.8
+Version: 1.2.9
 Summary: Adaptive routing for AI agents. Learns which models work best and routes automatically.
 Author-email: Kalibr Team <support@kalibr.systems>
 License: Apache-2.0

{kalibr-1.2.8.dist-info → kalibr-1.2.9.dist-info}/RECORD

@@ -12,7 +12,7 @@ kalibr/kalibr_app.py,sha256=ItZwEh0FZPx9_BE-zPQajC2yxI2y9IHYwJD0k9tbHvY,2773
 kalibr/models.py,sha256=HwD_-iysZMSnCzMQYO1Qcf0aeXySupY7yJeBwl_dLS0,1024
 kalibr/pricing.py,sha256=wY0GzcrZdXuHlZoq2e74RkX0scd6somk_KYbr-RSHdE,8844
 kalibr/redaction.py,sha256=XibxX4Lv1Ci0opE6Tb5ZI2GLbO0a8E9U66MAg60llnc,1139
-kalibr/router.py,sha256=ari4XOogl3tzvcVlGc1Qg3hOnYI2hGaCweLXx07f_fU,17820
+kalibr/router.py,sha256=aYYgI-rcibU8QI9mnGvLc2XmHNn6HZSB3-CO8mOwPRI,18182
 kalibr/schemas.py,sha256=XLZNLkXca6jbj9AF6gDIyGVnIcr1SVOsNYaKvW-wbgE,3669
 kalibr/simple_tracer.py,sha256=oiwXtiYaIqZxqCNV-b79_dsiJT0D3XvKhNT_LF6bRD4,9736
 kalibr/tokens.py,sha256=istjgaxi9S4dMddjuGtoQaTnZYcWLCqdnxRjV86yNXA,1297
@@ -44,9 +44,9 @@ kalibr_langchain/callback.py,sha256=SNM1aHOXdG55grHmGyTwbXOeM6hjZTub2REiZD2H-d8,
 kalibr_langchain/chat_model.py,sha256=Y4xsZGx9gZpDUF8NP-edJuYam4k0NBySdA6B5484MKk,3190
 kalibr_openai_agents/__init__.py,sha256=wL59LzGstptKigfQDrKKt_7hcMO1JGVQtVAsE0lz-Zw,1367
 kalibr_openai_agents/processor.py,sha256=F550sdRf3rpguP1yOlgAUQWDLPBy4hSACV3-zOyCpOU,18257
-kalibr-1.2.8.dist-info/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
-kalibr-1.2.8.dist-info/METADATA,sha256=DR_yUR8AmRmGL3Wgp9EhMaIkGIvzh9es5S_1v7b8vEM,9014
-kalibr-1.2.8.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-kalibr-1.2.8.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
-kalibr-1.2.8.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
-kalibr-1.2.8.dist-info/RECORD,,
+kalibr-1.2.9.dist-info/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
+kalibr-1.2.9.dist-info/METADATA,sha256=raFHt8CD3sUlapfeAGKOo4m_BOI0HQvmmtFs1wyqBfI,9014
+kalibr-1.2.9.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+kalibr-1.2.9.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
+kalibr-1.2.9.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
+kalibr-1.2.9.dist-info/RECORD,,