veris-ai 1.13.0__tar.gz → 1.14.0__tar.gz

{veris_ai-1.13.0 → veris_ai-1.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: veris-ai
-Version: 1.13.0
+Version: 1.14.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.13.0 → veris_ai-1.14.0}/pyproject.toml

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

{veris_ai-1.13.0 → veris_ai-1.14.0}/src/veris_ai/tool_mock.py

@@ -20,10 +20,12 @@ from veris_ai.api_client import get_api_client
 from veris_ai.utils import (
     convert_to_type,
     execute_callback,
+    execute_combined_callback,
     extract_json_schema,
     get_function_parameters,
     get_input_parameters,
     launch_callback_task,
+    launch_combined_callback_task,
 )
 
 logger = logging.getLogger(__name__)
@@ -245,13 +247,14 @@ class VerisSDK:
 
         return decorator
 
-    def mock(  # noqa: C901, PLR0915
+    def mock(  # noqa: C901, PLR0915, PLR0913
         self,
         mode: Literal["tool", "function"] = "tool",
         expects_response: bool | None = None,
         cache_response: bool | None = None,
         input_callback: Callable[..., Any] | None = None,
         output_callback: Callable[[Any], Any] | None = None,
+        combined_callback: Callable[..., Any] | None = None,
     ) -> Callable:
         """Decorator for mocking tool calls.
 
@@ -261,6 +264,7 @@ class VerisSDK:
             cache_response: Whether to cache the response
             input_callback: Callable that receives input parameters as individual arguments
             output_callback: Callable that receives the output value
+            combined_callback: Callable that receives both input parameters and mock_output
         """
         response_expectation = (
             ResponseExpectation.NONE
@@ -306,6 +310,7 @@ class VerisSDK:
                 input_params = get_input_parameters(func, args, kwargs)
                 launch_callback_task(input_callback, input_params, unpack=True)
                 launch_callback_task(output_callback, result, unpack=False)
+                launch_combined_callback_task(combined_callback, input_params, result)
 
                 return result
 
@@ -337,6 +342,7 @@ class VerisSDK:
                 input_params = get_input_parameters(func, args, kwargs)
                 execute_callback(input_callback, input_params, unpack=True)
                 execute_callback(output_callback, result, unpack=False)
+                execute_combined_callback(combined_callback, input_params, result)
 
                 return result
 
@@ -350,6 +356,7 @@ class VerisSDK:
         return_value: Any,  # noqa: ANN401
         input_callback: Callable[..., Any] | None = None,
         output_callback: Callable[[Any], Any] | None = None,
+        combined_callback: Callable[..., Any] | None = None,
     ) -> Callable:
         """Decorator for stubbing tool calls.
 
@@ -357,6 +364,7 @@ class VerisSDK:
             return_value: The value to return when the function is stubbed
             input_callback: Callable that receives input parameters as individual arguments
             output_callback: Callable that receives the output value
+            combined_callback: Callable that receives both input parameters and mock_output
         """
 
         def decorator(func: Callable) -> Callable:
@@ -380,6 +388,7 @@ class VerisSDK:
                 input_params = get_input_parameters(func, args, kwargs)
                 launch_callback_task(input_callback, input_params, unpack=True)
                 launch_callback_task(output_callback, return_value, unpack=False)
+                launch_combined_callback_task(combined_callback, input_params, return_value)
 
                 return return_value
 
@@ -397,6 +406,7 @@ class VerisSDK:
                 input_params = get_input_parameters(func, args, kwargs)
                 execute_callback(input_callback, input_params, unpack=True)
                 execute_callback(output_callback, return_value, unpack=False)
+                execute_combined_callback(combined_callback, input_params, return_value)
 
                 return return_value
 

{veris_ai-1.13.0 → veris_ai-1.14.0}/src/veris_ai/utils.py

@@ -489,3 +489,75 @@ def launch_callback_task(
     except RuntimeError:
         # If no event loop is running, log a warning
         logger.warning("Cannot launch callback task: no event loop running")
+
+
+def execute_combined_callback(
+    callback: Callable | None,
+    input_params: dict[str, Any],
+    mock_output: Any,  # noqa: ANN401
+) -> None:
+    """Execute a combined callback synchronously with input parameters and mock output.
+
+    Args:
+        callback: The callback callable to execute
+        input_params: Dictionary of input parameters
+        mock_output: The output from the mock/stub call
+
+    Note:
+        Exceptions in callbacks are caught and logged to prevent breaking the main flow.
+    """
+    if callback is None:
+        return
+
+    try:
+        # Combine input params with mock_output
+        combined_data = {**input_params, "mock_output": mock_output}
+        # Filter parameters to match callback signature
+        filtered_data = filter_callback_parameters(callback, combined_data)
+        callback(**filtered_data)
+    except Exception as e:
+        logger.warning(f"Combined callback execution failed: {e}", exc_info=True)
+
+
+def launch_combined_callback_task(
+    callback: Callable | None,
+    input_params: dict[str, Any],
+    mock_output: Any,  # noqa: ANN401
+) -> None:
+    """Launch a combined callback as a background task (fire-and-forget).
+
+    Args:
+        callback: The callback callable to execute (can be sync or async)
+        input_params: Dictionary of input parameters
+        mock_output: The output from the mock/stub call
+
+    Note:
+        This launches the callback without blocking. Errors are logged but won't
+        affect the main execution flow.
+    """
+    if callback is None:
+        return
+
+    async def _run_callback() -> None:
+        """Wrapper to run combined callback with error handling."""
+        try:
+            # Combine input params with mock_output
+            combined_data = {**input_params, "mock_output": mock_output}
+            # Filter parameters to match callback signature
+            filtered_data = filter_callback_parameters(callback, combined_data)
+
+            if inspect.iscoroutinefunction(callback):
+                await callback(**filtered_data)
+            else:
+                result = callback(**filtered_data)
+                if inspect.iscoroutine(result):
+                    await result
+        except Exception as e:
+            logger.warning(f"Combined callback execution failed: {e}", exc_info=True)
+
+    # Create task without awaiting (fire-and-forget)
+    try:
+        asyncio.create_task(_run_callback())
+    except RuntimeError:
+        # If no event loop is running, log a warning
+        logger.warning("Cannot launch combined callback task: no event loop running")

{veris_ai-1.13.0 → veris_ai-1.14.0}/tests/test_side_effects.py

@@ -948,3 +948,357 @@ def test_callback_with_no_matching_parameters(simulation_env):
     result = some_func(1, "test")
     assert result == "result"
     assert len(called) == 1
+
+
+# Test combined_callback functionality
+
+
+@pytest.mark.asyncio
+async def test_mock_with_async_combined_callback(simulation_env):
+    """Test mock decorator with async combined_callback."""
+    captured_results = []
+
+    async def combined_handler(a: int, b: int, d: int = None, mock_output: int = None):
+        """Combined callback that uses both inputs and output."""
+        # Compute sum of inputs that are not None, then multiply by mock_output
+        total_input = a + b + (d if d is not None else 0)
+        result = total_input * (mock_output if mock_output is not None else 1)
+        captured_results.append(result)
+
+    @veris.mock(mode="function", combined_callback=combined_handler)
+    async def add(a: int, b: int, c: int = None, d: int = None) -> int:
+        """Add numbers together."""
+        return a + b + (c if c is not None else 0) + (d if d is not None else 0)
+
+    mock_response = 6
+
+    with patch.object(get_api_client(), "post_async", return_value=mock_response):
+        result = await add(1, 2, d=4)
+        assert result == 6
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+        assert len(captured_results) == 1
+        # (1 + 2 + 4) * 6 = 42
+        assert captured_results[0] == 42
+
+
+@pytest.mark.asyncio
+async def test_mock_with_sync_combined_callback_async_func(simulation_env):
+    """Test mock decorator with sync combined_callback on async function."""
+    captured_results = []
+
+    def multiply_by_result(a: int, b: int, mock_output: int = None):
+        """Multiply inputs by the mock output."""
+        result = (a + b) * (mock_output if mock_output is not None else 1)
+        captured_results.append(result)
+
+    @veris.mock(mode="function", combined_callback=multiply_by_result)
+    async def add(a: int, b: int) -> int:
+        return a + b
+
+    mock_response = 10
+
+    with patch.object(get_api_client(), "post_async", return_value=mock_response):
+        result = await add(3, 7)
+        assert result == 10
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+        assert len(captured_results) == 1
+        # (3 + 7) * 10 = 100
+        assert captured_results[0] == 100
+
+
+def test_mock_with_sync_combined_callback_sync_func(simulation_env):
+    """Test mock decorator with sync combined_callback on sync function."""
+    captured_results = []
+
+    def process_combined(x: int, y: str, mock_output: dict = None):
+        """Process both input and output."""
+        result = {
+            "input_x": x,
+            "input_y": y,
+            "output": mock_output,
+            "combined": f"{y}:{x}:{mock_output.get('value') if mock_output else 'none'}",
+        }
+        captured_results.append(result)
+
+    @veris.mock(mode="function", combined_callback=process_combined)
+    def test_func(x: int, y: str) -> dict:
+        return {"value": x}
+
+    mock_response = {"value": 999}
+
+    with patch.object(get_api_client(), "post", return_value=mock_response):
+        result = test_func(42, "test")
+        assert result == {"value": 999}
+        assert len(captured_results) == 1
+        assert captured_results[0]["input_x"] == 42
+        assert captured_results[0]["input_y"] == "test"
+        assert captured_results[0]["output"] == {"value": 999}
+        assert captured_results[0]["combined"] == "test:42:999"
+
+
+@pytest.mark.asyncio
+async def test_stub_with_async_combined_callback(simulation_env):
+    """Test stub decorator with async combined_callback."""
+    captured_results = []
+
+    async def combined_handler(name: str, count: int, mock_output: str = None):
+        """Combine input and output."""
+        result = f"{name}:{count}:{mock_output}"
+        captured_results.append(result)
+
+    @veris.stub(return_value="stubbed_value", combined_callback=combined_handler)
+    async def process(name: str, count: int) -> str:
+        return f"{name}_{count}"
+
+    result = await process("test", 5)
+    assert result == "stubbed_value"
+    # Wait for background tasks to complete
+    await asyncio.sleep(0.01)
+    assert len(captured_results) == 1
+    assert captured_results[0] == "test:5:stubbed_value"
+
+
+def test_stub_with_sync_combined_callback_sync_func(simulation_env):
+    """Test stub decorator with sync combined_callback on sync function."""
+    captured_results = []
+
+    def multiply_inputs_by_output(a: int, b: int, mock_output: int = None):
+        """Multiply sum of inputs by output."""
+        result = (a + b) * (mock_output if mock_output is not None else 1)
+        captured_results.append(result)
+
+    @veris.stub(return_value=5, combined_callback=multiply_inputs_by_output)
+    def add(a: int, b: int) -> int:
+        return a + b
+
+    result = add(2, 3)
+    assert result == 5
+    assert len(captured_results) == 1
+    # (2 + 3) * 5 = 25
+    assert captured_results[0] == 25
+
+
+@pytest.mark.asyncio
+async def test_combined_callback_with_parameter_filtering(simulation_env):
+    """Test that combined callback only receives parameters it accepts."""
+    captured_results = []
+
+    async def selective_callback(a: int, mock_output: int = None):
+        """Callback that only accepts 'a' and 'mock_output', not 'b' or 'c'."""
+        result = a * (mock_output if mock_output is not None else 1)
+        captured_results.append(result)
+
+    @veris.mock(mode="function", combined_callback=selective_callback)
+    async def complex_func(a: int, b: int, c: str = "default") -> int:
+        return a + b
+
+    mock_response = 7
+
+    with patch.object(get_api_client(), "post_async", return_value=mock_response):
+        result = await complex_func(3, 5, c="ignored")
+        assert result == 7
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+        assert len(captured_results) == 1
+        # 3 * 7 = 21 (b and c are filtered out)
+        assert captured_results[0] == 21
+
+
+@pytest.mark.asyncio
+async def test_combined_callback_in_production_mode(production_env):
+    """Test that combined_callback is not called in production mode."""
+    callback_mock = Mock()
+
+    @veris.mock(mode="function", combined_callback=callback_mock)
+    async def test_func(x: int) -> int:
+        return x * 2
+
+    result = await test_func(21)
+    assert result == 42
+
+    # Combined callback should NOT have been called
+    callback_mock.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_combined_callback_exception_is_logged(simulation_env):
+    """Test that exceptions in combined callback are caught and logged."""
+
+    async def failing_combined_callback(x: int, mock_output: int = None):
+        raise ValueError("Combined callback error")
+
+    @veris.mock(mode="function", combined_callback=failing_combined_callback)
+    async def test_func(x: int) -> int:
+        return x * 2
+
+    mock_response = 100
+
+    with (
+        patch.object(get_api_client(), "post_async", return_value=mock_response),
+        patch("veris_ai.utils.logger.warning") as mock_logger,
+    ):
+        # Function should still work despite combined callback failure
+        result = await test_func(42)
+        assert result == 100
+
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+
+        # Error should have been logged
+        mock_logger.assert_called()
+        assert "Combined callback execution failed" in str(mock_logger.call_args)
+
+
+@pytest.mark.asyncio
+async def test_mock_with_all_three_callbacks(simulation_env):
+    """Test mock decorator with input, output, and combined callbacks."""
+    captured_inputs = []
+    captured_outputs = []
+    captured_combined = []
+
+    async def capture_input(**kwargs):
+        captured_inputs.append(kwargs)
+
+    async def capture_output(result: int):
+        captured_outputs.append(result)
+
+    async def capture_combined(a: int, b: int, mock_output: int = None):
+        combined = {"sum": a + b, "product": a * b, "mock": mock_output}
+        captured_combined.append(combined)
+
+    @veris.mock(
+        mode="function",
+        input_callback=capture_input,
+        output_callback=capture_output,
+        combined_callback=capture_combined,
+    )
+    async def add(a: int, b: int) -> int:
+        return a + b
+
+    mock_response = 50
+
+    with patch.object(get_api_client(), "post_async", return_value=mock_response):
+        result = await add(10, 20)
+        assert result == 50
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+
+        # All callbacks should have been called
+        assert len(captured_inputs) == 1
+        assert captured_inputs[0] == {"a": 10, "b": 20}
+
+        assert len(captured_outputs) == 1
+        assert captured_outputs[0] == 50
+
+        assert len(captured_combined) == 1
+        assert captured_combined[0] == {"sum": 30, "product": 200, "mock": 50}
+
+
+def test_stub_with_all_three_callbacks(simulation_env):
+    """Test stub decorator with input, output, and combined callbacks."""
+    captured_inputs = []
+    captured_outputs = []
+    captured_combined = []
+
+    def capture_input(**kwargs):
+        captured_inputs.append(kwargs)
+
+    def capture_output(result: str):
+        captured_outputs.append(result)
+
+    def capture_combined(name: str, value: int, mock_output: str = None):
+        combined = f"{name}_{value}_{mock_output}"
+        captured_combined.append(combined)
+
+    @veris.stub(
+        return_value="stubbed",
+        input_callback=capture_input,
+        output_callback=capture_output,
+        combined_callback=capture_combined,
+    )
+    def process(name: str, value: int) -> str:
+        return f"{name}:{value}"
+
+    result = process("test", 42)
+    assert result == "stubbed"
+
+    # All callbacks should have been called
+    assert len(captured_inputs) == 1
+    assert captured_inputs[0] == {"name": "test", "value": 42}
+
+    assert len(captured_outputs) == 1
+    assert captured_outputs[0] == "stubbed"
+
+    assert len(captured_combined) == 1
+    assert captured_combined[0] == "test_42_stubbed"
+
+
+@pytest.mark.asyncio
+async def test_combined_callback_with_kwargs_accepts_all(simulation_env):
+    """Test combined callback with **kwargs accepts all parameters including mock_output."""
+    captured_data = []
+
+    async def flexible_callback(**kwargs):
+        """Callback that accepts any parameters via **kwargs."""
+        captured_data.append(kwargs)
+
+    @veris.mock(mode="function", combined_callback=flexible_callback)
+    async def multi_param_func(a: int, b: str, c: float = 3.14) -> dict:
+        return {"result": a}
+
+    mock_response = {"result": 999}
+
+    with patch.object(get_api_client(), "post_async", return_value=mock_response):
+        result = await multi_param_func(10, "test", c=2.71)
+        assert result == {"result": 999}
+        # Wait for background tasks to complete
+        await asyncio.sleep(0.01)
+
+        assert len(captured_data) == 1
+        # Should have all input params plus mock_output
+        assert captured_data[0]["a"] == 10
+        assert captured_data[0]["b"] == "test"
+        assert captured_data[0]["c"] == 2.71
+        assert captured_data[0]["mock_output"] == {"result": 999}
+
+
+def test_combined_callback_user_example(simulation_env):
+    """Test the exact example from the user: add function with multiply_by_result."""
+    multiplication_results = []
+
+    def multiply_by_result(a: int, b: int, d: int = None, mock_output: int = None):
+        """Multiply sum of provided inputs by the mock output."""
+        # Sum the inputs that are not None
+        input_sum = a + b + (d if d is not None else 0)
+        # Multiply by mock output
+        result = input_sum * (mock_output if mock_output is not None else 1)
+        multiplication_results.append(result)
+
+    @veris.mock(mode="function", combined_callback=multiply_by_result)
+    def add(a: int, b: int, c: int = None, d: int = None) -> int:
+        """Add numbers together."""
+        total = a + b
+        if c is not None:
+            total += c
+        if d is not None:
+            total += d
+        return total
+
+    # Mock the API to return 6 as the result
+    mock_response = 6
+
+    with patch.object(get_api_client(), "post", return_value=mock_response):
+        # Call add(1, 2, d=4)
+        # Expected: inputs are 1, 2, 4 (c is None)
+        # Mock returns 6
+        # Combined callback should compute: (1 + 2 + 4) * 6 = 42
+        result = add(1, 2, d=4)
+
+        # The function returns the mocked value
+        assert result == 6
+
+        # The combined callback computed (1+2+4)*6
+        assert len(multiplication_results) == 1
+        assert multiplication_results[0] == 42

{veris_ai-1.13.0 → veris_ai-1.14.0}/uv.lock

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