ostruct-cli 0.8.7__tar.gz → 0.8.29__tar.gz

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ostruct-cli
-Version: 0.8.7
+Version: 0.8.29
 Summary: CLI for OpenAI Structured Output with Multi-Tool Integration
 Author: Yaniv Golan
 Author-email: yaniv@golan.name
@@ -27,7 +27,7 @@ Requires-Dist: ijson (>=3.2.3,<4.0)
 Requires-Dist: jinja2 (>=3.1.2,<4.0)
 Requires-Dist: jsonschema (>=4.23.0,<5.0)
 Requires-Dist: mypy (>=1.0,<2.0) ; extra == "dev"
-Requires-Dist: myst-parser (>=2.0.0,<3.0) ; extra == "docs"
+Requires-Dist: myst-parser (>=3.0.0,<4.0) ; extra == "docs"
 Requires-Dist: openai (==1.81.0)
 Requires-Dist: openai-model-registry (>=0.7.0,<1.0)
 Requires-Dist: pre-commit (>=4.1.0,<5.0) ; extra == "dev"
@@ -42,9 +42,9 @@ Requires-Dist: pytest-rerunfailures (>=12.0,<13.0) ; extra == "dev"
 Requires-Dist: python-dotenv (>=1.0.1,<2.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0) ; extra == "dev"
 Requires-Dist: pyyaml (>=6.0.2,<7.0)
-Requires-Dist: sphinx (>=7.0,<8.0) ; extra == "dev"
-Requires-Dist: sphinx (>=7.0,<8.0) ; extra == "docs"
-Requires-Dist: sphinx-design (>=0.5.0,<1.0) ; extra == "docs"
+Requires-Dist: sphinx (>=7.0.0,<8.0) ; extra == "dev"
+Requires-Dist: sphinx (>=7.0.0,<8.0) ; extra == "docs"
+Requires-Dist: sphinx-design (>=0.4.1,<1.0) ; extra == "docs"
 Requires-Dist: sphinx-rtd-theme (>=1.0,<2.0) ; extra == "docs"
 Requires-Dist: tenacity (>=8.2.3,<9.0) ; extra == "examples"
 Requires-Dist: tiktoken (==0.9.0)
@@ -216,23 +216,84 @@ Break down words into their components, showing their origins, meanings, and hie
 
 ## Installation
 
-### Quick Install (macOS)
+We provide multiple installation methods to suit different user needs. Choose the one that's right for you.
 
-For macOS users, we provide a one-line installer that handles everything automatically:
+<details>
+<summary><strong>Recommended: pipx (Python Users)</strong></summary>
+
+For users who have Python installed, `pipx` is the recommended installation method. It installs `ostruct` in an isolated environment, preventing conflicts with other Python packages.
+
+1. **Install pipx**:
+
+    ```bash
+    python3 -m pip install --user pipx
+    python3 -m pipx ensurepath
+    ```
+
+    *(Restart your terminal after running `ensurepath` to update your `PATH`)*
+
+2. **Install ostruct-cli**:
+
+    ```bash
+    pipx install ostruct-cli
+    ```
+
+</details>
+
+<details>
+<summary><strong>macOS: Homebrew</strong></summary>
+
+If you're on macOS and use Homebrew, you can install `ostruct` with a single command:
+
+```bash
+brew install yaniv-golan/ostruct/ostruct-cli
+```
+
+</details>
+
+<details>
+<summary><strong>Standalone Binaries (No Python Required)</strong></summary>
+
+We provide pre-compiled .zip archives for macOS, Windows, and Linux that do not require Python to be installed.
+
+1. Go to the [**Latest Release**](https://github.com/yaniv-golan/ostruct/releases/latest) page.
+2. Download the `.zip` file for your operating system (e.g., `ostruct-macos-latest.zip`, `ostruct-windows-latest.zip`, `ostruct-ubuntu-latest.zip`).
+3. Extract the `.zip` file. This will create a folder (e.g., `ostruct-macos-amd64`).
+4. On macOS/Linux, make the executable inside the extracted folder runnable:
+
+    ```bash
+    chmod +x /path/to/ostruct-macos-amd64/ostruct
+    ```
+
+5. Run the executable from within the extracted folder, as it depends on bundled libraries in the same directory.
+
+</details>
+
+<details>
+<summary><strong>Docker</strong></summary>
+
+If you prefer to use Docker, you can run `ostruct` from our official container image available on the GitHub Container Registry.
 
 ```bash
-curl -sSL https://raw.githubusercontent.com/yaniv-golan/ostruct/main/scripts/install-macos.sh | bash
+docker run -it --rm \
+  -v "$(pwd)":/app \
+  -w /app \
+  ghcr.io/yaniv-golan/ostruct:latest \
+  run template.j2 schema.json -ft input.txt
 ```
 
-This script will:
+This command mounts the current directory into the container and runs `ostruct`.
 
-- Install Python 3.10+ if needed (via Homebrew or python.org)
-- Install Homebrew if needed
-- Install ostruct-cli via pip
-- Configure your shell PATH automatically
-- Verify the installation works
+</details>
+
+### Uninstallation
 
-After installation, restart your terminal and test with `ostruct --version`.
+To uninstall `ostruct`, use the method corresponding to how you installed it:
+
+- **pipx**: `pipx uninstall ostruct-cli`
+- **Homebrew**: `brew uninstall ostruct-cli`
+- **Binaries**: Simply delete the binary file.
+- **Docker**: No uninstallation is needed for the image itself, but you can remove it with `docker rmi ghcr.io/yaniv-golan/ostruct:latest`.
 
 ### Manual Installation
 
@@ -446,6 +507,8 @@ tools:
 
 🚀 **New to ostruct?** Follow our [step-by-step quickstart guide](https://ostruct.readthedocs.io/en/latest/user-guide/quickstart.html) featuring Juno the beagle for a hands-on introduction.
 
+📝 **Template Scripting:** Learn ostruct's templating capabilities with the [template scripting guide](https://ostruct.readthedocs.io/en/latest/user-guide/ostruct_template_scripting_guide.html) - no prior Jinja2 knowledge required!
+
 📖 **Full Documentation:** <https://ostruct.readthedocs.io/>
 
 ### Quick Start

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/README.md

@@ -151,23 +151,84 @@ Break down words into their components, showing their origins, meanings, and hie
 
 ## Installation
 
-### Quick Install (macOS)
+We provide multiple installation methods to suit different user needs. Choose the one that's right for you.
 
-For macOS users, we provide a one-line installer that handles everything automatically:
+<details>
+<summary><strong>Recommended: pipx (Python Users)</strong></summary>
+
+For users who have Python installed, `pipx` is the recommended installation method. It installs `ostruct` in an isolated environment, preventing conflicts with other Python packages.
+
+1. **Install pipx**:
+
+    ```bash
+    python3 -m pip install --user pipx
+    python3 -m pipx ensurepath
+    ```
+
+    *(Restart your terminal after running `ensurepath` to update your `PATH`)*
+
+2. **Install ostruct-cli**:
+
+    ```bash
+    pipx install ostruct-cli
+    ```
+
+</details>
+
+<details>
+<summary><strong>macOS: Homebrew</strong></summary>
+
+If you're on macOS and use Homebrew, you can install `ostruct` with a single command:
+
+```bash
+brew install yaniv-golan/ostruct/ostruct-cli
+```
+
+</details>
+
+<details>
+<summary><strong>Standalone Binaries (No Python Required)</strong></summary>
+
+We provide pre-compiled .zip archives for macOS, Windows, and Linux that do not require Python to be installed.
+
+1. Go to the [**Latest Release**](https://github.com/yaniv-golan/ostruct/releases/latest) page.
+2. Download the `.zip` file for your operating system (e.g., `ostruct-macos-latest.zip`, `ostruct-windows-latest.zip`, `ostruct-ubuntu-latest.zip`).
+3. Extract the `.zip` file. This will create a folder (e.g., `ostruct-macos-amd64`).
+4. On macOS/Linux, make the executable inside the extracted folder runnable:
+
+    ```bash
+    chmod +x /path/to/ostruct-macos-amd64/ostruct
+    ```
+
+5. Run the executable from within the extracted folder, as it depends on bundled libraries in the same directory.
+
+</details>
+
+<details>
+<summary><strong>Docker</strong></summary>
+
+If you prefer to use Docker, you can run `ostruct` from our official container image available on the GitHub Container Registry.
 
 ```bash
-curl -sSL https://raw.githubusercontent.com/yaniv-golan/ostruct/main/scripts/install-macos.sh | bash
+docker run -it --rm \
+  -v "$(pwd)":/app \
+  -w /app \
+  ghcr.io/yaniv-golan/ostruct:latest \
+  run template.j2 schema.json -ft input.txt
 ```
 
-This script will:
+This command mounts the current directory into the container and runs `ostruct`.
 
-- Install Python 3.10+ if needed (via Homebrew or python.org)
-- Install Homebrew if needed
-- Install ostruct-cli via pip
-- Configure your shell PATH automatically
-- Verify the installation works
+</details>
+
+### Uninstallation
 
-After installation, restart your terminal and test with `ostruct --version`.
+To uninstall `ostruct`, use the method corresponding to how you installed it:
+
+- **pipx**: `pipx uninstall ostruct-cli`
+- **Homebrew**: `brew uninstall ostruct-cli`
+- **Binaries**: Simply delete the binary file.
+- **Docker**: No uninstallation is needed for the image itself, but you can remove it with `docker rmi ghcr.io/yaniv-golan/ostruct:latest`.
 
 ### Manual Installation
 
@@ -381,6 +442,8 @@ tools:
 
 🚀 **New to ostruct?** Follow our [step-by-step quickstart guide](https://ostruct.readthedocs.io/en/latest/user-guide/quickstart.html) featuring Juno the beagle for a hands-on introduction.
 
+📝 **Template Scripting:** Learn ostruct's templating capabilities with the [template scripting guide](https://ostruct.readthedocs.io/en/latest/user-guide/ostruct_template_scripting_guide.html) - no prior Jinja2 knowledge required!
+
 📖 **Full Documentation:** <https://ostruct.readthedocs.io/>
 
 ### Quick Start

ostruct_cli-0.8.29/pyproject.toml

@@ -0,0 +1,160 @@
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[project]
+name = "ostruct-cli"
+version = "0.8.29"
+description = "CLI for OpenAI Structured Output with Multi-Tool Integration"
+authors = [{name = "Yaniv Golan", email = "yaniv@golan.name"}]
+readme = "README.md"
+requires-python = ">=3.10,<4.0"
+dependencies = [
+    "pydantic>=2.6.3,<3.0",
+    "jsonschema>=4.23.0,<5.0",
+    "chardet>=5.0.0,<6.0",
+    "cachetools>=5.3.2,<6.0",
+    "ijson>=3.2.3,<4.0",
+    "typing-extensions>=4.9.0,<5.0",
+    "pyyaml>=6.0.2,<7.0",
+    "tomli>=2.0.1,<3.0;python_version<'3.11'",
+    "click>=8.1.7,<9.0",
+    "werkzeug>=3.1.3,<4.0",
+    "openai==1.81.0",
+    "tiktoken==0.9.0",
+    "pygments>=2.15.0,<3.0",
+    "jinja2>=3.1.2,<4.0",
+    "openai-model-registry>=0.7.0,<1.0",
+    "python-dotenv>=1.0.1,<2.0",
+]
+
+[project.scripts]
+ostruct = "ostruct.cli.cli:main"
+
+[project.optional-dependencies]
+dev = [
+    "pytest>=8.3.4,<9.0",
+    "pytest-rerunfailures>=12.0,<13.0",
+    "flake8>=6.0,<7.0",
+    "flake8-pyproject>=1.2.3,<2.0",
+    "black==24.8.0",
+    "mypy>=1.0,<2.0",
+    "pytest-asyncio>=0.25.2,<1.0",
+    "pytest-mock>=3.14.0,<4.0",
+    "build>=1.2.2.post1,<2.0",
+    "twine>=6.0.1,<7.0",
+    "python-dotenv>=1.0.1,<2.0",
+    "types-jsonschema>=4.23.0.20241208",
+    "anyio[trio]==3.7.1",
+    "sphinx>=7.0.0,<8.0",
+    "types-pyyaml>=6.0.12.20241230",
+    "types-pygments>=2.19.0.20250107",
+    "types-chardet>=5.0.4.6",
+    "pyfakefs>=5.7.4,<6.0",
+    "types-cachetools>=5.5.0.20240820",
+    "types-click>=7.1.8,<8.0",
+    "types-requests>=2.32.0.20241016",
+    "pre-commit>=4.1.0,<5.0",
+    "psutil>=7.0.0,<8.0",
+    "hypothesis>=6.0.0,<7.0",
+    "tomli>=2.0.1,<3.0",
+]
+docs = [
+    "sphinx>=7.0.0,<8.0",
+    "sphinx-rtd-theme>=1.0,<2.0",
+    "myst-parser>=3.0.0,<4.0",
+    "sphinx-design>=0.4.1,<1.0",
+    "tomli>=2.0.1,<3.0;python_version<'3.11'",
+]
+examples = [
+    "tenacity>=8.2.3,<9.0",
+    "asyncio-throttle>=1.0.2,<2.0",
+]
+
+[tool.poetry]
+packages = [{include = "ostruct", from = "src"}]
+include = ["py.typed"]
+
+[tool.poetry.group.dev.dependencies]
+hypothesis = "^6.135.4"
+pyinstaller = "^6.13"
+
+[tool.flake8]
+max-line-length = 120
+extend-ignore = ["E203"]
+
+[tool.mypy]
+plugins = ["pydantic.mypy"]
+python_version = "3.10"
+warn_unused_configs = true
+exclude = ["docs/*", "examples/*"]
+disallow_untyped_defs = false
+check_untyped_defs = true
+warn_return_any = false
+warn_unused_ignores = false
+show_error_codes = true
+
+[[tool.mypy.overrides]]
+module = ["openai_model_registry.*", "hypothesis"]
+ignore_missing_imports = true
+
+# Stricter settings for source code
+[[tool.mypy.overrides]]
+module = "ostruct.*"
+disallow_untyped_defs = true
+warn_return_any = true
+warn_unused_ignores = true
+
+# Special handling for Click-related code
+[[tool.mypy.overrides]]
+module = ["click.*", "ostruct.cli.click_options"]
+disallow_untyped_decorators = false
+warn_return_any = false
+
+[tool.black]
+line-length = 79
+target-version = ["py310"]
+include = '.pyi?$'
+preview = false
+required-version = "24.8.0"
+
+[tool.pytest.ini_options]
+asyncio_mode = "strict"
+testpaths = ["tests"]
+python_files = ["test_*.py"]
+markers = [
+    "live: mark test as a live test that makes real API calls or runs actual ostruct commands",
+    "asyncio: mark test as requiring async loop",
+    "no_fs: mark test to disable pyfakefs and use real filesystem",
+    "slow: mark test as slow performance/stress test",
+    "flaky: mark test as flaky (may need reruns)",
+    "mock_openai: mark test to use mock OpenAI client"
+]
+asyncio_default_fixture_loop_scope = "function"
+# By default, skip live tests unless explicitly requested
+addopts = "-m 'not live'"
+
+[tool.ruff]
+target-version = "py310"
+fix = true
+line-length = 79  # Match Black's setting
+
+[tool.ruff.lint]
+select = [
+    "E",   # pycodestyle errors
+    "W",   # pycodestyle warnings
+    "F",   # Pyflakes
+    "I",   # isort (import sorting)
+]
+ignore = [
+    "E501",  # Line too long (handled by Black)
+]
+
+[tool.ruff.lint.isort]
+# Black-compatible settings
+force-single-line = false
+combine-as-imports = true
+split-on-trailing-comma = true
+
+[tool.poetry.dependencies]
+python = ">=3.10,<3.14"

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/src/ostruct/cli/cli.py

@@ -18,6 +18,33 @@ from .errors import (
 )
 from .exit_codes import ExitCode
 from .registry_updates import get_update_notification
+from .utils import fix_surrogate_escapes
+
+
+def fix_argv_encoding() -> None:
+    """Fix UTF-8 encoding issues in sys.argv.
+
+    This function addresses the surrogate escape issue where Python's sys.argv
+    contains surrogate characters (e.g., a backslash followed by 'udce2')
+    when processing command line arguments with non-ASCII characters. This
+    commonly happens with filenames containing characters like en dash (–) or
+    other Unicode characters.
+
+    The fix detects arguments containing surrogate escapes and converts them
+    back to proper UTF-8 strings.
+    """
+    try:
+        fixed_argv = []
+        for arg in sys.argv:
+            fixed_argv.append(fix_surrogate_escapes(arg))
+
+        # Replace sys.argv with the fixed version
+        sys.argv = fixed_argv
+
+    except Exception:
+        # If anything goes wrong with the encoding fix, continue with original argv
+        # This ensures the CLI doesn't break even if the fix fails
+        pass
 
 
 def create_cli_group() -> click.Group:
@@ -108,6 +135,9 @@ def create_cli() -> click.Command:
 
 def main() -> None:
     """Main entry point for the CLI."""
+    # Fix UTF-8 encoding issues in command line arguments before processing
+    fix_argv_encoding()
+
     # Load environment variables from .env file
     load_dotenv()
 

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/src/ostruct/cli/errors.py

@@ -291,7 +291,22 @@ class TemplateValidationError(TaskTemplateError):
 class SystemPromptError(TaskTemplateError):
     """Raised when there are issues with system prompt loading or processing."""
 
-    pass
+    def __init__(
+        self,
+        message: str,
+        context: Optional[Dict[str, Any]] = None,
+    ) -> None:
+        """Initialize system prompt error.
+
+        Args:
+            message: Error message
+            context: Additional error context
+        """
+        super().__init__(
+            message,
+            context=context,
+            exit_code=ExitCode.VALIDATION_ERROR,
+        )
 
 
 class SchemaError(CLIError):

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/src/ostruct/cli/file_info.py

@@ -156,23 +156,45 @@ class FileInfo:
         Returns a path relative to the security manager's base directory.
         This ensures consistent path handling across the entire codebase.
 
+        For paths outside the base directory but within allowed directories,
+        returns the absolute path.
+
         Example:
             security_manager = SecurityManager(base_dir="/base")
             file_info = FileInfo("/base/file.txt", security_manager)
             print(file_info.path)  # Outputs: "file.txt"
 
+            # With allowed directory outside base:
+            file_info = FileInfo("/tmp/file.txt", security_manager)
+            print(file_info.path)  # Outputs: "/tmp/file.txt"
+
         Returns:
-            str: Path relative to security manager's base directory
+            str: Path relative to security manager's base directory, or absolute path
+                 if outside base directory but within allowed directories
 
         Raises:
-            ValueError: If the path is not within the base directory
+            ValueError: If the path is not within the base directory or allowed directories
         """
+        abs_path = Path(self.abs_path)
+        base_dir = Path(self.__security_manager.base_dir)
+
         try:
-            abs_path = Path(self.abs_path)
-            base_dir = Path(self.__security_manager.base_dir)
             return str(abs_path.relative_to(base_dir))
-        except ValueError as e:
-            logger.error("Error making path relative: %s", e)
+        except ValueError:
+            # Path is outside base_dir, check if it's in allowed directories
+            if self.__security_manager.is_path_allowed(abs_path):
+                logger.debug(
+                    "Path outside base_dir but allowed, returning absolute path: %s",
+                    abs_path,
+                )
+                return str(abs_path)
+
+            # Should never reach here if SecurityManager validation was done properly
+            logger.error(
+                "Error making path relative: %s is not within base directory %s",
+                abs_path,
+                base_dir,
+            )
             raise ValueError(
                 f"Path {abs_path} must be within base directory {base_dir}"
             )

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/src/ostruct/cli/file_list.py

@@ -320,6 +320,45 @@ class FileInfoList(List[FileInfo]):
             # Single file from file mapping
             return self[0].name
 
+    @property
+    def extension(self) -> str:
+        """Get the file extension of a single file without dot.
+
+        Returns:
+            str: Extension of the single file from file mapping.
+
+        Raises:
+            ValueError: If the list is empty or contains multiple files.
+        """
+        with self._lock:
+            if not self:
+                var_name = self._var_alias or "file_list"
+                raise ValueError(
+                    f"No files in '{var_name}'. Cannot access .extension property."
+                )
+
+            # Check for multiple files or directory mapping
+            if len(self) > 1:
+                var_name = self._var_alias or "file_list"
+                raise ValueError(
+                    f"'{var_name}' contains {len(self)} files. "
+                    f"Use '{{{{ {var_name}[0].extension }}}}' for the first file, "
+                    f"'{{{{ {var_name}|single.extension }}}}' if expecting exactly one file, "
+                    f"or loop over files with '{{%% for file in {var_name} %%}}{{{{ file.extension }}}}{{%% endfor %%}}'."
+                )
+
+            if self._from_dir:
+                var_name = self._var_alias or "file_list"
+                raise ValueError(
+                    f"'{var_name}' contains files from directory mapping. "
+                    f"Use '{{{{ {var_name}[0].extension }}}}' for the first file, "
+                    f"'{{{{ {var_name}|single.extension }}}}' if expecting exactly one file, "
+                    f"or loop over files with '{{%% for file in {var_name} %%}}{{{{ file.extension }}}}{{%% endfor %%}}'."
+                )
+
+            # Single file from file mapping
+            return self[0].extension
+
     @property
     def names(self) -> List[str]:
         """Get all filenames as a list."""

ostruct_cli-0.8.29/src/ostruct/cli/utils.py

@@ -0,0 +1,63 @@
+"""Common utilities for the CLI package."""
+
+from typing import Tuple
+
+from .errors import VariableNameError, VariableValueError
+
+
+def fix_surrogate_escapes(text: str) -> str:
+    """Fix UTF-8 encoding issues caused by surrogate escapes.
+
+    This function addresses the issue where Python's sys.argv contains
+    surrogate characters (e.g., a backslash followed by 'udce2') when
+    processing command line arguments with non-ASCII characters. This
+    commonly happens with filenames containing characters like en dash (–)
+    or other Unicode characters.
+
+    Args:
+        text: String that may contain surrogate escape characters
+
+    Returns:
+        String with surrogate escapes converted back to proper UTF-8
+    """
+    try:
+        # Check if the text contains surrogate characters
+        if any(0xDC00 <= ord(c) <= 0xDFFF for c in text):
+            # Convert surrogate escapes back to bytes, then decode as UTF-8
+            # This handles the case where Python used surrogateescape error handling
+            byte_data = text.encode("utf-8", "surrogateescape")
+            return byte_data.decode("utf-8")
+        else:
+            # No surrogate characters, return as-is
+            return text
+    except (UnicodeError, UnicodeDecodeError, UnicodeEncodeError):
+        # If conversion fails, return the original text
+        return text
+
+
+def parse_mapping(mapping: str) -> Tuple[str, str]:
+    """Parse a mapping string in the format 'name=value'.
+
+    Args:
+        mapping: Mapping string in format 'name=value'
+
+    Returns:
+        Tuple of (name, value) with whitespace stripped from both parts
+
+    Raises:
+        ValueError: If mapping format is invalid
+        VariableNameError: If name part is empty
+        VariableValueError: If value part is empty
+    """
+    if not mapping or "=" not in mapping:
+        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:
+        raise VariableValueError("Empty value in mapping")
+
+    return name, value

{ostruct_cli-0.8.7 → ostruct_cli-0.8.29}/src/ostruct/cli/validators.py

@@ -26,6 +26,7 @@ from .template_processor import (
 )
 from .template_utils import validate_json_schema
 from .types import CLIParams
+from .utils import fix_surrogate_escapes
 
 logger = logging.getLogger(__name__)
 
@@ -145,6 +146,9 @@ def validate_variable(
 
     result = []
     for var in value:
+        # Fix any surrogate escape issues in the variable string
+        var = fix_surrogate_escapes(var)
+
         if "=" not in var:
             raise click.BadParameter(
                 f"Variable must be in format name=value: {var}"
@@ -152,6 +156,11 @@ def validate_variable(
         name, val = var.split("=", 1)
         name = name.strip()
         val = val.strip()
+
+        # Fix surrogate escapes in both name and value
+        name = fix_surrogate_escapes(name)
+        val = fix_surrogate_escapes(val)
+
         if not name.isidentifier():
             raise click.BadParameter(f"Invalid variable name: {name}")
         result.append((name, val))
@@ -179,6 +188,9 @@ def validate_json_variable(
 
     result = []
     for var in value:
+        # Fix any surrogate escape issues in the variable string
+        var = fix_surrogate_escapes(var)
+
         if "=" not in var:
             raise InvalidJSONError(
                 f"JSON variable must be in format name='{'json':\"value\"}': {var}"
@@ -186,6 +198,11 @@ def validate_json_variable(
         name, json_str = var.split("=", 1)
         name = name.strip()
         json_str = json_str.strip()
+
+        # Fix surrogate escapes in both name and JSON string
+        name = fix_surrogate_escapes(name)
+        json_str = fix_surrogate_escapes(json_str)
+
         if not name.isidentifier():
             raise VariableNameError(f"Invalid variable name: {name}")
         try:

ostruct_cli-0.8.7/pyproject.toml

@@ -1,149 +0,0 @@
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[project]
-name = "ostruct-cli"
-version = "0.8.7"
-description = "CLI for OpenAI Structured Output with Multi-Tool Integration"
-authors = [{name = "Yaniv Golan", email = "yaniv@golan.name"}]
-readme = "README.md"
-requires-python = ">=3.10,<4.0"
-dependencies = [
-    "pydantic>=2.6.3,<3.0",
-    "jsonschema>=4.23.0,<5.0",
-    "chardet>=5.0.0,<6.0",
-    "cachetools>=5.3.2,<6.0",
-    "ijson>=3.2.3,<4.0",
-    "typing-extensions>=4.9.0,<5.0",
-    "pyyaml>=6.0.2,<7.0",
-    "tomli>=2.0.1,<3.0;python_version<'3.11'",
-    "click>=8.1.7,<9.0",
-    "werkzeug>=3.1.3,<4.0",
-    "openai==1.81.0",
-    "tiktoken==0.9.0",
-    "pygments>=2.15.0,<3.0",
-    "jinja2>=3.1.2,<4.0",
-    "openai-model-registry>=0.7.0,<1.0",
-    "python-dotenv>=1.0.1,<2.0",
-]
-
-[project.scripts]
-ostruct = "ostruct.cli.cli:main"
-
-[project.optional-dependencies]
-dev = [
-    "pytest>=8.3.4,<9.0",
-    "pytest-rerunfailures>=12.0,<13.0",
-    "flake8>=6.0,<7.0",
-    "flake8-pyproject>=1.2.3,<2.0",
-    "black==24.8.0",
-    "mypy>=1.0,<2.0",
-    "pytest-asyncio>=0.25.2,<1.0",
-    "pytest-mock>=3.14.0,<4.0",
-    "build>=1.2.2.post1,<2.0",
-    "twine>=6.0.1,<7.0",
-    "python-dotenv>=1.0.1,<2.0",
-    "types-jsonschema>=4.23.0.20241208",
-    "anyio[trio]==3.7.1",
-    "sphinx>=7.0,<8.0",
-    "types-pyyaml>=6.0.12.20241230",
-    "types-pygments>=2.19.0.20250107",
-    "types-chardet>=5.0.4.6",
-    "pyfakefs>=5.7.4,<6.0",
-    "types-cachetools>=5.5.0.20240820",
-    "types-click>=7.1.8,<8.0",
-    "types-requests>=2.32.0.20241016",
-    "pre-commit>=4.1.0,<5.0",
-    "psutil>=7.0.0,<8.0",
-    "hypothesis>=6.0.0,<7.0",
-    "tomli>=2.0.1,<3.0",
-]
-docs = [
-    "sphinx>=7.0,<8.0",
-    "sphinx-rtd-theme>=1.0,<2.0",
-    "myst-parser>=2.0.0,<3.0",
-    "sphinx-design>=0.5.0,<1.0",
-    "tomli>=2.0.1,<3.0;python_version<'3.11'",
-]
-examples = [
-    "tenacity>=8.2.3,<9.0",
-    "asyncio-throttle>=1.0.2,<2.0",
-]
-
-[tool.poetry]
-packages = [{include = "ostruct", from = "src"}]
-include = ["py.typed"]
-
-[tool.flake8]
-    max-line-length = 120
-    extend-ignore = ["E203"]
-
-    [tool.mypy]
-    plugins = ["pydantic.mypy"]
-    python_version = "3.10"
-    warn_unused_configs = true
-    exclude = ["docs/*", "examples/*"]
-    disallow_untyped_defs = false
-    check_untyped_defs = true
-    warn_return_any = false
-    warn_unused_ignores = false
-    show_error_codes = true
-
-    # Stricter settings for source code
-    [[tool.mypy.overrides]]
-    module = "ostruct.*"
-    disallow_untyped_defs = true
-    warn_return_any = true
-    warn_unused_ignores = true
-
-    # Special handling for Click-related code
-    [[tool.mypy.overrides]]
-    module = ["click.*", "ostruct.cli.click_options"]
-    disallow_untyped_decorators = false
-    warn_return_any = false
-
-    [tool.black]
-    line-length = 79
-    target-version = ["py310"]
-    include = '\.pyi?$'
-    preview = false
-    required-version = "24.8.0"
-
-    [tool.pytest.ini_options]
-    asyncio_mode = "strict"
-    testpaths = ["tests"]
-    python_files = ["test_*.py"]
-    markers = [
-        "live: mark test as a live test that makes real API calls or runs actual ostruct commands",
-        "asyncio: mark test as requiring async loop",
-        "no_fs: mark test to disable pyfakefs and use real filesystem",
-        "slow: mark test as slow performance/stress test",
-        "flaky: mark test as flaky (may need reruns)",
-        "mock_openai: mark test to use mock OpenAI client"
-    ]
-    asyncio_default_fixture_loop_scope = "function"
-    # By default, skip live tests unless explicitly requested
-    addopts = "-m 'not live'"
-
-    [tool.ruff]
-    target-version = "py310"
-    fix = true
-    line-length = 79  # Match Black's setting
-
-    [tool.ruff.lint]
-    select = [
-        "E",   # pycodestyle errors
-        "W",   # pycodestyle warnings
-        "F",   # Pyflakes
-        "I",   # isort (import sorting)
-    ]
-    ignore = [
-        "E501",  # Line too long (handled by Black)
-    ]
-
-    [tool.ruff.lint.isort]
-    # Black-compatible settings
-    force-single-line = false
-    combine-as-imports = true
-    split-on-trailing-comma = true

ostruct_cli-0.8.7/src/ostruct/cli/utils.py

@@ -1,33 +0,0 @@
-"""Common utilities for the CLI package."""
-
-from typing import Tuple
-
-from .errors import VariableNameError, VariableValueError
-
-
-def parse_mapping(mapping: str) -> Tuple[str, str]:
-    """Parse a mapping string in the format 'name=value'.
-
-    Args:
-        mapping: Mapping string in format 'name=value'
-
-    Returns:
-        Tuple of (name, value) with whitespace stripped from both parts
-
-    Raises:
-        ValueError: If mapping format is invalid
-        VariableNameError: If name part is empty
-        VariableValueError: If value part is empty
-    """
-    if not mapping or "=" not in mapping:
-        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:
-        raise VariableValueError("Empty value in mapping")
-
-    return name, value