Refine CLI annotation mapping for Python 3.9

Author: fopina-ci

defectdojo_api_generated/cli/commands/apis.py

@@ -197,10 +197,11 @@ def _get_click_type(
 
 
 def _get_class_annotation(click_type: Any) -> type:
-    # Classyclick inspects annotations at import time and expects a runtime type,
-    # not typing.Any or a ParamType instance such as click.Path(...).
-    if click_type is Any or isinstance(click_type, click.ParamType):
+    # Classyclick inspects annotations at import time and expects a runtime type.
+    if click_type is Any:
         return str
+    if isinstance(click_type, click.Path):
+        return Path
     return click_type
 
 

tests/unit/test_cli.py

@@ -3,7 +3,7 @@
 import unittest
 from importlib.metadata import version
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Optional, Tuple, Union
 from unittest import mock
 
 from click.testing import CliRunner
@@ -303,6 +303,24 @@ def create(self, any_request: AnyRequest):
 
         self.assertEqual(option.type.name, 'text')
 
+    def test_request_model_file_fields_annotate_as_path(self):
+        class FileRequest(BaseModel):
+            file: Optional[Union[bytes, str, Tuple[str, bytes]]] = None
+
+        class FileRequestApi:
+            def __init__(self, api_client):
+                self.api_client = api_client
+
+            def create(self, file_request: FileRequest):
+                return file_request.model_dump()
+
+        command_class = make_api_group('file_request_api', FileRequestApi)
+        command = command_class.click
+        option = next(param for param in command.params if getattr(param, 'name', None) == 'file')
+
+        self.assertIs(command_class.__annotations__['file'], Path)
+        self.assertEqual(option.type.name, 'file')
+
     def test_bad_request_exception_uses_detail_message(self):
         runner = CliRunner()