Fix CLI type annotations on Python 3.9

Author: fopina-ci

defectdojo_api_generated/cli/commands/apis.py

@@ -196,6 +196,15 @@ def _get_click_type(
         raise TypeError(f'Unsupported CLI parameter type{param_name}: {current!r}. Only primitive types are supported.')
 
 
+def _get_class_annotation(click_type: Any) -> type:
+    # 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
+
+
 def _iter_command_parameters(api_class: type, target_method: str):
     signature = inspect.signature(getattr(api_class, target_method))
 
@@ -286,7 +295,7 @@ def __call__(self):
     }
 
     for field_name, field, click_type, multiple, _converter in required_fields:
-        namespace['__annotations__'][field_name] = click_type
+        namespace['__annotations__'][field_name] = _get_class_annotation(click_type)
         option_kwargs = {
             'help': _get_model_field_help(field),
             'required': True,
@@ -306,7 +315,7 @@ def __call__(self):
     namespace['__annotations__']['jq'] = str
 
     for field_name, field, click_type, multiple, _converter in optional_fields:
-        namespace['__annotations__'][field_name] = click_type
+        namespace['__annotations__'][field_name] = _get_class_annotation(click_type)
         option_kwargs = {
             'help': _get_model_field_help(field),
             'default': field.default,
@@ -519,7 +528,7 @@ def __call__(self):
 
     for name, parameter, click_type, multiple, _converter in required_parameters:
         # required request-body models are passed as JSON strings and converted before the API call
-        namespace['__annotations__'][name] = click_type
+        namespace['__annotations__'][name] = _get_class_annotation(click_type)
         option_kwargs = {
             'help': _get_help_from_annotation(parameter.annotation),
             'required': True,
@@ -539,7 +548,7 @@ def __call__(self):
     namespace['__annotations__']['jq'] = str
 
     for name, parameter, click_type, multiple, _converter in optional_parameters:
-        namespace['__annotations__'][name] = click_type
+        namespace['__annotations__'][name] = _get_class_annotation(click_type)
         option_kwargs = {
             'help': _get_help_from_annotation(parameter.annotation),
             'default': parameter.default,

tests/unit/test_cli.py

@@ -3,11 +3,11 @@
 import unittest
 from importlib.metadata import version
 from pathlib import Path
-from typing import Optional
+from typing import Any, Optional, Tuple, Union
 from unittest import mock
 
 from click.testing import CliRunner
-from pydantic import Field
+from pydantic import BaseModel, Field
 from typing_extensions import Annotated
 
 from defectdojo_api_generated.api.findings_api import FindingsApi
@@ -287,6 +287,40 @@ def test_required_request_body_parameters_become_field_flags(self):
         payload = json.loads(run_result.output)
         self.assertEqual(payload['name'], 'Example')
 
+    def test_request_model_fields_typed_as_any_register_without_import_errors(self):
+        class AnyRequest(BaseModel):
+            payload: Any = None
+
+        class AnyRequestApi:
+            def __init__(self, api_client):
+                self.api_client = api_client
+
+            def create(self, any_request: AnyRequest):
+                return any_request.model_dump()
+
+        command = make_api_group('any_request_api', AnyRequestApi).click
+        option = next(param for param in command.params if getattr(param, 'name', None) == 'payload')
+
+        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()