[multipart] Support bytes[]/content type

packages/autorest.python/autorest/codegen/models/operation.py

@@ -586,7 +586,11 @@ def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
                     file_import.add_submodule_import(
                         relative_path, "_model_base", ImportType.LOCAL
                     )
-                    file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
+                    file_import.add_submodule_import(
+                        f"{relative_path}_vendor",
+                        "has_file",
+                        ImportType.LOCAL,
+                    )
                     file_import.add_submodule_import(
                         f"{relative_path}_vendor",
                         "multipart_file",

packages/autorest.python/autorest/codegen/serializers/builder_serializer.py

@@ -759,8 +759,8 @@ def _serialize_body_parameter(self, builder: OperationType) -> List[str]:
                 f"    _body = handle_multipart_form_data_model({body_param.client_name})",
                 "else:",
                 f"    _body = {body_param.client_name}",
-                "_files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}",
-                "_data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}",
+                "_files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}",
+                "_data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}",
             ]
         retval: List[str] = []
         body_kwarg_name = builder.request_builder.parameters.body_parameter.client_name

packages/autorest.python/autorest/codegen/serializers/general_serializer.py

@@ -131,6 +131,8 @@ def serialize_vendor_file(self, clients: List[Client]) -> str:
                 ImportType.SDKCORE,
             )
         if self.code_model.has_form_data:
+            file_import.add_submodule_import("typing", "List", ImportType.STDLIB)
+            file_import.add_submodule_import("typing", "Tuple", ImportType.STDLIB)
             file_import.add_submodule_import("typing", "Union", ImportType.STDLIB)
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
             file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)

packages/autorest.python/autorest/codegen/templates/vendor.py.jinja2

@@ -66,16 +66,31 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
     return None
 {% endif %}
 {% if code_model.has_form_data %}
+
+# file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)`
+FileType = Union[IOBase, bytes]
+FileTuple = Union[Tuple[str, FileType], Tuple[str, FileType, str]]
+MultiPartFile = Union[IOBase, bytes, FileTuple]
+HandledMultiPartFile = Union[IOBase, FileTuple]
+
 class NamedBytesIO(BytesIO):
     def __init__(self, name: str, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = name
 
-def multipart_file(file: Union[IOBase, bytes]) -> IOBase:
-    if isinstance(file, IOBase):
+def has_file(data: Any) -> bool:
+    return isinstance(data, (IOBase, bytes)) or (isinstance(data, (list, tuple)) and any(isinstance(f, (IOBase, bytes, tuple)) for f in data))
+
+def handle_file(file: Union[IOBase, bytes, FileTuple]) -> HandledMultiPartFile:
+    if isinstance(file, (IOBase, tuple)):
         return file
     return NamedBytesIO("auto-name-" + str(uuid.uuid4()), file)
 
+def multipart_file(file: Union[MultiPartFile, List[MultiPartFile]]) -> Union[HandledMultiPartFile, List[HandledMultiPartFile]]:
+    if isinstance(file, list):
+        return [handle_file(f) for f in file]
+    return handle_file(file)
+
 def multipart_data(data: Any) -> Any:
     if isinstance(data, (list, tuple, dict, Model)):
         return json.dumps(data, cls=SdkJSONEncoder, exclude_readonly=True)
@@ -96,7 +111,7 @@ def handle_multipart_form_data_model(body: Model) -> MutableMapping[str, Any]:
         attr = rest_name_attr.get(rest_name)
         if attr is not None:
             raw_value = getattr(body, attr, None)
-            if isinstance(raw_value, (bytes, IOBase)):
+            if has_file(raw_value):
                 result[rest_name] = raw_value
     return result
 {% endif %}

packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/_vendor.py

@@ -8,7 +8,7 @@
 from io import BytesIO, IOBase
 import json
 import sys
-from typing import Any, Union
+from typing import Any, List, Tuple, Union
 import uuid
 
 from ._model_base import Model, SdkJSONEncoder
@@ -19,18 +19,39 @@
     from typing import MutableMapping  # type: ignore  # pylint: disable=ungrouped-imports
 
 
+# file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)`
+FileType = Union[IOBase, bytes]
+FileTuple = Union[Tuple[str, FileType], Tuple[str, FileType, str]]
+MultiPartFile = Union[IOBase, bytes, FileTuple]
+HandledMultiPartFile = Union[IOBase, FileTuple]
+
+
 class NamedBytesIO(BytesIO):
     def __init__(self, name: str, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.name = name
 
 
-def multipart_file(file: Union[IOBase, bytes]) -> IOBase:
-    if isinstance(file, IOBase):
+def has_file(data: Any) -> bool:
+    return isinstance(data, (IOBase, bytes)) or (
+        isinstance(data, (list, tuple)) and any(isinstance(f, (IOBase, bytes, tuple)) for f in data)
+    )
+
+
+def handle_file(file: Union[IOBase, bytes, FileTuple]) -> HandledMultiPartFile:
+    if isinstance(file, (IOBase, tuple)):
         return file
     return NamedBytesIO("auto-name-" + str(uuid.uuid4()), file)
 
 
+def multipart_file(
+    file: Union[MultiPartFile, List[MultiPartFile]]
+) -> Union[HandledMultiPartFile, List[HandledMultiPartFile]]:
+    if isinstance(file, list):
+        return [handle_file(f) for f in file]
+    return handle_file(file)
+
+
 def multipart_data(data: Any) -> Any:
     if isinstance(data, (list, tuple, dict, Model)):
         return json.dumps(data, cls=SdkJSONEncoder, exclude_readonly=True)
@@ -52,6 +73,6 @@ def handle_multipart_form_data_model(body: Model) -> MutableMapping[str, Any]:
         attr = rest_name_attr.get(rest_name)
         if attr is not None:
             raw_value = getattr(body, attr, None)
-            if isinstance(raw_value, (bytes, IOBase)):
+            if has_file(raw_value):
                 result[rest_name] = raw_value
     return result

packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/aio/operations/_operations.py

@@ -6,7 +6,6 @@
 # Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from io import IOBase
 import sys
 from typing import Any, Callable, Dict, Optional, TypeVar, Union, overload
 
@@ -23,7 +22,7 @@
 from azure.core.tracing.decorator_async import distributed_trace_async
 
 from ... import _model_base, models as _models
-from ..._vendor import handle_multipart_form_data_model, multipart_data, multipart_file
+from ..._vendor import handle_multipart_form_data_model, has_file, multipart_data, multipart_file
 from ...operations._operations import (
     build_form_data_basic_request,
     build_form_data_binary_array_parts_request,
@@ -130,8 +129,8 @@ async def basic(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_basic_request(
             data=_data,
@@ -250,8 +249,8 @@ async def complex(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_complex_request(
             data=_data,
@@ -352,8 +351,8 @@ async def json_part(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_json_part_request(
             data=_data,
@@ -456,8 +455,8 @@ async def binary_array_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_binary_array_parts_request(
             data=_data,
@@ -564,8 +563,8 @@ async def json_array_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_json_array_parts_request(
             data=_data,
@@ -664,8 +663,8 @@ async def multi_binary_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_multi_binary_parts_request(
             data=_data,

packages/typespec-python/test/azure/generated/payload-multipart/payload/multipart/operations/_operations.py

@@ -6,7 +6,6 @@
 # Code generated by Microsoft (R) Python Code Generator.
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
-from io import IOBase
 import sys
 from typing import Any, Callable, Dict, Optional, TypeVar, Union, overload
 
@@ -25,7 +24,7 @@
 
 from .. import _model_base, models as _models
 from .._serialization import Serializer
-from .._vendor import handle_multipart_form_data_model, multipart_data, multipart_file
+from .._vendor import handle_multipart_form_data_model, has_file, multipart_data, multipart_file
 
 if sys.version_info >= (3, 9):
     from collections.abc import MutableMapping
@@ -181,8 +180,8 @@ def basic(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_basic_request(
             data=_data,
@@ -301,8 +300,8 @@ def complex(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_complex_request(
             data=_data,
@@ -403,8 +402,8 @@ def json_part(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_json_part_request(
             data=_data,
@@ -505,8 +504,8 @@ def binary_array_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_binary_array_parts_request(
             data=_data,
@@ -611,8 +610,8 @@ def json_array_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_json_array_parts_request(
             data=_data,
@@ -709,8 +708,8 @@ def multi_binary_parts(  # pylint: disable=inconsistent-return-statements
             _body = handle_multipart_form_data_model(body)
         else:
             _body = body
-        _files = {k: multipart_file(v) for k, v in _body.items() if isinstance(v, (IOBase, bytes))}
-        _data = {k: multipart_data(v) for k, v in _body.items() if not isinstance(v, (IOBase, bytes))}
+        _files = {k: multipart_file(v) for k, v in _body.items() if has_file(v)}
+        _data = {k: multipart_data(v) for k, v in _body.items() if not has_file(v)}
 
         _request = build_form_data_multi_binary_parts_request(
             data=_data,