kalibr 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

kalibr/router.py

@@ -260,34 +260,80 @@ class Router:
             else:
                 router_span.set_attribute("kalibr.fallback", True)
 
-            # Step 5: Dispatch to provider
-            try:
-                response = self._dispatch(model_id, messages, tool_id, **{**params, **kwargs})
-
-                # Auto-report if success_when provided
-                if self.success_when and not self._outcome_reported:
+            # Step 5: Build ordered candidate paths for fallback
+            # First: intelligence-selected path, then remaining registered paths
+            candidate_paths = []
+            selected_path = {"model": model_id, "tools": tool_id, "params": params}
+            candidate_paths.append(selected_path)
+
+            # Add remaining paths, skipping duplicates of the selected model
+            for path in self._paths:
+                if path["model"] != model_id:
+                    candidate_paths.append(path)
+
+            # Step 6: Try each candidate path with fallback
+            from kalibr.intelligence import report_outcome
+
+            last_exception = None
+            for i, candidate in enumerate(candidate_paths):
+                candidate_model = candidate["model"]
+                candidate_tools = candidate.get("tools")
+                candidate_params = candidate.get("params") or {}
+
+                is_fallback = (i > 0)
+                if is_fallback:
+                    logger.warning(f"Primary path failed, trying fallback: {candidate_model}")
+
+                try:
+                    response = self._dispatch(
+                        candidate_model,
+                        messages,
+                        candidate_tools,
+                        **{**candidate_params, **kwargs}
+                    )
+
+                    # Success! Update state to reflect which model succeeded
+                    self._last_model_id = candidate_model
+
+                    # Auto-report success if success_when provided
+                    if self.success_when and not self._outcome_reported:
+                        try:
+                            output = response.choices[0].message.content or ""
+                            success = self.success_when(output)
+                            self.report(success=success)
+                        except Exception as e:
+                            logger.warning(f"Auto-outcome evaluation failed: {e}")
+
+                    # Add trace_id to response for explicit linkage
+                    response.kalibr_trace_id = trace_id
+                    return response
+
+                except Exception as e:
+                    last_exception = e
+
+                    # Log the failure with model name and error
+                    logger.warning(f"Model {candidate_model} failed: {type(e).__name__}: {e}")
+
+                    # Report failure for this path to enable Thompson Sampling learning
                     try:
-                        output = response.choices[0].message.content or ""
-                        success = self.success_when(output)
-                        self.report(success=success)
-                    except Exception as e:
-                        logger.warning(f"Auto-outcome evaluation failed: {e}")
+                        report_outcome(
+                            trace_id=trace_id,
+                            goal=self.goal,
+                            success=False,
+                            failure_reason=f"provider_error: {type(e).__name__}",
+                            model_id=candidate_model,
+                        )
+                    except Exception:
+                        pass
 
-                # Add trace_id to response for explicit linkage
-                response.kalibr_trace_id = trace_id
-                return response
+                    # Continue to next candidate
+                    continue
 
-            except Exception as e:
-                router_span.set_attribute("error", True)
-                router_span.set_attribute("error.type", type(e).__name__)
-
-                # Auto-report failure
-                if not self._outcome_reported:
-                    try:
-                        self.report(success=False, reason=f"provider_error: {type(e).__name__}")
-                    except:
-                        pass
-                raise
+            # All paths failed - set error attributes and raise
+            router_span.set_attribute("error", True)
+            router_span.set_attribute("error.type", type(last_exception).__name__)
+            self._outcome_reported = True  # Prevent double-reporting on raise
+            raise last_exception
 
     def report(
         self,

kalibr/tokens.py

@@ -2,13 +2,18 @@
 
 from typing import Optional
 
-import tiktoken
+# Import tiktoken optionally for token counting
+try:
+    import tiktoken
+    HAS_TIKTOKEN = True
+except ImportError:
+    HAS_TIKTOKEN = False
 
 # Cache for tokenizer instances
 _tokenizer_cache = {}
 
 
-def count_tokens(text: str, model_id: str) -> int:
+def count_tokens(text: str, model_id: str = "gpt-4o") -> int:
     """Count tokens for given text and model.
 
     Args:
@@ -16,11 +21,15 @@ def count_tokens(text: str, model_id: str) -> int:
         model_id: Model identifier
 
     Returns:
-        Token count (approximate)
+        Token count (approximate if tiktoken is not installed)
     """
     if not text:
         return 0
 
+    if not HAS_TIKTOKEN:
+        # Fallback: rough estimate of 4 chars per token
+        return len(text) // 4
+
     # Try to get exact tokenizer for OpenAI models
     if "gpt" in model_id.lower():
         try:
@@ -34,7 +43,13 @@ def count_tokens(text: str, model_id: str) -> int:
 
 
 def get_openai_encoding(model_id: str):
-    """Get tiktoken encoding for OpenAI model."""
+    """Get tiktoken encoding for OpenAI model.
+
+    Returns None if tiktoken is not installed.
+    """
+    if not HAS_TIKTOKEN:
+        return None
+
     if model_id in _tokenizer_cache:
         return _tokenizer_cache[model_id]
 
@@ -48,5 +63,5 @@ def get_openai_encoding(model_id: str):
         _tokenizer_cache[model_id] = encoding
         return encoding
     except Exception as e:
-        print(f"⚠️  Failed to load tokenizer for {model_id}: {e}")
+        print(f"Warning: Failed to load tokenizer for {model_id}: {e}")
         raise

{kalibr-1.3.0.dist-info → kalibr-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kalibr
-Version: 1.3.0
+Version: 1.4.0
 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
@@ -13,18 +13,15 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: httpx>=0.27.0
-Requires-Dist: tiktoken>=0.8.0
 Requires-Dist: fastapi>=0.110.1
 Requires-Dist: uvicorn>=0.25.0
 Requires-Dist: pydantic>=2.6.4
@@ -35,6 +32,8 @@ Requires-Dist: requests>=2.31.0
 Requires-Dist: opentelemetry-api>=1.20.0
 Requires-Dist: opentelemetry-sdk>=1.20.0
 Requires-Dist: opentelemetry-exporter-otlp>=1.20.0
+Provides-Extra: tokens
+Requires-Dist: tiktoken>=0.8.0; extra == "tokens"
 Provides-Extra: langchain
 Requires-Dist: langchain-core>=0.1.0; extra == "langchain"
 Provides-Extra: langchain-openai
@@ -73,11 +72,21 @@ Adaptive routing for AI agents. Kalibr learns which models work best for your ta
 [![Python](https://img.shields.io/pypi/pyversions/kalibr)](https://pypi.org/project/kalibr/)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 
+## Requirements
+
+- Python 3.10 or higher
+- pip 21.0 or higher
+
 ## Installation
 ```bash
 pip install kalibr
 ```
 
+For accurate token counting, install with:
+```bash
+pip install kalibr[tokens]
+```
+
 ## Setup
 
 Get your credentials from [dashboard.kalibr.systems/settings](https://dashboard.kalibr.systems/settings), then:
@@ -259,6 +268,7 @@ report_outcome(trace_id="...", goal="book_meeting", success=True)
 
 ## Other Integrations
 ```bash
+pip install kalibr[tokens]        # Accurate token counting (tiktoken)
 pip install kalibr[crewai]        # CrewAI
 pip install kalibr[openai-agents] # OpenAI Agents SDK
 pip install kalibr[langchain-all] # LangChain with all providers

{kalibr-1.3.0.dist-info → kalibr-1.4.0.dist-info}/RECORD

@@ -12,10 +12,10 @@ 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=PS43LAkMnhQLrADX8bPACPP0PygEc9Sv-BWhX6TLQuc,18905
+kalibr/router.py,sha256=UCRw5qBzA46c1dmPnw05P2-_2DqnElSeeDhI2N3AD9A,20975
 kalibr/schemas.py,sha256=XLZNLkXca6jbj9AF6gDIyGVnIcr1SVOsNYaKvW-wbgE,3669
 kalibr/simple_tracer.py,sha256=oiwXtiYaIqZxqCNV-b79_dsiJT0D3XvKhNT_LF6bRD4,9736
-kalibr/tokens.py,sha256=istjgaxi9S4dMddjuGtoQaTnZYcWLCqdnxRjV86yNXA,1297
+kalibr/tokens.py,sha256=ug4y6h8gBaMLIfS0v9LQ-TzFaik5u5h4WANfOC7xV6U,1675
 kalibr/trace_capsule.py,sha256=SEfTE-GXvM9kcGCOZ5uEQSD8AnbmRRA0UUu0X8c8isw,10492
 kalibr/trace_models.py,sha256=9o7VJQk3gCrvdfXPrNh3Ptkq5sRgA9_qrLLE3jNkSBg,7304
 kalibr/tracer.py,sha256=jwWBpZbGXn6fEv4pw25BLFCH-22QUbyzofPWp1Iwdkk,11911
@@ -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.3.0.dist-info/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
-kalibr-1.3.0.dist-info/METADATA,sha256=b9D17tB5m0XMvQh5QL9XGJ0yEr7ftJb18iMWMG5hNC4,9298
-kalibr-1.3.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-kalibr-1.3.0.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
-kalibr-1.3.0.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
-kalibr-1.3.0.dist-info/RECORD,,
+kalibr-1.4.0.dist-info/LICENSE,sha256=5mwAnB38l3_PjmOQn6_L6cZnJvus143DUjMBPIH1yso,10768
+kalibr-1.4.0.dist-info/METADATA,sha256=xyDkq8f65JLaUddRwCzJf98L57w1MFrS7YPuh6OND14,9458
+kalibr-1.4.0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+kalibr-1.4.0.dist-info/entry_points.txt,sha256=Kojlc6WRX8V1qS9lOMdDPZpTUVHCtzGtHqXusErgmLY,47
+kalibr-1.4.0.dist-info/top_level.txt,sha256=dIfBOWUnnHGFDwgz5zfIx5_0bU3wOUgAbYr4JcFHZmo,59
+kalibr-1.4.0.dist-info/RECORD,,