@autorest/python 6.12.3 → 6.13.0

package/autorest/_utils.py

@@ -73,7 +73,7 @@ def parse_args(
         dest="debug",
         help="Debug mode",
         required=False,
-        action="store_true",
+        action="store",
     )
     args, unknown_args = parser.parse_known_args()
 

package/autorest/codegen/models/__init__.py

@@ -43,7 +43,6 @@ from .parameter import (
     ParameterLocation,
     BodyParameter,
     ParameterDelimeter,
-    MultipartBodyParameter,
     ClientParameter,
     ConfigParameter,
 )
@@ -115,7 +114,6 @@ __all__ = [
     "BodyParameter",
     "RequestBuilderBodyParameter",
     "ParameterDelimeter",
-    "MultipartBodyParameter",
     "CredentialType",
     "ClientParameter",
     "ConfigParameter",
@@ -135,9 +133,9 @@ TYPE_TO_OBJECT = {
     "binary": BinaryType,
     "any": AnyType,
     "datetime": DatetimeType,
-    "time": TimeType,
+    "plainTime": TimeType,
     "duration": DurationType,
-    "date": DateType,
+    "plainDate": DateType,
     "bytes": ByteArraySchema,
     "boolean": BooleanType,
     "combined": CombinedType,

package/autorest/codegen/models/base.py

@@ -186,3 +186,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
     @property
     def type_description(self) -> str:
         return self.type_annotation()
+
+    @property
+    def is_form_data(self) -> bool:
+        return False

package/autorest/codegen/models/base_builder.py

@@ -4,7 +4,17 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import List, Dict, Any, Generic, TypeVar, Optional, Union, TYPE_CHECKING
+from typing import (
+    List,
+    Dict,
+    Any,
+    Generic,
+    TypeVar,
+    Optional,
+    Union,
+    TYPE_CHECKING,
+    cast,
+)
 from abc import abstractmethod
 
 from .base import BaseModel
@@ -28,11 +38,16 @@ if TYPE_CHECKING:
     from .operation import Operation
     from .request_builder import RequestBuilder
 
+
+OverloadListType = TypeVar(
+    "OverloadListType", bound=Union[List["Operation"], List["RequestBuilder"]]
+)
+
 _LOGGER = logging.getLogger(__name__)
 
 
 class BaseBuilder(
-    Generic[ParameterListType], BaseModel
+    Generic[ParameterListType, OverloadListType], BaseModel
 ):  # pylint: disable=too-many-instance-attributes
     """Base class for Operations and Request Builders"""
 
@@ -44,16 +59,14 @@ class BaseBuilder(
         name: str,
         parameters: ParameterListType,
         *,
-        overloads=None,
+        overloads: Optional[OverloadListType] = None,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
         self.client = client
         self.name = name
         self._description: str = yaml_data.get("description", "")
         self.parameters = parameters
-        self.overloads: Union[List["Operation"], List["RequestBuilder"]] = (
-            overloads or []
-        )
+        self.overloads = overloads or cast(OverloadListType, [])
         self._summary: str = yaml_data.get("summary", "")
         self.want_tracing: bool = yaml_data.get("wantTracing", True)
         self.group_name: str = yaml_data[

package/autorest/codegen/models/code_model.py

@@ -11,7 +11,6 @@ from .model_type import ModelType
 from .combined_type import CombinedType
 from .client import Client
 from .request_builder import RequestBuilder, OverloadedRequestBuilder
-from .constant_type import ConstantType
 
 
 def _is_legacy(options) -> bool:
@@ -279,25 +278,6 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
     @property
     def need_typing_extensions(self) -> bool:
-        if self.options["models_mode"] and any(
-            isinstance(p.type, ConstantType)
-            and (p.optional or self.options["models_mode"] == "dpg")
-            for model in self.model_types
-            for p in model.properties
-        ):
-            return True
-        if any(
-            isinstance(parameter.type, ConstantType)
-            for client in self.clients
-            for og in client.operation_groups
-            for op in og.operations
-            for parameter in op.parameters.method
-        ):
-            return True
-        if any(
-            isinstance(parameter.type, ConstantType)
-            for client in self.clients
-            for parameter in client.config.parameters.kwargs_to_pop
-        ):
+        if self.options["models_mode"] == "dpg":
             return True
         return False

package/autorest/codegen/models/combined_type.py

@@ -79,6 +79,10 @@ class CombinedType(BaseType):
         pattern = re.compile(r"Union\[.*\]")
         return f'Union[{", ".join(map(lambda x: x[6: -1] if pattern.match(x) else x, inside_types))}]'
 
+    @property
+    def is_form_data(self) -> bool:
+        return any(t.is_form_data for t in self.types)
+
     def get_json_template_representation(
         self,
         *,

package/autorest/codegen/models/model_type.py

@@ -76,6 +76,10 @@ class ModelType(  # pylint: disable=abstract-method
         self.snake_case_name: str = self.yaml_data["snakeCaseName"]
         self.page_result_model: bool = self.yaml_data.get("pageResultModel", False)
 
+    @property
+    def is_form_data(self) -> bool:
+        return any(p.is_multipart_file_input for p in self.properties)
+
     @property
     def is_xml(self) -> bool:
         return self.yaml_data.get("isXml", False)
@@ -314,6 +318,15 @@ class GeneratedModelType(ModelType):  # pylint: disable=abstract-method
                 if kwargs.get("model_typing")
                 else TypingSection.REGULAR,
             )
+            if self.is_form_data:
+                file_import.add_submodule_import(
+                    relative_path,
+                    "_model_base",
+                    ImportType.LOCAL,
+                    typing_section=TypingSection.TYPING
+                    if kwargs.get("model_typing")
+                    else TypingSection.REGULAR,
+                )
         return file_import
 
 

package/autorest/codegen/models/operation.py

@@ -14,6 +14,7 @@ from typing import (
     Generic,
     TypeVar,
     cast,
+    Sequence,
 )
 
 from .request_builder_parameter import RequestBuilderParameter
@@ -30,7 +31,6 @@ from .response import (
 )
 from .parameter import (
     BodyParameter,
-    MultipartBodyParameter,
     Parameter,
     ParameterLocation,
 )
@@ -55,7 +55,7 @@ def is_internal(target: Optional[BaseType]) -> bool:
 
 
 class OperationBase(  # pylint: disable=too-many-public-methods
-    Generic[ResponseType], BaseBuilder[ParameterList]
+    Generic[ResponseType], BaseBuilder[ParameterList, List["Operation"]]
 ):
     def __init__(
         self,
@@ -290,7 +290,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods
                 Parameter,
                 RequestBuilderParameter,
                 BodyParameter,
-                MultipartBodyParameter,
             ]
         ],
         location: ParameterLocation,
@@ -492,7 +491,7 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             ) from exc
 
     @property
-    def success_status_codes(self) -> List[Union[str, int]]:
+    def success_status_codes(self) -> Sequence[Union[str, int]]:
         """The list of all successfull status code."""
         return sorted(
             [code for response in self.responses for code in response.status_codes]
@@ -575,33 +574,13 @@ class Operation(OperationBase[Response]):
         relative_path = "..." if async_mode else ".."
         if self.code_model.options["models_mode"] == "dpg":
             if self.parameters.has_body:
-                if not self.parameters.body_parameter.is_form_data:
+                if not self.has_form_data_body:
                     file_import.add_submodule_import(
                         f"{relative_path}_model_base",
                         "SdkJSONEncoder",
                         ImportType.LOCAL,
                     )
                     file_import.add_import("json", ImportType.STDLIB)
-                else:
-                    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",
-                        "multipart_file",
-                        ImportType.LOCAL,
-                    )
-                    file_import.add_submodule_import(
-                        f"{relative_path}_vendor",
-                        "multipart_data",
-                        ImportType.LOCAL,
-                    )
-                    file_import.add_submodule_import(
-                        f"{relative_path}_vendor",
-                        "handle_multipart_form_data_model",
-                        ImportType.LOCAL,
-                    )
             if self.default_error_deserialization or any(
                 r.type for r in self.responses
             ):

package/autorest/codegen/models/parameter.py

@@ -14,7 +14,6 @@ from typing import (
     Optional,
     TypeVar,
     Union,
-    Generic,
 )
 
 from .imports import FileImport, ImportType, TypingSection
@@ -243,9 +242,18 @@ class _ParameterBase(
 class BodyParameter(_ParameterBase):
     """Body parameter."""
 
+    @property
+    def entries(self) -> List["BodyParameter"]:
+        return [
+            BodyParameter.from_yaml(e, self.code_model)
+            for e in self.yaml_data.get("entries", [])
+        ]
+
     @property
     def is_form_data(self) -> bool:
-        return self.default_content_type == "multipart/form-data"
+        # hacky, but rn in legacy, there is no formdata model type, it's just a dict
+        # with all of the entries splatted out
+        return self.type.is_form_data or bool(self.entries)
 
     @property
     def is_partial_body(self) -> bool:
@@ -262,6 +270,10 @@ class BodyParameter(_ParameterBase):
 
     @property
     def in_method_signature(self) -> bool:
+        if self.yaml_data.get("entries"):
+            # Right now, only legacy generates with multipart bodies and entries
+            # and legacy generates with the multipart body arguments splatted out
+            return False
         return not (self.flattened or self.grouped_by)
 
     @property
@@ -278,6 +290,18 @@ class BodyParameter(_ParameterBase):
             return self.type.target_model_subtype((JSONModelType,)) is not None
         return isinstance(self.type, JSONModelType)
 
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
+        file_import = super().imports(async_mode, **kwargs)
+        if self.is_form_data:
+            relative_path = "..." if async_mode else ".."
+            file_import.add_submodule_import(
+                f"{relative_path}_vendor",
+                "prepare_multipart_form_data",
+                ImportType.LOCAL,
+            )
+            file_import.add_submodule_import("typing", "List", ImportType.STDLIB)
+        return file_import
+
     @classmethod
     def from_yaml(
         cls, yaml_data: Dict[str, Any], code_model: "CodeModel"
@@ -294,46 +318,6 @@ EntryBodyParameterType = TypeVar(
 )
 
 
-class _MultipartBodyParameter(Generic[EntryBodyParameterType], BodyParameter):
-    """Base class for MultipartBodyParameter and RequestBuilderMultipartBodyParameter"""
-
-    def __init__(
-        self,
-        yaml_data: Dict[str, Any],
-        code_model: "CodeModel",
-        type: BaseType,
-        entries: List[EntryBodyParameterType],
-    ) -> None:
-        super().__init__(yaml_data, code_model, type)
-        self.entries = entries
-
-    @property
-    def in_method_signature(self) -> bool:
-        # Right now, only legacy generates with multipart bodies
-        # and legacy generates with the multipart body arguments splatted out
-        return False
-
-
-class MultipartBodyParameter(
-    _MultipartBodyParameter[BodyParameter]  # pylint: disable=unsubscriptable-object
-):
-    """Multipart body parameter for Operation. Used for files and data input."""
-
-    @classmethod
-    def from_yaml(
-        cls, yaml_data: Dict[str, Any], code_model: "CodeModel"
-    ) -> "MultipartBodyParameter":
-        return cls(
-            yaml_data=yaml_data,
-            code_model=code_model,
-            type=code_model.lookup_type(id(yaml_data["type"])),
-            entries=[
-                BodyParameter.from_yaml(entry, code_model)
-                for entry in yaml_data["entries"]
-            ],
-        )
-
-
 class Parameter(_ParameterBase):
     """Basic Parameter class"""
 
@@ -455,12 +439,3 @@ class ConfigParameter(Parameter):
         if self.constant:
             return ParameterMethodLocation.KWARG
         return ParameterMethodLocation.POSITIONAL
-
-
-def get_body_parameter(
-    yaml_data: Dict[str, Any], code_model: "CodeModel"
-) -> Union[BodyParameter, MultipartBodyParameter]:
-    """Creates a regular body parameter or Multipart body parameter"""
-    if yaml_data.get("entries"):
-        return MultipartBodyParameter.from_yaml(yaml_data, code_model)
-    return BodyParameter.from_yaml(yaml_data, code_model)

package/autorest/codegen/models/parameter_list.py

@@ -22,19 +22,15 @@ from enum import Enum
 
 from .request_builder_parameter import (
     RequestBuilderBodyParameter,
-    RequestBuilderMultipartBodyParameter,
     RequestBuilderParameter,
-    get_request_body_parameter,
 )
 from .parameter import (
-    MultipartBodyParameter,
     ParameterLocation,
     BodyParameter,
     Parameter,
     ParameterMethodLocation,
     ClientParameter,
     ConfigParameter,
-    get_body_parameter,
 )
 
 ParameterType = TypeVar(
@@ -43,10 +39,6 @@ ParameterType = TypeVar(
 BodyParameterType = TypeVar(
     "BodyParameterType", bound=Union[BodyParameter, RequestBuilderBodyParameter]
 )
-RequestBuilderBodyParameterType = Union[
-    RequestBuilderBodyParameter, RequestBuilderMultipartBodyParameter
-]
-
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
@@ -314,7 +306,7 @@ class _ParameterListBase(
 
 class _ParameterList(
     _ParameterListBase[  # pylint: disable=unsubscriptable-object
-        Parameter, Union[MultipartBodyParameter, BodyParameter]
+        Parameter, BodyParameter
     ]
 ):
     """Base Parameter class for the two operation ParameterLists"""
@@ -325,11 +317,9 @@ class _ParameterList(
 
     @staticmethod
     def body_parameter_creator() -> (
-        Callable[
-            [Dict[str, Any], "CodeModel"], Union[MultipartBodyParameter, BodyParameter]
-        ]
+        Callable[[Dict[str, Any], "CodeModel"], BodyParameter]
     ):
-        return get_body_parameter
+        return BodyParameter.from_yaml
 
     @property
     def implementation(self) -> str:
@@ -348,7 +338,7 @@ class ParameterList(_ParameterList):
 
 class _RequestBuilderParameterList(
     _ParameterListBase[  # pylint: disable=unsubscriptable-object
-        RequestBuilderParameter, RequestBuilderBodyParameterType
+        RequestBuilderParameter, RequestBuilderBodyParameter
     ]
 ):
     """_RequestBuilderParameterList is base parameter list for RequestBuilder classes"""
@@ -361,9 +351,9 @@ class _RequestBuilderParameterList(
 
     @staticmethod
     def body_parameter_creator() -> (
-        Callable[[Dict[str, Any], "CodeModel"], RequestBuilderBodyParameterType]
+        Callable[[Dict[str, Any], "CodeModel"], RequestBuilderBodyParameter]
     ):
-        return get_request_body_parameter
+        return RequestBuilderBodyParameter.from_yaml
 
     @property
     def implementation(self) -> str:
@@ -372,14 +362,14 @@ class _RequestBuilderParameterList(
     @property
     def unsorted_method_params(
         self,
-    ) -> List[Union[RequestBuilderParameter, RequestBuilderBodyParameterType]]:
+    ) -> List[Union[RequestBuilderParameter, RequestBuilderBodyParameter]]:
         # don't have access to client params in request builder
         retval = [
             p
             for p in super().unsorted_method_params
             if not (
                 p.location == ParameterLocation.BODY
-                and cast(RequestBuilderBodyParameterType, p).is_partial_body
+                and cast(RequestBuilderBodyParameter, p).is_partial_body
             )
         ]
         retval.extend(
@@ -400,7 +390,7 @@ class _RequestBuilderParameterList(
     @property
     def constant(
         self,
-    ) -> List[Union[RequestBuilderParameter, RequestBuilderBodyParameterType]]:
+    ) -> List[Union[RequestBuilderParameter, RequestBuilderBodyParameter]]:
         """All constant parameters"""
         return [
             p for p in super().constant if p.location != ParameterLocation.ENDPOINT_PATH

package/autorest/codegen/models/property.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, Optional, TYPE_CHECKING, List
+from typing import Any, Dict, Optional, TYPE_CHECKING, List, cast
 
 from .base import BaseModel
 from .constant_type import ConstantType
@@ -37,6 +37,9 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         if self.client_default_value is None:
             self.client_default_value = self.type.client_default_value
         self.flattened_names: List[str] = yaml_data.get("flattenedNames", [])
+        self.is_multipart_file_input: bool = yaml_data.get(
+            "isMultipartFileInput", False
+        )
 
     @property
     def pylint_disable(self) -> str:
@@ -93,18 +96,31 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
     def is_enum_discriminator(self) -> bool:
         return self.is_discriminator and self.type.type == "enum"
 
-    def type_annotation(self, *, is_operation_file: bool = False) -> str:
+    @property
+    def is_base_discriminator(self) -> bool:
+        """If this discriminator is on the base model for polymorphic inheritance"""
         if self.is_enum_discriminator:
-            # here we are the enum discriminator property on the base model
-            return "Literal[None]"
+            return self.is_polymorphic and self.client_default_value is None
+        return (
+            self.is_discriminator
+            and self.is_polymorphic
+            and cast(ConstantType, self.type).value is None
+        )
+
+    def type_annotation(self, *, is_operation_file: bool = False) -> str:
+        types_type_annotation = self.type.type_annotation(
+            is_operation_file=is_operation_file
+        )
+        if self.is_multipart_file_input:
+            # we only support FileType or list of FileType
+            types_type_annotation = types_type_annotation.replace("bytes", "FileType")
+        if self.is_base_discriminator:
+            return "str"
         if self.optional and self.client_default_value is None:
-            return f"Optional[{self.type.type_annotation(is_operation_file=is_operation_file)}]"
-        return self.type.type_annotation(is_operation_file=is_operation_file)
+            return f"Optional[{types_type_annotation}]"
+        return types_type_annotation
 
     def get_declaration(self, value: Any = None) -> Any:
-        if self.is_enum_discriminator:
-            # here we are the enum discriminator property on the base model
-            return None
         return self.type.get_declaration(value)
 
     def get_json_template_representation(
@@ -114,6 +130,8 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
         client_default_value_declaration: Optional[str] = None,
         description: Optional[str] = None,
     ) -> Any:
+        if self.is_multipart_file_input:
+            return "[filetype]" if self.type.type == "list" else "filetype"
         if self.client_default_value:
             client_default_value_declaration = self.get_declaration(
                 self.client_default_value
@@ -161,6 +179,8 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
                 "rest_discriminator" if self.is_discriminator else "rest_field",
                 ImportType.LOCAL,
             )
+        if self.is_multipart_file_input:
+            file_import.add_submodule_import(".._vendor", "FileType", ImportType.LOCAL)
         return file_import
 
     @classmethod

package/autorest/codegen/models/request_builder.py

@@ -33,7 +33,7 @@ ParameterListType = TypeVar(
 )
 
 
-class RequestBuilderBase(BaseBuilder[ParameterListType]):
+class RequestBuilderBase(BaseBuilder[ParameterListType, List["RequestBuilder"]]):
     def __init__(
         self,
         yaml_data: Dict[str, Any],

package/autorest/codegen/models/request_builder_parameter.py

@@ -3,13 +3,12 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import TYPE_CHECKING, Any, Dict, Union
+from typing import TYPE_CHECKING, Any, Dict
 from .parameter import (
     ParameterLocation,
     ParameterMethodLocation,
     Parameter,
     BodyParameter,
-    _MultipartBodyParameter,
 )
 from .base import BaseType
 from .primitive_types import BinaryType, StringType
@@ -67,32 +66,6 @@ class RequestBuilderBodyParameter(BodyParameter):
         return "_content"
 
 
-class RequestBuilderMultipartBodyParameter(
-    _MultipartBodyParameter[  # pylint: disable=unsubscriptable-object
-        RequestBuilderBodyParameter
-    ]
-):
-    """Multipart body parameter for Request BUilders"""
-
-    @property
-    def name_in_high_level_operation(self) -> str:
-        return f"_{self.client_name}"
-
-    @classmethod
-    def from_yaml(
-        cls, yaml_data: Dict[str, Any], code_model: "CodeModel"
-    ) -> "RequestBuilderMultipartBodyParameter":
-        return cls(
-            yaml_data=yaml_data,
-            code_model=code_model,
-            type=code_model.lookup_type(id(yaml_data["type"])),
-            entries=[
-                RequestBuilderBodyParameter.from_yaml(entry, code_model)
-                for entry in yaml_data["entries"]
-            ],
-        )
-
-
 class RequestBuilderParameter(Parameter):
     """Basic RequestBuilder Parameter."""
 
@@ -149,12 +122,3 @@ class RequestBuilderParameter(Parameter):
         if self.implementation == "Client":
             return f"self._config.{self.client_name}"
         return self.client_name
-
-
-def get_request_body_parameter(
-    yaml_data: Dict[str, Any], code_model: "CodeModel"
-) -> Union[RequestBuilderBodyParameter, RequestBuilderMultipartBodyParameter]:
-    """Get body parameter for a request builder"""
-    if yaml_data.get("entries"):
-        return RequestBuilderMultipartBodyParameter.from_yaml(yaml_data, code_model)
-    return RequestBuilderBodyParameter.from_yaml(yaml_data, code_model)

package/autorest/codegen/serializers/builder_serializer.py

@@ -26,7 +26,6 @@ from ..models import (
     ParameterMethodLocation,
     RequestBuilderBodyParameter,
     OverloadedRequestBuilder,
-    MultipartBodyParameter,
     Property,
     RequestBuilderType,
     CombinedType,
@@ -207,7 +206,7 @@ def _serialize_json_model_body(
 
 def _serialize_multipart_body(builder: BuilderType) -> List[str]:
     retval: List[str] = []
-    body_param = cast(MultipartBodyParameter, builder.parameters.body_parameter)
+    body_param = builder.parameters.body_parameter
     # we have to construct our form data before passing to the request as well
     retval.append("# Construct form data")
     retval.append(f"_{body_param.client_name} = {{")
@@ -349,7 +348,11 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
     def param_description(self, builder: BuilderType) -> List[str]:
         description_list: List[str] = []
         for param in builder.parameters.method:
-            if not param.in_docstring or param.hide_in_operation_signature:
+            if (
+                not param.in_docstring
+                or param.hide_in_operation_signature
+                or param.method_location == ParameterMethodLocation.KWARG
+            ):
                 continue
             description_list.extend(
                 f":{param.description_keyword} {param.client_name}: {param.description}".replace(
@@ -748,17 +751,39 @@ class _OperationSerializer(
 
         This function serializes the body params that need to be serialized.
         """
-        body_param = cast(BodyParameter, builder.parameters.body_parameter)
+        retval: List[str] = []
+        body_param = builder.parameters.body_parameter
         if body_param.is_form_data:
-            return [
-                f"if isinstance({body_param.client_name}, _model_base.Model):",
-                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))}",
+            model_type = cast(
+                ModelType,
+                (
+                    body_param.type.target_model_subtype((JSONModelType, DPGModelType))
+                    if isinstance(body_param.type, CombinedType)
+                    else body_param.type
+                ),
+            )
+            file_fields = [
+                p.wire_name for p in model_type.properties if p.is_multipart_file_input
             ]
-        retval: List[str] = []
+            data_fields = [
+                p.wire_name
+                for p in model_type.properties
+                if not p.is_multipart_file_input
+            ]
+            retval.extend(
+                [
+                    "_body = (",
+                    f"    {body_param.client_name}.as_dict()",
+                    f"    if isinstance({body_param.client_name}, _model_base.Model) else",
+                    f"    {body_param.client_name}",
+                    ")",
+                    f"_file_fields: List[str] = {file_fields}",
+                    f"_data_fields: List[str] = {data_fields}",
+                    "_files, _data = prepare_multipart_form_data(_body, _file_fields, _data_fields)",
+                ]
+            )
+            return retval
+
         body_kwarg_name = builder.request_builder.parameters.body_parameter.client_name
         send_xml = builder.parameters.body_parameter.type.is_xml
         xml_serialization_ctxt = (
@@ -810,8 +835,8 @@ class _OperationSerializer(
     ) -> List[str]:
         """Create the body parameter before we pass it as either json or content to the request builder"""
         retval = []
-        body_param = cast(BodyParameter, builder.parameters.body_parameter)
-        if hasattr(body_param, "entries"):
+        body_param = builder.parameters.body_parameter
+        if body_param.entries:
             return _serialize_multipart_body(builder)
         body_kwarg_name = builder.request_builder.parameters.body_parameter.client_name
         body_param_type = body_param.type
@@ -972,9 +997,13 @@ class _OperationSerializer(
                 f"    {parameter.client_name}={parameter.name_in_high_level_operation},"
                 f"{'  # type: ignore' if type_ignore else ''}"
             )
-        if request_builder.has_form_data_body:
-            retval.append("    data=_data,")
+        if builder.parameters.has_body and builder.parameters.body_parameter.entries:
+            # this is for legacy
+            client_name = builder.parameters.body_parameter.client_name
+            retval.append(f"    {client_name}=_{client_name},")
+        elif request_builder.has_form_data_body:
             retval.append("    files=_files,")
+            retval.append("    data=_data,")
         elif request_builder.overloads:
             seen_body_params = set()
             for overload in request_builder.overloads:

package/autorest/codegen/serializers/general_serializer.py

@@ -130,18 +130,30 @@ class GeneralSerializer(BaseSerializer):
                 "MatchConditions",
                 ImportType.SDKCORE,
             )
-        if self.code_model.has_form_data:
+        if (
+            self.code_model.has_form_data
+            and self.code_model.options["models_mode"] == "dpg"
+        ):
+            file_import.add_submodule_import("typing", "IO", 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", "Optional", ImportType.STDLIB)
+            file_import.add_submodule_import("typing", "Mapping", ImportType.STDLIB)
+            file_import.add_submodule_import("typing", "Sequence", ImportType.STDLIB)
+            file_import.add_submodule_import("typing", "Dict", ImportType.STDLIB)
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
-            file_import.add_submodule_import("io", "IOBase", ImportType.STDLIB)
-            file_import.add_submodule_import("io", "BytesIO", ImportType.STDLIB)
-            file_import.add_import("uuid", ImportType.STDLIB)
-            file_import.add_import("json", ImportType.STDLIB)
-            file_import.add_mutable_mapping_import()
-            file_import.add_submodule_import("._model_base", "Model", ImportType.LOCAL)
+            file_import.add_submodule_import("typing", "List", ImportType.STDLIB)
             file_import.add_submodule_import(
-                "._model_base", "SdkJSONEncoder", ImportType.LOCAL
+                "._model_base",
+                "SdkJSONEncoder",
+                ImportType.LOCAL,
             )
+            file_import.add_submodule_import(
+                "._model_base",
+                "Model",
+                ImportType.LOCAL,
+            )
+            file_import.add_import("json", ImportType.STDLIB)
 
         return template.render(
             code_model=self.code_model,

package/autorest/codegen/serializers/model_serializer.py

@@ -197,6 +197,9 @@ class MsrestModelSerializer(_ModelSerializer):
 
 
 class DpgModelSerializer(_ModelSerializer):
+    def super_call(self, model: ModelType):
+        return f"super().__init__({self.properties_to_pass_to_super(model)})"
+
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
@@ -238,6 +241,7 @@ class DpgModelSerializer(_ModelSerializer):
                 if not any(
                     p.client_name == pp.client_name
                     and p.type_annotation() == pp.type_annotation()
+                    and not p.is_base_discriminator
                     for pp in parent_properties
                 )
             ]
@@ -257,7 +261,10 @@ class DpgModelSerializer(_ModelSerializer):
             args.append(f"visibility=[{v_list}]")
         if prop.client_default_value is not None:
             args.append(f"default={prop.client_default_value_declaration}")
-        if hasattr(prop.type, "encode") and prop.type.encode:  # type: ignore
+
+        if prop.is_multipart_file_input:
+            args.append("is_multipart_file_input=True")
+        elif hasattr(prop.type, "encode") and prop.type.encode:  # type: ignore
             args.append(f'format="{prop.type.encode}"')  # type: ignore
 
         field = "rest_discriminator" if prop.is_discriminator else "rest_field"
@@ -274,7 +281,7 @@ class DpgModelSerializer(_ModelSerializer):
     def initialize_properties(self, model: ModelType) -> List[str]:
         init_args = []
         for prop in self.get_properties_to_declare(model):
-            if prop.constant or prop.is_discriminator:
+            if prop.constant and not prop.is_base_discriminator:
                 init_args.append(
                     f"self.{prop.client_name}: {prop.type_annotation()} = "
                     f"{prop.get_declaration()}"
@@ -286,5 +293,30 @@ class DpgModelSerializer(_ModelSerializer):
         return [
             p
             for p in model.properties
-            if not p.is_discriminator and not p.constant and p.visibility != ["read"]
+            if p.is_base_discriminator
+            or not p.is_discriminator
+            and not p.constant
+            and p.visibility != ["read"]
         ]
+
+    @staticmethod
+    def properties_to_pass_to_super(model: ModelType) -> str:
+        properties_to_pass_to_super = ["*args"]
+        for parent in model.parents:
+            for prop in model.properties:
+                if (
+                    prop.client_name
+                    in [
+                        prop.client_name
+                        for prop in parent.properties
+                        if prop.is_base_discriminator
+                    ]
+                    and prop.is_discriminator
+                    and not prop.constant
+                    and not prop.readonly
+                ):
+                    properties_to_pass_to_super.append(
+                        f"{prop.client_name}={prop.get_declaration()}"
+                    )
+        properties_to_pass_to_super.append("**kwargs")
+        return ", ".join(properties_to_pass_to_super)

package/autorest/codegen/templates/model_base.py.jinja2

@@ -5,7 +5,6 @@
 # license information.
 # --------------------------------------------------------------------------
 # pylint: disable=protected-access, arguments-differ, signature-differs, broad-except
-# pyright: reportGeneralTypeIssues=false
 
 import calendar
 import decimal
@@ -16,9 +15,10 @@ import base64
 import re
 import copy
 import typing
-import email
+import email.utils
 from datetime import datetime, date, time, timedelta, timezone
 from json import JSONEncoder
+from typing_extensions import Self
 import isodate
 from {{ code_model.core_library }}.exceptions import DeserializationError
 from {{ code_model.core_library }}{{ ".utils" if code_model.options["unbranded"] else "" }} import CaseInsensitiveEnumMeta
@@ -35,6 +35,7 @@ _LOGGER = logging.getLogger(__name__)
 __all__ = ["SdkJSONEncoder", "Model", "rest_field", "rest_discriminator"]
 
 TZ_UTC = timezone.utc
+_T = typing.TypeVar("_T")
 
 
 def _timedelta_as_isostr(td: timedelta) -> str:
@@ -242,7 +243,7 @@ def _deserialize_date(attr: typing.Union[str, date]) -> date:
     # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
     if isinstance(attr, date):
         return attr
-    return isodate.parse_date(attr, defaultmonth=None, defaultday=None)
+    return isodate.parse_date(attr, defaultmonth=None, defaultday=None)  # type: ignore
 
 
 def _deserialize_time(attr: typing.Union[str, time]) -> time:
@@ -383,8 +384,12 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):  # pylint: disable=uns
         except KeyError:
             return default
 
-    @typing.overload  # type: ignore
-    def pop(self, key: str) -> typing.Any:  # pylint: disable=no-member
+    @typing.overload
+    def pop(self, key: str) -> typing.Any:
+        ...
+
+    @typing.overload
+    def pop(self, key: str, default: _T) -> _T:
         ...
 
     @typing.overload
@@ -405,8 +410,8 @@ class _MyMutableMapping(MutableMapping[str, typing.Any]):  # pylint: disable=uns
     def update(self, *args: typing.Any, **kwargs: typing.Any) -> None:
         self._data.update(*args, **kwargs)
 
-    @typing.overload  # type: ignore
-    def setdefault(self, key: str) -> typing.Any:
+    @typing.overload
+    def setdefault(self, key: str, default: None = None) -> None:
         ...
 
     @typing.overload
@@ -470,7 +475,13 @@ def _get_rest_field(
 
 
 def _create_value(rf: typing.Optional["_RestField"], value: typing.Any) -> typing.Any:
-    return _deserialize(rf._type, value) if (rf and rf._is_model) else _serialize(value, rf._format if rf else None)
+    if not rf:
+        return _serialize(value, None)
+    if rf._is_multipart_file_input:
+        return value
+    if rf._is_model:
+        return _deserialize(rf._type, value)
+    return _serialize(value, rf._format)
 
 
 class Model(_MyMutableMapping):
@@ -506,7 +517,7 @@ class Model(_MyMutableMapping):
     def copy(self) -> "Model":
         return Model(self.__dict__)
 
-    def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> "Model":  # pylint: disable=unused-argument
+    def __new__(cls, *args: typing.Any, **kwargs: typing.Any) -> Self:  # pylint: disable=unused-argument
         # we know the last three classes in mro are going to be 'Model', 'dict', and 'object'
         mros = cls.__mro__[:-3][::-1]  # ignore model, dict, and object parents, and reverse the mro order
         attr_to_rest_field: typing.Dict[str, _RestField] = {  # map attribute name to rest_field property
@@ -548,7 +559,7 @@ class Model(_MyMutableMapping):
         exist_discriminators.append(discriminator)
         mapped_cls = cls.__mapping__.get(
             data.get(discriminator), cls
-        )  # pylint: disable=no-member
+        )  # pyright: ignore # pylint: disable=no-member
         if mapped_cls == cls:
             return cls(data)
         return mapped_cls._deserialize(data, exist_discriminators)  # pylint: disable=protected-access
@@ -565,9 +576,14 @@ class Model(_MyMutableMapping):
         if exclude_readonly:
             readonly_props = [p._rest_name for p in self._attr_to_rest_field.values() if _is_readonly(p)]
         for k, v in self.items():
-            if exclude_readonly and k in readonly_props:  # pyright: ignore[reportUnboundVariable]
+            if exclude_readonly and k in readonly_props:  # pyright: ignore
                 continue
-            result[k] = Model._as_dict_value(v, exclude_readonly=exclude_readonly)
+            is_multipart_file_input = False
+            try:
+                is_multipart_file_input = next(rf for rf in self._attr_to_rest_field.values() if rf._rest_name == k)._is_multipart_file_input
+            except StopIteration:
+                pass
+            result[k] = v if is_multipart_file_input else Model._as_dict_value(v, exclude_readonly=exclude_readonly)
         return result
 
     @staticmethod
@@ -575,10 +591,10 @@ class Model(_MyMutableMapping):
         if v is None or isinstance(v, _Null):
             return None
         if isinstance(v, (list, tuple, set)):
-            return [
+            return type(v)(
                 Model._as_dict_value(x, exclude_readonly=exclude_readonly)
                 for x in v
-            ]
+            )
         if isinstance(v, dict):
             return {
                 dk: Model._as_dict_value(dv, exclude_readonly=exclude_readonly)
@@ -619,22 +635,22 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
                     return obj
                 return _deserialize(model_deserializer, obj)
 
-            return functools.partial(_deserialize_model, annotation)
+            return functools.partial(_deserialize_model, annotation)  # pyright: ignore
     except Exception:
         pass
 
     # is it a literal?
     try:
-        if annotation.__origin__ is typing.Literal:
+        if annotation.__origin__ is typing.Literal:  # pyright: ignore
             return None
     except AttributeError:
         pass
 
     # is it optional?
     try:
-        if any(a for a in annotation.__args__ if a == type(None)):
+        if any(a for a in annotation.__args__ if a == type(None)):  # pyright: ignore
             if_obj_deserializer = _get_deserialize_callable_from_annotation(
-                next(a for a in annotation.__args__ if a != type(None)), module, rf
+                next(a for a in annotation.__args__ if a != type(None)), module, rf  # pyright: ignore
             )
 
             def _deserialize_with_optional(if_obj_deserializer: typing.Optional[typing.Callable], obj):
@@ -647,7 +663,9 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
         pass
 
     if getattr(annotation, "__origin__", None) is typing.Union:
-        deserializers = [_get_deserialize_callable_from_annotation(arg, module, rf) for arg in annotation.__args__]
+        deserializers = [
+            _get_deserialize_callable_from_annotation(arg, module, rf) for arg in annotation.__args__  # pyright: ignore
+        ]
 
         def _deserialize_with_union(deserializers, obj):
             for deserializer in deserializers:
@@ -660,8 +678,10 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
         return functools.partial(_deserialize_with_union, deserializers)
 
     try:
-        if annotation._name == "Dict":
-            value_deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[1], module, rf)
+        if annotation._name == "Dict":  # pyright: ignore
+            value_deserializer = _get_deserialize_callable_from_annotation(
+                annotation.__args__[1], module, rf  # pyright: ignore
+            )
 
             def _deserialize_dict(
                 value_deserializer: typing.Optional[typing.Callable],
@@ -681,8 +701,8 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
     except (AttributeError, IndexError):
         pass
     try:
-        if annotation._name in ["List", "Set", "Tuple", "Sequence"]:
-            if len(annotation.__args__) > 1:
+        if annotation._name in ["List", "Set", "Tuple", "Sequence"]:  # pyright: ignore
+            if len(annotation.__args__) > 1:  # pyright: ignore
 
                 def _deserialize_multiple_sequence(
                     entry_deserializers: typing.List[typing.Optional[typing.Callable]],
@@ -696,10 +716,12 @@ def _get_deserialize_callable_from_annotation(  # pylint: disable=R0911, R0915,
                     )
 
                 entry_deserializers = [
-                    _get_deserialize_callable_from_annotation(dt, module, rf) for dt in annotation.__args__
+                    _get_deserialize_callable_from_annotation(dt, module, rf) for dt in annotation.__args__  # pyright: ignore
                 ]
                 return functools.partial(_deserialize_multiple_sequence, entry_deserializers)
-            deserializer = _get_deserialize_callable_from_annotation(annotation.__args__[0], module, rf)
+            deserializer = _get_deserialize_callable_from_annotation(
+                annotation.__args__[0], module, rf  # pyright: ignore
+            )
 
             def _deserialize_sequence(
                 deserializer: typing.Optional[typing.Callable],
@@ -779,6 +801,7 @@ class _RestField:
         visibility: typing.Optional[typing.List[str]] = None,
         default: typing.Any = _UNSET,
         format: typing.Optional[str] = None,
+        is_multipart_file_input: bool = False,
     ):
         self._type = type
         self._rest_name_input = name
@@ -788,6 +811,7 @@ class _RestField:
         self._is_model = False
         self._default = default
         self._format = format
+        self._is_multipart_file_input = is_multipart_file_input
 
     @property
     def _rest_name(self) -> str:
@@ -833,8 +857,9 @@ def rest_field(
     visibility: typing.Optional[typing.List[str]] = None,
     default: typing.Any = _UNSET,
     format: typing.Optional[str] = None,
+    is_multipart_file_input: bool = False,
 ) -> typing.Any:
-    return _RestField(name=name, type=type, visibility=visibility, default=default, format=format)
+    return _RestField(name=name, type=type, visibility=visibility, default=default, format=format, is_multipart_file_input=is_multipart_file_input)
 
 
 def rest_discriminator(

package/autorest/codegen/templates/model_dpg.py.jinja2

@@ -60,7 +60,7 @@
     {% set initialize_properties = serializer.initialize_properties(model) %}
     {% if not model.internal and serializer.init_line(model) or initialize_properties %}
     def __init__(self, *args: Any, **kwargs: Any) -> None:{{ '# pylint: disable=useless-super-delegation' if not initialize_properties else '' }}
-        super().__init__(*args, **kwargs)
+        {{ serializer.super_call(model) }}
     {% for initialize_property in initialize_properties %}
         {{ initialize_property }}
     {% endfor %}

package/autorest/codegen/templates/packaging_templates/setup.py.jinja2

@@ -94,7 +94,10 @@ setup(
         {% elif azure_arm %}
         "azure-mgmt-core<2.0.0,>=1.3.2",
         {% else %}
-        "azure-core<2.0.0,>=1.29.5",
+        "azure-core<2.0.0,>=1.30.0",
+        {% endif %}
+        {% if code_model.need_typing_extensions %}
+        "typing-extensions>=4.6.0",
         {% endif %}
     ],
     {% if package_mode %}

package/autorest/codegen/templates/serialization.py.jinja2

@@ -170,13 +170,6 @@ class RawDeserializer:
         return None
 
 
-try:
-    basestring  # type: ignore
-    unicode_str = unicode  # type: ignore
-except NameError:
-    basestring = str
-    unicode_str = str
-
 _LOGGER = logging.getLogger(__name__)
 
 try:
@@ -547,7 +540,7 @@ class Serializer(object):
         "multiple": lambda x, y: x % y != 0,
     }
 
-    def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]]=None):
+    def __init__(self, classes: Optional[Mapping[str, type]]=None):
         self.serialize_type = {
             "iso-8601": Serializer.serialize_iso,
             "rfc-1123": Serializer.serialize_rfc,
@@ -563,7 +556,7 @@ class Serializer(object):
             "[]": self.serialize_iter,
             "{}": self.serialize_dict,
         }
-        self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
+        self.dependencies: Dict[str, type] = dict(classes) if classes else {}
         self.key_transformer = full_restapi_key_transformer
         self.client_side_validation = True
 
@@ -651,7 +644,7 @@ class Serializer(object):
                         else:  # That's a basic type
                             # Integrate namespace if necessary
                             local_node = _create_xml_node(xml_name, xml_prefix, xml_ns)
-                            local_node.text = unicode_str(new_attr)
+                            local_node.text = str(new_attr)
                             serialized.append(local_node)  # type: ignore
                     else:  # JSON
                         for k in reversed(keys):  # type: ignore
@@ -1000,7 +993,7 @@ class Serializer(object):
             return self.serialize_basic(attr, self.basic_types[obj_type], **kwargs)
         if obj_type is _long_type:
             return self.serialize_long(attr)
-        if obj_type is unicode_str:
+        if obj_type is str:
             return self.serialize_unicode(attr)
         if obj_type is datetime.datetime:
             return self.serialize_iso(attr)
@@ -1376,7 +1369,7 @@ class Deserializer(object):
 
     valid_date = re.compile(r"\d{4}[-]\d{2}[-]\d{2}T\d{2}:\d{2}:\d{2}" r"\.?\d*Z?[-+]?[\d{2}]?:?[\d{2}]?")
 
-    def __init__(self, classes: Optional[Mapping[str, Type[ModelType]]]=None):
+    def __init__(self, classes: Optional[Mapping[str, type]]=None):
         self.deserialize_type = {
             "iso-8601": Deserializer.deserialize_iso,
             "rfc-1123": Deserializer.deserialize_rfc,
@@ -1396,7 +1389,7 @@ class Deserializer(object):
             "duration": (isodate.Duration, datetime.timedelta),
             "iso-8601": (datetime.datetime),
         }
-        self.dependencies: Dict[str, Type[ModelType]] = dict(classes) if classes else {}
+        self.dependencies: Dict[str, type] = dict(classes) if classes else {}
         self.key_extractors = [rest_key_extractor, xml_key_extractor]
         # Additional properties only works if the "rest_key_extractor" is used to
         # extract the keys. Making it to work whatever the key extractor is too much
@@ -1449,7 +1442,7 @@ class Deserializer(object):
 
         response, class_name = self._classify_target(target_obj, data)
 
-        if isinstance(response, basestring):
+        if isinstance(response, str):
             return self.deserialize_data(data, response)
         elif isinstance(response, type) and issubclass(response, Enum):
             return self.deserialize_enum(data, response)
@@ -1520,7 +1513,7 @@ class Deserializer(object):
         if target is None:
             return None, None
 
-        if isinstance(target, basestring):
+        if isinstance(target, str):
             try:
                 target = self.dependencies[target]
             except KeyError:
@@ -1583,7 +1576,7 @@ class Deserializer(object):
         if hasattr(raw_data, "_content_consumed"):
             return RawDeserializer.deserialize_from_http_generics(raw_data.text, raw_data.headers)
 
-        if isinstance(raw_data, (basestring, bytes)) or hasattr(raw_data, "read"):
+        if isinstance(raw_data, (str, bytes)) or hasattr(raw_data, "read"):
             return RawDeserializer.deserialize_from_text(raw_data, content_type)  # type: ignore
         return raw_data
 
@@ -1705,7 +1698,7 @@ class Deserializer(object):
         if isinstance(attr, ET.Element):
             # Do no recurse on XML, just return the tree as-is
             return attr
-        if isinstance(attr, basestring):
+        if isinstance(attr, str):
             return self.deserialize_basic(attr, "str")
         obj_type = type(attr)
         if obj_type in self.basic_types:
@@ -1762,7 +1755,7 @@ class Deserializer(object):
         if data_type == "bool":
             if attr in [True, False, 1, 0]:
                 return bool(attr)
-            elif isinstance(attr, basestring):
+            elif isinstance(attr, str):
                 if attr.lower() in ["true", "1"]:
                     return True
                 elif attr.lower() in ["false", "0"]:

package/autorest/codegen/templates/vendor.py.jinja2

@@ -65,38 +65,42 @@ def prep_if_none_match(etag: Optional[str], match_condition: Optional[MatchCondi
         return "*"
     return None
 {% endif %}
-{% if code_model.has_form_data %}
-class NamedBytesIO(BytesIO):
-    def __init__(self, name: str, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.name = name
+{% if code_model.has_form_data and code_model.options["models_mode"] == "dpg" %}
+# file-like tuple could be `(filename, IO (or bytes))` or `(filename, IO (or bytes), content_type)`
+FileContent = Union[str, bytes, IO[str], IO[bytes]]
 
-def multipart_file(file: Union[IOBase, bytes]) -> IOBase:
-    if isinstance(file, IOBase):
-        return file
-    return NamedBytesIO("auto-name-" + str(uuid.uuid4()), file)
+FileType = Union[
+    # file (or bytes)
+    FileContent,
+    # (filename, file (or bytes))
+    Tuple[Optional[str], FileContent],
+    # (filename, file (or bytes), content_type)
+    Tuple[Optional[str], FileContent, Optional[str]],
+]
 
-def multipart_data(data: Any) -> Any:
-    if isinstance(data, (list, tuple, dict, Model)):
-        return json.dumps(data, cls=SdkJSONEncoder, exclude_readonly=True)
-    return data
+FilesType = Union[Mapping[str, FileType], Sequence[Tuple[str, FileType]]]
 
-def handle_multipart_form_data_model(body: Model) -> MutableMapping[str, Any]:  # pylint: disable=unsubscriptable-object
-    """handle first layer of model. 
-    If its value is bytes or IO, replace it with raw value instead of serialized value.
+def serialize_multipart_data_entry(data_entry: Any) -> Any:
+    if isinstance(data_entry, (list, tuple, dict, Model)):
+        return json.dumps(data_entry, cls=SdkJSONEncoder, exclude_readonly=True)
+    return data_entry
 
-    :param body: The model to handle.
-    :type body: ~payload.multipart._model_base.Model
-    :return: The handled model.
-    :rtype: MutableMapping[str, Any]
-    """
-    result = body.as_dict()
-    rest_name_attr = {v._rest_name: k for k, v in body._attr_to_rest_field.items()}  # pylint: disable=protected-access
-    for rest_name in result.keys():
-        attr = rest_name_attr.get(rest_name)
-        if attr is not None:
-            raw_value = getattr(body, attr, None)
-            if isinstance(raw_value, (bytes, IOBase)):
-                result[rest_name] = raw_value
-    return result
-{% endif %}
+def prepare_multipart_form_data(
+    body: Mapping[str, Any], multipart_fields: List[str], data_fields: List[str]
+) -> Tuple[List[FileType], Dict[str, Any]]:
+    files: List[FileType] = []
+    data: Dict[str, Any] = {}
+    for multipart_field in multipart_fields:
+        multipart_entry = body.get(multipart_field)
+        if isinstance(multipart_entry, list):
+            files.extend([(multipart_field, e) for e in multipart_entry ])
+        elif multipart_entry:
+            files.append((multipart_field, multipart_entry))
+
+    for data_field in data_fields:
+        data_entry = body.get(data_field)
+        if data_entry:
+            data[data_field] = serialize_multipart_data_entry(data_entry)
+
+    return files, data
+{% endif %}

package/autorest/m4reformatter/__init__.py

@@ -240,6 +240,10 @@ def update_primitive(  # pylint: disable=too-many-return-statements
         base = _update_type_base("bytes", yaml_data)
         base["encode"] = yaml_data["format"]
         return base
+    if type_group == "date":
+        return _update_type_base("plainDate", yaml_data)
+    if type_group == "time":
+        return _update_type_base("plainTime", yaml_data)
     return _update_type_base(type_group, yaml_data)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.12.3",
+  "version": "6.13.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {

package/run_cadl.py

@@ -22,7 +22,7 @@ if __name__ == "__main__":
     env_builder = venv.EnvBuilder(with_pip=True)
     venv_context = env_builder.ensure_directories(venv_path)
 
-    if "--debug" in sys.argv:
+    if "--debug" in sys.argv or "--debug=true" in sys.argv:
         try:
             import debugpy  # pylint: disable=import-outside-toplevel
         except ImportError: