wry 0.1.10.dev4__tar.gz → 0.2.1.dev1__tar.gz

{wry-0.1.10.dev4 → wry-0.2.1.dev1}/PKG-INFO

@@ -1,14 +1,13 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.1.10.dev4
+Version: 0.2.1.dev1
 Summary: Why Repeat Yourself? - Define your CLI once with Pydantic models
-Author-email: Tyler House <26489166+tahouse@users.noreply.github.com>
 License: MIT
-Project-URL: Homepage, https://github.com/tahouse/wry
-Project-URL: Repository, https://github.com/tahouse/wry
-Project-URL: Issues, https://github.com/tahouse/wry/issues
-Project-URL: Documentation, https://github.com/tahouse/wry#readme
+License-File: LICENSE
 Keywords: cli,pydantic,click,wry,dry,configuration,type-safe
+Author: Tyler House
+Author-email: 26489166+tahouse@users.noreply.github.com
+Requires-Python: >=3.10,<4.0
 Classifier: Development Status :: 1 - Planning
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -16,33 +15,19 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: System :: System Shells
 Classifier: Topic :: Utilities
-Requires-Python: >=3.10
+Requires-Dist: annotated-types (>=0.6.0,<0.7.0)
+Requires-Dist: click (>=8.0,<9.0)
+Requires-Dist: pydantic (>=2.9.2,<3.0.0)
+Requires-Dist: pydantic-core (>=2.23.4,<3.0.0)
+Project-URL: Documentation, https://github.com/tahouse/wry#readme
+Project-URL: Homepage, https://github.com/tahouse/wry
+Project-URL: Repository, https://github.com/tahouse/wry
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: click>=8.0
-Requires-Dist: pydantic>=2.9.2
-Requires-Dist: annotated-types>=0.5.0
-Requires-Dist: pydantic-core>=2.23.4
-Provides-Extra: dev
-Requires-Dist: pytest>=6.0; extra == "dev"
-Requires-Dist: pytest-cov; extra == "dev"
-Requires-Dist: pytest-xdist; extra == "dev"
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: mypy>=1.17.1; extra == "dev"
-Requires-Dist: build; extra == "dev"
-Requires-Dist: twine; extra == "dev"
-Requires-Dist: setuptools-scm>=8.0; extra == "dev"
-Requires-Dist: pre-commit; extra == "dev"
-Requires-Dist: safety; extra == "dev"
-Requires-Dist: bandit[toml]; extra == "dev"
-Provides-Extra: test
-Requires-Dist: pytest>=6.0; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: pytest-xdist; extra == "test"
-Dynamic: license-file
 
 # wry - Why Repeat Yourself? CLI
 
@@ -378,11 +363,14 @@ cd wry
 python -m venv venv
 source venv/bin/activate  # On Windows: venv\Scripts\activate
 
-# Install in development mode
-pip install -e ".[dev,test]"
+# Install Poetry (if not already installed)
+pip install poetry
+
+# Install all dependencies in development mode
+poetry install
 
 # Install pre-commit hooks
-pre-commit install
+poetry run pre-commit install
 ```
 
 ### Running Tests
@@ -443,7 +431,8 @@ To ensure consistent behavior between local development and CI:
 Install the exact versions used in CI:
 
 ```bash
-pip install -e ".[dev,test]" --upgrade
+poetry update
+poetry install
 ```
 
 ### Coverage Requirements
@@ -528,17 +517,43 @@ We welcome contributions! Please follow these guidelines to ensure a smooth proc
 
 ### Development Setup
 
-To ensure consistency between local development and CI environments, we use pinned dependencies:
+We use Poetry for dependency management to ensure consistent environments:
 
 ```bash
-# Install development dependencies with exact versions
-pip install -r requirements-dev.txt
+# Install Poetry (if not already installed)
+curl -sSL https://install.python-poetry.org | python3 -
+
+# Install dependencies (including dev dependencies)
+poetry install
 
-# Install the package in editable mode
-pip install -e .
+# Activate the virtual environment
+poetry shell
 ```
 
-**Important**: Always use `requirements-dev.txt` for development to ensure your local environment matches CI/CD.
+**Important**: Poetry automatically creates an isolated virtual environment and uses `poetry.lock` to ensure everyone has the exact same dependencies.
+
+### Common Poetry Commands
+
+```bash
+# Install dependencies from lock file
+poetry install
+
+# Update dependencies within version constraints
+poetry update
+
+# Add a new dependency
+poetry add package-name
+
+# Add a development dependency
+poetry add --group dev package-name
+
+# Show installed packages
+poetry show
+
+# Run commands in the Poetry environment
+poetry run python script.py
+poetry run pytest
+```
 
 ### Getting Started
 
@@ -567,10 +582,9 @@ pip install -e .
 1. **Set up development environment**:
 
    ```bash
-   python -m venv venv
-   source venv/bin/activate  # On Windows: venv\Scripts\activate
-   pip install -e ".[dev,test]"
-   pre-commit install
+   poetry install        # Creates venv and installs all dependencies
+   poetry shell          # Activate the virtual environment
+   poetry run pre-commit install  # Set up git hooks
    ```
 
 2. **Make your changes**:
@@ -583,13 +597,13 @@ pip install -e .
 
    ```bash
    # Run tests
-   pytest
+   poetry run pytest
 
    # Check coverage (must be 100%)
-   pytest --cov=wry --cov-report=term-missing
+   poetry run pytest --cov=wry --cov-report=term-missing
 
    # Run linting
-   pre-commit run --all-files
+   poetry run pre-commit run --all-files
    ```
 
 4. **Commit your changes**:
@@ -695,3 +709,4 @@ If you're interested in this feature, please provide feedback!
 - 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 → wry-0.2.1.dev1}/README.md

@@ -332,11 +332,14 @@ cd wry
 python -m venv venv
 source venv/bin/activate  # On Windows: venv\Scripts\activate
 
-# Install in development mode
-pip install -e ".[dev,test]"
+# Install Poetry (if not already installed)
+pip install poetry
+
+# Install all dependencies in development mode
+poetry install
 
 # Install pre-commit hooks
-pre-commit install
+poetry run pre-commit install
 ```
 
 ### Running Tests
@@ -397,7 +400,8 @@ To ensure consistent behavior between local development and CI:
 Install the exact versions used in CI:
 
 ```bash
-pip install -e ".[dev,test]" --upgrade
+poetry update
+poetry install
 ```
 
 ### Coverage Requirements
@@ -482,17 +486,43 @@ We welcome contributions! Please follow these guidelines to ensure a smooth proc
 
 ### Development Setup
 
-To ensure consistency between local development and CI environments, we use pinned dependencies:
+We use Poetry for dependency management to ensure consistent environments:
 
 ```bash
-# Install development dependencies with exact versions
-pip install -r requirements-dev.txt
+# Install Poetry (if not already installed)
+curl -sSL https://install.python-poetry.org | python3 -
+
+# Install dependencies (including dev dependencies)
+poetry install
 
-# Install the package in editable mode
-pip install -e .
+# Activate the virtual environment
+poetry shell
 ```
 
-**Important**: Always use `requirements-dev.txt` for development to ensure your local environment matches CI/CD.
+**Important**: Poetry automatically creates an isolated virtual environment and uses `poetry.lock` to ensure everyone has the exact same dependencies.
+
+### Common Poetry Commands
+
+```bash
+# Install dependencies from lock file
+poetry install
+
+# Update dependencies within version constraints
+poetry update
+
+# Add a new dependency
+poetry add package-name
+
+# Add a development dependency
+poetry add --group dev package-name
+
+# Show installed packages
+poetry show
+
+# Run commands in the Poetry environment
+poetry run python script.py
+poetry run pytest
+```
 
 ### Getting Started
 
@@ -521,10 +551,9 @@ pip install -e .
 1. **Set up development environment**:
 
    ```bash
-   python -m venv venv
-   source venv/bin/activate  # On Windows: venv\Scripts\activate
-   pip install -e ".[dev,test]"
-   pre-commit install
+   poetry install        # Creates venv and installs all dependencies
+   poetry shell          # Activate the virtual environment
+   poetry run pre-commit install  # Set up git hooks
    ```
 
 2. **Make your changes**:
@@ -537,13 +566,13 @@ pip install -e .
 
    ```bash
    # Run tests
-   pytest
+   poetry run pytest
 
    # Check coverage (must be 100%)
-   pytest --cov=wry --cov-report=term-missing
+   poetry run pytest --cov=wry --cov-report=term-missing
 
    # Run linting
-   pre-commit run --all-files
+   poetry run pre-commit run --all-files
    ```
 
 4. **Commit your changes**:

wry-0.2.1.dev1/pyproject.toml

@@ -0,0 +1,152 @@
+[tool.poetry]
+name = "wry"
+version = "0.2.1.dev1"  # Placeholder - actual version comes from git tags via poetry-dynamic-versioning
+description = "Why Repeat Yourself? - Define your CLI once with Pydantic models"
+authors = ["Tyler House <26489166+tahouse@users.noreply.github.com>"]
+readme = "README.md"
+license = "MIT"
+homepage = "https://github.com/tahouse/wry"
+repository = "https://github.com/tahouse/wry"
+documentation = "https://github.com/tahouse/wry#readme"
+keywords = ["cli", "pydantic", "click", "wry", "dry", "configuration", "type-safe"]
+classifiers = [
+    "Development Status :: 1 - Planning",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: System :: System Shells",
+    "Topic :: Utilities",
+]
+packages = [{include = "wry"}]
+
+[tool.poetry.dependencies]
+python = "^3.10"
+click = "^8.0"
+pydantic = "^2.9.2"
+annotated-types = "^0.6.0"
+pydantic-core = "^2.23.4"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "^8.4.2"
+pytest-cov = "^7.0.0"
+pytest-xdist = "^3.8.0"
+coverage = {extras = ["toml"], version = "^7.10.7"}
+ruff = "^0.13.2"
+mypy = "^1.18.2"
+build = "^1.2.1"
+twine = "^6.0.0"
+pre-commit = "^3.8.0"
+safety = "^3.2.3"
+bandit = {extras = ["toml"], version = "^1.7.5"}
+
+[tool.poetry-dynamic-versioning]
+enable = false
+vcs = "git"
+style = "pep440"
+pattern = "^v(?P<base>\\d+\\.\\d+\\.\\d+)"
+format-jinja = """
+    {%- if distance == 0 -%}
+        {{ serialize_pep440(base, stage, revision) }}
+    {%- elif revision is not none -%}
+        {{ serialize_pep440(base, stage, revision + 1, dev=distance) }}
+    {%- else -%}
+        {{ serialize_pep440(bump_version(base), stage, revision, dev=distance) }}
+    {%- endif -%}
+"""
+
+[tool.poetry-dynamic-versioning.substitution]
+files = ["wry/_version.py"]
+
+[build-system]
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning>=1.0.0,<2.0.0"]
+build-backend = "poetry_dynamic_versioning.backend"
+
+# Keep existing tool configurations
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+extend-exclude = [
+    "wry/_version.py",  # Auto-generated by setuptools-scm
+]
+
+[tool.ruff.lint]
+select = [
+    "E",  # pycodestyle errors
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # isort
+    "B",  # flake8-bugbear
+    "C4", # flake8-comprehensions
+    "UP", # pyupgrade
+]
+ignore = []
+
+[tool.ruff.lint.per-file-ignores]
+# Allow lambdas and assert False in test files
+"tests/**/*.py" = ["E731", "B011"]
+# Allow unused variables in test files
+"tests/**/test_*.py" = ["F841"]
+
+[tool.mypy]
+python_version = "3.10"
+warn_return_any = true
+warn_unused_configs = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+disallow_untyped_decorators = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_no_return = true
+warn_unreachable = true
+strict_optional = true
+strict_equality = true
+extra_checks = true
+
+# Per-module options
+[[tool.mypy.overrides]]
+module = "tests.*"
+disallow_untyped_defs = false
+disallow_untyped_decorators = false
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+python_files = ["test_*.py", "*_test.py"]
+python_classes = ["Test*"]
+python_functions = ["test_*"]
+addopts = "-ra -q --strict-markers --cov=wry --cov-report=term-missing --cov-report=html --cov-report=xml"
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+    "integration: marks tests as integration tests",
+]
+
+[tool.coverage.run]
+branch = true
+source = ["wry"]
+omit = [
+    "tests/*",
+    "wry/_version.py",
+]
+
+[tool.coverage.report]
+exclude_lines = [
+    "pragma: no cover",
+    "def __repr__",
+    "if self.debug:",
+    "if TYPE_CHECKING:",
+    "raise AssertionError",
+    "raise NotImplementedError",
+    "if __name__ == .__main__.:",
+    "class .*\\bProtocol\\):",
+    "@(abc\\.)?abstractmethod",
+]
+
+[tool.bandit]
+targets = ["wry"]
+exclude_dirs = ["tests", "examples"]
+skips = ["B101"]  # assert_used - needed for type checking

{wry-0.1.10.dev4 → wry-0.2.1.dev1}/wry/__init__.py

@@ -46,7 +46,7 @@ Example:
 Coming soon - this package is under active development.
 """
 
-# Version is managed by setuptools-scm from git tags
+# Version is managed by poetry-dynamic-versioning from git tags
 try:
     from ._version import __commit_id__, __version__
 
@@ -55,27 +55,10 @@ try:
     if __commit_id__:
         __version_full__ += f"+{__commit_id__}"
 except ImportError:
-    # Fallback for development/editable installs
-    try:
-        # Try to get version dynamically for editable installs
-        from setuptools_scm import get_version
-
-        __version__ = get_version(root="../..", relative_to=__file__)
-        # Extract commit hash from version if present
-        if "+" in __version__ and "g" in __version__:
-            # Version like "0.0.2+g1234567" or "0.0.2.dev1+g1234567"
-            __commit_id__ = __version__.split("+")[-1].split(".")[0]
-            __version_full__ = __version__
-        else:
-            __commit_id__ = None
-            __version_full__ = __version__
-        # Clean version for consistency
-        __version__ = __version__.split("+")[0]
-    except Exception:
-        # Ultimate fallback
-        __version__ = "0.0.1-dev"
-        __version_full__ = __version__
-        __commit_id__ = None
+    # Fallback for development when _version.py is not generated
+    __version__ = "0.0.0"
+    __version_full__ = __version__
+    __commit_id__ = None
 
 __author__ = "Tyler House"
 __email__ = "26489166+tahouse@users.noreply.github.com"

wry-0.2.1.dev1/wry/_version.py

@@ -0,0 +1,14 @@
+# file generated by poetry-dynamic-versioning
+from typing import TYPE_CHECKING
+
+__version__: str = "0.2.1.dev1"  # This will be replaced during build
+__version_tuple__: tuple[int, ...] = (0, 2, 1, "dev1")  # This will be replaced during build
+__commit_id__: str | None = None  # This will be replaced during build
+
+# For compatibility with setuptools-scm test expectations
+VERSION_TUPLE = __version_tuple__
+COMMIT_ID = __commit_id__
+
+if TYPE_CHECKING:
+    # Version will be injected by poetry-dynamic-versioning
+    pass

{wry-0.1.10.dev4 → wry-0.2.1.dev1}/wry/auto_model.py

@@ -42,66 +42,73 @@ class AutoWryModel(WryModel):
         """Automatically add AutoOption to all unannotated fields."""
         super().__init_subclass__(**kwargs)
 
+        # Skip if we've already processed this class
+        if hasattr(cls, "_autowrymodel_processed"):
+            return
+
+        # Mark this class as processed
+        cls._autowrymodel_processed = True  # type: ignore[attr-defined]
+
         # Process annotations to add AutoOption where needed
         if not hasattr(cls, "__annotations__"):
             cls.__annotations__ = {}
 
-        # Get field names from the class
-        for attr_name in dir(cls):
+        # Process all annotations to add AutoOption where needed
+        for attr_name, annotation in cls.__annotations__.copy().items():
             if attr_name.startswith("_"):
                 continue
 
+            # Check if it's already Annotated
+            origin = get_origin(annotation)
+            # Compare using string representation to handle module reload scenarios
+            if origin is not None and str(origin) == "<class 'typing.Annotated'>":
+                # Check if it has any Click-related metadata
+                metadata = get_args(annotation)[1:]
+                has_click_metadata = any(
+                    # Check for AutoClickParameter enums
+                    isinstance(m, AutoClickParameter)
+                    or
+                    # Check for Click decorators
+                    (hasattr(m, "__module__") and "click" in str(m.__module__))
+                    for m in metadata
+                )
+
+                if has_click_metadata:
+                    # Already has Click configuration, skip
+                    continue
+
+                # Add AutoOption to existing annotation
+                base_type = get_args(annotation)[0]
+                # For Python 3.10 compatibility, we need to reconstruct manually
+                # Create a new annotation with AutoOption prepended to existing metadata
+                if not metadata:
+                    cls.__annotations__[attr_name] = Annotated[base_type, AutoClickParameter.OPTION]
+                elif len(metadata) == 1:
+                    cls.__annotations__[attr_name] = Annotated[base_type, AutoClickParameter.OPTION, metadata[0]]
+                elif len(metadata) == 2:
+                    cls.__annotations__[attr_name] = Annotated[
+                        base_type, AutoClickParameter.OPTION, metadata[0], metadata[1]
+                    ]
+                else:
+                    # For more metadata, we skip adding AutoOption to avoid complexity
+                    # This is a rare case and the field will still work
+                    pass
+            else:
+                # Not annotated, add AutoOption
+                cls.__annotations__[attr_name] = Annotated[annotation, AutoClickParameter.OPTION]
+
+        # Also process fields that are defined with Field() but not in annotations
+        for attr_name in dir(cls):
+            if attr_name.startswith("_") or attr_name in cls.__annotations__:
+                continue
+
             attr_value = getattr(cls, attr_name)
 
             # Check if it's a field
             if isinstance(attr_value, FieldInfo):
-                # Check if annotation exists
-                if attr_name in cls.__annotations__:
-                    annotation = cls.__annotations__[attr_name]
-
-                    # Check if it's already Annotated
-                    origin = get_origin(annotation)
-                    if origin is not None and str(origin) == str(Annotated):
-                        # Check if it has any Click-related metadata
-                        metadata = get_args(annotation)[1:]
-                        has_click_metadata = any(
-                            # Check for AutoClickParameter enums
-                            isinstance(m, AutoClickParameter)
-                            or
-                            # Check for Click decorators
-                            (hasattr(m, "__module__") and "click" in str(m.__module__))
-                            for m in metadata
-                        )
-
-                        if has_click_metadata:
-                            # Already has Click configuration, skip
-                            continue
-
-                        # Add AutoOption to existing annotation
-                        base_type = get_args(annotation)[0]
-                        # For Python 3.10 compatibility, we need to reconstruct manually
-                        # Create a new annotation with AutoOption prepended to existing metadata
-                        if not metadata:
-                            cls.__annotations__[attr_name] = Annotated[base_type, AutoClickParameter.OPTION]
-                        elif len(metadata) == 1:
-                            cls.__annotations__[attr_name] = Annotated[
-                                base_type, AutoClickParameter.OPTION, metadata[0]
-                            ]
-                        elif len(metadata) == 2:
-                            cls.__annotations__[attr_name] = Annotated[
-                                base_type, AutoClickParameter.OPTION, metadata[0], metadata[1]
-                            ]
-                        else:
-                            # For more metadata, we skip adding AutoOption to avoid complexity
-                            # This is a rare case and the field will still work
-                            pass
-                    else:
-                        # Not annotated, add AutoOption
-                        cls.__annotations__[attr_name] = Annotated[annotation, AutoClickParameter.OPTION]
-                else:
-                    # No annotation, infer type from field
-                    field_type = attr_value.annotation or Any
-                    cls.__annotations__[attr_name] = Annotated[field_type, AutoClickParameter.OPTION]
+                # No annotation, infer type from field
+                field_type = attr_value.annotation or Any
+                cls.__annotations__[attr_name] = Annotated[field_type, AutoClickParameter.OPTION]
 
 
 # Convenience function for creating auto models dynamically

{wry-0.1.10.dev4 → wry-0.2.1.dev1}/wry/click_integration.py

@@ -13,7 +13,7 @@ import inspect
 import types
 from collections.abc import Callable, Mapping, Sequence
 from enum import Enum, auto
-from typing import Annotated, Any, TypeAlias, cast, get_args, get_origin, get_type_hints
+from typing import Any, TypeAlias, cast, get_args, get_origin, get_type_hints
 
 import click
 from annotated_types import (
@@ -43,6 +43,7 @@ class AutoClickParameter(Enum):
     OPTION = auto()
     REQUIRED_OPTION = auto()
     ARGUMENT = auto()
+    EXCLUDE = auto()
 
 
 ClickParameterDecorator: TypeAlias = Callable[[FC], FC]
@@ -341,7 +342,9 @@ def generate_click_parameters(
         annotation = type_hints.get(field_name)
 
         # Skip fields without annotations
-        if get_origin(annotation) is not Annotated:
+        origin = get_origin(annotation)
+        # Compare using string representation to handle module reload scenarios
+        if origin is None or str(origin) != "<class 'typing.Annotated'>":
             continue
 
         # Get metadata from annotation
@@ -357,6 +360,9 @@ def generate_click_parameters(
                 field_type = AutoClickParameter.REQUIRED_OPTION
             elif item == AutoClickParameter.ARGUMENT:
                 field_type = AutoClickParameter.ARGUMENT
+            elif item == AutoClickParameter.EXCLUDE:
+                field_type = AutoClickParameter.EXCLUDE
+                break  # Skip this field entirely
             elif (
                 hasattr(item, "__module__")
                 and "click" in str(item.__module__)
@@ -365,6 +371,10 @@ def generate_click_parameters(
                 click_parameter = item
                 break
 
+        # Skip excluded fields
+        if field_type == AutoClickParameter.EXCLUDE:
+            continue
+
         if field_type == AutoClickParameter.OPTION or field_type == AutoClickParameter.REQUIRED_OPTION:
             # Auto-generate Click option from Field info
             option_name = f"--{field_name.replace('_', '-')}"