veris-ai 1.2.0__tar.gz → 1.3.0__tar.gz

{veris_ai-1.2.0 → veris_ai-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veris-ai
-Version: 1.2.0
+Version: 1.3.0
 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.2.0 → veris_ai-1.3.0}/pyproject.toml

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

{veris_ai-1.2.0 → veris_ai-1.3.0}/src/veris_ai/__init__.py

@@ -5,9 +5,9 @@ from typing import Any
 __version__ = "0.1.0"
 
 # Import lightweight modules that only use base dependencies
-from .tool_mock import veris
 from .jaeger_interface import JaegerClient
 from .models import ResponseExpectation
+from .tool_mock import veris
 
 # Lazy import for modules with heavy dependencies
 _instrument = None
@@ -34,9 +34,4 @@ def instrument(*args: Any, **kwargs: Any) -> Any:  # noqa: ANN401
     return _instrument(*args, **kwargs)
 
 
-__all__ = [
-    "veris",
-    "JaegerClient",
-    "instrument",
-    "ResponseExpectation"
-]
+__all__ = ["veris", "JaegerClient", "instrument", "ResponseExpectation"]

{veris_ai-1.2.0 → veris_ai-1.3.0}/src/veris_ai/jaeger_interface/client.py

@@ -5,12 +5,12 @@ This implementation keeps dependencies minimal while providing fully-typed
 """
 
 import json
-from typing import Any, Dict, List, Optional, Self
+import types
+from typing import Any, Self
 
 import requests
 
-from .models import GetTraceResponse, SearchResponse, Span, Tag, Trace
-
+from .models import GetTraceResponse, SearchResponse, Span, Trace
 
 __all__ = ["JaegerClient"]
 
@@ -60,30 +60,27 @@ class JaegerClient:  # noqa: D101
         session.headers.update(self._headers)
         return session, True
 
-    def _span_matches_tags(self, span: Span, span_tags: Dict[str, Any]) -> bool:
+    def _span_matches_tags(self, span: Span, span_tags: dict[str, Any]) -> bool:
         """Check if a span matches any of the provided tags (OR logic)."""
         if not span.tags or not span_tags:
             return False
-        
+
         # Convert span tags to a dict for easier lookup
         span_tag_dict = {tag.key: tag.value for tag in span.tags}
-        
+
         # OR logic: return True if ANY tag matches
-        for key, value in span_tags.items():
-            if span_tag_dict.get(key) == value:
-                return True
-        
-        return False
+        return any(span_tag_dict.get(key) == value for key, value in span_tags.items())
 
     def _filter_spans(
         self,
-        traces: List[Trace],
-        span_tags: Optional[Dict[str, Any]],
-        span_operations: Optional[List[str]] = None
-    ) -> List[Trace]:
-        """
-        Filter spans within traces based on span_tags (OR logic) and/or span_operations (OR logic).
-        If both are provided, a span must match at least one tag AND at least one operation.
+        traces: list[Trace],
+        span_tags: dict[str, Any] | None,
+        span_operations: list[str] | None = None,
+    ) -> list[Trace]:
+        """Filter spans within traces based on span_tags and/or span_operations.
+
+        Uses OR logic within each filter type. If both are provided, a span must
+        match at least one tag AND at least one operation.
         """
         if not span_tags and not span_operations:
             return traces
@@ -109,7 +106,7 @@ class JaegerClient:  # noqa: D101
                     traceID=trace.traceID,
                     spans=filtered_spans,
                     process=trace.process,
-                    warnings=trace.warnings
+                    warnings=trace.warnings,
                 )
                 filtered_traces.append(filtered_trace)
 
@@ -119,16 +116,16 @@ class JaegerClient:  # noqa: D101
     # Public API
     # ---------------------------------------------------------------------
 
-    def search(
+    def search(  # noqa: PLR0913
         self,
-        service: Optional[str] = None,
+        service: str | None = None,
         *,
-        limit: Optional[int] = None,
-        tags: Optional[Dict[str, Any]] = None,
-        operation: Optional[str] = None,
-        span_tags: Optional[Dict[str, Any]] = None,
-        span_operations: Optional[List[str]] = None,
-        **kwargs: Any
+        limit: int | None = None,
+        tags: dict[str, Any] | None = None,
+        operation: str | None = None,
+        span_tags: dict[str, Any] | None = None,
+        span_operations: list[str] | None = None,
+        **kwargs: Any,  # noqa: ANN401
     ) -> SearchResponse:  # noqa: D401
         """Search traces using the *v1* ``/api/traces`` endpoint with optional span filtering.
 
@@ -137,9 +134,11 @@ class JaegerClient:  # noqa: D101
             limit: Maximum number of traces to return.
             tags: Dictionary of tag filters for trace-level filtering (AND-combined).
             operation: Operation name to search for.
-            span_tags: Dictionary of tag filters for span-level filtering (OR-combined AND-combined with span_operations).
+            span_tags: Dictionary of tag filters for span-level filtering.
+                      Uses OR logic. Combined with span_operations using AND.
                       Applied client-side after retrieving traces.
-            span_operations: List of operation names to search for (OR-combined AND-combined with span_tags).
+            span_operations: List of operation names to search for.
+                            Uses OR logic. Combined with span_tags using AND.
             **kwargs: Additional parameters to pass to the Jaeger API.
 
         Returns:
@@ -147,24 +146,24 @@ class JaegerClient:  # noqa: D101
             with spans filtered according to span_tags if provided.
         """
         # Build params for the Jaeger API (excluding span_tags)
-        params: Dict[str, Any] = {}
-        
+        params: dict[str, Any] = {}
+
         if service is not None:
             params["service"] = service
-        
+
         if limit is not None:
             params["limit"] = limit
-        
+
         if operation is not None:
             params["operation"] = operation
-        
+
         if tags:
             # Convert tags to JSON string as expected by Jaeger API
             params["tags"] = json.dumps(tags)
-        
+
         # Add any additional parameters
         params.update(kwargs)
-        
+
         session, should_close = self._make_session()
         try:
             url = f"{self._base_url}/api/traces"
@@ -174,18 +173,22 @@ class JaegerClient:  # noqa: D101
         finally:
             if should_close:
                 session.close()
-        
+
         # Parse the response
         search_response = SearchResponse.model_validate(data)  # type: ignore[arg-type]
-        
+
         # Apply span-level filtering if span_tags is provided
-        if span_tags or span_operations and search_response.data and isinstance(search_response.data, list):
+        if (
+            (span_tags or span_operations)
+            and search_response.data
+            and isinstance(search_response.data, list)
+        ):
             filtered_traces = self._filter_spans(search_response.data, span_tags, span_operations)
             search_response.data = filtered_traces
             # Update the total to reflect filtered results
             if search_response.total is not None:
                 search_response.total = len(filtered_traces)
-        
+
         return search_response
 
     def get_trace(self, trace_id: str) -> GetTraceResponse:  # noqa: D401
@@ -225,7 +228,7 @@ class JaegerClient:  # noqa: D101
         self,
         exc_type: type[BaseException] | None,
         exc: BaseException | None,
-        tb: Any | None,
+        tb: types.TracebackType | None,
     ) -> None:
         """Exit the context manager."""
         # Only close if we created the session

{veris_ai-1.2.0 → veris_ai-1.3.0}/src/veris_ai/jaeger_interface/models.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-import json
 from typing import Any
 
-from pydantic import BaseModel, Field, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field
 
 __all__ = [
     "Tag",

{veris_ai-1.2.0 → veris_ai-1.3.0}/src/veris_ai/models.py

@@ -5,7 +5,7 @@ from enum import Enum
 
 class ResponseExpectation(str, Enum):
     """Expected response behavior for tool mocking."""
-    
+
     AUTO = "auto"
     REQUIRED = "required"
-    NONE = "none"
+    NONE = "none"

{veris_ai-1.2.0 → veris_ai-1.3.0}/src/veris_ai/tool_mock.py

@@ -92,7 +92,7 @@ class VerisSDK:
             **params_dict,
         )
 
-    def mock(
+    def mock(  # noqa: C901, PLR0915
         self,
         mode: Literal["tool", "function"] = "tool",
         expects_response: bool | None = None,
@@ -100,15 +100,8 @@ class VerisSDK:
     ) -> Callable:
         """Decorator for mocking tool calls."""
 
-        def decorator(func: Callable) -> Callable:
+        def decorator(func: Callable) -> Callable:  # noqa: C901, PLR0915
             """Decorator for mocking tool calls."""
-            endpoint = os.getenv("VERIS_MOCK_ENDPOINT_URL")
-            if not endpoint:
-                error_msg = "VERIS_MOCK_ENDPOINT_URL environment variable is not set"
-                raise ValueError(error_msg)
-            # Default timeout of 30 seconds
-            timeout = float(os.getenv("VERIS_MOCK_TIMEOUT", "90.0"))
-            
             # Check if the original function is async
             is_async = inspect.iscoroutinefunction(func)
 
@@ -148,7 +141,7 @@ class VerisSDK:
                     response_expectation = ResponseExpectation.REQUIRED
                 else:
                     response_expectation = ResponseExpectation.AUTO
-                
+
                 payload = {
                     "session_id": self.session_id,
                     "response_expectation": response_expectation.value,
@@ -169,11 +162,16 @@ class VerisSDK:
                 **kwargs: dict[str, object],
             ) -> object:
                 # Check if we're in simulation mode
-                env_mode = os.getenv("ENV", "").lower()
-                if env_mode != "simulation":
+                if not self.session_id:
                     # If not in simulation mode, execute the original function
                     return await func(*args, **kwargs)
-                
+                endpoint = os.getenv("VERIS_MOCK_ENDPOINT_URL")
+                if not endpoint:
+                    error_msg = "VERIS_MOCK_ENDPOINT_URL environment variable is not set"
+                    raise ValueError(error_msg)
+                # Default timeout of 30 seconds
+                timeout = float(os.getenv("VERIS_MOCK_TIMEOUT", "90.0"))
+
                 logger.info(f"Simulating function: {func.__name__}")
                 payload, return_type_obj = create_mock_payload(*args, **kwargs)
 
@@ -196,11 +194,16 @@ class VerisSDK:
                 **kwargs: dict[str, object],
             ) -> object:
                 # Check if we're in simulation mode
-                env_mode = os.getenv("ENV", "").lower()
-                if env_mode != "simulation":
+                if not self.session_id:
                     # If not in simulation mode, execute the original function
                     return func(*args, **kwargs)
-                
+                endpoint = os.getenv("VERIS_MOCK_ENDPOINT_URL")
+                if not endpoint:
+                    error_msg = "VERIS_MOCK_ENDPOINT_URL environment variable is not set"
+                    raise ValueError(error_msg)
+                # Default timeout of 30 seconds
+                timeout = float(os.getenv("VERIS_MOCK_TIMEOUT", "90.0"))
+
                 logger.info(f"Simulating function: {func.__name__}")
                 payload, return_type_obj = create_mock_payload(*args, **kwargs)
 
@@ -228,23 +231,21 @@ class VerisSDK:
         def decorator(func: Callable) -> Callable:
             # Check if the original function is async
             is_async = inspect.iscoroutinefunction(func)
-            
+
             @wraps(func)
             async def async_wrapper(
                 *args: tuple[object, ...],
                 **kwargs: dict[str, object],
             ) -> object:
-                env_mode = os.getenv("ENV", "").lower()
-                if env_mode != "simulation":
+                if not self.session_id:
                     # If not in simulation mode, execute the original function
-                    return func(*args, **kwargs)
+                    return await func(*args, **kwargs)
                 logger.info(f"Simulating function: {func.__name__}")
                 return return_value
-            
+
             @wraps(func)
             def sync_wrapper(*args: tuple[object, ...], **kwargs: dict[str, object]) -> object:
-                env_mode = os.getenv("ENV", "").lower()
-                if env_mode != "simulation":
+                if not self.session_id:
                     # If not in simulation mode, execute the original function
                     return func(*args, **kwargs)
                 logger.info(f"Simulating function: {func.__name__}")

{veris_ai-1.2.0 → veris_ai-1.3.0}/tests/conftest.py

@@ -27,23 +27,33 @@ def mock_context():
 
 @pytest.fixture
 def simulation_env():
+    from veris_ai import veris
+
+    # Set session_id to enable simulation mode
+    veris.set_session_id("test-session-123")
+
     with patch.dict(
         os.environ,
         {
             "VERIS_MOCK_ENDPOINT_URL": "http://test-endpoint",
-            "ENV": "simulation",
         },
     ):
         yield
+        # Clean up session_id after test
+        veris.clear_session_id()
 
 
 @pytest.fixture
 def production_env():
+    from veris_ai import veris
+
+    # Clear session_id to ensure production mode (no simulation)
+    veris.clear_session_id()
+
     with patch.dict(
         os.environ,
         {
             "VERIS_MOCK_ENDPOINT_URL": "http://test-endpoint",
-            "ENV": "production",
         },
     ):
         yield

{veris_ai-1.2.0 → veris_ai-1.3.0}/tests/test_tool_mock.py

@@ -71,26 +71,19 @@ async def test_mock_with_context(simulation_env):
 
 
 @pytest.mark.asyncio
-async def test_mock_without_context(simulation_env):
+async def test_mock_without_context():
+    """Test that without session_id, the function runs in production mode."""
+
     @veris.mock(mode="function")
     async def test_func() -> dict:
         return {"result": "real"}
 
-    mock_response = {"result": {"mocked": True}}
-
-    with patch("veris_ai.tool_mock.httpx.AsyncClient") as mock_client:
-        mock_response_obj = Mock()
-        mock_response_obj.json.return_value = mock_response
-        mock_response_obj.raise_for_status.return_value = None
+    # Clear session_id to ensure production mode
+    veris.clear_session_id()
 
-        mock_client.return_value.__aenter__.return_value.post = AsyncMock(
-            return_value=mock_response_obj,
-        )
-        veris.clear_session_id()
-        result = await test_func()
-        first_call = mock_client.return_value.__aenter__.return_value.post.call_args
-        assert first_call.kwargs["json"]["session_id"] == None
-        assert result == {"result": {"mocked": True}}
+    # In production mode, the original function should be called
+    result = await test_func()
+    assert result == {"result": "real"}
 
 
 # Test error handling
@@ -111,15 +104,22 @@ async def test_mock_http_error(simulation_env):
 
 @pytest.mark.asyncio
 async def test_mock_missing_endpoint():
-    with (
-        patch.dict(os.environ, {"VERIS_MOCK_ENDPOINT_URL": ""}),
-        pytest.raises(ValueError, match="VERIS_MOCK_ENDPOINT_URL environment variable is not set"),
-    ):
+    """Test that missing endpoint raises ValueError when function is called in simulation mode."""
+    with patch.dict(os.environ, {"VERIS_MOCK_ENDPOINT_URL": ""}):
 
         @veris.mock()
         async def test_func():
             return {"result": "real"}
 
+        # Set session_id to enable simulation mode
+        veris.set_session_id("test-session")
+
+        # Error should be raised when function is called
+        with pytest.raises(
+            ValueError, match="VERIS_MOCK_ENDPOINT_URL environment variable is not set"
+        ):
+            await test_func()
+
 
 @pytest.mark.asyncio
 async def test_mock_invalid_endpoint(simulation_env):
@@ -352,7 +352,7 @@ async def test_mock_decorator_tool_mode(simulation_env):
     async def test_func() -> dict:
         return {"result": "real"}
 
-    mock_response = "This is a mocked tool response"
+    mock_response = {"result": "mocked"}
 
     with patch("veris_ai.tool_mock.httpx.AsyncClient") as mock_client:
         mock_response_obj = Mock()
@@ -364,7 +364,7 @@ async def test_mock_decorator_tool_mode(simulation_env):
         )
 
         result = await test_func()
-        assert result == {"content": [{"type": "text", "text": mock_response}]}
+        assert result == {"result": "mocked"}
 
 
 @pytest.mark.asyncio
@@ -412,7 +412,7 @@ async def test_mock_decorator_with_expects_response(simulation_env):
         result = await test_func()
         # Verify the request payload included expects_response
         first_call = mock_client.return_value.__aenter__.return_value.post.call_args
-        assert first_call.kwargs["json"]["expects_response"] is True
+        assert first_call.kwargs["json"]["response_expectation"] == "required"
         assert result == {"result": {"mocked": True}}
 
 
@@ -465,7 +465,7 @@ async def test_mock_decorator_all_parameters(simulation_env):
         # Verify the request payload
         first_call = mock_client.return_value.__aenter__.return_value.post.call_args
         payload = first_call.kwargs["json"]
-        assert payload["expects_response"] is False
+        assert payload["response_expectation"] == "none"
         assert payload["cache_response"] is True
         assert result == mock_response
 
@@ -492,7 +492,7 @@ async def test_mock_decorator_function_mode_defaults_expects_response(simulation
         await test_func()
         # Verify expects_response is False for function mode by default
         first_call = mock_client.return_value.__aenter__.return_value.post.call_args
-        assert first_call.kwargs["json"]["expects_response"] is False
+        assert first_call.kwargs["json"]["response_expectation"] == "none"
 
 
 @pytest.mark.asyncio
@@ -504,7 +504,7 @@ async def test_mock_decorator_json_schema_in_payload(simulation_env):
     async def test_func() -> List[dict]:
         return [{"result": "real"}]
 
-    mock_response = {"result": [{"mocked": True}]}
+    mock_response = [{"mocked": True}]
 
     with patch("veris_ai.tool_mock.httpx.AsyncClient") as mock_client:
         mock_response_obj = Mock()

{veris_ai-1.2.0 → veris_ai-1.3.0}/tests/test_utils.py

@@ -114,17 +114,17 @@ class TestConvertToType:
         result = convert_to_type("42", str | int)
         assert result == "42"  # String type is tried first and succeeds
         assert isinstance(result, str)
-        
+
         # Test with int value - will be converted to string (first type in union)
         result = convert_to_type(42, str | int)
         assert result == "42"  # Converted to string since str is first in union
         assert isinstance(result, str)
-        
+
         # Test with int | str (reversed order) - int comes first
         result = convert_to_type("42", int | str)
         assert result == 42  # Converted to int since int is first
         assert isinstance(result, int)
-        
+
         # Test with a value that only works as string
         result = convert_to_type("hello", str | int | float)
         assert result == "hello"

{veris_ai-1.2.0 → veris_ai-1.3.0}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 3
+revision = 2
 requires-python = ">=3.11"
 resolution-markers = [
     "python_full_version >= '3.13'",
@@ -1472,7 +1472,7 @@ wheels = [
 
 [[package]]
 name = "veris-ai"
-version = "1.1.0"
+version = "1.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },