wry 0.2.1.dev1__tar.gz → 0.2.2.dev1__tar.gz

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.2.1.dev1
+Version: 0.2.2.dev1
 Summary: Why Repeat Yourself? - Define your CLI once with Pydantic models
 License: MIT
 License-File: LICENSE

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wry"
-version = "0.2.1.dev1"  # Placeholder - actual version comes from git tags via poetry-dynamic-versioning
+version = "0.2.2.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"

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/wry/__init__.py

@@ -89,6 +89,7 @@ from .multi_model import (  # noqa: E402
 # Convenience aliases
 AutoOption = AutoClickParameter.OPTION
 AutoArgument = AutoClickParameter.ARGUMENT
+AutoExclude = AutoClickParameter.EXCLUDE
 
 # Re-export all public APIs
 __all__ = [

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/wry/_version.py

@@ -1,8 +1,8 @@
 # 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
+__version__: str = "0.2.2.dev1"  # This will be replaced during build
+__version_tuple__: tuple[int, ...] = (0, 2, 2, "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

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/wry/click_integration.py

@@ -336,6 +336,7 @@ def generate_click_parameters(
     """
     arguments: list[ClickParameterDecorator[Any]] = []  # Arguments must come first
     options: list[ClickParameterDecorator[Any]] = []  # Options come after arguments
+    argument_docs: list[tuple[str, str]] = []  # Track (arg_name, description) for docstring injection
     type_hints = get_type_hints(model_class, include_extras=True)
 
     for field_name, field_info in model_class.model_fields.items():
@@ -379,14 +380,22 @@ def generate_click_parameters(
             # Auto-generate Click option from Field info
             option_name = f"--{field_name.replace('_', '-')}"
 
+            # Check if field is required first (needed to decide on default handling)
+            is_required = field_info.is_required() or field_type == AutoClickParameter.REQUIRED_OPTION
+
             click_kwargs: dict[str, Any] = {
-                "default": (field_info.default if field_info.default is not PydanticUndefined else None),
                 "help": field_info.description or f"{field_name.replace('_', ' ').title()}",
                 "show_default": True,
             }
 
-            # Check if field is required
-            is_required = field_info.is_required() or field_type == AutoClickParameter.REQUIRED_OPTION
+            # Only set default if field has one, or if field is not required
+            # For required fields without a default, we must NOT set default=None
+            # or Click will think there IS a default and won't enforce the requirement
+            if field_info.default is not PydanticUndefined:
+                click_kwargs["default"] = field_info.default
+            elif not is_required:
+                # Optional field without explicit default gets None
+                click_kwargs["default"] = None
 
             # Determine Click type from annotation
             base_type = get_args(annotation)[0]
@@ -502,6 +511,10 @@ def generate_click_parameters(
             # Note: required=False to allow --config to replace arg
             arguments.append(click.argument(argument_name, **click_kwargs, required=False))
 
+            # Track argument description for docstring injection
+            if field_info.description:
+                argument_docs.append((argument_name.upper(), field_info.description))
+
         elif click_parameter:
             # Determine if it's an argument or option
             if hasattr(click_parameter, "__name__") and "argument" in str(click_parameter):
@@ -573,6 +586,21 @@ def generate_click_parameters(
             if config_and_env_options:
                 func._has_config_option = True  # type: ignore
 
+        # Inject argument descriptions into docstring BEFORE applying decorators
+        if argument_docs:
+            original_doc = func.__doc__ or ""
+            # Build argument documentation section
+            # Use \b to prevent Click from rewrapping, and format like Options section
+            arg_doc_lines = ["\n\n\b"]
+            arg_doc_lines.append("\n\b\bArguments:")
+            for arg_name, description in argument_docs:
+                # Match Click's Options formatting: 2 space indent, left-aligned
+                arg_doc_lines.append(f"\n\b\b  {arg_name.ljust(18)} {description}")
+            arg_doc_section = "".join(arg_doc_lines)
+
+            # Append to existing docstring
+            func.__doc__ = original_doc.rstrip() + arg_doc_section
+
         # Apply arguments first, then options (Click requirement)
         all_decorators = arguments + final_options
         for dec in reversed(all_decorators):
@@ -720,23 +748,15 @@ def eager_json_config(ctx: click.Context, param: click.Parameter, value: Any) ->
         with open(value) as f:
             json_data = json.load(f)
 
-        # Pre-fill missing required parameters from JSON
-        # This prevents Click from throwing MissingParameter errors
-        for json_key, json_value in json_data.items():
-            param_key = json_key.replace("-", "_")  # Handle kebab-case
-            if param_key not in ctx.params:
-                ctx.params[param_key] = json_value
-
-        # Store for later merging
+        # Store JSON data for later merging in from_click_context
         ctx.ensure_object(dict)["json_data"] = json_data
 
-        # Also modify Click argument requirements if they exist
-        # This allows JSON to satisfy required arguments
+        # Mark parameters from JSON as not required
+        # This allows JSON to satisfy required arguments without modifying defaults
         if hasattr(ctx, "command") and ctx.command:
             for p in ctx.command.params:
                 if (isinstance(p, click.Argument) or isinstance(p, click.Option)) and p.name in json_data:
                     p.required = False
-                    p.default = json_data[p.name]
 
         return value
 

{wry-0.2.1.dev1 → wry-0.2.2.dev1}/wry/core/model.py

@@ -66,7 +66,7 @@ class WryModel(BaseModel):
         if "_value_sources" not in data:
             # Only initialize sources if not already provided
             self._value_sources = {}
-            for field_name in self.model_fields:
+            for field_name in self.__class__.model_fields:
                 # Mark non-default values as programmatic
                 if field_name in data:
                     self._value_sources[field_name] = ValueSource.CLI
@@ -526,6 +526,7 @@ class WryModel(BaseModel):
                         # Only override if it's actually from CLI
                         if "COMMANDLINE" in source_str:
                             config_data[field_name] = TrackedValue(value, ValueSource.CLI)
+                            continue
                         # Skip if it's DEFAULT or ENVIRONMENT - already handled above
                         continue
                 except (AttributeError, RuntimeError):