ostruct-cli 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

ostruct/cli/template_utils.py

@@ -47,30 +47,189 @@ class TemplateMetadataError(TaskTemplateError):
 
 
 def validate_json_schema(schema: Dict[str, Any]) -> None:
-    """Validate that a dictionary follows JSON Schema structure.
-
-    This function checks that the provided dictionary is a valid JSON Schema,
-    following the JSON Schema specification.
+    """Validate a JSON schema.
 
     Args:
-        schema: Dictionary to validate as a JSON Schema
+        schema: The schema to validate
 
     Raises:
         SchemaValidationError: If the schema is invalid
     """
     try:
-        # Get the validator class for the schema
-        validator_cls = jsonschema.validators.validator_for(schema)
-
-        # Check schema itself is valid
-        validator_cls.check_schema(schema)
-
-        # Create validator instance
-        validator_cls(schema)
-    except jsonschema.exceptions.SchemaError as e:
-        raise SchemaValidationError(f"Invalid JSON Schema: {e}")
+        # 1. Quick structural validation
+        if not isinstance(schema, dict):
+            raise SchemaValidationError(
+                "Invalid JSON Schema: Schema must be a JSON object",
+                context={
+                    "validation_type": "schema",
+                    "found": type(schema).__name__,
+                    "tips": ["Ensure your schema is a valid JSON object"],
+                },
+            )
+
+        # 2. Extract and validate schema wrapper
+        schema_to_validate = schema.get("schema", schema)
+        if not isinstance(schema_to_validate, dict):
+            raise SchemaValidationError(
+                "Invalid JSON Schema: Inner schema must be a JSON object",
+                context={
+                    "validation_type": "schema",
+                    "found": type(schema_to_validate).__name__,
+                    "tips": [
+                        "If using a schema wrapper, ensure the inner schema is a valid JSON object"
+                    ],
+                },
+            )
+
+        # 3. Check for circular references with enhanced detection
+        def resolve_ref(ref: str, root: Dict[str, Any]) -> Dict[str, Any]:
+            """Resolve a JSON reference to its target object."""
+            if not ref.startswith("#/"):
+                raise SchemaValidationError(
+                    "Invalid JSON Schema: Only local references are supported",
+                    context={
+                        "validation_type": "schema",
+                        "ref": ref,
+                        "tips": [
+                            "Use only local references (starting with #/)"
+                        ],
+                    },
+                )
+
+            parts = ref[2:].split("/")
+            current = root
+            for part in parts:
+                if part not in current:
+                    raise SchemaValidationError(
+                        f"Invalid JSON Schema: Reference {ref} not found",
+                        context={
+                            "validation_type": "schema",
+                            "ref": ref,
+                            "tips": [
+                                "Check that all references point to existing definitions"
+                            ],
+                        },
+                    )
+                current = current[part]
+            return current
+
+        def check_refs(
+            obj: Any,
+            path: List[str],
+            seen_refs: List[str],
+            root: Dict[str, Any],
+        ) -> None:
+            """Check for circular references in the schema."""
+            if isinstance(obj, dict):
+                if "$ref" in obj:
+                    ref = obj["$ref"]
+                    if ref in seen_refs:
+                        raise SchemaValidationError(
+                            "Invalid JSON Schema: Circular reference found",
+                            context={
+                                "validation_type": "schema",
+                                "path": "/".join(path),
+                                "ref": ref,
+                                "found": "circular reference",
+                                "tips": [
+                                    "Remove circular references in your schema",
+                                    "Use unique identifiers instead of nested references",
+                                    "Consider flattening your schema structure",
+                                ],
+                            },
+                        )
+
+                    # Resolve the reference and check its contents
+                    seen_refs.append(ref)
+                    try:
+                        resolved = resolve_ref(ref, root)
+                        check_refs(resolved, path, seen_refs.copy(), root)
+                    except SchemaValidationError:
+                        raise
+                    except Exception as e:
+                        raise SchemaValidationError(
+                            f"Invalid JSON Schema: Failed to resolve reference {ref}",
+                            context={
+                                "validation_type": "schema",
+                                "path": "/".join(path),
+                                "ref": ref,
+                                "error": str(e),
+                                "tips": [
+                                    "Check that all references are properly formatted"
+                                ],
+                            },
+                        )
+
+                for key, value in obj.items():
+                    if key != "$ref":  # Skip checking the reference itself
+                        check_refs(value, path + [key], seen_refs.copy(), root)
+            elif isinstance(obj, list):
+                for i, value in enumerate(obj):
+                    check_refs(value, path + [str(i)], seen_refs.copy(), root)
+
+        check_refs(schema_to_validate, [], [], schema_to_validate)
+
+        # 4. Check required root properties
+        if "type" not in schema_to_validate:
+            raise SchemaValidationError(
+                "Invalid JSON Schema: Missing required 'type' property",
+                context={
+                    "validation_type": "schema",
+                    "tips": ["Add a 'type' property to your schema root"],
+                },
+            )
+
+        # 5. Check for required fields not defined in properties
+        if schema_to_validate.get("type") == "object":
+            required_fields = schema_to_validate.get("required", [])
+            properties = schema_to_validate.get("properties", {})
+            missing_fields = [
+                field for field in required_fields if field not in properties
+            ]
+            if missing_fields:
+                raise SchemaValidationError(
+                    "Invalid JSON Schema: Required fields must be defined in properties",
+                    context={
+                        "validation_type": "schema",
+                        "missing_fields": missing_fields,
+                        "tips": [
+                            "Add the following fields to 'properties':",
+                            *[f"  - {field}" for field in missing_fields],
+                            "Or remove them from 'required' if they are not needed",
+                        ],
+                    },
+                )
+
+        # 6. Validate against JSON Schema meta-schema
+        try:
+            validator = jsonschema.validators.validator_for(schema_to_validate)
+            validator.check_schema(schema_to_validate)
+        except jsonschema.exceptions.SchemaError as e:
+            raise SchemaValidationError(
+                f"Invalid JSON Schema: {str(e)}",
+                context={
+                    "validation_type": "schema",
+                    "path": "/".join(str(p) for p in e.path),
+                    "details": e.message,
+                    "tips": [
+                        "Ensure your schema follows JSON Schema specification",
+                        "Check property types and formats",
+                        "Validate schema structure",
+                    ],
+                },
+            )
+
+    except SchemaValidationError:
+        raise  # Re-raise SchemaValidationError without wrapping
     except Exception as e:
-        raise SchemaValidationError(f"Schema validation error: {e}")
+        raise SchemaValidationError(
+            f"Invalid JSON Schema: {str(e)}",
+            context={
+                "validation_type": "schema",
+                "error": str(e),
+                "tips": ["Check schema syntax", "Validate JSON structure"],
+            },
+        )
 
 
 def validate_response(

ostruct/cli/utils.py

@@ -12,7 +12,7 @@ def parse_mapping(mapping: str) -> Tuple[str, str]:
         mapping: Mapping string in format 'name=value'
 
     Returns:
-        Tuple of (name, value)
+        Tuple of (name, value) with whitespace stripped from both parts
 
     Raises:
         ValueError: If mapping format is invalid
@@ -23,6 +23,8 @@ def parse_mapping(mapping: str) -> Tuple[str, str]:
         raise ValueError("Invalid mapping format")
 
     name, value = mapping.split("=", 1)
+    name = name.strip()
+    value = value.strip()
     if not name:
         raise VariableNameError("Empty name in mapping")
     if not value:

ostruct/cli/validators.py

@@ -49,7 +49,7 @@ def validate_variable(
         value: List of "name=value" strings
 
     Returns:
-        List of validated (name, value) tuples
+        List of validated (name, value) tuples with whitespace stripped from both parts
 
     Raises:
         click.BadParameter: If validation fails
@@ -64,6 +64,8 @@ def validate_variable(
                 f"Variable must be in format name=value: {var}"
             )
         name, val = var.split("=", 1)
+        name = name.strip()
+        val = val.strip()
         if not name.isidentifier():
             raise click.BadParameter(f"Invalid variable name: {name}")
         result.append((name, val))
@@ -81,7 +83,7 @@ def validate_json_variable(
         value: List of "name=json_string" values
 
     Returns:
-        List of validated (name, parsed_json) tuples
+        List of validated (name, parsed_json) tuples with whitespace stripped from name
 
     Raises:
         click.BadParameter: If validation fails
@@ -96,6 +98,8 @@ def validate_json_variable(
                 f'JSON variable must be in format name=\'{"json":"value"}\': {var}'
             )
         name, json_str = var.split("=", 1)
+        name = name.strip()
+        json_str = json_str.strip()
         if not name.isidentifier():
             raise VariableNameError(f"Invalid variable name: {name}")
         try:

{ostruct_cli-0.6.1.dist-info → ostruct_cli-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ostruct-cli
-Version: 0.6.1
+Version: 0.7.0
 Summary: CLI for OpenAI Structured Output
 Author: Yaniv Golan
 Author-email: yaniv@golan.name
@@ -16,7 +16,7 @@ Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: ijson (>=3.2.3,<4.0.0)
 Requires-Dist: jsonschema (>=4.23.0,<5.0.0)
 Requires-Dist: openai (>=1.0.0,<2.0.0)
-Requires-Dist: openai-structured (>=2.0.0,<3.0.0)
+Requires-Dist: openai-structured (>=2.1.0,<3.0.0)
 Requires-Dist: pydantic (>=2.6.3,<3.0.0)
 Requires-Dist: pyyaml (>=6.0.2,<7.0.0)
 Requires-Dist: tiktoken (==0.9.0)
@@ -33,7 +33,9 @@ Description-Content-Type: text/markdown
 [![CI](https://github.com/yaniv-golan/ostruct/actions/workflows/ci.yml/badge.svg)](https://github.com/yaniv-golan/ostruct/actions/workflows/ci.yml)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-Command-line interface for working with OpenAI models and structured output, powered by the [openai-structured](https://github.com/yaniv-golan/openai-structured) library.
+ostruct tranforms unstructured inputs into structured, usable JSON output using OpenAI APIs.
+
+ostruct will process a set of plain text files (data, source code, CSV, etc), input variables, a dynamic prompt template, and a JSON schema specifying the desired output format, and will produce the result in JSON format.
 
 ## Features
 
@@ -42,6 +44,12 @@ Command-line interface for working with OpenAI models and structured output, pow
 - Automatic token counting and context window management
 - Streaming support for real-time output
 - Secure handling of sensitive data
+- Model registry management with support for updating to the latest OpenAI models
+- Non-intrusive registry update checks with user notifications
+
+## Requirements
+
+- Python 3.10 or higher
 
 ## Installation
 
@@ -57,6 +65,16 @@ pip install ostruct-cli
 
 If you plan to contribute to the project, see the [Development Setup](#development-setup) section below for instructions on setting up the development environment with Poetry.
 
+## Environment Variables
+
+ostruct-cli respects the following environment variables:
+
+- `OPENAI_API_KEY`: Your OpenAI API key (required unless provided via command line)
+- `OPENAI_API_BASE`: Custom API base URL (optional)
+- `OPENAI_API_VERSION`: API version to use (optional)
+- `OPENAI_API_TYPE`: API type (e.g., "azure") (optional)
+- `OSTRUCT_DISABLE_UPDATE_CHECKS`: Set to "1", "true", or "yes" to disable automatic registry update checks
+
 ## Shell Completion
 
 ostruct-cli supports shell completion for Bash, Zsh, and Fish shells. To enable it:
@@ -209,196 +227,84 @@ The command will output:
 }
 ```
 
-### Example 3: Processing Multiple Files
+## System Prompt Handling
 
-1. Create a template file `extract_from_profiles.j2`:
+ostruct-cli provides three ways to specify a system prompt, with a clear precedence order:
 
-```jinja
-Extract information about the people from this data:
+1. Command-line option (`--sys-prompt` or `--sys-file`):
 
-{% for profile in profiles %}
-== {{ profile.name }}
+   ```bash
+   # Direct string
+   ostruct run template.j2 schema.json --sys-prompt "You are an expert analyst"
 
-{{ profile.content }}
+   # From file
+   ostruct run template.j2 schema.json --sys-file system_prompt.txt
+   ```
 
-{% endfor %}
-```
+2. Template frontmatter:
 
-2. Use the same schema file `schema.json` as above, but updated for multiple people:
+   ```jinja
+   ---
+   system_prompt: You are an expert analyst
+   ---
+   Extract information from: {{ text }}
+   ```
 
-```json
-{
-  "type": "object",
-  "properties": {
-    "people": {
-      "type": "array",
-      "items": {
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string",
-            "description": "The person's full name"
-          },
-          "age": {
-            "type": "integer",
-            "description": "The person's age"
-          },
-          "occupation": {
-            "type": "string",
-            "description": "The person's job or profession"
-          }
-        },
-        "required": ["name", "age", "occupation"],
-        "additionalProperties": false
-      }
-    }
-  },
-  "required": ["people"],
-  "additionalProperties": false
-}
-```
+3. Default system prompt (built into the CLI)
 
-3. Run the CLI:
+### Precedence Rules
 
-```bash
-# Basic usage
-ostruct run extract_from_profiles.j2 schema.json -p profiles "profiles/*.txt"
+When multiple system prompts are provided, they are resolved in this order:
 
-# With advanced options
-ostruct run extract_from_profiles.j2 schema.json \
-  -p profiles "profiles/*.txt" \
-  --model gpt-4o \
-  --sys-prompt "Extract precise information about the person" \
-  --temperature 0.5
-```
+1. Command-line options take highest precedence:
+   - If both `--sys-prompt` and `--sys-file` are provided, `--sys-prompt` wins
+   - Use `--ignore-task-sysprompt` to ignore template frontmatter
 
-The command will output:
+2. Template frontmatter is used if:
+   - No command-line options are provided
+   - `--ignore-task-sysprompt` is not set
 
-```json
-{
-  "people": [
-    {
-      "name": "John Smith",
-      "age": 35,
-      "occupation": "software engineer"
-    },
-    {
-      "name": "Jane Doe",
-      "age": 28,
-      "occupation": "data scientist"
-    }
-  ]
-}
-```
-
-### About Template Files
-
-Template files use the `.j2` extension to indicate they contain Jinja2 template syntax. This convention:
-
-- Enables proper syntax highlighting in most editors
-- Makes it clear the file contains template logic
-- Follows industry standards for Jinja2 templates
+3. Default system prompt is used only if no other prompts are provided
 
-## CLI Options
-
-The CLI revolves around a single subcommand called `run`. Basic usage:
+Example combining multiple sources:
 
 ```bash
-ostruct run <TASK_TEMPLATE> <SCHEMA_FILE> [OPTIONS]
-```
-
-Common options include:
-
-- File & Directory Inputs:
-  - `-f <NAME> <PATH>`: Map a single file to a variable name
-  - `-d <NAME> <DIR>`: Map a directory to a variable name
-  - `-p <NAME> <PATTERN>`: Map files matching a glob pattern to a variable name
-  - `-R, --recursive`: Enable recursive directory/pattern scanning
-
-- Variables:
-  - `-V name=value`: Define a simple string variable
-  - `-J name='{"key":"value"}'`: Define a JSON variable
-
-- Model Parameters:
-  - `-m, --model MODEL`: Select the OpenAI model (supported: gpt-4o, o1, o3-mini)
-  - `--temperature FLOAT`: Set sampling temperature (0.0-2.0)
-  - `--max-output-tokens INT`: Set maximum output tokens
-  - `--top-p FLOAT`: Set top-p sampling parameter (0.0-1.0)
-  - `--frequency-penalty FLOAT`: Adjust frequency penalty (-2.0-2.0)
-  - `--presence-penalty FLOAT`: Adjust presence penalty (-2.0-2.0)
-  - `--reasoning-effort [low|medium|high]`: Control model reasoning effort
-
-- System Prompt:
-  - `--sys-prompt TEXT`: Provide system prompt directly
-  - `--sys-file FILE`: Load system prompt from file
-  - `--ignore-task-sysprompt`: Ignore system prompt in template frontmatter
-
-- API Configuration:
-  - `--api-key KEY`: OpenAI API key (defaults to OPENAI_API_KEY env var)
-  - `--timeout FLOAT`: API timeout in seconds (default: 60.0)
-
-## Debug Options
-
-- `--debug-validation`: Show detailed schema validation debugging
-- `--debug-openai-stream`: Enable low-level debug output for OpenAI streaming
-- `--progress-level {none,basic,detailed}`: Set progress reporting level
-  - `none`: No progress indicators
-  - `basic`: Show key operation steps (default)
-  - `detailed`: Show all steps with additional info
-- `--show-model-schema`: Display the generated Pydantic model schema
-- `--verbose`: Enable verbose logging
-- `--dry-run`: Validate and render template without making API calls
-- `--no-progress`: Disable all progress indicators
-
-All debug and error logs are written to:
+# Command-line prompt will override template frontmatter
+ostruct run template.j2 schema.json --sys-prompt "Override prompt"
 
-- `~/.ostruct/logs/ostruct.log`: General application logs
-- `~/.ostruct/logs/openai_stream.log`: OpenAI streaming operations logs
-
-For more detailed documentation and examples, visit our [documentation](https://ostruct.readthedocs.io/).
-
-## Development
-
-To contribute or report issues, please visit our [GitHub repository](https://github.com/yaniv-golan/ostruct).
-
-## Development Setup
-
-1. Clone the repository:
-
-```bash
-git clone https://github.com/yanivgolan/ostruct.git
-cd ostruct
+# Ignore template frontmatter and use default
+ostruct run template.j2 schema.json --ignore-task-sysprompt
 ```
 
-2. Install Poetry if you haven't already:
+## Model Registry Management
 
-```bash
-curl -sSL https://install.python-poetry.org | python3 -
-```
+ostruct-cli maintains a registry of OpenAI models and their capabilities, which includes:
 
-3. Install dependencies:
+- Context window sizes for each model
+- Maximum output token limits
+- Supported parameters and their constraints
+- Model version information
 
-```bash
-poetry install
-```
-
-4. Install openai-structured in editable mode:
+To ensure you're using the latest models and features, you can update the registry:
 
 ```bash
-poetry add --editable ../openai-structured  # Adjust path as needed
-```
+# Update from the official repository
+ostruct update-registry
 
-5. Run tests:
+# Update from a custom URL
+ostruct update-registry --url https://example.com/models.yml
 
-```bash
-poetry run pytest
+# Force an update even if the registry is current
+ostruct update-registry --force
 ```
 
-## Contributing
+This is especially useful when:
 
-Contributions are welcome! Please feel free to submit a Pull Request.
+- New OpenAI models are released
+- Model capabilities or parameters change
+- You need to work with custom model configurations
 
-## License
+The registry file is stored at `~/.openai_structured/config/models.yml` and is automatically referenced when validating model parameters and token limits.
 
-This project is licensed under the MIT License - see the LICENSE file for details.
+The update command uses HTTP conditional requests (If-Modified-Since headers) to check if the remote registry has changed before downloading, ensuring efficient updates.
 

{ostruct_cli-0.6.1.dist-info → ostruct_cli-0.7.0.dist-info}/RECORD

@@ -1,44 +1,45 @@
 ostruct/__init__.py,sha256=X6zo6V7ZNMv731Wi388aTVQngD1410ExGwGx4J6lpyo,187
-ostruct/cli/__init__.py,sha256=sYHKT6o1kFy1acbXejzAvVm8Cy8U91Yf1l4DlzquHKg,409
+ostruct/cli/__init__.py,sha256=IfQ68CRqPEeCP4zxV1DxowSEWFKhZiB8swMAOZJOXa8,494
 ostruct/cli/base_errors.py,sha256=S1cQxoiALbXKPxzgLo6XdSWpzPRb7RKz0QARmu9Zt4g,5987
 ostruct/cli/cache_manager.py,sha256=ej3KrRfkKKZ_lEp2JswjbJ5bW2ncsvna9NeJu81cqqs,5192
-ostruct/cli/cli.py,sha256=lagB4j8G1hg2NmAYvWEarA24qYuY2w-cuRWiqUzoWik,65105
+ostruct/cli/cli.py,sha256=WqVToFC4mt4qXeaW0pGRmakGal8vxxH0ny_BHNMKh5M,69645
 ostruct/cli/click_options.py,sha256=WbRJdB9sO63ChN3fnCP7XWs73DHKl0C1ervfwL11am0,11371
-ostruct/cli/errors.py,sha256=zJdJ-AyzjCE8glVKbJGAcB-Mz1J1SlzTDJDmhqAVFYc,14930
+ostruct/cli/errors.py,sha256=UytzS6RKOFMpB3GCJl73M93k74cutKOTFo5RDM4PTE0,15292
 ostruct/cli/exit_codes.py,sha256=uNjvQeUGwU1mlUJYIDrExAn7YlwOXZo603yLAwpqIwk,338
 ostruct/cli/file_info.py,sha256=ilpT8IuckfhadLF1QQAPLXJp7p8kVpffDEEJ2erHPZU,14485
 ostruct/cli/file_list.py,sha256=jLuCd1ardoAXX8FNwPgIqEM-ixzr1xP5ZSqXo2lmrj0,11270
 ostruct/cli/file_utils.py,sha256=J3-6fbEGQ7KD_bU81pAxueHLv9XV0X7f8FSMt_0AJGQ,22537
-ostruct/cli/model_creation.py,sha256=TmqJVdnZOYtTctNihOlxWIbyAfX-zfxehP9rp2t6P2c,17586
+ostruct/cli/model_creation.py,sha256=UdXT3657rC5t-aZAZkQDuIdaQWSY9P6vgHKNAoFUWVw,16768
 ostruct/cli/path_utils.py,sha256=j44q1OoLkqMErgK-qEuhuIZ1VyzqRIvNgxR1et9PoXA,4813
 ostruct/cli/progress.py,sha256=rj9nVEco5UeZORMbzd7mFJpFGJjbH9KbBFh5oTE5Anw,3415
+ostruct/cli/registry_updates.py,sha256=H0-Ftz4TvzryS2Qyoei7k2GKiY_s0Qr17i6pqrRmgF0,4921
 ostruct/cli/schema_validation.py,sha256=ohEuxJ0KF93qphj0JSZDnrxDn0C2ZU37g-U2JY03onM,8154
 ostruct/cli/security/__init__.py,sha256=CQpkCgTFYlA1p6atpQeNgIKtE4LZGUKt4EbytbGKpCs,846
 ostruct/cli/security/allowed_checker.py,sha256=N5UXlpjdj5zAbKk-lRDlHiHV3KtQHtJNhtZI_qGB4zw,1638
 ostruct/cli/security/base.py,sha256=q9YUdHEj2eg5w8GEw5403E9OQKIjZbEiaWsvYFnCGLw,1359
 ostruct/cli/security/case_manager.py,sha256=I_ZJSyntLuGx5qVzze559CI-OxsaNPSibkAN8zZ7PvE,2345
-ostruct/cli/security/errors.py,sha256=VZDOGGD-jYLf6E5gCkKxrE34RJXJP_CPWGOF5jV_r4I,5230
-ostruct/cli/security/normalization.py,sha256=qevvxW3hHDtD1cVvDym8LJEQD1AKenVB-0ZvjCYjn5E,5242
+ostruct/cli/security/errors.py,sha256=8jYJFRQyEXIH3Wd2ATWORVoqbDg7qwu0TsuROpsqNfU,5254
+ostruct/cli/security/normalization.py,sha256=ULvFopRLiUMC86yGxge5Jzjbvc64C_j2QlD5smKPjEI,5286
 ostruct/cli/security/safe_joiner.py,sha256=PHowCeBAkfHfPqRwuO5Com0OemGuq3cHkdu2p9IYNT0,7107
-ostruct/cli/security/security_manager.py,sha256=R54CgE7eG_0VybvjXj4fNn1jB-RHMUlnJ6Yw8BOtKKc,13512
+ostruct/cli/security/security_manager.py,sha256=HFCqJ5kAhaZlFnPTEs6MKNM8JeE2q79db9jW-cHIvxw,15242
 ostruct/cli/security/symlink_resolver.py,sha256=wtZdJ_T_0FOy6B1P5ty1odEXQk9vr8BzlWeAFD4huJE,16744
 ostruct/cli/security/types.py,sha256=15yuG_T4CXyAFFFdSWLjVS7ACmDGIPXhQpZ8awcDwCQ,2991
 ostruct/cli/security/windows_paths.py,sha256=qxC2H2kLwtmQ7YePYde3UrmOJcGnsLEebDLh242sUaI,13453
 ostruct/cli/serialization.py,sha256=ec0UswDE2onwtZVUoZaMCsGv6zW_tSKdBng2qVo6Ucs,704
 ostruct/cli/template_env.py,sha256=S2ZvxuMQMicodSVqUhrw0kOzbNmlpQjSHtWlOwjXCms,1538
-ostruct/cli/template_extensions.py,sha256=tJN3HGAS2yzGI8Up6STPday8NVL0VV6UCClBrtDKYr0,1623
+ostruct/cli/template_extensions.py,sha256=_lomtDGMGxMfpw05v_-daJ0JbhRm_r_-uEJlPAjbpkI,2699
 ostruct/cli/template_filters.py,sha256=SjuQxlM5S283TS2El_AbrzETGnYoQeTpmA9sv5et3QI,19222
 ostruct/cli/template_io.py,sha256=yUWO-8rZnSdX97DTMSEX8fG9CP1ISsOhm2NZN3Fab9A,8821
 ostruct/cli/template_rendering.py,sha256=vp_4gvrYLd_kbQi3TYrYNniXLTeLmTaitGVBQManXvo,13342
 ostruct/cli/template_schema.py,sha256=ckH4rUZnEgfm_BHS9LnMGr8LtDxRmZ0C6UBVrSp8KTc,19604
-ostruct/cli/template_utils.py,sha256=Lf1TvonlRA835nxyevEBSPTEbKiz_momvQYM0ZoZDZU,8034
+ostruct/cli/template_utils.py,sha256=MZdXXjL-x-IXX-5Y8GWopGNBkDE2ItLdCuCl0QWFR_U,14968
 ostruct/cli/template_validation.py,sha256=AXa2zmsws1j-0CTFlp7fMiZR43iNLnj4h467up2JdgU,12693
 ostruct/cli/token_utils.py,sha256=r4KPEO3Sec18Q6mU0aClK6XGShvusgUggXEQgEPPlaA,1369
-ostruct/cli/utils.py,sha256=1UCl4rHjBWKR5EKugvlVGHiHjO3XXmqvkgeAUSyIPDU,831
-ostruct/cli/validators.py,sha256=BYFZeebCPZObTUjO1TaAMpsD6h7ROkYAFn9C7uf1Q68,2992
+ostruct/cli/utils.py,sha256=uY7c0NaINHWfnl77FcPE3TmYUXv3RqEeUTjrCMDij9A,922
+ostruct/cli/validators.py,sha256=k-vmBjkPmC-VwSTM5Yq1zQjGSIOzzTHS4kc0B7Aqpck,3186
 ostruct/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ostruct_cli-0.6.1.dist-info/LICENSE,sha256=QUOY6QCYVxAiH8vdrUTDqe3i9hQ5bcNczppDSVpLTjk,1068
-ostruct_cli-0.6.1.dist-info/METADATA,sha256=2D0_QCNb3xN2Y_K1pMB5WmZBcU8KkN2rqS9qwZMa-pc,10426
-ostruct_cli-0.6.1.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-ostruct_cli-0.6.1.dist-info/entry_points.txt,sha256=NFq9IuqHVTem0j9zKjV8C1si_zGcP1RL6Wbvt9fUDXw,48
-ostruct_cli-0.6.1.dist-info/RECORD,,
+ostruct_cli-0.7.0.dist-info/LICENSE,sha256=QUOY6QCYVxAiH8vdrUTDqe3i9hQ5bcNczppDSVpLTjk,1068
+ostruct_cli-0.7.0.dist-info/METADATA,sha256=1Z54LbqNhr6aRMLvoiTKeaeETc5fNQe31J7Msz4EmyA,8618
+ostruct_cli-0.7.0.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+ostruct_cli-0.7.0.dist-info/entry_points.txt,sha256=NFq9IuqHVTem0j9zKjV8C1si_zGcP1RL6Wbvt9fUDXw,48
+ostruct_cli-0.7.0.dist-info/RECORD,,