kalibr 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

{kalibr-1.2.1.dist-info → kalibr-1.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.2
 Name: kalibr
-Version: 1.2.1
+Version: 1.2.3
 Summary: Unified LLM Observability & Multi-Model AI Integration Framework - Deploy to GPT, Claude, Gemini, Copilot with full telemetry.
 Author-email: Kalibr Team <support@kalibr.systems>
 License: Apache-2.0
@@ -64,7 +64,6 @@ Requires-Dist: pytest>=7.4.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21.0; extra == "dev"
 Requires-Dist: black>=23.0.0; extra == "dev"
 Requires-Dist: ruff>=0.1.0; extra == "dev"
-Dynamic: license-file
 
 # Kalibr Python SDK
 

{kalibr-1.2.1.dist-info → kalibr-1.2.3.dist-info}/RECORD

@@ -33,17 +33,17 @@ kalibr/instrumentation/openai_instr.py,sha256=UU0Pi1Gq1FqgetYWDacQhNFdjemuPrc0hR
 kalibr/instrumentation/registry.py,sha256=sfQnXhbPOI5LVon2kFhe8KcXQwWmuKW1XUe50B2AaBc,4749
 kalibr/middleware/__init__.py,sha256=qyDUn_irAX67MS-IkuDVxg4RmFnJHDf_BfIT3qfGoBI,115
 kalibr/middleware/auto_tracer.py,sha256=ZBSBM0O3a6rwVzfik1n5NUmQDah8_iaf86rU64aPYT4,13037
-kalibr-1.2.1.dist-info/licenses/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
 kalibr_crewai/__init__.py,sha256=b0HFTiE80eArtSMBOIEKu1JM6KU0tCjEylKCVVVF29Q,1796
 kalibr_crewai/callbacks.py,sha256=_d1M4J-6XfKqrVIxnOgOQu57jpFKVv-VIsmPV0HNgZ4,20419
-kalibr_crewai/instrumentor.py,sha256=MbGELxjAQxy4o7BiNL8ik79avl0hXYxECvDzWi-fdsE,21993
+kalibr_crewai/instrumentor.py,sha256=-G_-xaqE3Op70MSEIaZjPYioGDxKRagwLbZmcmmvzFg,26793
 kalibr_langchain/__init__.py,sha256=O4XYVyhLp1v-Y1kGZw3zD-tUK9wp0UX8Jt6oN0QTHN4,1373
 kalibr_langchain/async_callback.py,sha256=_Mj_YrKbULNtfxixZ7iwiHyWEV9l178ZA5Oy5A5Pakk,27748
 kalibr_langchain/callback.py,sha256=SNM1aHOXdG55grHmGyTwbXOeM6hjZTub2REiZD2H-d8,35216
 kalibr_openai_agents/__init__.py,sha256=wL59LzGstptKigfQDrKKt_7hcMO1JGVQtVAsE0lz-Zw,1367
 kalibr_openai_agents/processor.py,sha256=F550sdRf3rpguP1yOlgAUQWDLPBy4hSACV3-zOyCpOU,18257
-kalibr-1.2.1.dist-info/METADATA,sha256=sv6H2efZMRiHxGJZLnHtBaI6NurzfV7UFv62kQNRyV4,11223
-kalibr-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kalibr-1.2.1.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
-kalibr-1.2.1.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
-kalibr-1.2.1.dist-info/RECORD,,
+kalibr-1.2.3.dist-info/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
+kalibr-1.2.3.dist-info/METADATA,sha256=x6_p6pRthFdGcHYRMXeKCmf0WRwMU5xE9FT142ce4ts,11201
+kalibr-1.2.3.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+kalibr-1.2.3.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
+kalibr-1.2.3.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
+kalibr-1.2.3.dist-info/RECORD,,

{kalibr-1.2.1.dist-info → kalibr-1.2.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

kalibr_crewai/instrumentor.py

@@ -12,6 +12,8 @@ from datetime import datetime, timezone
 from functools import wraps
 from typing import Any, Callable, Dict, List, Optional
 
+from opentelemetry import trace as otel_trace
+
 from .callbacks import EventBatcher, _count_tokens, _get_provider_from_model
 
 # Import Kalibr cost adapters
@@ -150,6 +152,10 @@ class KalibrCrewAIInstrumentor:
         # Instrumentation state
         self._is_instrumented = False
 
+        # Accumulated metrics for crew-level aggregation
+        self._accumulated_tokens = {"input": 0, "output": 0}
+        self._accumulated_cost = 0.0
+
     def instrument(self) -> bool:
         """Instrument CrewAI classes.
 
@@ -236,11 +242,22 @@ class KalibrCrewAIInstrumentor:
             start_time = time.time()
             ts_start = datetime.now(timezone.utc)
 
+            # Reset accumulators before crew execution
+            instrumentor._accumulated_tokens = {"input": 0, "output": 0}
+            instrumentor._accumulated_cost = 0.0
+
             # Capture crew info
             crew_name = getattr(crew_self, "name", None) or "unnamed_crew"
-            agent_count = len(getattr(crew_self, "agents", []))
+            agents = getattr(crew_self, "agents", [])
+            agent_count = len(agents)
             task_count = len(getattr(crew_self, "tasks", []))
 
+            # Extract model from first agent if available
+            model_name = "unknown"
+            provider = "crewai"
+            if agents:
+                model_name, provider = _extract_model_from_agent(agents[0])
+
             status = "success"
             error_type = None
             error_message = None
@@ -260,12 +277,33 @@ class KalibrCrewAIInstrumentor:
                 duration_ms = int((time.time() - start_time) * 1000)
                 ts_end = datetime.now(timezone.utc)
 
+                # Enrich CrewAI's OTel span with Kalibr telemetry
+                try:
+                    current_span = otel_trace.get_current_span()
+                    if current_span and current_span.is_recording():
+                        current_span.set_attribute("kalibr.cost_usd", instrumentor._accumulated_cost)
+                        current_span.set_attribute("kalibr.input_tokens", instrumentor._accumulated_tokens["input"])
+                        current_span.set_attribute("kalibr.output_tokens", instrumentor._accumulated_tokens["output"])
+                        current_span.set_attribute("kalibr.total_tokens", instrumentor._accumulated_tokens["input"] + instrumentor._accumulated_tokens["output"])
+                        current_span.set_attribute("kalibr.model_id", model_name)
+                        current_span.set_attribute("kalibr.provider", provider)
+                        current_span.set_attribute("kalibr.duration_ms", duration_ms)
+                        current_span.set_attribute("kalibr.tenant_id", instrumentor.tenant_id)
+                except Exception:
+                    pass  # Don't fail if span enrichment fails
+
                 # Build output info
                 output_preview = None
                 if instrumentor.capture_output and result is not None:
                     output_preview = str(result)[:500]
 
-                # Create event
+                # Get accumulated metrics from child agent/task executions
+                input_tokens = instrumentor._accumulated_tokens["input"]
+                output_tokens = instrumentor._accumulated_tokens["output"]
+                total_tokens = input_tokens + output_tokens
+                cost_usd = instrumentor._accumulated_cost
+
+                # Create event with aggregated metrics
                 event = {
                     "schema_version": "1.0",
                     "trace_id": trace_id,
@@ -273,18 +311,18 @@ class KalibrCrewAIInstrumentor:
                     "parent_span_id": None,
                     "tenant_id": instrumentor.tenant_id,
                     "workflow_id": instrumentor.workflow_id,
-                    "provider": "crewai",
-                    "model_id": "crew",
-                    "model_name": crew_name,
+                    "provider": provider,
+                    "model_id": model_name,
+                    "model_name": model_name,
                     "operation": f"crew:{crew_name}",
                     "endpoint": "crew.kickoff",
                     "duration_ms": duration_ms,
                     "latency_ms": duration_ms,
-                    "input_tokens": 0,
-                    "output_tokens": 0,
-                    "total_tokens": 0,
-                    "cost_usd": 0.0,
-                    "total_cost_usd": 0.0,
+                    "input_tokens": input_tokens,
+                    "output_tokens": output_tokens,
+                    "total_tokens": total_tokens,
+                    "cost_usd": cost_usd,
+                    "total_cost_usd": cost_usd,
                     "status": status,
                     "error_type": error_type,
                     "error_message": error_message,
@@ -321,10 +359,21 @@ class KalibrCrewAIInstrumentor:
             start_time = time.time()
             ts_start = datetime.now(timezone.utc)
 
+            # Reset accumulators before crew execution
+            instrumentor._accumulated_tokens = {"input": 0, "output": 0}
+            instrumentor._accumulated_cost = 0.0
+
             crew_name = getattr(crew_self, "name", None) or "unnamed_crew"
-            agent_count = len(getattr(crew_self, "agents", []))
+            agents = getattr(crew_self, "agents", [])
+            agent_count = len(agents)
             task_count = len(getattr(crew_self, "tasks", []))
 
+            # Extract model from first agent if available
+            model_name = "unknown"
+            provider = "crewai"
+            if agents:
+                model_name, provider = _extract_model_from_agent(agents[0])
+
             status = "success"
             error_type = None
             error_message = None
@@ -344,10 +393,32 @@ class KalibrCrewAIInstrumentor:
                 duration_ms = int((time.time() - start_time) * 1000)
                 ts_end = datetime.now(timezone.utc)
 
+                # Enrich CrewAI's OTel span with Kalibr telemetry
+                try:
+                    current_span = otel_trace.get_current_span()
+                    if current_span and current_span.is_recording():
+                        current_span.set_attribute("kalibr.cost_usd", instrumentor._accumulated_cost)
+                        current_span.set_attribute("kalibr.input_tokens", instrumentor._accumulated_tokens["input"])
+                        current_span.set_attribute("kalibr.output_tokens", instrumentor._accumulated_tokens["output"])
+                        current_span.set_attribute("kalibr.total_tokens", instrumentor._accumulated_tokens["input"] + instrumentor._accumulated_tokens["output"])
+                        current_span.set_attribute("kalibr.model_id", model_name)
+                        current_span.set_attribute("kalibr.provider", provider)
+                        current_span.set_attribute("kalibr.duration_ms", duration_ms)
+                        current_span.set_attribute("kalibr.tenant_id", instrumentor.tenant_id)
+                except Exception:
+                    pass  # Don't fail if span enrichment fails
+
                 output_preview = None
                 if instrumentor.capture_output and result is not None:
                     output_preview = str(result)[:500]
 
+                # Get accumulated metrics from child agent/task executions
+                input_tokens = instrumentor._accumulated_tokens["input"]
+                output_tokens = instrumentor._accumulated_tokens["output"]
+                total_tokens = input_tokens + output_tokens
+                cost_usd = instrumentor._accumulated_cost
+
+                # Create event with aggregated metrics
                 event = {
                     "schema_version": "1.0",
                     "trace_id": trace_id,
@@ -355,18 +426,18 @@ class KalibrCrewAIInstrumentor:
                     "parent_span_id": None,
                     "tenant_id": instrumentor.tenant_id,
                     "workflow_id": instrumentor.workflow_id,
-                    "provider": "crewai",
-                    "model_id": "crew",
-                    "model_name": crew_name,
+                    "provider": provider,
+                    "model_id": model_name,
+                    "model_name": model_name,
                     "operation": f"crew:{crew_name}",
                     "endpoint": "crew.kickoff_async",
                     "duration_ms": duration_ms,
                     "latency_ms": duration_ms,
-                    "input_tokens": 0,
-                    "output_tokens": 0,
-                    "total_tokens": 0,
-                    "cost_usd": 0.0,
-                    "total_cost_usd": 0.0,
+                    "input_tokens": input_tokens,
+                    "output_tokens": output_tokens,
+                    "total_tokens": total_tokens,
+                    "cost_usd": cost_usd,
+                    "total_cost_usd": cost_usd,
                     "status": status,
                     "error_type": error_type,
                     "error_message": error_message,
@@ -445,6 +516,11 @@ class KalibrCrewAIInstrumentor:
                 # Calculate cost using CostAdapterFactory
                 cost_usd = _calculate_cost(provider, model_name, input_tokens, output_tokens)
 
+                # Accumulate metrics for crew-level aggregation
+                instrumentor._accumulated_tokens["input"] += input_tokens
+                instrumentor._accumulated_tokens["output"] += output_tokens
+                instrumentor._accumulated_cost += cost_usd
+
                 event = {
                     "schema_version": "1.0",
                     "trace_id": str(uuid.uuid4()),  # TODO: Link to crew trace
@@ -541,6 +617,11 @@ class KalibrCrewAIInstrumentor:
                 # Calculate cost using CostAdapterFactory
                 cost_usd = _calculate_cost(provider, model_name, input_tokens, output_tokens)
 
+                # Accumulate metrics for crew-level aggregation
+                instrumentor._accumulated_tokens["input"] += input_tokens
+                instrumentor._accumulated_tokens["output"] += output_tokens
+                instrumentor._accumulated_cost += cost_usd
+
                 event = {
                     "schema_version": "1.0",
                     "trace_id": str(uuid.uuid4()),