schemez 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

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):
@@ -119,6 +119,9 @@ class FunctionSchema(pydantic.BaseModel):
         required = self.parameters.get("required", self.required)
 
         for name, details in properties.items():
+            if name.startswith("_"):  # TODO: kwarg for renaming instead perhaps?
+                logger.debug("Skipping parameter %s due to leading underscore", name)
+                continue
             # Get base type
             if "enum" in details:
                 values = tuple(details["enum"])  # type: ignore
@@ -246,19 +249,14 @@ class FunctionSchema(pydantic.BaseModel):
             RuntimeError: If datamodel-codegen is not available
             subprocess.CalledProcessError: If code generation fails
         """
+        import shutil
         import subprocess
         import tempfile
 
-        try:
-            # Check if datamodel-codegen is available
-            subprocess.run(
-                ["datamodel-codegen", "--version"],
-                check=True,
-                capture_output=True,
-            )
-        except (subprocess.CalledProcessError, FileNotFoundError) as e:
+        # Check if datamodel-codegen is available
+        if not shutil.which("datamodel-codegen"):
             msg = "datamodel-codegen not available"
-            raise RuntimeError(msg) from e
+            raise RuntimeError(msg)
 
         name = class_name or f"{self.name.title()}Response"
 

schemez/helpers.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 
 import asyncio
 import importlib
-import os
 from pathlib import Path
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -15,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:
@@ -177,42 +176,6 @@ def resolve_type_string(type_string: str, safe: bool = True) -> type:
             raise ValueError(msg) from e
 
 
-async def _detect_command(command: str, *, test_flag: str = "--version") -> list[str]:
-    """Detect the correct command prefix for running a command.
-
-    Tries 'uv run' first, then falls back to direct execution.
-
-    Args:
-        command: The command to detect
-        test_flag: Flag to test command availability with
-
-    Returns:
-        Command prefix list (empty for direct execution)
-
-    Raises:
-        RuntimeError: If command is not available
-    """
-    cmd_prefixes = [["uv", "run"], []]
-
-    for prefix in cmd_prefixes:
-        try:
-            proc = await asyncio.create_subprocess_exec(
-                *prefix,
-                command,
-                test_flag,
-                stdout=asyncio.subprocess.PIPE,
-                stderr=asyncio.subprocess.PIPE,
-            )
-            await proc.communicate()
-            if proc.returncode == 0:
-                return prefix
-        except FileNotFoundError:
-            continue
-
-    msg = f"{command} not available (tried both 'uv run' and direct execution)"
-    raise RuntimeError(msg)
-
-
 async def model_to_python_code(
     model: type[BaseModel] | dict[str, Any],
     *,
@@ -236,7 +199,10 @@ async def model_to_python_code(
         RuntimeError: If datamodel-codegen is not available
         subprocess.CalledProcessError: If code generation fails
     """
-    working_prefix = await _detect_command("datamodel-codegen")
+    # Check if datamodel-codegen is available
+    if not shutil.which("datamodel-codegen"):
+        msg = "datamodel-codegen not available"
+        raise RuntimeError(msg)
 
     if isinstance(model, dict):
         schema = model
@@ -271,7 +237,6 @@ async def model_to_python_code(
 
     try:  # Generate model using datamodel-codegen
         proc = await asyncio.create_subprocess_exec(
-            *working_prefix,
             "datamodel-codegen",
             *args,
             stdout=asyncio.subprocess.PIPE,

schemez/schema.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import os
 from typing import TYPE_CHECKING, Any, Literal, Self
 
 import anyenv
@@ -15,9 +14,9 @@ if TYPE_CHECKING:
 
     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 +42,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
 
@@ -233,7 +234,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:

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] | UPath],
         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.2.dist-info → schemez-1.2.4.dist-info}/METADATA

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

{schemez-1.2.2.dist-info → schemez-1.2.4.dist-info}/RECORD

@@ -5,21 +5,21 @@ 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=kAV3W8_ory2vIlJELaSajQUgo8RcbEdu7ACkYpgWniI,26125
-schemez/helpers.py,sha256=6PnZfbwiQPZGiuHScqkpT3kA2Wm4O3O79gsGA95l7ow,8888
+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=u6SDhYDtfCjgy2Aa-_MDLLNcUfEXbeye4T-W6s3AED8,9558
+schemez/schema.py,sha256=Qt4INzB22jj-Uu61T-QI-USpNKMEeATdp98zE0Q8pL8,9592
 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/executor.py,sha256=-uSPfkE5JrpUQWbmD0QdEpAXVBsWiRmCWCcFvDWqtus,10486
+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.2.2.dist-info/licenses/LICENSE,sha256=AteGCH9r177TxxrOFEiOARrastASsf7yW6MQxlAHdwA,1078
-schemez-1.2.2.dist-info/WHEEL,sha256=ZbtZh9LqsQoZs-WmwRO6z-tavdkb5LzNxvrOv2F_OXE,78
-schemez-1.2.2.dist-info/METADATA,sha256=hIMu_x6gj7dGIFYuILQvUcMb_IvE10OPP_nLcXKWXSA,11616
-schemez-1.2.2.dist-info/RECORD,,
+schemez-1.2.4.dist-info/licenses/LICENSE,sha256=AteGCH9r177TxxrOFEiOARrastASsf7yW6MQxlAHdwA,1078
+schemez-1.2.4.dist-info/WHEEL,sha256=ELhySV62sOro8I5wRaLaF3TWxhBpkcDkdZUdAYLy_Hk,78
+schemez-1.2.4.dist-info/METADATA,sha256=ycelBanzLf1RK3HpheIamKERJ8lcEMdxmxmecfKotzk,11616
+schemez-1.2.4.dist-info/RECORD,,

{schemez-1.2.2.dist-info → schemez-1.2.4.dist-info}/WHEEL

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