wizelit-sdk 0.1.26__py3-none-any.whl → 0.1.28__py3-none-any.whl

wizelit_sdk/agent_wrapper/__init__.py

@@ -5,4 +5,7 @@ from .agent_wrapper import WizelitAgent
 from .job import Job
 from .streaming import LogStreamer
 
-__all__ = ["WizelitAgent", "Job", "LogStreamer"]
+# Backward-compatible alias used by sample MCP servers
+WizelitAgentWrapper = WizelitAgent
+
+__all__ = ["WizelitAgent", "WizelitAgentWrapper", "Job", "LogStreamer"]

wizelit_sdk/agent_wrapper/agent_wrapper.py

@@ -8,6 +8,11 @@ from contextvars import ContextVar
 from fastmcp import FastMCP, Context
 from fastmcp.dependencies import CurrentContext
 from wizelit_sdk.agent_wrapper.job import Job
+from wizelit_sdk.agent_wrapper.signature_validation import (
+    SignatureValidationError,
+    bind_and_validate_arguments,
+    ensure_type_hints,
+)
 
 if TYPE_CHECKING:
     from wizelit_sdk.database import DatabaseManager
@@ -191,6 +196,35 @@ class WizelitAgent:
 
             new_sig = sig.replace(parameters=params_list)
 
+            # Exclude dependency-injected params from validation/schema
+            exclude_args = ["ctx"]
+            if has_job_param:
+                exclude_args.append("job")
+
+            # Validate that the user function has explicit type hints
+            ensure_type_hints(func, exclude_params=exclude_args)
+
+            # Validate response_handling schema early to catch drift
+            if response_handling is not None:
+                allowed_keys = {"mode", "extract_path", "template", "content_type"}
+                unknown_keys = set(response_handling.keys()) - allowed_keys
+                if unknown_keys:
+                    raise ValueError(
+                        f"response_handling for {tool_name} has unsupported keys: {sorted(unknown_keys)}"
+                    )
+
+                mode = response_handling.get("mode", "default")
+                if mode not in {"direct", "formatted", "default"}:
+                    raise ValueError(
+                        f"response_handling.mode for {tool_name} must be one of 'direct', 'formatted', 'default'"
+                    )
+
+                content_type = response_handling.get("content_type", "text")
+                if content_type not in {"text", "json", "auto"}:
+                    raise ValueError(
+                        f"response_handling.content_type for {tool_name} must be one of 'text', 'json', 'auto'"
+                    )
+
             # Create the wrapper function
             async def tool_wrapper(*args, **kwargs):
                 """MCP-compliant wrapper with streaming."""
@@ -209,31 +243,14 @@ class WizelitAgent:
                         job = job()
                     # If job is still None, _execute_tool will create it
 
-                # Bind all arguments (including positional) to the original function signature
-                # This ensures parameters are correctly passed even if fast-mcp uses positional args
-                # Create a signature without 'job' since we've already extracted it
-                func_sig = inspect.signature(func)
-                if has_job_param and "job" in func_sig.parameters:
-                    # Remove 'job' from signature for binding since we handle it separately
-                    params_without_job = {
-                        name: param
-                        for name, param in func_sig.parameters.items()
-                        if name != "job"
-                    }
-                    func_sig = func_sig.replace(
-                        parameters=list(params_without_job.values())
-                    )
-
                 try:
-                    bound_args = func_sig.bind(*args, **kwargs)
-                    bound_args.apply_defaults()
-                    func_kwargs = bound_args.arguments
-                except TypeError as e:
-                    # Fallback: if binding fails, use kwargs as-is (shouldn't happen normally)
-                    logging.warning(
-                        f"Failed to bind arguments for {tool_name}: {e}. Args: {args}, Kwargs: {kwargs}"
+                    func_kwargs = bind_and_validate_arguments(
+                        func, args, kwargs, exclude_params=exclude_args
                     )
-                    func_kwargs = kwargs
+                except SignatureValidationError as exc:
+                    raise ValueError(
+                        f"Argument validation failed for {tool_name}: {exc}"
+                    ) from exc
 
                 return await self._execute_tool(
                     func, ctx, is_async, is_long_running, tool_name, job, **func_kwargs
@@ -258,10 +275,6 @@ class WizelitAgent:
 
             # Register with fast-mcp
             # Exclude ctx and job from schema generation since they're dependency-injected
-            exclude_args = ["ctx"]
-            if has_job_param:
-                exclude_args.append("job")
-
             # Prepare tool kwargs
             tool_kwargs = {
                 "description": tool_description,

wizelit_sdk/agent_wrapper/signature_validation.py

@@ -0,0 +1,118 @@
+"""Common helpers for function signature validation.
+
+These helpers are used by the Wizelit MCP wrappers to enforce that tool
+functions declare explicit type hints and that incoming arguments match the
+expected signature at runtime.
+"""
+
+from __future__ import annotations
+
+import inspect
+from typing import Any, Dict, Iterable, Mapping, Sequence, get_type_hints
+
+from typeguard import check_type
+
+
+class SignatureValidationError(TypeError):
+    """Raised when a function signature or call arguments are invalid."""
+
+
+def _clean_excluded(exclude: Iterable[str] | None) -> set[str]:
+    return {name for name in (exclude or [])}
+
+
+def ensure_type_hints(
+    func: Any, *, exclude_params: Iterable[str] | None = None
+) -> Dict[str, Any]:
+    """Ensure a function has type hints for all non-excluded parameters.
+
+    Args:
+        func: The target function.
+        exclude_params: Parameter names to ignore (e.g., dependency-injected params).
+
+    Returns:
+        The resolved type hints for the function.
+
+    Raises:
+        SignatureValidationError: If any non-excluded parameter lacks a type hint.
+    """
+
+    exclude = _clean_excluded(exclude_params)
+    hints = get_type_hints(func, include_extras=True)
+    missing = [
+        name
+        for name, param in inspect.signature(func).parameters.items()
+        if name not in exclude and param.kind != inspect.Parameter.VAR_KEYWORD
+        and param.kind != inspect.Parameter.VAR_POSITIONAL
+        and name not in hints
+    ]
+
+    if missing:
+        raise SignatureValidationError(
+            f"Function {func.__name__} is missing type hints for: {', '.join(missing)}"
+        )
+    return hints
+
+
+def bind_and_validate_arguments(
+    func: Any,
+    args: Sequence[Any],
+    kwargs: Mapping[str, Any],
+    *,
+    exclude_params: Iterable[str] | None = None,
+) -> Dict[str, Any]:
+    """Bind args/kwargs to a function signature and validate types.
+
+    This ensures required parameters are present and values match the annotated
+    types. Excluded parameters are ignored for both binding and validation.
+
+    Args:
+        func: The target function.
+        args: Positional arguments.
+        kwargs: Keyword arguments.
+        exclude_params: Parameter names to ignore during validation.
+
+    Returns:
+        A dictionary of bound arguments suitable for calling ``func``.
+
+    Raises:
+        SignatureValidationError: If required parameters are missing or types mismatch.
+    """
+
+    exclude = _clean_excluded(exclude_params)
+    sig = inspect.signature(func)
+
+    # Drop excluded parameters from the signature for binding
+    filtered_params = [
+        param
+        for name, param in sig.parameters.items()
+        if name not in exclude
+    ]
+    filtered_sig = sig.replace(parameters=filtered_params)
+
+    try:
+        bound = filtered_sig.bind(*args, **kwargs)
+        bound.apply_defaults()
+    except TypeError as exc:
+        raise SignatureValidationError(
+            f"Invalid arguments for {func.__name__}: {exc}"
+        ) from exc
+
+    hints = get_type_hints(func, include_extras=True)
+    for name, value in bound.arguments.items():
+        if name in exclude:
+            continue
+        expected = hints.get(name)
+        if expected is None:
+            continue
+        try:
+            # typeguard 4.x uses check_type(value, expected_type)
+            # typeguard 2.x uses check_type(argname, value, expected_type)
+            check_type(value, expected)
+        except TypeError as exc:
+            raise SignatureValidationError(
+                f"Argument '{name}' to {func.__name__} must be {expected!r}, got {type(value)!r}. "
+                f"Value: {value!r}. Original error: {exc}"
+            ) from exc
+
+    return bound.arguments

wizelit_sdk/database.py

@@ -18,11 +18,11 @@ class DatabaseManager:
     """Singleton database manager with connection pooling."""
 
     DATABASE_URL: str = ""
-    POOL_SIZE: int = 5
-    MAX_OVERFLOW: int = 10
-    POOL_TIMEOUT: int = 30
-    POOL_RECYCLE: int = 3600
-    ECHO_SQL: bool = False
+    POOL_SIZE: int = int(os.getenv("DB_POOL_SIZE", "5"))
+    MAX_OVERFLOW: int = int(os.getenv("DB_MAX_OVERFLOW", "10"))
+    POOL_TIMEOUT: int = int(os.getenv("DB_POOL_TIMEOUT", "30"))
+    POOL_RECYCLE: int = int(os.getenv("DB_POOL_RECYCLE", "3600"))
+    ECHO_SQL: bool = os.getenv("DB_ECHO_SQL", "false").lower() == "true"
 
     _instance = None
 

{wizelit_sdk-0.1.26.dist-info → wizelit_sdk-0.1.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wizelit-sdk
-Version: 0.1.26
+Version: 0.1.28
 Summary: Wizelit Agent Wrapper - Internal utility package
 Author-email: Your Name <your.email@company.com>
 Requires-Python: >=3.10
@@ -8,6 +8,7 @@ Requires-Dist: asyncpg>=0.26.0
 Requires-Dist: fastmcp>=0.1.0
 Requires-Dist: redis>=4.5.0
 Requires-Dist: sqlalchemy>=1.4
+Requires-Dist: typeguard>=4.3.0
 Requires-Dist: typing-extensions>=4.0.0
 Provides-Extra: dev
 Requires-Dist: black>=22.0.0; extra == 'dev'

wizelit_sdk-0.1.28.dist-info/RECORD

@@ -0,0 +1,13 @@
+wizelit_sdk/__init__.py,sha256=76Dt-WxNbEJwOCPqu2P9AooVSQoGmc8-CH1fxIWJ5Lo,471
+wizelit_sdk/database.py,sha256=6F2Nyt-sr5U5GkAB9OeSCU-iv2byZBDsg7aXqCl-ntk,4822
+wizelit_sdk/agent_wrapper/__init__.py,sha256=srVcHZfvpf3q8m2nzIST6Ofl2V8Vv5GRtcNXudOLiD8,333
+wizelit_sdk/agent_wrapper/agent_wrapper.py,sha256=LiSYpnKF-RTx_9UnVgW9KqyfTWtilK_Gft1yCuxujus,23204
+wizelit_sdk/agent_wrapper/job.py,sha256=Gk2CyLBQFzIosYuGrqUj6_rZ9kDIO6YLYQ7Pxk6ASuM,13776
+wizelit_sdk/agent_wrapper/signature_validation.py,sha256=Njplwofw36jXoWgBooaZCbwhkf72pR-UoRQ3Q6-biro,3729
+wizelit_sdk/agent_wrapper/streaming.py,sha256=f0VV3IzGAlfQY_cw2OHgxWjvM16Hs42_b700EUX2QpY,6633
+wizelit_sdk/models/__init__.py,sha256=UB7nfHoE6hGcjfzy7w8AmuKVmYrTg9wIgGjG8GWziJ0,143
+wizelit_sdk/models/base.py,sha256=aEPGMZVczKnlWz4Ps99e_xI5TcuSV3DxCigRMU5BnhE,704
+wizelit_sdk/models/job.py,sha256=P68Vb1k77Z_Tha4dE0GzrLPa0LJrnMCxyYMENZyD7Kc,2480
+wizelit_sdk-0.1.28.dist-info/METADATA,sha256=wBU5HBbuQBXynPvt_L2blH-JzArvPpDgU2jkRZ2kOWQ,3297
+wizelit_sdk-0.1.28.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+wizelit_sdk-0.1.28.dist-info/RECORD,,

wizelit_sdk-0.1.26.dist-info/RECORD

@@ -1,12 +0,0 @@
-wizelit_sdk/__init__.py,sha256=76Dt-WxNbEJwOCPqu2P9AooVSQoGmc8-CH1fxIWJ5Lo,471
-wizelit_sdk/database.py,sha256=39Vu5A8CV7u7ItIwRgrkAugD9UqNbG5vQrCsMOgTamc,4631
-wizelit_sdk/agent_wrapper/__init__.py,sha256=OAF36jAmI0A3ByppsYMzJDHeDG9X0Ac4LbFzNp0b7jw,219
-wizelit_sdk/agent_wrapper/agent_wrapper.py,sha256=e9KCQSpC7hox3q6sqzhOLDIq37btw7IT4ejeuljc6Gk,22742
-wizelit_sdk/agent_wrapper/job.py,sha256=Gk2CyLBQFzIosYuGrqUj6_rZ9kDIO6YLYQ7Pxk6ASuM,13776
-wizelit_sdk/agent_wrapper/streaming.py,sha256=f0VV3IzGAlfQY_cw2OHgxWjvM16Hs42_b700EUX2QpY,6633
-wizelit_sdk/models/__init__.py,sha256=UB7nfHoE6hGcjfzy7w8AmuKVmYrTg9wIgGjG8GWziJ0,143
-wizelit_sdk/models/base.py,sha256=aEPGMZVczKnlWz4Ps99e_xI5TcuSV3DxCigRMU5BnhE,704
-wizelit_sdk/models/job.py,sha256=P68Vb1k77Z_Tha4dE0GzrLPa0LJrnMCxyYMENZyD7Kc,2480
-wizelit_sdk-0.1.26.dist-info/METADATA,sha256=0QpbkJ8Z5Vl-2s7xrYHoTrutSAMUgQol9JNr9fgXkgo,3265
-wizelit_sdk-0.1.26.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-wizelit_sdk-0.1.26.dist-info/RECORD,,