fix: address PR review comments

Signed-off-by: Matthew Grigsby <38010437+MatthewGrigsby@users.noreply.github.com>

Author: MatthewGrigsby

cforge/common/prompting.py

@@ -108,22 +108,6 @@ def _prompt_string_value(
     return typer.prompt("", type=str, default=default, show_default=show_default)
 
 
-def _unwrap_optional_annotation(annotation: Any) -> Any:
-    """Unwrap Optional[T] and Annotated[Optional[T], ...] into T."""
-    origin = get_origin(annotation)
-    if origin is Annotated:
-        args = get_args(annotation)
-        if args:
-            return _unwrap_optional_annotation(args[0])
-
-    args = get_args(annotation)
-    if origin is Union and type(None) in args:
-        non_none_args = [arg for arg in args if arg is not type(None)]
-        if non_none_args:
-            return non_none_args[0]
-    return annotation
-
-
 def _validate_pydantic_schema_dict_key_types(schema_class: type[BaseModel]) -> None:
     """Reject dict fields with non-string keys (JSON object keys are always strings)."""
     visited_models: set[type[BaseModel]] = set()

pyproject.toml

@@ -47,7 +47,7 @@ maintainers = [
 # ----------------------------------------------------------------
 dependencies = [
     "rich>=13.9.4",
-    "typer>=0.23.1",
+    "typer>=0.20.0",
     "mcp-contextforge-gateway==1.0.0b2",
     "cryptography>=44.0.0",
     "jsonschema>=4.23.0",

tests/commands/resources/test_tools.py

@@ -156,11 +156,16 @@ def test_tools_update_interactive(self, mock_console) -> None:
         """Test tools update interactive mode."""
         mock_result = {"id": "tool-1", "name": "updated"}
 
-        with patch("cforge.commands.resources.tools.get_console", return_value=mock_console):
-            with patch("cforge.commands.resources.tools.prompt_for_schema", return_value={"description": "updated"}):
-                with patch("cforge.commands.resources.tools.make_authenticated_request", return_value=mock_result):
-                    with patch("cforge.commands.resources.tools.print_json"):
-                        tools_update(tool_id="tool-1", data_file=None)
+        with patch_functions(
+            "cforge.commands.resources.tools",
+            get_console=mock_console,
+            prompt_for_schema={"return_value": {"description": "updated"}},
+            make_authenticated_request={"return_value": mock_result},
+            print_json=None,
+        ) as mocks:
+            tools_update(tool_id="tool-1", data_file=None)
+            mocks.make_authenticated_request.assert_called_once_with("PUT", "/tools/tool-1", json_data={"description": "updated"})
+            mocks.print_json.assert_called_once()
 
     def test_tools_delete_with_confirmation(self, mock_console) -> None:
         """Test tools delete with confirmation."""

tests/common/test_prompting.py

@@ -3,7 +3,7 @@
 
 # Standard
 from datetime import datetime
-from typing import Annotated, Any, Dict, List, Optional, Union
+from typing import Annotated, Any, Dict, List, Optional
 from unittest.mock import patch
 
 # Third-Party
@@ -23,7 +23,6 @@
     _resolve_schema_type,
     _schema_contains_ref,
     _strip_schema_internal_properties,
-    _unwrap_optional_annotation,
 )
 
 
@@ -1766,23 +1765,6 @@ def test_resolve_ref_schema_non_dict_input_returns_empty_schema(self) -> None:
         result = _resolve_ref_schema({}, "not-a-dict")  # type: ignore[arg-type]
         assert result == {}
 
-    def test_unwrap_optional_annotation_union_only_none_returns_annotation(self) -> None:
-        """Test Optional unwrapping keeps annotation when union has no non-None members."""
-        marker: object = object()
-        with patch("cforge.common.prompting.get_origin", return_value=Union), patch("cforge.common.prompting.get_args", return_value=(type(None),)):
-            assert _unwrap_optional_annotation(marker) is marker
-
-    def test_unwrap_optional_annotation_annotated_without_args_returns_annotation(self) -> None:
-        """Annotated branches should handle empty arg tuples defensively."""
-        marker: object = object()
-        with patch("cforge.common.prompting.get_origin", return_value=Annotated), patch("cforge.common.prompting.get_args", return_value=()):
-            assert _unwrap_optional_annotation(marker) is marker
-
-    def test_unwrap_optional_annotation_annotated_optional_unwraps(self) -> None:
-        """Annotated optional annotations should unwrap to the inner type."""
-        annotation = Annotated[Optional[int], "meta"]
-        assert _unwrap_optional_annotation(annotation) is int
-
     def test_resolve_schema_type_any_of_all_null_returns_null(self) -> None:
         """Test schema type resolver returns null when all anyOf variants are null."""
         schema = {"anyOf": [{"type": "null"}, {"type": "null"}]}