wry 0.1.9.dev2__tar.gz → 0.1.10.dev4__tar.gz

wry-0.1.10.dev4/.github/workflows/check-requirements.yml

@@ -0,0 +1,32 @@
+name: Check Requirements
+
+on:
+  pull_request:
+    paths:
+      - 'pyproject.toml'
+      - 'requirements-dev.txt'
+      - '.github/workflows/check-requirements.yml'
+
+jobs:
+  check-requirements:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - name: Check requirements consistency
+      run: |
+        echo "Checking that requirements-dev.txt matches pyproject.toml constraints..."
+        python -m pip install --upgrade pip
+
+        # Install from requirements file
+        pip install -r requirements-dev.txt
+
+        # Check if package can be installed with these deps
+        pip install --no-deps -e .
+
+        echo "✅ Requirements file is valid and consistent!"

{wry-0.1.9.dev2 → wry-0.1.10.dev4}/.github/workflows/ci-cd.yml

@@ -35,14 +35,17 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml') }}
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/pyproject.toml', 'requirements-dev.txt') }}
         restore-keys: |
           ${{ runner.os }}-pip-
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -e ".[dev,test]"
+        # Install exact versions from requirements file first
+        pip install -r requirements-dev.txt
+        # Then install the package in editable mode (without deps to avoid conflicts)
+        pip install --no-deps -e .
 
     - name: Install pre-commit hooks
       run: |

{wry-0.1.9.dev2 → wry-0.1.10.dev4}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -25,7 +25,7 @@ repos:
         entry: pytest
         language: system
         types: [python]
-        args: [--cov=wry, --cov-branch, --cov-report=xml, --cov-report=term-missing, --cov-fail-under=90]
+        args: [tests/unit/, --cov=wry, --cov-branch, --cov-report=xml, --cov-report=term-missing, --cov-fail-under=85]
         pass_filenames: false
         always_run: true
 
@@ -41,13 +41,6 @@ repos:
           - annotated-types>=0.6.0
           - setuptools-scm>=8.0
 
-# Temporarily disabled - bandit has dependency issues in pre-commit
-  # - repo: https://github.com/PyCQA/bandit
-  #   rev: 1.7.5
-  #   hooks:
-  #     - id: bandit
-  #       args: [-c, pyproject.toml]
-
 exclude: |
   (?x)(
     # Exclude auto-generated files

{wry-0.1.9.dev2 → wry-0.1.10.dev4}/CHANGELOG.md

@@ -7,6 +7,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.9] - 2025-09-29
+
+### Added
+
+- **Automatic multiple option support for list types**
+  - `list[str]` and `tuple[str, ...]` fields now automatically generate Click options with `multiple=True`
+  - Supports both `AutoWryModel` and `WryModel` with proper type conversion
+  - Handles edge cases: empty lists, single values, and multiple values
+  - Works with different data types: `list[int]`, `list[str]`, etc.
+  - Maintains type safety: Click tuples are correctly converted to Python lists
+
+### Fixed
+
+- **Variadic argument bug resolution**
+  - Fixed issue where variadic Click arguments (`nargs=-1`) were incorrectly converted to strings
+  - Variadic arguments now preserve their tuple type when used with `@generate_click_parameters`
+  - Resolves duplicate parameter warnings and validation errors
+
+### Testing
+
+- **Comprehensive test coverage for multiple options**
+  - Added `tests/unit/test_multiple_option_bug.py` with 6 test cases
+  - Added `tests/unit/test_variadic_argument_bug.py` with 3 test cases
+  - Tests cover AutoWryModel, WryModel, edge cases, type validation, and different data types
+  - All tests pass with proper type checking and validation
+
 ## [0.1.8] - 2025-09-10
 
 ### Fixed
@@ -144,7 +170,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial version as `drycli` package (before rename to `wry`)
 
-[Unreleased]: https://github.com/tahouse/wry/compare/v0.1.8...HEAD
+[Unreleased]: https://github.com/tahouse/wry/compare/v0.1.9...HEAD
+[0.1.9]: https://github.com/tahouse/wry/compare/v0.1.8...v0.1.9
 [0.1.8]: https://github.com/tahouse/wry/compare/v0.1.7...v0.1.8
 [0.1.7]: https://github.com/tahouse/wry/compare/v0.1.6...v0.1.7
 [0.1.6]: https://github.com/tahouse/wry/compare/v0.1.5...v0.1.6

{wry-0.1.9.dev2 → wry-0.1.10.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.1.9.dev2
+Version: 0.1.10.dev4
 Summary: Why Repeat Yourself? - Define your CLI once with Pydantic models
 Author-email: Tyler House <26489166+tahouse@users.noreply.github.com>
 License: MIT
@@ -81,7 +81,7 @@ The simplest way to use wry is with `AutoWryModel`, which automatically generate
 ```python
 import click
 from pydantic import Field
-from wry import AutoWryModel, generate_click_parameters
+from wry import AutoWryModel
 
 class AppArgs(AutoWryModel):
     """Configuration for my app."""
@@ -91,9 +91,10 @@ class AppArgs(AutoWryModel):
     verbose: bool = Field(default=False, description="Verbose output")
 
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 def main(**kwargs):
     """My simple CLI application."""
+    # Create the model instance from kwargs
     config = AppArgs(**kwargs)
     click.echo(f"Hello {config.name}, you are {config.age} years old!")
 
@@ -101,6 +102,8 @@ if __name__ == "__main__":
     main()
 ```
 
+**Note**: Currently, `generate_click_parameters()` passes individual parameters as kwargs to your function. You need to instantiate the model yourself. See the [Future Features](#future-features) section for a potential cleaner API.
+
 Run it:
 
 ```bash
@@ -122,7 +125,7 @@ wry can track where each configuration value came from. You have two options:
 
 ```python
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 def main(**kwargs):
     # Simple instantiation - no source tracking
     config = AppArgs(**kwargs)
@@ -133,7 +136,7 @@ def main(**kwargs):
 
 ```python
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 @click.pass_context
 def main(ctx, **kwargs):
     # Full source tracking with context
@@ -210,7 +213,7 @@ Use multiple Pydantic models in a single command:
 ```python
 from typing import Annotated
 import click
-from wry import WryModel, AutoOption, generate_click_parameters, multi_model
+from wry import WryModel, AutoOption, multi_model, create_models
 
 class ServerConfig(WryModel):
     host: Annotated[str, AutoOption] = "localhost"
@@ -222,7 +225,13 @@ class DatabaseArgs(WryModel):
 
 @click.command()
 @multi_model(ServerConfig, DatabaseConfig)
-def serve(server: ServerConfig, database: DatabaseConfig):
+@click.pass_context
+def serve(ctx, **kwargs):
+    # Create model instances
+    configs = create_models(ctx, kwargs, ServerConfig, DatabaseConfig)
+    server = configs[ServerConfig]
+    database = configs[DatabaseConfig]
+
     print(f"Starting server at {server.host}:{server.port}")
     print(f"Database: {database.db_url} (pool size: {database.pool_size})")
 ```
@@ -233,7 +242,7 @@ Automatically generate options for all fields:
 
 ```python
 import click
-from wry import AutoWryModel, generate_click_parameters
+from wry import AutoWryModel
 from pydantic import Field
 
 class QuickConfig(AutoWryModel):
@@ -244,7 +253,7 @@ class QuickConfig(AutoWryModel):
     email: str = Field(description="Your email")
 
 @click.command()
-@generate_click_parameters(QuickConfig)
+@QuickConfig.generate_click_parameters()
 def quickstart(config: QuickConfig):
     print(f"Hello {config.name}!")
 ```
@@ -307,8 +316,8 @@ By default, `generate_click_parameters` runs in strict mode to prevent common mi
 
 ```python
 @click.command()
-@generate_click_parameters(Config)  # strict=True by default
-@generate_click_parameters(Config)  # ERROR: Duplicate decorator detected!
+@Config.generate_click_parameters()  # strict=True by default
+@Config.generate_click_parameters()  # ERROR: Duplicate decorator detected!
 def main(**kwargs):
     pass
 ```
@@ -316,7 +325,7 @@ def main(**kwargs):
 To allow multiple decorators (not recommended):
 
 ```python
-@generate_click_parameters(Config, strict=False)
+@Config.generate_click_parameters(strict=False)
 ```
 
 ### Manual Field Control
@@ -517,6 +526,20 @@ The wry codebase is organized into focused modules:
 
 We welcome contributions! Please follow these guidelines to ensure a smooth process.
 
+### Development Setup
+
+To ensure consistency between local development and CI environments, we use pinned dependencies:
+
+```bash
+# Install development dependencies with exact versions
+pip install -r requirements-dev.txt
+
+# Install the package in editable mode
+pip install -e .
+```
+
+**Important**: Always use `requirements-dev.txt` for development to ensure your local environment matches CI/CD.
+
 ### Getting Started
 
 1. **Fork the repository** on GitHub
@@ -642,7 +665,33 @@ We welcome contributions! Please follow these guidelines to ensure a smooth proc
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
+## Future Features
+
+### Automatic Model Instantiation (Proof of Concept)
+
+We're exploring a cleaner API that would automatically instantiate models and pass them to your function. See `examples/auto_instantiate_poc.py` for a working proof of concept:
+
+```python
+# Potential future syntax
+@click.command()
+@AppConfig.click_command()  # or @auto_instantiate(AppConfig)
+def main(config: AppConfig):
+    """The decorator would handle instantiation automatically."""
+    click.echo(f"Hello {config.name}!")
+    # Source tracking would work automatically too!
+```
+
+This would:
+
+- Automatically handle `@click.pass_context` when needed for source tracking
+- Instantiate the model and pass it with the correct parameter name
+- Support multiple models in a single command
+- Make the API more intuitive and similar to other libraries
+
+If you're interested in this feature, please provide feedback!
+
 ## Acknowledgments
 
 - Built on top of [Click](https://click.palletsprojects.com/) and [Pydantic](https://pydantic-docs.helpmanual.io/)
 - Inspired by the DRY (Don't Repeat Yourself) principle
+We'd also like to acknowledgme `pydanclick`, which uses a similar clean syntax (no kwargs to command functions). The code for this feature will be independently written given that `wry` supports source tracking, constraint help text creation, instantiation from config files, and several other features not supported by `pydanclick`.

{wry-0.1.9.dev2 → wry-0.1.10.dev4}/README.md

@@ -35,7 +35,7 @@ The simplest way to use wry is with `AutoWryModel`, which automatically generate
 ```python
 import click
 from pydantic import Field
-from wry import AutoWryModel, generate_click_parameters
+from wry import AutoWryModel
 
 class AppArgs(AutoWryModel):
     """Configuration for my app."""
@@ -45,9 +45,10 @@ class AppArgs(AutoWryModel):
     verbose: bool = Field(default=False, description="Verbose output")
 
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 def main(**kwargs):
     """My simple CLI application."""
+    # Create the model instance from kwargs
     config = AppArgs(**kwargs)
     click.echo(f"Hello {config.name}, you are {config.age} years old!")
 
@@ -55,6 +56,8 @@ if __name__ == "__main__":
     main()
 ```
 
+**Note**: Currently, `generate_click_parameters()` passes individual parameters as kwargs to your function. You need to instantiate the model yourself. See the [Future Features](#future-features) section for a potential cleaner API.
+
 Run it:
 
 ```bash
@@ -76,7 +79,7 @@ wry can track where each configuration value came from. You have two options:
 
 ```python
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 def main(**kwargs):
     # Simple instantiation - no source tracking
     config = AppArgs(**kwargs)
@@ -87,7 +90,7 @@ def main(**kwargs):
 
 ```python
 @click.command()
-@generate_click_parameters(AppArgs)
+@AppArgs.generate_click_parameters()
 @click.pass_context
 def main(ctx, **kwargs):
     # Full source tracking with context
@@ -164,7 +167,7 @@ Use multiple Pydantic models in a single command:
 ```python
 from typing import Annotated
 import click
-from wry import WryModel, AutoOption, generate_click_parameters, multi_model
+from wry import WryModel, AutoOption, multi_model, create_models
 
 class ServerConfig(WryModel):
     host: Annotated[str, AutoOption] = "localhost"
@@ -176,7 +179,13 @@ class DatabaseArgs(WryModel):
 
 @click.command()
 @multi_model(ServerConfig, DatabaseConfig)
-def serve(server: ServerConfig, database: DatabaseConfig):
+@click.pass_context
+def serve(ctx, **kwargs):
+    # Create model instances
+    configs = create_models(ctx, kwargs, ServerConfig, DatabaseConfig)
+    server = configs[ServerConfig]
+    database = configs[DatabaseConfig]
+
     print(f"Starting server at {server.host}:{server.port}")
     print(f"Database: {database.db_url} (pool size: {database.pool_size})")
 ```
@@ -187,7 +196,7 @@ Automatically generate options for all fields:
 
 ```python
 import click
-from wry import AutoWryModel, generate_click_parameters
+from wry import AutoWryModel
 from pydantic import Field
 
 class QuickConfig(AutoWryModel):
@@ -198,7 +207,7 @@ class QuickConfig(AutoWryModel):
     email: str = Field(description="Your email")
 
 @click.command()
-@generate_click_parameters(QuickConfig)
+@QuickConfig.generate_click_parameters()
 def quickstart(config: QuickConfig):
     print(f"Hello {config.name}!")
 ```
@@ -261,8 +270,8 @@ By default, `generate_click_parameters` runs in strict mode to prevent common mi
 
 ```python
 @click.command()
-@generate_click_parameters(Config)  # strict=True by default
-@generate_click_parameters(Config)  # ERROR: Duplicate decorator detected!
+@Config.generate_click_parameters()  # strict=True by default
+@Config.generate_click_parameters()  # ERROR: Duplicate decorator detected!
 def main(**kwargs):
     pass
 ```
@@ -270,7 +279,7 @@ def main(**kwargs):
 To allow multiple decorators (not recommended):
 
 ```python
-@generate_click_parameters(Config, strict=False)
+@Config.generate_click_parameters(strict=False)
 ```
 
 ### Manual Field Control
@@ -471,6 +480,20 @@ The wry codebase is organized into focused modules:
 
 We welcome contributions! Please follow these guidelines to ensure a smooth process.
 
+### Development Setup
+
+To ensure consistency between local development and CI environments, we use pinned dependencies:
+
+```bash
+# Install development dependencies with exact versions
+pip install -r requirements-dev.txt
+
+# Install the package in editable mode
+pip install -e .
+```
+
+**Important**: Always use `requirements-dev.txt` for development to ensure your local environment matches CI/CD.
+
 ### Getting Started
 
 1. **Fork the repository** on GitHub
@@ -596,7 +619,33 @@ We welcome contributions! Please follow these guidelines to ensure a smooth proc
 
 This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
 
+## Future Features
+
+### Automatic Model Instantiation (Proof of Concept)
+
+We're exploring a cleaner API that would automatically instantiate models and pass them to your function. See `examples/auto_instantiate_poc.py` for a working proof of concept:
+
+```python
+# Potential future syntax
+@click.command()
+@AppConfig.click_command()  # or @auto_instantiate(AppConfig)
+def main(config: AppConfig):
+    """The decorator would handle instantiation automatically."""
+    click.echo(f"Hello {config.name}!")
+    # Source tracking would work automatically too!
+```
+
+This would:
+
+- Automatically handle `@click.pass_context` when needed for source tracking
+- Instantiate the model and pass it with the correct parameter name
+- Support multiple models in a single command
+- Make the API more intuitive and similar to other libraries
+
+If you're interested in this feature, please provide feedback!
+
 ## Acknowledgments
 
 - Built on top of [Click](https://click.palletsprojects.com/) and [Pydantic](https://pydantic-docs.helpmanual.io/)
 - Inspired by the DRY (Don't Repeat Yourself) principle
+We'd also like to acknowledgme `pydanclick`, which uses a similar clean syntax (no kwargs to command functions). The code for this feature will be independently written given that `wry` supports source tracking, constraint help text creation, instantiation from config files, and several other features not supported by `pydanclick`.

wry-0.1.10.dev4/examples/auto_instantiate_edge_cases.py

@@ -0,0 +1,165 @@
+#!/usr/bin/env python3
+"""Edge cases for automatic model instantiation - mixing models with raw Click options."""
+
+import click
+from pydantic import Field
+
+from examples.auto_instantiate_poc import auto_instantiate, multi_auto_instantiate
+from wry import AutoWryModel
+
+
+class ServerConfig(AutoWryModel):
+    """Server configuration."""
+
+    host: str = Field(default="localhost", description="Server host")
+    port: int = Field(default=8080, description="Server port")
+
+
+class DatabaseConfig(AutoWryModel):
+    """Database configuration."""
+
+    url: str = Field(default="sqlite:///app.db", description="Database URL")
+    pool_size: int = Field(default=5, description="Connection pool size")
+
+
+# Example 1: Single model + additional Click options
+@click.command()
+@click.option("--dry-run", is_flag=True, help="Don't actually start the server")
+@click.option("--config-file", type=click.Path(), help="External config file")
+@auto_instantiate(ServerConfig)
+def mixed_single(server: ServerConfig, dry_run: bool, config_file: str):
+    """Mix model with raw Click options."""
+    if config_file:
+        click.echo(f"Loading additional config from: {config_file}")
+
+    if dry_run:
+        click.echo("DRY RUN MODE - not starting server")
+    else:
+        click.echo(f"Starting server at {server.host}:{server.port}")
+
+
+# Example 2: Multiple models + additional Click options
+@click.command()
+@click.option("--environment", type=click.Choice(["dev", "staging", "prod"]), default="dev")
+@click.option("--force", is_flag=True, help="Force deployment")
+@multi_auto_instantiate(ServerConfig, DatabaseConfig)
+def mixed_multi(server: ServerConfig, db: DatabaseConfig, environment: str, force: bool):
+    """Mix multiple models with raw Click options."""
+    click.echo(f"Deploying to {environment} environment")
+
+    if force:
+        click.echo("FORCE mode enabled")
+
+    click.echo(f"Server: {server.host}:{server.port}")
+    click.echo(f"Database: {db.url}")
+
+
+# Example 3: What happens with name conflicts?
+class ConfigWithExtraOptions(AutoWryModel):
+    """Model that might conflict with raw options."""
+
+    name: str = Field(description="Application name")
+    version: str = Field(default="1.0.0", description="Version")
+    # Note: 'force' would conflict with the Click option below
+
+
+@click.command()
+@click.option("--force", is_flag=True, help="Force update")  # Raw Click option
+@click.option("--verbose", "-v", count=True, help="Verbosity level")  # Another raw option
+@auto_instantiate(ConfigWithExtraOptions)
+def potential_conflict(config: ConfigWithExtraOptions, force: bool, verbose: int):
+    """Test potential naming conflicts."""
+    click.echo(f"App: {config.name} v{config.version}")
+    click.echo(f"Force: {force}")
+    click.echo(f"Verbosity: {verbose}")
+
+
+# Example 4: Complex scenario - models + Click args + options
+@click.command()
+@click.argument("action", type=click.Choice(["start", "stop", "restart"]))
+@click.option("--timeout", type=int, default=30, help="Operation timeout")
+@multi_auto_instantiate(ServerConfig, DatabaseConfig)
+def complex_command(action: str, server: ServerConfig, db: DatabaseConfig, timeout: int):
+    """Complex mix of arguments, options, and models."""
+    click.echo(f"Action: {action} (timeout: {timeout}s)")
+    click.echo(f"Server: {server.host}:{server.port}")
+    click.echo(f"Database: {db.url}")
+
+
+# Example 5: How would parameter naming work?
+def demonstrate_parameter_resolution():
+    """Show how parameters are resolved in different scenarios."""
+
+    scenarios = """
+    Current POC behavior:
+
+    1. The decorator inspects function signature for type hints
+    2. Parameters with model types get the instantiated models
+    3. Other parameters get their values from Click kwargs
+
+    Example function signature:
+        def cmd(server: ServerConfig, db: DatabaseConfig, force: bool, verbose: int)
+
+    The decorator:
+        - Finds 'server: ServerConfig' → injects ServerConfig instance
+        - Finds 'db: DatabaseConfig' → injects DatabaseConfig instance
+        - 'force' and 'verbose' → passed through from Click kwargs
+
+    Potential issues:
+
+    1. Name conflicts: If a model has a field 'force' and there's also a
+       Click option '--force', they would conflict in kwargs
+
+    2. Parameter order: Currently relies on **kwargs which doesn't preserve
+       order, but function parameters have order
+
+    3. Missing parameters: What if the function expects a parameter that
+       isn't in kwargs or models?
+    """
+
+    return scenarios
+
+
+# Test the examples
+if __name__ == "__main__":
+    import sys
+
+    from click.testing import CliRunner
+
+    runner = CliRunner()
+
+    if len(sys.argv) > 1:
+        # Allow running specific commands
+        import importlib.util
+
+        spec = importlib.util.spec_from_file_location("module", __file__)
+        module = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(module)
+
+        cmd_name = sys.argv[1]
+        cmd = getattr(module, cmd_name, None)
+        if cmd and hasattr(cmd, "callback"):
+            cmd(sys.argv[2:])
+    else:
+        # Run all tests
+        print("=== Single Model + Raw Options ===")
+        result = runner.invoke(mixed_single, ["--host", "0.0.0.0", "--dry-run", "--config-file", "app.yaml"])
+        print(result.output)
+
+        print("\n=== Multiple Models + Raw Options ===")
+        result = runner.invoke(
+            mixed_multi,
+            ["--environment", "prod", "--force", "--host", "api.example.com", "--url", "postgres://prod-db/app"],
+        )
+        print(result.output)
+
+        print("\n=== Potential Conflicts ===")
+        result = runner.invoke(potential_conflict, ["--name", "MyApp", "--force", "-vvv"])
+        print(result.output)
+
+        print("\n=== Complex Scenario ===")
+        result = runner.invoke(complex_command, ["restart", "--timeout", "60", "--port", "9000", "--pool-size", "20"])
+        print(result.output)
+
+        print("\n=== Parameter Resolution Logic ===")
+        print(demonstrate_parameter_resolution())