wry 0.2.1__tar.gz → 0.2.2.dev1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wry
-Version: 0.2.1
+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 → wry-0.2.2.dev1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wry"
-version = "0.2.1"  # 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 → 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"  # This will be replaced during build
-__version_tuple__: tuple[int, ...] = (0, 2, 1)  # 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 → wry-0.2.2.dev1}/wry/click_integration.py

@@ -380,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]
@@ -740,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 → 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):