schemez 1.1.0__tar.gz → 1.1.1__tar.gz

{schemez-1.1.0 → schemez-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: schemez
-Version: 1.1.0
+Version: 1.1.1
 Summary: Pydantic shim for config stuff
 Keywords: 
 Author: Philipp Temminghoff

{schemez-1.1.0 → schemez-1.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "schemez"
-version = "1.1.0"
+version = "1.1.1"
 description = "Pydantic shim for config stuff"
 readme = "README.md"
 requires-python = ">=3.13"

{schemez-1.1.0 → schemez-1.1.1}/src/schemez/helpers.py

@@ -4,19 +4,19 @@ from __future__ import annotations
 
 import asyncio
 import importlib
-import json
 import os
 from pathlib import Path
 import subprocess
 import sys
 import tempfile
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Literal
 
 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:
     from collections.abc import Callable
@@ -177,11 +177,48 @@ 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],
     *,
     class_name: str | None = None,
-    target_python_version: str | None = None,
+    target_python_version: PythonVersion | None = None,
+    model_type: str = "pydantic.BaseModel",
 ) -> str:
     """Convert a BaseModel to Python code asynchronously.
 
@@ -190,6 +227,7 @@ async def model_to_python_code(
         class_name: Optional custom class name for the generated code
         target_python_version: Target Python version for code generation.
             Defaults to current system Python version.
+        model_type: Type of the generated model. Defaults to "pydantic.BaseModel".
 
     Returns:
         Generated Python code as string
@@ -198,67 +236,50 @@ async def model_to_python_code(
         RuntimeError: If datamodel-codegen is not available
         subprocess.CalledProcessError: If code generation fails
     """
-    try:
-        # Check if datamodel-codegen is available
-        proc = await asyncio.create_subprocess_exec(
-            "datamodel-codegen",
-            "--version",
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
-        )
-        await proc.communicate()
-        if proc.returncode != 0:
-            raise subprocess.CalledProcessError(
-                proc.returncode or -1, "datamodel-codegen"
-            )
-    except FileNotFoundError as e:
-        msg = "datamodel-codegen not available"
-        raise RuntimeError(msg) from e
+    working_prefix = await _detect_command("datamodel-codegen")
 
-    # Get model schema
     schema = model.model_json_schema()
     name = class_name or model.__name__
-    python_version = (
-        target_python_version or f"{sys.version_info.major}.{sys.version_info.minor}"
-    )
-
-    # Create temporary file with schema
+    py = target_python_version or f"{sys.version_info.major}.{sys.version_info.minor}"
     with tempfile.NamedTemporaryFile(mode="w", suffix=".json", delete=False) as f:
-        json.dump(schema, f)
+        # Use pydantic_core.to_json for proper schema serialization
+        schema_json = to_json(schema, indent=2).decode()
+        f.write(schema_json)
         schema_file = Path(f.name)
 
-    try:
-        # Generate model using datamodel-codegen
+    args = [
+        "--input",
+        str(schema_file),
+        "--input-file-type",
+        "jsonschema",
+        "--output-model-type",
+        model_type,
+        "--class-name",
+        name,
+        "--disable-timestamp",
+        "--use-union-operator",
+        "--use-schema-description",
+        "--enum-field-as-literal",
+        "all",
+        "--target-python-version",
+        py,
+    ]
+
+    try:  # Generate model using datamodel-codegen
         proc = await asyncio.create_subprocess_exec(
+            *working_prefix,
             "datamodel-codegen",
-            "--input",
-            str(schema_file),
-            "--input-file-type",
-            "jsonschema",
-            "--output-model-type",
-            "pydantic.BaseModel",
-            "--class-name",
-            name,
-            "--disable-timestamp",
-            "--use-union-operator",
-            "--use-schema-description",
-            "--enum-field-as-literal",
-            "all",
-            "--target-python-version",
-            python_version,
+            *args,
             stdout=asyncio.subprocess.PIPE,
             stderr=asyncio.subprocess.PIPE,
         )
-        stdout, stderr = await proc.communicate()
+        stdout, _stderr = await proc.communicate()
 
         if proc.returncode != 0:
-            msg = f"datamodel-codegen failed: {stderr.decode()}"
-            raise subprocess.CalledProcessError(
-                proc.returncode or -1, "datamodel-codegen"
-            )
+            code = proc.returncode or -1
+            raise subprocess.CalledProcessError(code, "datamodel-codegen")
 
         return stdout.decode().strip()
 
-    finally:
-        # Cleanup temp file
+    finally:  # Cleanup temp file
         schema_file.unlink(missing_ok=True)

{schemez-1.1.0 → schemez-1.1.1}/src/schemez/schema.py

@@ -19,6 +19,7 @@ if TYPE_CHECKING:
 
 StrPath = str | os.PathLike[str]
 SourceType = Literal["pdf", "image"]
+PythonVersion = Literal["3.13", "3.14", "3.15"]
 
 DEFAULT_SYSTEM_PROMPT = "You are a schema extractor for {name} BaseModels."
 DEFAULT_USER_PROMPT = "Extract information from this document:"
@@ -260,7 +261,7 @@ class Schema(BaseModel):
         cls,
         *,
         class_name: str | None = None,
-        target_python_version: str | None = None,
+        target_python_version: PythonVersion | None = None,
     ) -> str:
         """Convert this model to Python code asynchronously.