x

Author: fopina

.gitignore

@@ -103,7 +103,7 @@ celerybeat.pid
 
 # Environments
 .env
-.venv
+.venv*
 env/
 /venv/
 ENV/

Makefile

@@ -6,6 +6,10 @@ lint-check:
 	uv run ruff format --diff
 	uv run ruff check
 
+test39:
+	VIRTUAL_ENV=.venv39 uv run --active --python 3.9 --extra cli pytest --cov
+
+
 test:
 	if [ -n "$(GITHUB_RUN_ID)" ]; then \
 		uv run pytest --cov --cov-report=xml --junitxml=junit.xml -o junit_family=legacy; \

defectdojo_api_generated/cli/commands/apis.py

@@ -179,7 +179,7 @@ def _get_click_type(
 
         if origin is Union or origin is getattr(types, 'UnionType', None):
             if _is_file_upload_union(current):
-                return click.Path(exists=True, dir_okay=False, path_type=Path), multiple, None
+                return Path, multiple, None
 
             union_args = [arg for arg in get_args(current) if arg is not type(None)]
             if not union_args:
@@ -197,11 +197,8 @@ def _get_click_type(
 
 
 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
 
 
@@ -247,9 +244,7 @@ def _build_model_field_command(
     required_fields = [item for item in field_definitions if item[1].is_required()]
     optional_fields = [item for item in field_definitions if not item[1].is_required()]
 
-    def _convert_value(
-        name: str, value: Any, converter: Optional[type[BaseModel]], *, multiple: bool
-    ):
+    def _convert_value(name: str, value: Any, converter: Optional[type[BaseModel]], *, multiple: bool):
         if name == 'file':
             if multiple:
                 return tuple(_coerce_file_upload_value(item) for item in value)
@@ -481,9 +476,7 @@ def make_api_command(api_class: type, command_name: str, target_method: str, *,
     required_parameters = [item for item in command_parameters if item[1].default is inspect.Signature.empty]
     optional_parameters = [item for item in command_parameters if item[1].default is not inspect.Signature.empty]
 
-    def _convert_value(
-        name: str, value: Any, converter: Optional[type[BaseModel]], *, multiple: bool
-    ):
+    def _convert_value(name: str, value: Any, converter: Optional[type[BaseModel]], *, multiple: bool):
         if name == 'file':
             if multiple:
                 return tuple(_coerce_file_upload_value(item) for item in value)

tests/unit/test_cli.py

@@ -3,11 +3,11 @@
 import unittest
 from importlib.metadata import version
 from pathlib import Path
-from typing import Any, Optional, Tuple, Union
+from typing import Optional
 from unittest import mock
 
 from click.testing import CliRunner
-from pydantic import BaseModel, Field
+from pydantic import Field
 from typing_extensions import Annotated
 
 from defectdojo_api_generated.api.findings_api import FindingsApi
@@ -287,40 +287,6 @@ 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()