string-schema 0.1.3__tar.gz → 0.1.5__tar.gz

{string_schema-0.1.3/string_schema.egg-info → string_schema-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: string-schema
-Version: 0.1.3
+Version: 0.1.5
 Summary: A simple, LLM-friendly schema definition library for converting string syntax to structured schemas
 Home-page: https://github.com/xychenmsn/string-schema
 Author: Michael Chen

{string_schema-0.1.3 → string_schema-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "string-schema"
-version = "0.1.3"
+version = "0.1.5"
 description = "A simple, LLM-friendly schema definition library for converting string syntax to structured schemas"
 readme = "README.md"
 license = "MIT"
@@ -64,6 +64,12 @@ include = ["string_schema*"]
 [tool.setuptools.package-data]
 string_schema = ["py.typed"]
 
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.package-dir]
+"" = "."
+
 [tool.black]
 line-length = 100
 target-version = ['py311', 'py312', 'py313']

{string_schema-0.1.3 → string_schema-0.1.5}/setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="string-schema",
-    version="0.1.3",
+    version="0.1.5",
     author="Michael Chen",
     author_email="xychen@msn.com",
     description="A simple, LLM-friendly schema definition library for converting string syntax to structured schemas",

{string_schema-0.1.3 → string_schema-0.1.5}/string_schema/integrations/pydantic.py

@@ -111,41 +111,41 @@ def _simple_field_to_pydantic(field: SimpleField) -> tuple:
 
 
 # New consistent naming
-def json_schema_to_model(name: str, json_schema: Dict[str, Any]) -> Type[BaseModel]:
+def json_schema_to_model(json_schema: Dict[str, Any], name: str) -> Type[BaseModel]:
     """
     Create Pydantic model from JSON Schema dictionary.
 
     Args:
-        name: Name of the model class
         json_schema: JSON Schema dictionary
+        name: Name of the model class
 
     Returns:
         Dynamically created Pydantic model class
 
     Example:
-        UserModel = json_schema_to_model('User', json_schema)
+        UserModel = json_schema_to_model(json_schema, 'User')
     """
-    return create_pydantic_from_json_schema(name, json_schema)
+    return create_pydantic_from_json_schema(json_schema, name)
 
 
 # Legacy alias for backward compatibility
-def json_schema_to_pydantic(name: str, json_schema: Dict[str, Any]) -> Type[BaseModel]:
+def json_schema_to_pydantic(json_schema: Dict[str, Any], name: str) -> Type[BaseModel]:
     """
     Create Pydantic model from JSON Schema dictionary.
 
     DEPRECATED: Use json_schema_to_model() instead for consistent naming.
     """
-    return json_schema_to_model(name, json_schema)
+    return json_schema_to_model(json_schema, name)
 
 
-def create_pydantic_from_json_schema(name: str, json_schema: Dict[str, Any]) -> Type[BaseModel]:
+def create_pydantic_from_json_schema(json_schema: Dict[str, Any], name: str) -> Type[BaseModel]:
     """
     Create Pydantic model from JSON Schema.
-    
+
     Args:
-        name: Name of the model class
         json_schema: JSON Schema dictionary
-        
+        name: Name of the model class
+
     Returns:
         Dynamically created Pydantic model class
     """
@@ -184,7 +184,7 @@ def _json_schema_to_pydantic_field(field_schema: Dict[str, Any], required: bool
         python_type = TypingUnion[tuple(union_types)]
     elif field_schema.get('type') == 'object':
         # Handle nested objects by creating a nested Pydantic model
-        nested_model = create_pydantic_from_json_schema(f"{parent_name}Nested", field_schema)
+        nested_model = create_pydantic_from_json_schema(field_schema, f"{parent_name}Nested")
         python_type = nested_model
     elif field_schema.get('type') == 'array':
         # Handle arrays
@@ -192,7 +192,7 @@ def _json_schema_to_pydantic_field(field_schema: Dict[str, Any], required: bool
         if items_schema.get('type') == 'object':
             # Array of objects
             from typing import List
-            item_model = create_pydantic_from_json_schema(f"{parent_name}Item", items_schema)
+            item_model = create_pydantic_from_json_schema(items_schema, f"{parent_name}Item")
             python_type = List[item_model]
         else:
             # Array of primitives
@@ -441,7 +441,7 @@ def _string_to_model_with_name(name: str, schema_str: str) -> Type[BaseModel]:
 
     # Convert string to JSON Schema, then to Pydantic
     json_schema = parse_string_schema(schema_str)
-    return create_pydantic_from_json_schema(name, json_schema)
+    return create_pydantic_from_json_schema(json_schema, name)
 
 
 # Legacy alias for backward compatibility

{string_schema-0.1.3 → string_schema-0.1.5}/string_schema/utilities.py

@@ -93,7 +93,7 @@ def string_to_model(schema_str: str, name: Optional[str] = None) -> Type[BaseMod
                 if items_schema.get('type') == 'object':
                     # Array of objects: create nested model for items
                     from .integrations.pydantic import create_pydantic_from_json_schema
-                    ItemModel = create_pydantic_from_json_schema(f"{name}Item", items_schema)
+                    ItemModel = create_pydantic_from_json_schema(items_schema, f"{name}Item")
 
                     # Create the array model using RootModel
                     class ArrayModel(RootModel[List[ItemModel]]):
@@ -125,7 +125,7 @@ def string_to_model(schema_str: str, name: Optional[str] = None) -> Type[BaseMod
                 if items_schema.get('type') == 'object':
                     # Array of objects: create nested model for items
                     from .integrations.pydantic import create_pydantic_from_json_schema
-                    ItemModel = create_pydantic_from_json_schema(f"{name}Item", items_schema)
+                    ItemModel = create_pydantic_from_json_schema(items_schema, f"{name}Item")
 
                     # Create constraints for the array
                     constraints = {}
@@ -159,7 +159,7 @@ def string_to_model(schema_str: str, name: Optional[str] = None) -> Type[BaseMod
         else:
             # Regular object schema
             from .integrations.pydantic import create_pydantic_from_json_schema
-            return create_pydantic_from_json_schema(name, json_schema)
+            return create_pydantic_from_json_schema(json_schema, name)
 
     except Exception as e:
         raise ValueError(f"Failed to create model from schema '{schema_str}': {str(e)}") from e

{string_schema-0.1.3 → string_schema-0.1.5/string_schema.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: string-schema
-Version: 0.1.3
+Version: 0.1.5
 Summary: A simple, LLM-friendly schema definition library for converting string syntax to structured schemas
 Home-page: https://github.com/xychenmsn/string-schema
 Author: Michael Chen

{string_schema-0.1.3 → string_schema-0.1.5}/string_schema.egg-info/SOURCES.txt

@@ -3,6 +3,25 @@ MANIFEST.in
 README.md
 pyproject.toml
 setup.py
+./string_schema/__init__.py
+./string_schema/py.typed
+./string_schema/utilities.py
+./string_schema/core/__init__.py
+./string_schema/core/builders.py
+./string_schema/core/fields.py
+./string_schema/core/validators.py
+./string_schema/examples/__init__.py
+./string_schema/examples/presets.py
+./string_schema/examples/recipes.py
+./string_schema/integrations/__init__.py
+./string_schema/integrations/json_schema.py
+./string_schema/integrations/openapi.py
+./string_schema/integrations/pydantic.py
+./string_schema/integrations/reverse.py
+./string_schema/parsing/__init__.py
+./string_schema/parsing/optimizer.py
+./string_schema/parsing/string_parser.py
+./string_schema/parsing/syntax.py
 docs/README.md
 docs/advanced-usage.md
 docs/api-reference.md