schemez 1.2.3__py3-none-any.whl → 1.4.0__py3-none-any.whl

schemez/__init__.py

@@ -35,9 +35,11 @@ from schemez.schema_generators import (
     create_constructor_schema,
 )
 from schemez.typedefs import OpenAIFunctionDefinition, OpenAIFunctionTool
+from schemez.code_generation import ToolCodeGenerator, ToolsetCodeGenerator
 
 __version__ = version("schemez")
 
+
 __all__ = [
     "ExecutableFunction",
     "FunctionType",
@@ -54,6 +56,8 @@ __all__ = [
     "SchemaDef",
     "SchemaField",
     "TOMLCode",
+    "ToolCodeGenerator",
+    "ToolsetCodeGenerator",
     "YAMLCode",
     "__version__",
     "create_constructor_schema",

schemez/code_generation/__init__.py

@@ -0,0 +1,6 @@
+"""Meta-resource provider that exposes tools through Python execution."""
+
+from schemez.code_generation.tool_code_generator import ToolCodeGenerator
+from schemez.code_generation.toolset_code_generator import ToolsetCodeGenerator
+
+__all__ = ["ToolCodeGenerator", "ToolsetCodeGenerator"]

schemez/code_generation/namespace_callable.py

@@ -0,0 +1,76 @@
+"""Namespace callable wrapper for tools."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import inspect
+from typing import TYPE_CHECKING, Any
+
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from schemez.code_generation.tool_code_generator import ToolCodeGenerator
+
+
+@dataclass
+class NamespaceCallable:
+    """Wrapper for tool functions with proper repr and call interface."""
+
+    callable: Callable
+    """The callable function to execute."""
+
+    name_override: str | None = None
+    """Override name for the callable, defaults to callable.__name__."""
+
+    def __post_init__(self) -> None:
+        """Set function attributes for introspection."""
+        self.__name__ = self.name_override or self.callable.__name__
+        self.__doc__ = self.callable.__doc__ or ""
+
+    @property
+    def name(self) -> str:
+        """Get the effective name of the callable."""
+        return self.name_override or self.callable.__name__
+
+    @classmethod
+    def from_generator(cls, generator: ToolCodeGenerator) -> NamespaceCallable:
+        """Create a NamespaceCallable from a ToolCodeGenerator.
+
+        Args:
+            generator: The generator to wrap
+
+        Returns:
+            NamespaceCallable instance
+        """
+        return cls(generator.callable, generator.name_override)
+
+    async def __call__(self, *args, **kwargs) -> Any:
+        """Execute the wrapped callable."""
+        try:
+            if inspect.iscoroutinefunction(self.callable):
+                result = await self.callable(*args, **kwargs)
+
+            result = self.callable(*args, **kwargs)
+        except Exception as e:  # noqa: BLE001
+            return f"Error executing {self.name}: {e!s}"
+        else:
+            return result if result is not None else "Operation completed successfully"
+
+    def __repr__(self) -> str:
+        """Return detailed representation for debugging."""
+        return f"NamespaceCallable(name='{self.name}')"
+
+    def __str__(self) -> str:
+        """Return readable string representation."""
+        return f"<tool: {self.name}>"
+
+    @property
+    def signature(self) -> str:
+        """Get function signature for debugging."""
+        try:
+            sig = inspect.signature(self.callable)
+        except (ValueError, TypeError):
+            return f"{self.name}(...)"
+        else:
+            return f"{self.name}{sig}"

schemez/code_generation/route_helpers.py

@@ -0,0 +1,126 @@
+"""Helper functions for FastAPI route generation."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING, Any
+
+from schemez.schema import json_schema_to_base_model
+
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from pydantic import BaseModel
+    from pydantic.fields import FieldInfo
+
+
+def create_param_model(parameters_schema: dict[str, Any]) -> type[BaseModel] | None:
+    """Create Pydantic model for parameter validation using schemez.
+
+    Args:
+        parameters_schema: JSON schema for tool parameters
+
+    Returns:
+        Pydantic model class or None if no parameters
+    """
+    if parameters_schema.get("properties"):
+        return json_schema_to_base_model(parameters_schema)  # type: ignore
+    return None
+
+
+def generate_func_code(model_fields: dict[str, FieldInfo]) -> str:
+    """Generate dynamic function code for FastAPI route handler.
+
+    Args:
+        model_fields: Model fields from Pydantic model
+
+    Returns:
+        Generated function code as string
+    """
+    route_params = []
+    for name, field_info in model_fields.items():
+        field_type = field_info.annotation
+        if field_info.is_required():
+            route_params.append(f"{name}: {field_type.__name__}")  # type: ignore
+        else:
+            route_params.append(f"{name}: {field_type.__name__} = None")  # type: ignore
+
+    # Create function signature dynamically
+    param_str = ", ".join(route_params)
+    return f"""
+async def dynamic_handler({param_str}) -> dict[str, Any]:
+    kwargs = {{{", ".join(f'"{name}": {name}' for name in model_fields)}}}
+    return await route_handler(**kwargs)
+"""
+
+
+def create_route_handler(tool_callable: Callable, param_cls: type | None) -> Callable:
+    """Create FastAPI route handler for a tool.
+
+    Args:
+        tool_callable: The tool function to execute
+        param_cls: Pydantic model for parameter validation
+
+    Returns:
+        Async route handler function
+    """
+
+    async def route_handler(*args, **kwargs) -> Any:
+        """Route handler for the tool."""
+        if param_cls:
+            params_instance = param_cls(**kwargs)  # Parse and validate parameters
+            dct = params_instance.model_dump()  # Convert to dict and remove None values
+            clean_params = {k: v for k, v in dct.items() if v is not None}
+            result = await _execute_tool_function(tool_callable, **clean_params)
+        else:
+            result = await _execute_tool_function(tool_callable)
+        return {"result": result}
+
+    return route_handler
+
+
+async def _execute_tool_function(tool_callable: Callable, **kwargs) -> Any:
+    """Execute a tool function with the given parameters.
+
+    Args:
+        tool_callable: Tool function to execute
+        **kwargs: Tool parameters
+
+    Returns:
+        Tool execution result
+    """
+    try:
+        # For now, just simulate execution
+        # In real implementation, this would call the actual tool
+        # potentially through sandbox providers
+        return f"Executed {tool_callable.__name__} with params: {kwargs}"
+    except Exception as e:  # noqa: BLE001
+        return f"Error executing {tool_callable.__name__}: {e!s}"
+
+
+if __name__ == "__main__":
+    from llmling_agent.tools.base import Tool
+
+    def greet(name: str, greeting: str = "Hello") -> str:
+        """Greet someone."""
+        return f"{greeting}, {name}!"
+
+    # Create a tool and demonstrate helper functions
+    tool = Tool.from_callable(greet)
+    schema = tool.schema["function"]
+    parameters_schema = schema.get("parameters", {})
+
+    # Create parameter model
+    param_cls = create_param_model(dict(parameters_schema))
+    print(f"Generated parameter model: {param_cls}")
+
+    if param_cls:
+        print(f"Model fields: {param_cls.model_fields}")
+
+        # Generate function code
+        func_code = generate_func_code(param_cls.model_fields)
+        print(f"Generated function code:\n{func_code}")
+
+    # Create route handler
+    handler = create_route_handler(greet, param_cls)
+    print(f"Generated route handler: {handler}")

schemez/code_generation/tool_code_generator.py

@@ -0,0 +1,272 @@
+"""Meta-resource provider that exposes tools through Python execution."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+import inspect
+from typing import TYPE_CHECKING, Any
+
+from pydantic_ai import RunContext
+
+from schemez import create_schema
+from schemez.code_generation.route_helpers import (
+    create_param_model,
+    create_route_handler,
+    generate_func_code,
+)
+
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+    from fastapi import FastAPI
+
+    from schemez.typedefs import OpenAIFunctionTool, Property
+
+
+TYPE_MAP = {
+    "string": "str",
+    "integer": "int",
+    "number": "float",
+    "boolean": "bool",
+    "array": "list",
+    "null": "None",
+}
+
+
+@dataclass
+class ToolCodeGenerator:
+    """Generates code artifacts for a single tool."""
+
+    schema: OpenAIFunctionTool
+    """Schema of the tool."""
+
+    callable: Callable
+    """Tool to generate code for."""
+
+    name_override: str | None = None
+    """Name of the tool."""
+
+    @classmethod
+    def from_callable(cls, fn: Callable) -> ToolCodeGenerator:
+        """Create a ToolCodeGenerator from a Tool."""
+        schema = create_schema(fn).model_dump_openai()
+        schema["function"]["name"] = fn.__name__
+        schema["function"]["description"] = fn.__doc__ or ""
+        return cls(schema=schema, callable=callable)
+
+    @property
+    def name(self) -> str:
+        """Name of the tool."""
+        return self.name_override or self.callable.__name__
+
+    def _extract_basic_signature(self, return_type: str = "Any") -> str:
+        """Fallback signature extraction from tool schema."""
+        schema = self.schema["function"]
+        params = schema.get("parameters", {}).get("properties", {})
+        required = set(schema.get("parameters", {}).get("required", []))
+
+        param_strs = []
+        for name, param_info in params.items():
+            # Skip context parameters that should be hidden from users
+            if self._is_context_parameter(name):
+                continue
+
+            type_hint = self._infer_parameter_type(name, param_info)
+
+            if name not in required:
+                # Check for actual default value in schema
+                default_value = param_info.get("default")
+                if default_value is not None:
+                    if isinstance(default_value, str):
+                        param_strs.append(f"{name}: {type_hint} = {default_value!r}")
+                    else:
+                        param_strs.append(f"{name}: {type_hint} = {default_value}")
+                else:
+                    param_strs.append(f"{name}: {type_hint} = None")
+            else:
+                param_strs.append(f"{name}: {type_hint}")
+
+        return f"{self.name}({', '.join(param_strs)}) -> {return_type}"
+
+    def _infer_parameter_type(self, param_name: str, param_info: Property) -> str:
+        """Infer parameter type from schema and function inspection."""
+        schema_type = param_info.get("type", "Any")
+
+        # If schema has a specific type, use it
+        if schema_type != "object":
+            return TYPE_MAP.get(schema_type, "Any")
+
+        # For 'object' type, try to infer from function signature
+        try:
+            callable_func = self.callable
+            # Use wrapped signature if available (for context parameter hiding)
+            sig = getattr(callable_func, "__signature__", None) or inspect.signature(
+                callable_func
+            )
+
+            if param_name in sig.parameters:
+                param = sig.parameters[param_name]
+
+                # Try annotation first
+                if param.annotation != inspect.Parameter.empty:
+                    if hasattr(param.annotation, "__name__"):
+                        return param.annotation.__name__
+                    return str(param.annotation)
+
+                # Infer from default value
+                if param.default != inspect.Parameter.empty:
+                    default_type = type(param.default).__name__
+                    # Map common types
+                    if default_type in ["int", "float", "str", "bool"]:
+                        return default_type
+                # If no default and it's required, assume str for web-like functions
+                required = set(
+                    self.schema.get("function", {})
+                    .get("parameters", {})
+                    .get("required", [])
+                )
+                if param_name in required:
+                    return "str"
+
+        except Exception:  # noqa: BLE001
+            pass
+
+        # Fallback to Any for unresolved object types
+        return "Any"
+
+    def _get_return_model_name(self) -> str:
+        """Get the return model name for a tool."""
+        try:
+            schema = create_schema(self.callable)
+            if schema.returns.get("type") == "object":
+                return f"{self.name.title()}Response"
+            if schema.returns.get("type") == "array":
+                return f"list[{self.name.title()}Item]"
+            return TYPE_MAP.get(schema.returns.get("type", "string"), "Any")
+        except Exception:  # noqa: BLE001
+            return "Any"
+
+    def get_function_signature(self) -> str:
+        """Extract function signature using schemez."""
+        try:
+            return_model_name = self._get_return_model_name()
+            return self._extract_basic_signature(return_model_name)
+        except Exception:  # noqa: BLE001
+            return self._extract_basic_signature("Any")
+
+    def _get_callable_signature(self) -> inspect.Signature:
+        """Get signature from callable, respecting wrapped signatures."""
+        # Use wrapped signature if available (for context parameter hiding)
+        return getattr(self.callable, "__signature__", None) or inspect.signature(
+            self.callable
+        )
+
+    def _is_context_parameter(self, param_name: str) -> bool:  # noqa: PLR0911
+        """Check if a parameter is a context parameter that should be hidden."""
+        try:
+            sig = self._get_callable_signature()
+            if param_name not in sig.parameters:
+                return False
+
+            param = sig.parameters[param_name]
+            if param.annotation == inspect.Parameter.empty:
+                return False
+
+            # Check if parameter is RunContext or AgentContext
+            annotation = param.annotation
+            annotation_str = str(annotation)
+
+            # Handle RunContext (including parameterized like RunContext[None])
+            if annotation is RunContext:
+                return True
+
+            # Check for parameterized RunContext using string matching
+            if "RunContext" in annotation_str:
+                return True
+
+            # Handle AgentContext
+            if hasattr(annotation, "__name__") and annotation.__name__ == "AgentContext":
+                return True
+
+            # Check for AgentContext in string representation
+            if "AgentContext" in annotation_str:
+                return True
+
+        except Exception:  # noqa: BLE001
+            pass
+
+        return False
+
+    def generate_return_model(self) -> str | None:
+        """Generate Pydantic model code for the tool's return type."""
+        try:
+            schema = create_schema(self.callable)
+            if schema.returns.get("type") not in {"object", "array"}:
+                return None
+
+            class_name = f"{self.name.title()}Response"
+            model_code = schema.to_pydantic_model_code(class_name=class_name)
+            return model_code.strip() or None
+
+        except Exception:  # noqa: BLE001
+            return None
+
+    # Route generation methods
+    def generate_route_handler(self) -> Callable:
+        """Generate FastAPI route handler for this tool.
+
+        Returns:
+            Async route handler function
+        """
+        # Extract parameter schema
+        schema = self.schema["function"]
+        parameters_schema = schema.get("parameters", {})
+
+        # Create parameter model
+        param_cls = create_param_model(dict(parameters_schema))
+
+        # Create route handler
+        return create_route_handler(self.callable, param_cls)
+
+    def add_route_to_app(self, app: FastAPI, path_prefix: str = "/tools") -> None:
+        """Add this tool's route to FastAPI app.
+
+        Args:
+            app: FastAPI application instance
+            path_prefix: Path prefix for the route
+        """
+        # Extract parameter schema
+        schema = self.schema["function"]
+        parameters_schema = schema.get("parameters", {})
+
+        # Create parameter model
+        param_cls = create_param_model(dict(parameters_schema))
+
+        # Create the route handler
+        route_handler = self.generate_route_handler()
+
+        # Set up the route with proper parameter annotations for FastAPI
+        if param_cls:
+            # Get field information from the generated model
+            model_fields = param_cls.model_fields
+            func_code = generate_func_code(model_fields)
+            # Execute the dynamic function creation
+            namespace = {"route_handler": route_handler, "Any": Any}
+            exec(func_code, namespace)
+            dynamic_handler: Callable = namespace["dynamic_handler"]  # type: ignore
+        else:
+
+            async def dynamic_handler() -> dict[str, Any]:
+                return await route_handler()
+
+        # Add route to FastAPI app
+        app.get(f"{path_prefix}/{self.name}")(dynamic_handler)
+
+
+if __name__ == "__main__":
+    import webbrowser
+
+    generator = ToolCodeGenerator.from_callable(webbrowser.open)
+    sig = generator.get_function_signature()
+    print(sig)

schemez/code_generation/toolset_code_generator.py

@@ -0,0 +1,151 @@
+"""Orchestrates code generation for multiple tools."""
+
+from __future__ import annotations
+
+import contextlib
+from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+from schemez.code_generation.namespace_callable import NamespaceCallable
+from schemez.code_generation.tool_code_generator import ToolCodeGenerator
+
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Sequence
+
+    from fastapi import FastAPI
+
+
+USAGE = """\
+Usage notes:
+- Write your code inside an 'async def main():' function
+- All tool functions are async, use 'await'
+- Use 'return' statements to return values from main()
+- Generated model classes are available for type checking
+- Use 'await report_progress(current, total, message)' for long-running operations
+- DO NOT call asyncio.run() or try to run the main function yourself
+- DO NOT import asyncio or other modules - tools are already available
+- Example:
+    async def main():
+        for i in range(5):
+            await report_progress(i, 5, f'Step {i+1} for {name}')
+            should_continue = await ask_user('Continue?', 'bool')
+            if not should_continue:
+                break
+        return f'Completed for {name}'
+
+"""
+
+
+@dataclass
+class ToolsetCodeGenerator:
+    """Generates code artifacts for multiple tools."""
+
+    generators: Sequence[ToolCodeGenerator]
+    """ToolCodeGenerator instances for each tool."""
+
+    include_signatures: bool = True
+    """Include function signatures in documentation."""
+
+    include_docstrings: bool = True
+    """Include function docstrings in documentation."""
+
+    @classmethod
+    def from_callables(
+        cls,
+        callables: Sequence[Callable],
+        include_signatures: bool = True,
+        include_docstrings: bool = True,
+    ) -> ToolsetCodeGenerator:
+        """Create a ToolsetCodeGenerator from a sequence of Tools.
+
+        Args:
+            callables: Callables to generate code for
+            include_signatures: Include function signatures in documentation
+            include_docstrings: Include function docstrings in documentation
+
+        Returns:
+            ToolsetCodeGenerator instance
+        """
+        generators = [ToolCodeGenerator.from_callable(i) for i in callables]
+        return cls(generators, include_signatures, include_docstrings)
+
+    def generate_tool_description(self) -> str:
+        """Generate comprehensive tool description with available functions."""
+        if not self.generators:
+            return "Execute Python code (no tools available)"
+
+        return_models = self.generate_return_models()
+        parts = [
+            "Execute Python code with the following tools available as async functions:",
+            "",
+        ]
+
+        if return_models:
+            parts.extend([
+                "# Generated return type models",
+                return_models,
+                "",
+                "# Available functions:",
+                "",
+            ])
+
+        for generator in self.generators:
+            if self.include_signatures:
+                signature = generator.get_function_signature()
+                parts.append(f"async def {signature}:")
+            else:
+                parts.append(f"async def {generator.name}(...):")
+
+            if self.include_docstrings and generator.callable.__doc__:
+                indented_desc = "    " + generator.callable.__doc__.replace(
+                    "\n", "\n    "
+                )
+                parts.append(f'    """{indented_desc}"""')
+            parts.append("")
+
+        parts.append(USAGE)
+
+        return "\n".join(parts)
+
+    def generate_execution_namespace(self) -> dict[str, Any]:
+        """Build Python namespace with tool functions and generated models."""
+        namespace: dict[str, Any] = {"__builtins__": __builtins__, "_result": None}
+
+        # Add tool functions
+        for generator in self.generators:
+            namespace[generator.name] = NamespaceCallable.from_generator(generator)
+
+        # Add generated model classes to namespace
+        if models_code := self.generate_return_models():
+            with contextlib.suppress(Exception):
+                exec(models_code, namespace)
+
+        return namespace
+
+    def generate_return_models(self) -> str:
+        """Generate Pydantic models for tool return types."""
+        model_parts = [
+            code for g in self.generators if (code := g.generate_return_model())
+        ]
+        return "\n\n".join(model_parts) if model_parts else ""
+
+    def add_all_routes(self, app: FastAPI, path_prefix: str = "/tools") -> None:
+        """Add FastAPI routes for all tools.
+
+        Args:
+            app: FastAPI application instance
+            path_prefix: Path prefix for routes
+        """
+        for generator in self.generators:
+            generator.add_route_to_app(app, path_prefix)
+
+
+if __name__ == "__main__":
+    import webbrowser
+
+    generator = ToolsetCodeGenerator.from_callables([webbrowser.open])
+    models = generator.generate_return_models()
+    print(models)
+    namespace = generator.generate_execution_namespace()
+    print(namespace)

schemez/functionschema.py

@@ -12,7 +12,6 @@ import decimal
 import enum
 import inspect
 import ipaddress
-import logging
 from pathlib import Path
 import re
 import types
@@ -23,6 +22,7 @@ from uuid import UUID
 import docstring_parser
 import pydantic
 
+from schemez import log
 from schemez.typedefs import (
     OpenAIFunctionDefinition,
     OpenAIFunctionTool,
@@ -34,7 +34,7 @@ if typing.TYPE_CHECKING:
     from schemez.typedefs import Property
 
 
-logger = logging.getLogger(__name__)
+logger = log.get_logger(__name__)
 
 
 class FunctionType(enum.StrEnum):

schemez/helpers.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import asyncio
 import importlib
-import os
 from pathlib import Path
 import shutil
 import subprocess
@@ -16,7 +15,6 @@ from pydantic import BaseModel
 from pydantic_core import to_json
 
 
-StrPath = str | os.PathLike[str]
 PythonVersion = Literal["3.13", "3.14", "3.15"]
 
 if TYPE_CHECKING:

schemez/schema.py

@@ -2,22 +2,20 @@
 
 from __future__ import annotations
 
-import os
-from typing import TYPE_CHECKING, Any, Literal, Self
+from enum import Enum
+from typing import TYPE_CHECKING, Any, Literal, Optional, Self
 
-import anyenv
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel, ConfigDict, Field, create_model
 import upath
 
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
-    from llmling_agent.agent.agent import AgentType
     from llmling_agent.models.content import BaseContent
+    from upath.types import JoinablePathLike
 
 
-StrPath = str | os.PathLike[str]
 SourceType = Literal["pdf", "image"]
 PythonVersion = Literal["3.13", "3.14", "3.15"]
 
@@ -43,7 +41,9 @@ class Schema(BaseModel):
         return merge_models(self, other)
 
     @classmethod
-    def from_yaml(cls, content: str, inherit_path: StrPath | None = None) -> Self:
+    def from_yaml(
+        cls, content: str, inherit_path: JoinablePathLike | None = None
+    ) -> Self:
         """Create from YAML string."""
         import yamling
 
@@ -68,41 +68,47 @@ class Schema(BaseModel):
         return get_function_model(func, name=name)
 
     @classmethod
-    def from_vision_llm_sync(
-        cls,
-        file_content: bytes,
-        source_type: SourceType = "pdf",
-        model: str = "google-gla:gemini-2.0-flash",
-        system_prompt: str = DEFAULT_SYSTEM_PROMPT,
-        user_prompt: str = DEFAULT_USER_PROMPT,
-        provider: AgentType = "pydantic_ai",
-    ) -> Self:
-        """Create a schema model from a document using AI.
+    def from_json_schema(cls, json_schema: dict[str, Any]) -> type[Schema]:
+        """Create a schema model from a JSON schema.
 
         Args:
-            file_content: The document content to create a schema from
-            source_type: The type of the document
-            model: The AI model to use for schema extraction
-            system_prompt: The system prompt to use for schema extraction
-            user_prompt: The user prompt to use for schema extraction
-            provider: The provider to use for schema extraction
+            json_schema: The JSON schema to create a schema from
 
         Returns:
-            A new schema model class based on the document
+            A new schema model class based on the JSON schema
         """
-        from llmling_agent import Agent, ImageBase64Content, PDFBase64Content
+        from datamodel_code_generator import DataModelType, PythonVersion
+        from datamodel_code_generator.model import get_data_model_types
+        from datamodel_code_generator.parser.jsonschema import JsonSchemaParser
+        from pydantic.v1.main import ModelMetaclass
 
-        if source_type == "pdf":
-            content: BaseContent = PDFBase64Content.from_bytes(file_content)
-        else:
-            content = ImageBase64Content.from_bytes(file_content)
-        agent = Agent[None](  # type:ignore[var-annotated]
-            model=model,
-            system_prompt=system_prompt.format(name=cls.__name__),
-            provider=provider,
-        ).to_structured(cls)
-        chat_message = anyenv.run_sync(agent.run(user_prompt, content))
-        return chat_message.content
+        data_model_types = get_data_model_types(
+            DataModelType.PydanticBaseModel, target_python_version=PythonVersion.PY_312
+        )
+        parser = JsonSchemaParser(
+            f"""{json_schema}""",
+            data_model_type=data_model_types.data_model,
+            data_model_root_type=data_model_types.root_model,
+            data_model_field_type=data_model_types.field_model,
+            data_type_manager_type=data_model_types.data_type_manager,
+            dump_resolve_reference_action=data_model_types.dump_resolve_reference_action,
+        )
+        code_str = (
+            parser.parse()
+            .replace("from pydantic ", "from pydantic.v1 ")  # type: ignore
+            .replace("from __future__ import annotations\n\n", "")
+        )
+        ex_namespace: dict[str, Any] = {}
+        exec(code_str, ex_namespace, ex_namespace)
+        model = None
+        for v in ex_namespace.values():
+            if isinstance(v, ModelMetaclass):
+                model = v
+        if not model:
+            msg = "Class not found in output"
+            raise Exception(msg)  # noqa: TRY002
+        model.__module__ = __name__
+        return model  # type: ignore
 
     @classmethod
     async def from_vision_llm(
@@ -112,7 +118,6 @@ class Schema(BaseModel):
         model: str = "google-gla:gemini-2.0-flash",
         system_prompt: str = DEFAULT_SYSTEM_PROMPT,
         user_prompt: str = DEFAULT_USER_PROMPT,
-        provider: AgentType = "pydantic_ai",
     ) -> Self:
         """Create a schema model from a document using AI.
 
@@ -122,7 +127,6 @@ class Schema(BaseModel):
             model: The AI model to use for schema extraction
             system_prompt: The system prompt to use for schema extraction
             user_prompt: The user prompt to use for schema extraction
-            provider: The provider to use for schema extraction
 
         Returns:
             A new schema model class based on the document
@@ -133,45 +137,11 @@ class Schema(BaseModel):
             content: BaseContent = PDFBase64Content.from_bytes(file_content)
         else:
             content = ImageBase64Content.from_bytes(file_content)
-        agent = Agent[None](  # type:ignore[var-annotated]
-            model=model,
-            system_prompt=system_prompt.format(name=cls.__name__),
-            provider=provider,
-        ).to_structured(cls)
+        prompt = system_prompt.format(name=cls.__name__)
+        agent = Agent(model=model, system_prompt=prompt, output_type=cls)
         chat_message = await agent.run(user_prompt, content)
         return chat_message.content
 
-    @classmethod
-    def from_llm_sync(
-        cls,
-        text: str,
-        model: str = "google-gla:gemini-2.0-flash",
-        system_prompt: str = DEFAULT_SYSTEM_PROMPT,
-        user_prompt: str = DEFAULT_USER_PROMPT,
-        provider: AgentType = "pydantic_ai",
-    ) -> Self:
-        """Create a schema model from a text snippet using AI.
-
-        Args:
-            text: The text to create a schema from
-            model: The AI model to use for schema extraction
-            system_prompt: The system prompt to use for schema extraction
-            user_prompt: The user prompt to use for schema extraction
-            provider: The provider to use for schema extraction
-
-        Returns:
-            A new schema model class based on the document
-        """
-        from llmling_agent import Agent
-
-        agent = Agent[None](  # type:ignore[var-annotated]
-            model=model,
-            system_prompt=system_prompt.format(name=cls.__name__),
-            provider=provider,
-        ).to_structured(cls)
-        chat_message = anyenv.run_sync(agent.run(user_prompt, text))
-        return chat_message.content
-
     @classmethod
     async def from_llm(
         cls,
@@ -179,7 +149,6 @@ class Schema(BaseModel):
         model: str = "google-gla:gemini-2.0-flash",
         system_prompt: str = DEFAULT_SYSTEM_PROMPT,
         user_prompt: str = DEFAULT_USER_PROMPT,
-        provider: AgentType = "pydantic_ai",
     ) -> Self:
         """Create a schema model from a text snippet using AI.
 
@@ -188,18 +157,14 @@ class Schema(BaseModel):
             model: The AI model to use for schema extraction
             system_prompt: The system prompt to use for schema extraction
             user_prompt: The user prompt to use for schema extraction
-            provider: The provider to use for schema extraction
 
         Returns:
             A new schema model class based on the document
         """
         from llmling_agent import Agent
 
-        agent = Agent[None](  # type:ignore[var-annotated]
-            model=model,
-            system_prompt=system_prompt.format(name=cls.__name__),
-            provider=provider,
-        ).to_structured(cls)
+        prompt = system_prompt.format(name=cls.__name__)
+        agent = Agent(model=model, system_prompt=prompt, output_type=cls)
         chat_message = await agent.run(user_prompt, text)
         return chat_message.content
 
@@ -233,7 +198,7 @@ class Schema(BaseModel):
         )
         return yamling.dump_yaml(text)
 
-    def save(self, path: StrPath, overwrite: bool = False) -> None:
+    def save(self, path: JoinablePathLike, overwrite: bool = False) -> None:
         """Save configuration to a YAML file.
 
         Args:
@@ -279,3 +244,87 @@ class Schema(BaseModel):
             class_name=class_name,
             target_python_version=target_python_version,
         )
+
+
+def json_schema_to_base_model(
+    schema: dict[str, Any], model_cls: type[BaseModel] = Schema
+) -> type[Schema]:
+    type_mapping: dict[str, type] = {
+        "string": str,
+        "integer": int,
+        "number": float,
+        "boolean": bool,
+        "array": list,
+        "object": dict,
+    }
+
+    properties = schema.get("properties", {})
+    required_fields = schema.get("required", [])
+    model_fields = {}
+
+    def process_field(field_name: str, field_props: dict[str, Any]) -> tuple:
+        """Recursively processes a field and returns its type and Field instance."""
+        json_type = field_props.get("type", "string")
+        enum_values = field_props.get("enum")
+
+        # Handle Enums
+        if enum_values:
+            enum_name: str = f"{field_name.capitalize()}Enum"
+            field_type: Any = Enum(enum_name, {v: v for v in enum_values})
+        # Handle Nested Objects
+        elif json_type == "object" and "properties" in field_props:
+            # Recursively create submodel
+            field_type = json_schema_to_base_model(field_props)  # type: ignore
+        # Handle Arrays with Nested Objects
+        elif json_type == "array" and "items" in field_props:
+            item_props = field_props["items"]
+            if item_props.get("type") == "object":
+                item_type: Any = json_schema_to_base_model(item_props)  # pyright: ignore[reportRedeclaration]
+            else:
+                item_type = type_mapping.get(item_props.get("type"), Any)  # pyright: ignore[reportAssignmentType]
+            field_type = list[item_type]  # type: ignore
+        else:
+            field_type = type_mapping.get(json_type, Any)  # type: ignore
+
+        # Handle default values and optionality
+        default_value = field_props.get("default", ...)
+        nullable = field_props.get("nullable", False)
+        description = field_props.get("title", "")
+
+        if nullable:
+            field_type = Optional[field_type]  # type: ignore  # noqa: UP045
+
+        if field_name not in required_fields:
+            default_value = field_props.get("default")
+
+        return field_type, Field(default_value, description=description)
+
+    # Process each field
+    for field_name, field_props in properties.items():
+        model_fields[field_name] = process_field(field_name, field_props)
+
+    return create_model(  # type: ignore
+        schema.get("title", "DynamicModel"), **model_fields, __base__=model_cls
+    )
+
+
+if __name__ == "__main__":
+    schema = {
+        "$id": "https://example.com/person.schema.json",
+        "$schema": "https://json-schema.org/draft/2020-12/schema",
+        "title": "Person",
+        "type": "object",
+        "properties": {
+            "firstName": {"type": "string", "description": "The person's first name."},
+            "lastName": {"type": "string", "description": "The person's last name."},
+            "age": {
+                "description": "Age in years, must be equal to or greater than zero.",
+                "type": "integer",
+                "minimum": 0,
+            },
+        },
+    }
+    model = Schema.from_json_schema(schema)
+    import devtools
+
+    devtools.debug(model.__fields__)

schemez/tool_executor/executor.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-import logging
 from pathlib import Path
 import time
 from typing import TYPE_CHECKING, Any
@@ -12,6 +11,7 @@ from pydantic import BaseModel
 from pydantic_core import from_json
 from upath import UPath
 
+from schemez import log
 from schemez.functionschema import FunctionSchema
 from schemez.tool_executor.helpers import clean_generated_code, generate_input_model
 
@@ -20,11 +20,12 @@ if TYPE_CHECKING:
     from collections.abc import Callable, Sequence
 
     from fastapi import FastAPI
+    from upath.types import JoinablePathLike
 
     from schemez.tool_executor.types import ToolHandler
 
 
-logger = logging.getLogger(__name__)
+logger = log.get_logger(__name__)
 
 
 class HttpToolExecutor:
@@ -32,7 +33,7 @@ class HttpToolExecutor:
 
     def __init__(
         self,
-        schemas: Sequence[dict[str, Any] | Path],
+        schemas: Sequence[dict[str, Any] | JoinablePathLike],
         handler: ToolHandler,
         base_url: str = "http://localhost:8000",
     ):
@@ -61,7 +62,7 @@ class HttpToolExecutor:
             match schema:
                 case dict():
                     loaded_schemas.append(schema)
-                case str() | Path():
+                case str() | Path() | UPath():
                     text = UPath(schema).read_text("utf-8")
                     loaded_schemas.append(from_json(text))
                 case _:
@@ -264,7 +265,7 @@ from datetime import datetime
         uvicorn.run(app, host=host, port=port)
         return None
 
-    async def save_to_files(self, output_dir: Path) -> dict[str, Path]:
+    async def save_to_files(self, output_dir: JoinablePathLike) -> dict[str, UPath]:
         """Save generated code to files.
 
         Args:
@@ -273,7 +274,7 @@ from datetime import datetime
         Returns:
             Dictionary mapping file types to paths
         """
-        output_dir = Path(output_dir)
+        output_dir = UPath(output_dir)
         output_dir.mkdir(parents=True, exist_ok=True)
 
         saved_files = {}

schemez/tool_executor/helpers.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
-import logging
 import time
 
+from schemez import log
 from schemez.helpers import model_to_python_code
 
 
-logger = logging.getLogger(__name__)
+logger = log.get_logger(__name__)
 
 
 async def generate_input_model(schema_dict: dict) -> tuple[str, str]:

{schemez-1.2.3.dist-info → schemez-1.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schemez
-Version: 1.2.3
+Version: 1.4.0
 Summary: Pydantic shim for config stuff
 Keywords: 
 Author: Philipp Temminghoff

schemez-1.4.0.dist-info/RECORD

@@ -0,0 +1,30 @@
+schemez/__init__.py,sha256=UwLAA0B5whh63w9sYQvs_b_NNm6TBCm86-zPQiDxj3g,1799
+schemez/bind_kwargs.py,sha256=ChyArgNa5R8VdwSJmmrQItMH9Ld6hStWBISw-T1wyws,6228
+schemez/code.py,sha256=usZLov9i5KpK1W2VJxngUzeetgrINtodiooG_AxN-y4,2072
+schemez/code_generation/__init__.py,sha256=KV2ETgN8sKHlAOGnktURAHDJbz8jImBNputaxhdlin8,286
+schemez/code_generation/namespace_callable.py,sha256=LiQHsS3J46snBj4uhKNrI-dboeQNPO2QwdbhSk3-gyE,2382
+schemez/code_generation/route_helpers.py,sha256=YZfD0BUZ6_0iLnSzf2vKa8Fu2kJNfC-8oYzaQ--x8fA,4056
+schemez/code_generation/tool_code_generator.py,sha256=yM29h4nccZEV21FMSZaKJI-IBdDezxpHld3n4WFWfkM,9627
+schemez/code_generation/toolset_code_generator.py,sha256=Uw4UEjLzzHsm6YzsPFaEPxYHpFgIv_DKaFVP0XePjjI,5083
+schemez/convert.py,sha256=3sOxOgDaFzV7uiOUSM6_Sy0YlafIlZRSevs5y2vT1Kw,4403
+schemez/create_type.py,sha256=wrdqdzXtfxZfsgp9IroldoYGTJs_Rdli8TiscqhV2bI,11647
+schemez/docstrings.py,sha256=kmd660wcomXzKac0SSNYxPRNbVCUovrpmE9jwnVRS6c,4115
+schemez/executable.py,sha256=YM4WcmRyJ9CpzKpNgS0A-Ri0Jd7mAzfHmoaXONI-mIs,7134
+schemez/functionschema.py,sha256=D5nJIOQYwfOwuNSHLIoqNZtYkA1Y0DIFH18qMI6--ik,26141
+schemez/helpers.py,sha256=YFx7UKYDI_sn5sVGAzzl5rcB26iBvLatvZlEFsQM5rc,7874
+schemez/log.py,sha256=i0SDbIfWmuC_nfJdQOYAdUYaR0TBk3Mhu-K3M-lnAM4,364
+schemez/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+schemez/pydantic_types.py,sha256=8vgSl8i2z9n0fB-8AJj-D3TBByEWE5IxItBxQ0XwXFI,1640
+schemez/schema.py,sha256=OUiMNkoJZzsRQ2hTdKLvHFrmeoSZZhtbgnV4EjeIPA4,11552
+schemez/schema_generators.py,sha256=Gze7S7dQkTsl_1ckeHLXPxx4jQo7RB6hHQM-5fpAsrA,6973
+schemez/schemadef/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+schemez/schemadef/schemadef.py,sha256=FtD7TOnYxiuYOIfadRHKkkbZn98mWFb0_lKfPsPR-hI,14393
+schemez/tool_executor/__init__.py,sha256=7wLjhA1NGekTMsiIfWLAv6J7qYhWDlanH9DKU4v1c6c,263
+schemez/tool_executor/executor.py,sha256=0VOY9N4Epqdv_MYU-BoDiTKbFiyIwGk_pfe5JcxJq4o,10497
+schemez/tool_executor/helpers.py,sha256=zxfI9tUkUx8Dy9fNP89-2kqfV8eZwQ3re2Gmd-oekb0,1476
+schemez/tool_executor/types.py,sha256=l2DxUIEHP9bjLnEaXZ6X428cSviicTDJsc3wfSNqKxg,675
+schemez/typedefs.py,sha256=3OAUQ1nin9nlsOcTPAO5xrsOqVUfwsH_7_cexQYREus,6091
+schemez-1.4.0.dist-info/licenses/LICENSE,sha256=AteGCH9r177TxxrOFEiOARrastASsf7yW6MQxlAHdwA,1078
+schemez-1.4.0.dist-info/WHEEL,sha256=DpNsHFUm_gffZe1FgzmqwuqiuPC6Y-uBCzibcJcdupM,78
+schemez-1.4.0.dist-info/METADATA,sha256=PyncybCr23T22f_d0yl76k-YwHfXv2XHHGAGeuEgdw4,11616
+schemez-1.4.0.dist-info/RECORD,,

{schemez-1.2.3.dist-info → schemez-1.4.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.2
+Generator: uv 0.9.8
 Root-Is-Purelib: true
 Tag: py3-none-any

schemez-1.2.3.dist-info/RECORD

@@ -1,25 +0,0 @@
-schemez/__init__.py,sha256=KkwJF8pfbzw_4cBxwXuUyXIExqdxS8iumvyAL-JUED4,1669
-schemez/bind_kwargs.py,sha256=ChyArgNa5R8VdwSJmmrQItMH9Ld6hStWBISw-T1wyws,6228
-schemez/code.py,sha256=usZLov9i5KpK1W2VJxngUzeetgrINtodiooG_AxN-y4,2072
-schemez/convert.py,sha256=3sOxOgDaFzV7uiOUSM6_Sy0YlafIlZRSevs5y2vT1Kw,4403
-schemez/create_type.py,sha256=wrdqdzXtfxZfsgp9IroldoYGTJs_Rdli8TiscqhV2bI,11647
-schemez/docstrings.py,sha256=kmd660wcomXzKac0SSNYxPRNbVCUovrpmE9jwnVRS6c,4115
-schemez/executable.py,sha256=YM4WcmRyJ9CpzKpNgS0A-Ri0Jd7mAzfHmoaXONI-mIs,7134
-schemez/functionschema.py,sha256=NXQsZKeo7GRr7gnhEMHJvnjZhQktn9Kjf1W8xWyWh5Y,26135
-schemez/helpers.py,sha256=_4-S8n7m3yajVYdYckSyrG1GsfMqCOfm5O-bGkYI1qc,7917
-schemez/log.py,sha256=i0SDbIfWmuC_nfJdQOYAdUYaR0TBk3Mhu-K3M-lnAM4,364
-schemez/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-schemez/pydantic_types.py,sha256=8vgSl8i2z9n0fB-8AJj-D3TBByEWE5IxItBxQ0XwXFI,1640
-schemez/schema.py,sha256=u6SDhYDtfCjgy2Aa-_MDLLNcUfEXbeye4T-W6s3AED8,9558
-schemez/schema_generators.py,sha256=Gze7S7dQkTsl_1ckeHLXPxx4jQo7RB6hHQM-5fpAsrA,6973
-schemez/schemadef/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-schemez/schemadef/schemadef.py,sha256=FtD7TOnYxiuYOIfadRHKkkbZn98mWFb0_lKfPsPR-hI,14393
-schemez/tool_executor/__init__.py,sha256=7wLjhA1NGekTMsiIfWLAv6J7qYhWDlanH9DKU4v1c6c,263
-schemez/tool_executor/executor.py,sha256=lQFnVO5J64nFNEsy82jRS-q52PaU3fWsnuQddaLOo6c,10410
-schemez/tool_executor/helpers.py,sha256=jxBv1G_R8rQU3ACHGgfVEecqO0DSZQ6qUIHcn25Ucc4,1470
-schemez/tool_executor/types.py,sha256=l2DxUIEHP9bjLnEaXZ6X428cSviicTDJsc3wfSNqKxg,675
-schemez/typedefs.py,sha256=3OAUQ1nin9nlsOcTPAO5xrsOqVUfwsH_7_cexQYREus,6091
-schemez-1.2.3.dist-info/licenses/LICENSE,sha256=AteGCH9r177TxxrOFEiOARrastASsf7yW6MQxlAHdwA,1078
-schemez-1.2.3.dist-info/WHEEL,sha256=X16MKk8bp2DRsAuyteHJ-9qOjzmnY0x1aj0P1ftqqWA,78
-schemez-1.2.3.dist-info/METADATA,sha256=VPcDp5yYQYgz_YPcUsmDFhVh3-oeL7JTOdS4cAw0Aio,11616
-schemez-1.2.3.dist-info/RECORD,,