apcore-cli 0.10.2__tar.gz → 0.10.4__tar.gz

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/CHANGELOG.md

@@ -5,6 +5,22 @@ All notable changes to apcore-cli (Python SDK) will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.4] - 2026-07-14
+
+Patch release. Bumps the required `apcore` floor to `0.26.0` to align the ecosystem on the 0.26.0 governance layer (Execution Policy, governance events, no-handler fail-loud — additive, no breaking changes). No code or API changes; all 798 tests pass (5 xfailed) unmodified against apcore 0.26.0.
+
+## [0.10.3] - 2026-07-07
+
+Patch release: fixes Pydantic v2 `Optional[...]` field type mapping and bumps the required `apcore-toolkit` floor. All 798 tests pass (5 xfailed).
+
+### Fixed
+
+- **`Optional[X]` fields mapped to the wrong Click type.** Pydantic v2 emits `Optional[X]` as `{"anyOf": [<X>, {"type": "null"}]}` rather than `{"type": "X"}`, so every optional CLI option fell through to `click.STRING` with a spurious "no type specified" warning — `Optional[bool]` lost its flag, `Optional[int]` lost `INT`, and the `*_file` convention stopped applying. `_map_type` (`schema_parser.py`) and the `anyOf`/`oneOf` branch of `_resolve_node` (`ref_resolver.py`) now recover the dominant non-null type from `anyOf`. JSON Schema list-form types (`{"type": ["string", "null"]}`) are likewise reduced to their first non-null string, so they no longer risk an unhashable-key `TypeError` in the type lookup. Regression tests added in `tests/test_schema_parser.py` and `tests/test_ref_resolver.py`.
+
+### Changed
+
+- Bumped the required `apcore-toolkit` floor to `>= 0.10.0` (which centralizes `RegistryWriter` field mapping and adds the shared annotation-preservation conformance verifier — additive, no breaking changes).
+
 ## [0.10.2] - 2026-06-24
 
 ### Changed

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apcore-cli
-Version: 0.10.2
+Version: 0.10.4
 Summary: Terminal adapter for apcore — execute AI-Perceivable modules from the command line
 Project-URL: Homepage, https://aiperceivable.com
 Project-URL: Repository, https://github.com/aiperceivable/apcore-cli-python
@@ -21,8 +21,8 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.11
-Requires-Dist: apcore-toolkit>=0.9.1
-Requires-Dist: apcore>=0.25.0
+Requires-Dist: apcore-toolkit>=0.10.0
+Requires-Dist: apcore>=0.26.0
 Requires-Dist: click>=8.1
 Requires-Dist: cryptography>=41.0
 Requires-Dist: jsonschema>=4.20
@@ -89,7 +89,7 @@ Terminal adapter for apcore. Execute AI-Perceivable modules from the command lin
 pip install apcore-cli
 ```
 
-Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.7.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
+Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.10.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
 
 ```bash
 pip install "apcore-cli[toolkit]"   # equivalent to plain `pip install apcore-cli`

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/README.md

@@ -48,7 +48,7 @@ Terminal adapter for apcore. Execute AI-Perceivable modules from the command lin
 pip install apcore-cli
 ```
 
-Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.7.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
+Requires Python 3.11+, `apcore >= 0.21.0`, and `apcore-toolkit >= 0.10.0` (now a **required** runtime dependency as of v0.9.0 — previously optional; see the [tech-design ADR-09](https://github.com/aiperceivable/apcore-cli/blob/main/docs/tech-design.md) for the byte-equivalent toolkit-delegated tier rationale). The `[toolkit]` extras group is retained as a no-op for backward compat:
 
 ```bash
 pip install "apcore-cli[toolkit]"   # equivalent to plain `pip install apcore-cli`

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apcore-cli"
-version = "0.10.2"
+version = "0.10.4"
 description = "Terminal adapter for apcore — execute AI-Perceivable modules from the command line"
 readme = "README.md"
 license = "Apache-2.0"
@@ -26,8 +26,8 @@ classifiers = [
     "Environment :: Console",
 ]
 dependencies = [
-    "apcore>=0.25.0",
-    "apcore-toolkit>=0.9.1",
+    "apcore>=0.26.0",
+    "apcore-toolkit>=0.10.0",
     "click>=8.1",
     "jsonschema>=4.20",
     "rich>=13.0",

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/src/apcore_cli/ref_resolver.py

@@ -117,8 +117,10 @@ def _resolve_node(
                 merged["properties"].update(node["properties"])
             sibling_required: list[str] = list(node["required"]) if isinstance(node.get("required"), list) else []
             all_required_sets: list[set[str]] = []
+            resolved_branches: list[dict] = []
             for sub_schema in node[keyword]:
                 resolved = _resolve_node(sub_schema, defs, visited, depth + 1, max_depth, module_id)
+                resolved_branches.append(resolved)
                 if "properties" in resolved:
                     merged["properties"].update(resolved["properties"])
                 if "required" in resolved:
@@ -136,6 +138,28 @@ def _resolve_node(
             for k, v in node.items():
                 if k not in (keyword, "properties", "required") and k not in merged:
                     merged[k] = v
+            # Pydantic v2 emits Optional[X] as {"anyOf": [<X-schema>, {"type": "null"}]}.
+            # The branch merge above copies properties but never the scalar `type` from
+            # branches, so Optional[str]/Optional[int]/etc. lose their type entirely.
+            # Recover it: if the merged result has no `type`, pick the type of the first
+            # non-null branch (ignoring {"type": "null"} sentinels).
+            if "type" not in merged:
+                for branch in resolved_branches:
+                    branch_type = branch.get("type")
+                    if isinstance(branch_type, str) and branch_type != "null":
+                        merged["type"] = branch_type
+                        break
+                    if isinstance(branch_type, list):
+                        # JSON Schema list-form type (e.g. ["string", "null"]):
+                        # recover the first non-null string so downstream never
+                        # sees an unhashable list type.
+                        recovered = next(
+                            (t for t in branch_type if isinstance(t, str) and t != "null"),
+                            None,
+                        )
+                        if recovered is not None:
+                            merged["type"] = recovered
+                            break
             return merged
 
     # Recursively process every dict-valued child of this node.

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/src/apcore_cli/schema_parser.py

@@ -34,10 +34,45 @@ RESERVED_PROPERTY_NAMES: frozenset[str] = frozenset(
 )
 
 
+def _resolve_type_from_any_of(prop_schema: dict) -> str | None:
+    """Extract the dominant non-null type from an anyOf schema.
+
+    Pydantic v2 emits Optional[X] as {"anyOf": [<X-schema>, {"type": "null"}]}.
+    We pick the first non-null branch and return its type string so the caller
+    can avoid a "no type" warning for what is effectively a typed optional field.
+    $ref entries (nested models) are treated as "object".
+    """
+    branches = [b for b in prop_schema.get("anyOf", []) if b.get("type") != "null"]
+    if not branches:
+        return None
+    first = branches[0]
+    branch_type = first.get("type")
+    if isinstance(branch_type, str):
+        return branch_type
+    if isinstance(branch_type, list):
+        # JSON Schema list-form type (e.g. ["string", "null"]): first non-null string.
+        return next((t for t in branch_type if isinstance(t, str) and t != "null"), None)
+    if "$ref" in first:  # nested model
+        return "object"
+    return None
+
+
 def _map_type(prop_name: str, prop_schema: dict) -> Any:
     """Map JSON Schema type to Click parameter type."""
     schema_type = prop_schema.get("type")
 
+    # JSON Schema allows a list-form type (e.g. ["string", "null"]). Reduce it to
+    # the first non-null string so it maps cleanly and never reaches the
+    # (hashable-key) type_map lookup below as an unhashable list.
+    if isinstance(schema_type, list):
+        schema_type = next((t for t in schema_type if isinstance(t, str) and t != "null"), None)
+
+    # Pydantic v2 generates Optional[X] as {"anyOf": [<X-schema>, {"type": "null"}]}
+    # rather than {"type": "X"}.  Resolve the dominant branch so we don't fall
+    # through to the "no type specified" warning for every optional field.
+    if schema_type is None and "anyOf" in prop_schema:
+        schema_type = _resolve_type_from_any_of(prop_schema)
+
     # Check file convention
     if schema_type == "string" and (prop_name.endswith("_file") or prop_schema.get("x-cli-file") is True):
         return click.Path(exists=True)

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/tests/test_ref_resolver.py

@@ -415,3 +415,26 @@ class TestRefResolverExceptions:
             cur = cur["properties"]["inner"]
             depth_seen += 1
         assert depth_seen == 50
+
+
+class TestOptionalTypeRecovery:
+    """Optional[X] (Pydantic v2 anyOf-null) must recover the scalar `type` so the
+    schema parser does not fall through to a "no type" warning."""
+
+    def test_optional_scalar_recovers_type(self):
+        result = resolve_refs(
+            {
+                "type": "object",
+                "properties": {"name": {"anyOf": [{"type": "string"}, {"type": "null"}]}},
+            }
+        )
+        assert result["properties"]["name"]["type"] == "string"
+
+    def test_optional_list_form_type_recovers_string(self):
+        result = resolve_refs(
+            {
+                "type": "object",
+                "properties": {"name": {"anyOf": [{"type": ["string", "null"]}, {"type": "null"}]}},
+            }
+        )
+        assert result["properties"]["name"]["type"] == "string"

{apcore_cli-0.10.2 → apcore_cli-0.10.4}/tests/test_schema_parser.py

@@ -332,3 +332,35 @@ class TestNoFlagCollision:
         }
         result = schema_to_click_options(schema)
         assert len(result) == 2
+
+
+class TestMapTypeOptional:
+    """Pydantic v2 Optional[X] (anyOf-null) and JSON Schema list-form types."""
+
+    def test_optional_string(self):
+        assert _map_type("name", {"anyOf": [{"type": "string"}, {"type": "null"}]}) is click.STRING
+
+    def test_optional_integer(self):
+        assert _map_type("count", {"anyOf": [{"type": "integer"}, {"type": "null"}]}) is click.INT
+
+    def test_optional_boolean(self):
+        assert _map_type("flag", {"anyOf": [{"type": "boolean"}, {"type": "null"}]}) is _BOOLEAN_FLAG
+
+    def test_optional_model_ref_maps_to_string(self):
+        # Optional[Model] -> anyOf[$ref, null]; $ref treated as object -> STRING
+        assert _map_type("cfg", {"anyOf": [{"$ref": "#/$defs/M"}, {"type": "null"}]}) is click.STRING
+
+    def test_optional_string_file_convention(self):
+        # The *_file convention must still apply through an Optional[str].
+        result = _map_type("data_file", {"anyOf": [{"type": "string"}, {"type": "null"}]})
+        assert isinstance(result, click.Path)
+
+    def test_list_form_type_does_not_raise(self):
+        # JSON Schema {"type": ["string", "null"]} must reduce to STRING, not TypeError.
+        assert _map_type("name", {"type": ["string", "null"]}) is click.STRING
+
+    def test_anyof_only_null_falls_back_to_string(self, caplog):
+        with caplog.at_level(logging.WARNING, logger="apcore_cli.schema_parser"):
+            result = _map_type("field", {"anyOf": [{"type": "null"}]})
+        assert result is click.STRING
+        assert "No type specified" in caplog.text