fix: Detect File fields correctly

Author: Constantinos Symeonides

end_to_end_tests/golden_record/my_test_api_client/api/tests/upload_file_tests_upload_post.py

@@ -5,7 +5,7 @@
 from ...client import Client
 from ...models.body_upload_file_tests_upload_post import BodyUploadFileTestsUploadPost
 from ...models.http_validation_error import HTTPValidationError
-from ...types import UNSET, File, Response, Unset
+from ...types import UNSET, Response, Unset, is_file
 
 
 def _get_kwargs(
@@ -25,7 +25,7 @@ def _get_kwargs(
     files = {}
     data = {}
     for key, value in multipart_data.to_dict().items():
-        if isinstance(value, File):
+        if is_file(value):
             files[key] = value
         else:
             data[key] = value

end_to_end_tests/golden_record/my_test_api_client/types.py

@@ -1,5 +1,6 @@
 """ Contains some shared types for properties """
-from typing import BinaryIO, Generic, MutableMapping, Optional, TextIO, Tuple, TypeVar, Union
+from io import IOBase
+from typing import Any, BinaryIO, Generic, MutableMapping, Optional, TextIO, Tuple, TypeVar, Union
 
 import attr
 
@@ -14,6 +15,10 @@ def __bool__(self) -> bool:
 FileJsonType = Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]
 
 
+def is_file(value: Any) -> bool:
+    return isinstance(value, tuple) and len(value) == 3 and isinstance(value[1], IOBase)
+
+
 @attr.s(auto_attribs=True)
 class File:
     """ Contains information for file uploads """
@@ -40,4 +45,4 @@ class Response(Generic[T]):
     parsed: Optional[T]
 
 
-__all__ = ["File", "Response"]
+__all__ = ["File", "Response", "is_file"]

openapi_python_client/templates/endpoint_module.py.jinja

@@ -4,7 +4,7 @@ import httpx
 from attr import asdict
 
 from ...client import AuthenticatedClient, Client
-from ...types import Response, UNSET{% if endpoint.multipart_body_reference %}, File {% endif %}
+from ...types import Response, UNSET{% if endpoint.multipart_body_reference %}, is_file {% endif %}
 
 {% for relative in endpoint.relative_imports %}
 {{ relative }}
@@ -40,7 +40,7 @@ def _get_kwargs(
     files = {}
     data = {}
     for key, value in multipart_data.to_dict().items():
-         if isinstance(value, File):
+         if is_file(value):
              files[key] = value
          else:
              data[key] = value

openapi_python_client/templates/types.py.jinja

@@ -1,5 +1,6 @@
 """ Contains some shared types for properties """
-from typing import BinaryIO, Generic, MutableMapping, Optional, TextIO, Tuple, TypeVar, Union
+from io import IOBase
+from typing import Any, BinaryIO, Generic, MutableMapping, Optional, TextIO, Tuple, TypeVar, Union
 
 import attr
 
@@ -15,6 +16,10 @@ UNSET: Unset = Unset()
 FileJsonType = Tuple[Optional[str], Union[BinaryIO, TextIO], Optional[str]]
 
 
+def is_file(value: Any) -> bool:
+    return isinstance(value, tuple) and len(value) == 3 and isinstance(value[1], IOBase)
+
+
 @attr.s(auto_attribs=True)
 class File:
     """ Contains information for file uploads """
@@ -41,4 +46,4 @@ class Response(Generic[T]):
     parsed: Optional[T]
 
 
-__all__ = ["File", "Response"]
+__all__ = ["File", "Response", "is_file"]