veris-ai 1.14.1__tar.gz → 1.14.2__tar.gz

{veris_ai-1.14.1 → veris_ai-1.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veris-ai
-Version: 1.14.1
+Version: 1.14.2
 Summary: A Python package for Veris AI tools
 Project-URL: Homepage, https://github.com/veris-ai/veris-python-sdk
 Project-URL: Bug Tracker, https://github.com/veris-ai/veris-python-sdk/issues

{veris_ai-1.14.1 → veris_ai-1.14.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "veris-ai"
-version = "1.14.1"
+version = "1.14.2"
 description = "A Python package for Veris AI tools"
 readme = "README.md"
 requires-python = ">=3.11"

{veris_ai-1.14.1 → veris_ai-1.14.2}/src/veris_ai/api_client.py

@@ -2,6 +2,7 @@
 
 import logging
 import os
+from contextvars import ContextVar
 from typing import Any
 
 import httpx
@@ -9,6 +10,9 @@ from urllib.parse import urljoin
 
 logger = logging.getLogger(__name__)
 
+# Context variable to store base_url for per-request multi-tenant scenarios
+_base_url_context: ContextVar[str | None] = ContextVar("veris_base_url", default=None)
+
 
 class SimulatorAPIClient:
     """Centralized client for making requests to VERIS simulation endpoints.
@@ -20,10 +24,9 @@ class SimulatorAPIClient:
         changes reflected without recreating the singleton.
     """
 
-    def __init__(self, timeout: float | None = None, base_url: str | None = None) -> None:
+    def __init__(self, timeout: float | None = None) -> None:
         """Initialize the API client with static timeout configuration."""
         self._timeout = timeout or float(os.getenv("VERIS_MOCK_TIMEOUT", "300.0"))
-        self._base_url = base_url
 
     @property
     def base_url(self) -> str:
@@ -31,7 +34,12 @@ class SimulatorAPIClient:
         return self._get_base_url()
 
     def _get_base_url(self) -> str:
-        """Resolve the base URL from environment.
+        """Resolve the base URL from context, environment, or default.
+
+        Priority order:
+            1. Context variable (for per-request multi-tenant scenarios)
+            2. VERIS_API_URL environment variable
+            3. Default production URL
 
         Behavior:
             - If VERIS_API_URL is unset, default to the dev simulator URL.
@@ -39,7 +47,9 @@ class SimulatorAPIClient:
               (do not fall back). This supports tests expecting connection
               failures when an invalid endpoint is provided.
         """
-        return self._base_url or os.getenv("VERIS_API_URL") or "https://simulator.api.veris.ai"
+        # Priority: context > env var > default
+        context_url = _base_url_context.get()
+        return context_url or os.getenv("VERIS_API_URL") or "https://simulator.api.veris.ai"
 
     def _build_headers(self) -> dict[str, str] | None:
         """Build headers including OpenTelemetry tracing and API key."""
@@ -107,7 +117,7 @@ def get_api_client() -> SimulatorAPIClient:
     return _api_client
 
 
-def set_api_client_params(base_url: str | None = None, timeout: float | None = None) -> None:
+def set_api_client_params(timeout: float | None = None) -> None:
     """Set the global API client instance for testing purposes."""
     global _api_client  # noqa: PLW0603
-    _api_client = SimulatorAPIClient(base_url=base_url, timeout=timeout)
+    _api_client = SimulatorAPIClient(timeout=timeout)

{veris_ai-1.14.1 → veris_ai-1.14.2}/src/veris_ai/tool_mock.py

@@ -16,7 +16,7 @@ from typing import (
 
 
 from veris_ai.models import ResponseExpectation, ToolCallOptions
-from veris_ai.api_client import get_api_client, set_api_client_params
+from veris_ai.api_client import _base_url_context, get_api_client
 from veris_ai.utils import (
     convert_to_type,
     execute_callback,
@@ -93,7 +93,7 @@ class VerisSDK:
             self._set_session_id(token_data["session_id"])
             self._set_thread_id(token_data["thread_id"])
             if token_data.get("api_url"):
-                set_api_client_params(base_url=token_data["api_url"])
+                _base_url_context.set(token_data["api_url"])
             logger.info(
                 f"Session ID set to {token_data['session_id']}, "
                 f"Thread ID set to {token_data['thread_id']} - mocking enabled"
@@ -144,10 +144,11 @@ class VerisSDK:
         _thread_id_context.set(None)
 
     def clear_context(self) -> None:
-        """Clear the session_id and thread_id from context variables."""
+        """Clear the session_id, thread_id, and base_url from context variables."""
         self._clear_session_id()
         self._clear_thread_id()
-        logger.info("Session ID and Thread ID cleared - mocking disabled")
+        _base_url_context.set(None)
+        logger.info("Session ID, Thread ID, and Base URL cleared - mocking disabled")
 
     def clear_session_id(self) -> None:
         """DEPRECATED: Use clear_context() instead."""

veris_ai-1.14.2/tests/test_api_client.py

@@ -0,0 +1,78 @@
+"""Tests for SimulatorAPIClient endpoint URL generation and configuration."""
+
+import os
+from unittest.mock import patch
+
+import pytest
+
+from veris_ai.api_client import SimulatorAPIClient, get_api_client, set_api_client_params
+
+
+def test_tool_mock_endpoint_default():
+    """Test that tool_mock_endpoint property returns correct URL with default base_url."""
+    client = SimulatorAPIClient()
+    endpoint = client.tool_mock_endpoint
+
+    # Should use default base URL
+    assert endpoint == "https://simulator.api.veris.ai/v3/tool_mock"
+
+
+def test_tool_mock_endpoint_with_env_var():
+    """Test that tool_mock_endpoint respects VERIS_API_URL environment variable."""
+    with patch.dict(os.environ, {"VERIS_API_URL": "https://test.api.veris.ai"}):
+        client = SimulatorAPIClient()
+        endpoint = client.tool_mock_endpoint
+
+        assert endpoint == "https://test.api.veris.ai/v3/tool_mock"
+
+
+def test_log_tool_call_endpoint():
+    """Test get_log_tool_call_endpoint generates correct URL."""
+    with patch.dict(os.environ, {"VERIS_API_URL": "https://test.api.com"}):
+        client = SimulatorAPIClient()
+        endpoint = client.get_log_tool_call_endpoint("session-123")
+
+        assert endpoint == "https://test.api.com/v3/log_tool_call?session_id=session-123"
+
+
+def test_log_tool_response_endpoint():
+    """Test get_log_tool_response_endpoint generates correct URL."""
+    with patch.dict(os.environ, {"VERIS_API_URL": "https://test.api.com"}):
+        client = SimulatorAPIClient()
+        endpoint = client.get_log_tool_response_endpoint("session-456")
+
+        assert endpoint == "https://test.api.com/v3/log_tool_response?session_id=session-456"
+
+
+def test_custom_timeout():
+    """Test that custom timeout is set correctly."""
+    client = SimulatorAPIClient(timeout=30.0)
+    assert client._timeout == 30.0
+
+
+def test_default_timeout():
+    """Test that default timeout is used when not specified."""
+    with patch.dict(os.environ, {"VERIS_MOCK_TIMEOUT": "120.0"}):
+        client = SimulatorAPIClient()
+        assert client._timeout == 120.0
+
+
+def test_set_api_client_params_timeout():
+    """Test that set_api_client_params reconfigures the global client timeout."""
+    # Reconfigure with custom timeout
+    set_api_client_params(timeout=60.0)
+
+    # Get client and verify timeout has been updated
+    client = get_api_client()
+    assert client._timeout == 60.0
+
+    # Restore original client
+    set_api_client_params()
+
+
+def test_empty_env_var_uses_default():
+    """Test that empty VERIS_API_URL falls back to default."""
+    with patch.dict(os.environ, {"VERIS_API_URL": ""}, clear=True):
+        client = SimulatorAPIClient()
+        # Empty string should NOT be used, should fall back to default
+        assert client._get_base_url() == "https://simulator.api.veris.ai"

{veris_ai-1.14.1 → veris_ai-1.14.2}/uv.lock

@@ -1571,7 +1571,7 @@ wheels = [
 
 [[package]]
 name = "veris-ai"
-version = "1.14.0"
+version = "1.14.1"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

veris_ai-1.14.1/tests/test_api_client.py

@@ -1,140 +0,0 @@
-"""Tests for SimulatorAPIClient endpoint URL generation and configuration."""
-
-import os
-from unittest.mock import patch
-
-import pytest
-
-from veris_ai.api_client import SimulatorAPIClient, get_api_client, set_api_client_params
-
-
-def test_tool_mock_endpoint_default():
-    """Test that tool_mock_endpoint property returns correct URL with default base_url."""
-    client = SimulatorAPIClient()
-    endpoint = client.tool_mock_endpoint
-
-    # Should use default base URL
-    assert endpoint == "https://simulator.api.veris.ai/v3/tool_mock"
-
-
-def test_tool_mock_endpoint_custom_base_url():
-    """Test that tool_mock_endpoint uses cached base_url from constructor."""
-    client = SimulatorAPIClient(base_url="https://custom.api.com")
-    endpoint = client.tool_mock_endpoint
-
-    assert endpoint == "https://custom.api.com/v3/tool_mock"
-
-
-def test_tool_mock_endpoint_with_env_var():
-    """Test that tool_mock_endpoint respects VERIS_API_URL environment variable."""
-    with patch.dict(os.environ, {"VERIS_API_URL": "https://test.api.veris.ai"}):
-        client = SimulatorAPIClient()
-        endpoint = client.tool_mock_endpoint
-
-        assert endpoint == "https://test.api.veris.ai/v3/tool_mock"
-
-
-def test_log_tool_call_endpoint():
-    """Test get_log_tool_call_endpoint generates correct URL."""
-    client = SimulatorAPIClient(base_url="https://test.api.com")
-    endpoint = client.get_log_tool_call_endpoint("session-123")
-
-    assert endpoint == "https://test.api.com/v3/log_tool_call?session_id=session-123"
-
-
-def test_log_tool_response_endpoint():
-    """Test get_log_tool_response_endpoint generates correct URL."""
-    client = SimulatorAPIClient(base_url="https://test.api.com")
-    endpoint = client.get_log_tool_response_endpoint("session-456")
-
-    assert endpoint == "https://test.api.com/v3/log_tool_response?session_id=session-456"
-
-
-def test_base_url_without_protocol_behavior():
-    """Test that base_url without protocol is treated as relative path by urljoin."""
-    # Note: urljoin treats URLs without protocol as relative paths
-    client = SimulatorAPIClient(base_url="api.example.com")
-    endpoint = client.tool_mock_endpoint
-
-    # urljoin treats "api.example.com" as a relative path, so result is just the path component
-    assert endpoint == "v3/tool_mock"
-
-
-def test_base_url_with_trailing_slash():
-    """Test that base_url with trailing slash is handled correctly."""
-    client = SimulatorAPIClient(base_url="https://test.api.com/")
-    endpoint = client.tool_mock_endpoint
-
-    # urljoin should handle trailing slash correctly
-    assert endpoint == "https://test.api.com/v3/tool_mock"
-
-
-def test_custom_timeout():
-    """Test that custom timeout is set correctly."""
-    client = SimulatorAPIClient(timeout=30.0)
-    assert client._timeout == 30.0
-
-
-def test_default_timeout():
-    """Test that default timeout is used when not specified."""
-    with patch.dict(os.environ, {"VERIS_MOCK_TIMEOUT": "120.0"}):
-        client = SimulatorAPIClient()
-        assert client._timeout == 120.0
-
-
-def test_set_api_client_params():
-    """Test that set_api_client_params reconfigures the global client."""
-    # Get original client
-    original_client = get_api_client()
-    original_endpoint = original_client.tool_mock_endpoint
-
-    # Reconfigure with custom parameters
-    set_api_client_params(base_url="https://custom.test.api", timeout=60.0)
-
-    # Get new client and verify it's been updated
-    new_client = get_api_client()
-    assert new_client.tool_mock_endpoint == "https://custom.test.api/v3/tool_mock"
-    assert new_client._timeout == 60.0
-
-    # Restore original client
-    set_api_client_params()
-
-
-def test_set_api_client_params_partial():
-    """Test that set_api_client_params can set only base_url or timeout."""
-    # Set only base_url
-    set_api_client_params(base_url="https://partial.test")
-    client = get_api_client()
-    assert client.tool_mock_endpoint == "https://partial.test/v3/tool_mock"
-    assert client._timeout == 300  # Should use default
-
-    # Set only timeout
-    set_api_client_params(timeout=45.0)
-    client = get_api_client()
-    assert client._timeout == 45.0
-
-    # Restore defaults
-    set_api_client_params()
-
-
-def test_multiple_endpoint_calls_use_cached_base_url():
-    """Test that multiple endpoint property accesses use the same cached base_url."""
-    client = SimulatorAPIClient(base_url="https://cached.api")
-
-    # Call multiple endpoint methods
-    endpoint1 = client.tool_mock_endpoint
-    endpoint2 = client.get_log_tool_call_endpoint("session-1")
-    endpoint3 = client.get_log_tool_response_endpoint("session-2")
-
-    # All should use the same base URL
-    assert endpoint1.startswith("https://cached.api/")
-    assert endpoint2.startswith("https://cached.api/")
-    assert endpoint3.startswith("https://cached.api/")
-
-
-def test_empty_env_var_uses_default():
-    """Test that empty VERIS_API_URL falls back to default."""
-    with patch.dict(os.environ, {"VERIS_API_URL": ""}, clear=True):
-        client = SimulatorAPIClient()
-        # Empty string should NOT be used, should fall back to default
-        assert client._get_base_url() == "https://simulator.api.veris.ai"