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

schemez/functionschema.py

@@ -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

@@ -6,6 +6,7 @@ import asyncio
 import importlib
 import os
 from pathlib import Path
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -177,42 +178,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 +201,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 +239,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-1.2.2.dist-info → schemez-1.2.3.dist-info}/METADATA

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

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

@@ -5,8 +5,8 @@ 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=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
@@ -19,7 +19,7 @@ schemez/tool_executor/executor.py,sha256=lQFnVO5J64nFNEsy82jRS-q52PaU3fWsnuQddaL
 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.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.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,,

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

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