@autorest/python 5.11.0 → 5.12.1

package/ChangeLog.md

@@ -1,5 +1,73 @@
 # Change Log
 
+### 2022-01-10 - 5.12.1
+
+| Library | Min Version
+| --------------- | -------
+|`@autorest/core` |  `3.6.2`
+|`@autorest/modelerfour` | `4.19.1`
+|`azure-core` dep of generated code | `1.20.1`
+|`msrest` dep of generated code | `0.6.21`
+|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+
+**Bug Fixes**
+
+- Fix support for json merge patch  #1117
+
+### 2021-12-06 - 5.12.0
+
+| Library | Min Version
+| --------------- | -------
+|`@autorest/core` |  `3.6.2`
+|`@autorest/modelerfour` | `4.19.1`
+|`azure-core` dep of generated code | `1.20.1`
+|`msrest` dep of generated code | `0.6.21`
+|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+
+**Breaking Changes in Version Tolerant Generation**
+
+- Remove metadata property for version tolerant and low level client generations #1090
+- Generate SDKs with `--python3-only` defaulting to `True` for version tolerant and low level client  #1087
+
+**New Features**
+
+- Generate a `_patch.py` file if one does not exist. These files are used to customize the generated code  #1092
+
+**Bug Fixes**
+
+- Can now handle body params with names `json`, `content`, `data`, and `files` #1081
+- Improve generated templates for `data` and `files` input body params by adding quotes around the keys  #1082
+- Using flag `--python3-only` will get you typed sync client and config files  #1085
+- Pin `mistune` dependency to less than `2.x.x` so autorest can be successfully installed  #1106
+
+### 2021-11-05 - 5.11.2
+
+| Library | Min Version
+| --------------- | -------
+|`@autorest/core` |  `3.6.2`
+|`@autorest/modelerfour` | `4.19.1`
+|`azure-core` dep of generated code | `1.20.0`
+|`msrest` dep of generated code | `0.6.21`
+|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+
+**Bug Fixes**
+
+- Respect no client side validation for low level client generations  #1080
+
+### 2021-11-05 - 5.11.1
+
+| Library | Min Version
+| --------------- | -------
+|`@autorest/core` |  `3.6.2`
+|`@autorest/modelerfour` | `4.19.1`
+|`azure-core` dep of generated code | `1.20.0`
+|`msrest` dep of generated code | `0.6.21`
+|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+
+**Bug Fixes**
+
+- Hide mixin operations for version tolerant generation  #1071
+
 ### 2021-11-04 - 5.11.0
 
 | Library | Min Version

package/autorest/codegen/__init__.py

@@ -60,7 +60,7 @@ def _validate_code_model_options(options: Dict[str, Any]) -> None:
             "to 'public' or 'hidden'."
         )
 
-    if not options["show_operations"] and options["add_python_3_operation_files"]:
+    if not options["show_operations"] and options["add_python3_operation_files"]:
         raise ValueError(
             "Can not add typed sync operation files if you are not showing operations. "
             "If you want typed synced operation files, you have to add flag "
@@ -256,7 +256,7 @@ class CodeGenerator(Plugin):
         version_tolerant = self._autorestapi.get_boolean_value("version-tolerant", False)
         show_operations = self._autorestapi.get_boolean_value("show-operations", not low_level_client)
         models_mode_default = "none" if low_level_client or version_tolerant else "msrest"
-        python_3_only = self._autorestapi.get_boolean_value("python3-only", False)
+        python3_only = self._autorestapi.get_boolean_value("python3-only", low_level_client or version_tolerant)
 
         options: Dict[str, Any] = {
             "azure_arm": azure_arm,
@@ -282,13 +282,13 @@ class CodeGenerator(Plugin):
             "only_path_and_body_params_positional": self._autorestapi.get_boolean_value(
                 "only-path-and-body-params-positional", low_level_client or version_tolerant
             ),
-            "add_python_3_operation_files": self._autorestapi.get_boolean_value(
-                "add-python3-operation-files", python_3_only
+            "add_python3_operation_files": self._autorestapi.get_boolean_value(
+                "add-python3-operation-files", python3_only and not low_level_client
             ),
             "version_tolerant": version_tolerant,
             "low_level_client": low_level_client,
             "combine_operation_files": self._autorestapi.get_boolean_value("combine-operation-files", version_tolerant),
-            "python_3_only": python_3_only,
+            "python3_only": python3_only,
         }
 
         if options["builders_visibility"] is None:

package/autorest/codegen/models/__init__.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, TypeVar, Union
+from typing import Any, Dict
 from .base_model import BaseModel
 from .code_model import CodeModel
 from .credential_schema import AzureKeyCredentialSchema, TokenCredentialSchema
@@ -22,8 +22,7 @@ from .operation import Operation
 from .property import Property
 from .operation_group import OperationGroup
 from .schema_response import SchemaResponse
-from .parameter_list import GlobalParameterList, ParameterList
-from .request_builder_parameter_list import RequestBuilderParameterList
+from .parameter_list import ParameterList, GlobalParameterList
 from .request_builder import RequestBuilder
 from .base_builder import BaseBuilder
 from .lro_paging_operation import LROPagingOperation
@@ -63,6 +62,7 @@ __all__ = [
     "HiddenModelObjectSchema",
     "ParameterStyle",
     "IOSchema",
+    "GlobalParameterList",
 ]
 
 def _generate_as_object_schema(yaml_data: Dict[str, Any]) -> bool:
@@ -119,23 +119,3 @@ def build_schema(yaml_data: Dict[str, Any], **kwargs) -> BaseSchema:
         code_model.primitives[yaml_id] = schema
 
     return schema
-
-BuilderType = TypeVar(
-    "BuilderType",
-    bound=Union[
-        RequestBuilder,
-        Operation,
-        LROPagingOperation,
-        LROOperation,
-        PagingOperation,
-    ]
-)
-
-ParameterListType = TypeVar(
-    "ParameterListType",
-    bound=Union[
-        ParameterList,
-        GlobalParameterList,
-        RequestBuilderParameterList,
-    ],
-)

package/autorest/codegen/models/base_builder.py

@@ -3,14 +3,11 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Callable, Dict, List, Optional, Union, TYPE_CHECKING
+from typing import Any, Callable, Dict, List, Optional, Union
 from .base_model import BaseModel
 from .schema_response import SchemaResponse
 from .schema_request import SchemaRequest
 
-if TYPE_CHECKING:
-    from . import ParameterListType
-
 
 _M4_HEADER_PARAMETERS = ["content_type", "accept"]
 
@@ -70,7 +67,7 @@ class BaseBuilder(BaseModel):
         yaml_data: Dict[str, Any],
         name: str,
         description: str,
-        parameters: "ParameterListType",
+        parameters,
         schema_requests: List[SchemaRequest],
         responses: Optional[List[SchemaResponse]] = None,
         summary: Optional[str] = None,

package/autorest/codegen/models/client.py

@@ -73,7 +73,9 @@ class Client:
             )
         file_import.add_from_import("azure.core.rest", "HttpRequest", ImportType.AZURECORE, TypingSection.CONDITIONAL)
         for og in self.code_model.operation_groups:
-            file_import.add_from_import(".operations", og.class_name, ImportType.LOCAL)
+            file_import.add_from_import(
+                f".{self.code_model.operations_folder_name}", og.class_name, ImportType.LOCAL
+            )
 
         if self.code_model.sorted_schemas:
             path_to_models = ".." if async_mode else "."
@@ -94,6 +96,6 @@ class Client:
             pass
         return file_import
 
-    def send_request_signature(self, async_mode) -> List[str]:
+    def send_request_signature(self, async_mode: bool, is_python3_file: bool) -> List[str]:
         request_signature = ["request: HttpRequest," if async_mode else "request,  # type: HttpRequest"]
-        return request_signature + self.parameters.method_signature_kwargs(async_mode)
+        return request_signature + self.parameters.method_signature_kwargs(is_python3_file)

package/autorest/codegen/models/code_model.py

@@ -29,7 +29,7 @@ from .rest import Rest
 
 _LOGGER = logging.getLogger(__name__)
 
-class CodeModel:  # pylint: disable=too-many-instance-attributes
+class CodeModel:  # pylint: disable=too-many-instance-attributes, too-many-public-methods
     """Holds all of the information we have parsed out of the yaml file. The CodeModel is what gets
     serialized by the serializers.
 
@@ -203,6 +203,10 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes
                 operation for operation in operation_group.operations if operation not in next_operations
             ]
 
+    @property
+    def has_schemas(self):
+        return self.schemas or self.enums
+
     @property
     def default_authentication_policy(self) -> Type[CredentialSchemaPolicy]:
         return ARMChallengeAuthenticationPolicy if self.options['azure_arm'] else BearerTokenCredentialPolicy
@@ -238,6 +242,15 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes
 
         return properties
 
+    @property
+    def operations_folder_name(self) -> str:
+        name = "operations"
+        if self.options["version_tolerant"] and not any(
+            og for og in self.operation_groups if not og.is_empty_operation_group
+        ):
+            name = f"_{name}"
+        return name
+
     def _add_properties_from_inheritance(self) -> None:
         """Adds properties from base classes to schemas with parents.
 

package/autorest/codegen/models/operation_group.py

@@ -56,7 +56,7 @@ class OperationGroup(BaseModel):
             file_import.merge(operation.imports_for_multiapi(async_mode))
         return file_import
 
-    def imports(self, async_mode: bool, has_schemas: bool) -> FileImport:
+    def imports(self, async_mode: bool) -> FileImport:
         file_import = FileImport()
         file_import.add_from_import("azure.core.exceptions", "ClientAuthenticationError", ImportType.AZURECORE)
         file_import.add_from_import("azure.core.exceptions", "ResourceNotFoundError", ImportType.AZURECORE)
@@ -73,7 +73,7 @@ class OperationGroup(BaseModel):
                     "azure.core.tracing.decorator", "distributed_trace", ImportType.AZURECORE,
                 )
         local_path = "..." if async_mode else ".."
-        if has_schemas and self.code_model.options["models_mode"]:
+        if self.code_model.has_schemas and self.code_model.options["models_mode"]:
             file_import.add_from_import(local_path, "models", ImportType.LOCAL, alias="_models")
         if self.code_model.options["builders_visibility"] == "embedded" and async_mode:
             if not self.code_model.options["combine_operation_files"]:
@@ -85,8 +85,11 @@ class OperationGroup(BaseModel):
             else:
                 operation_group_builders = self.code_model.rest.request_builders
             for request_builder in operation_group_builders:
+                python3_only = self.code_model.options["python3_only"]
+                typed_sync_operation_file = self.code_model.options["add_python3_operation_files"]
+                suffix = "_py3" if typed_sync_operation_file and not python3_only else ""
                 file_import.add_from_import(
-                    f"...operations.{self.filename}",
+                    f"...{self.code_model.operations_folder_name}.{self.filename}{suffix}",
                     request_builder.name,
                     import_type=ImportType.LOCAL
                 )
@@ -101,14 +104,11 @@ class OperationGroup(BaseModel):
 
     @property
     def filename(self) -> str:
-        if self.code_model.options["combine_operation_files"]:
-            return "_operations"
-
         basename = self.name
         if self.is_empty_operation_group:
             basename = self.code_model.module_name
 
-        if basename == "operations":
+        if basename == "operations" or self.code_model.options["combine_operation_files"]:
             return f"_operations"
         return f"_{basename}_operations"
 

package/autorest/codegen/models/parameter.py

@@ -97,6 +97,7 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
         self.is_data_input = yaml_data.get("isPartialBody", False) and not self.is_multipart
         self.content_types = content_types or []
         self.body_kwargs: List[Parameter] = []
+        self.is_body_kwarg = False
 
     def __hash__(self) -> int:
         return hash(self.serialized_name)
@@ -167,7 +168,7 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
     @property
     def pre_semicolon_content_types(self) -> List[str]:
         """Splits on semicolon of media types and returns the first half.
-        I.e. ["text/plain; encoding=UTF-8"] -> ["text/plain"]
+        I.e. ["text/plain; charset=UTF-8"] -> ["text/plain"]
         """
         return [content_type.split(";")[0] for content_type in self.content_types]
 
@@ -282,8 +283,8 @@ class Parameter(BaseModel):  # pylint: disable=too-many-instance-attributes, too
     def has_default_value(self):
         return self.default_value is not None or not self.required
 
-    def method_signature(self, is_python_3_file: bool) -> str:
-        if is_python_3_file:
+    def method_signature(self, is_python3_file: bool) -> str:
+        if is_python3_file:
             if self.has_default_value:
                 return f"{self.serialized_name}: {self.type_annotation} = {self.default_value_declaration},"
             return f"{self.serialized_name}: {self.type_annotation},"

package/autorest/codegen/models/parameter_list.py

@@ -12,6 +12,7 @@ from .parameter import Parameter, ParameterLocation
 from .base_schema import BaseSchema
 from .dictionary_schema import DictionarySchema
 from .primitive_schemas import AnySchema, StringSchema
+from .utils import JSON_REGEXP
 
 if TYPE_CHECKING:
     from .schema_request import SchemaRequest
@@ -79,7 +80,7 @@ class ParameterList(MutableSequence):  # pylint: disable=too-many-public-methods
 
     @property
     def default_content_type(self) -> str:
-        json_content_types = [c for c in self.content_types if "json" in c]
+        json_content_types = [c for c in self.content_types if JSON_REGEXP.match(c)]
         if json_content_types:
             if "application/json" in json_content_types:
                 return "application/json"
@@ -172,11 +173,15 @@ class ParameterList(MutableSequence):  # pylint: disable=too-many-public-methods
 
     @property
     def multipart(self) -> List[Parameter]:
-        return self.get_from_predicate(lambda parameter: parameter.is_multipart)
+        return self.get_from_predicate(
+            lambda parameter: parameter.is_multipart and not parameter.is_body_kwarg
+        )
 
     @property
     def data_inputs(self) -> List[Parameter]:
-        return self.get_from_predicate(lambda parameter: parameter.is_data_input)
+        return self.get_from_predicate(
+            lambda parameter: parameter.is_data_input and not parameter.is_body_kwarg
+        )
 
     def _filter_out_multiple_content_type(self, kwarg_params):
         """We don't want multiple content type kwargs in the method signature"""
@@ -214,24 +219,24 @@ class ParameterList(MutableSequence):  # pylint: disable=too-many-public-methods
         return signature_parameters
 
 
-    def method_signature(self, is_python_3_file: bool) -> List[str]:
+    def method_signature(self, is_python3_file: bool) -> List[str]:
         return _method_signature_helper(
-            positional=self.method_signature_positional(is_python_3_file),
-            keyword_only=self.method_signature_keyword_only(is_python_3_file),
-            kwarg_params=self.method_signature_kwargs(is_python_3_file)
+            positional=self.method_signature_positional(is_python3_file),
+            keyword_only=self.method_signature_keyword_only(is_python3_file),
+            kwarg_params=self.method_signature_kwargs(is_python3_file)
         )
 
-    def method_signature_positional(self, is_python_3_file: bool) -> List[str]:
-        return [parameter.method_signature(is_python_3_file) for parameter in self.positional]
+    def method_signature_positional(self, is_python3_file: bool) -> List[str]:
+        return [parameter.method_signature(is_python3_file) for parameter in self.positional]
 
-    def method_signature_keyword_only(self, is_python_3_file: bool) -> List[str]:
-        if not (self.keyword_only and is_python_3_file):
+    def method_signature_keyword_only(self, is_python3_file: bool) -> List[str]:
+        if not (self.keyword_only and is_python3_file):
             return []
-        return ["*,"] + [parameter.method_signature(is_python_3_file) for parameter in self.keyword_only]
+        return ["*,"] + [parameter.method_signature(is_python3_file) for parameter in self.keyword_only]
 
     @staticmethod
-    def method_signature_kwargs(is_python_3_file: bool) -> List[str]:
-        return ["**kwargs: Any"] if is_python_3_file else ["**kwargs  # type: Any"]
+    def method_signature_kwargs(is_python3_file: bool) -> List[str]:
+        return ["**kwargs: Any"] if is_python3_file else ["**kwargs  # type: Any"]
 
     @property
     def positional(self) -> List[Parameter]:
@@ -245,9 +250,9 @@ class ParameterList(MutableSequence):  # pylint: disable=too-many-public-methods
     def kwargs(self) -> List[Parameter]:
         return [p for p in self.method if p.is_kwarg]
 
-    def kwargs_to_pop(self, is_python_3_file: bool) -> List[Parameter]:
+    def kwargs_to_pop(self, is_python3_file: bool) -> List[Parameter]:
         kwargs_to_pop = self.kwargs
-        if not is_python_3_file:
+        if not is_python3_file:
             kwargs_to_pop += self.keyword_only
         return kwargs_to_pop
 
@@ -433,41 +438,41 @@ class GlobalParameterList(ParameterList):
             return True
         return serialized_name != self.host_variable_name
 
-    def kwargs_to_pop(self, is_python_3_file: bool) -> List[Parameter]:
+    def kwargs_to_pop(self, is_python3_file: bool) -> List[Parameter]:
         return [
-            k for k in super().kwargs_to_pop(is_python_3_file)
+            k for k in super().kwargs_to_pop(is_python3_file)
             if not self._param_is_in_config_method(k.serialized_name)
         ]
 
-    def config_kwargs_to_pop(self, is_python_3_file: bool) -> List[Parameter]:
-        current_kwargs_to_pop = super().kwargs_to_pop(is_python_3_file)
+    def config_kwargs_to_pop(self, is_python3_file: bool) -> List[Parameter]:
+        current_kwargs_to_pop = super().kwargs_to_pop(is_python3_file)
         return [k for k in current_kwargs_to_pop if self._param_is_in_config_method(k.serialized_name)]
 
     @property
     def config_method(self) -> List[Parameter]:
         return [p for p in self.method if self._param_is_in_config_method(p.serialized_name)]
 
-    def client_method_signature(self, is_python_3_file: bool) -> List[str]:
-        return self.method_signature(is_python_3_file)
+    def client_method_signature(self, is_python3_file: bool) -> List[str]:
+        return self.method_signature(is_python3_file)
 
-    def config_method_signature(self, is_python_3_file: bool) -> List[str]:
+    def config_method_signature(self, is_python3_file: bool) -> List[str]:
 
         positional = [
-            p.method_signature(is_python_3_file)
+            p.method_signature(is_python3_file)
             for p in self.positional
             if self._param_is_in_config_method(p.serialized_name)
         ]
         keyword_only_params = [p for p in self.keyword_only if self._param_is_in_config_method(p.serialized_name)]
         keyword_only_method_signature = []
-        if is_python_3_file:
+        if is_python3_file:
             keyword_only_method_signature = (
                 ["*,"] +
                 [
-                    p.method_signature(is_python_3_file) for p in keyword_only_params
+                    p.method_signature(is_python3_file) for p in keyword_only_params
                 ]
             ) if keyword_only_params else []
         return _method_signature_helper(
             positional=positional,
             keyword_only=keyword_only_method_signature,
-            kwarg_params=self.method_signature_kwargs(is_python_3_file)
+            kwarg_params=self.method_signature_kwargs(is_python3_file)
         )

package/autorest/codegen/models/request_builder.py

@@ -80,13 +80,17 @@ class RequestBuilder(BaseBuilder):
             file_import.add_from_import(
                 f"{relative_path}_vendor", "_format_url_section", ImportType.LOCAL
             )
+        if self.parameters.headers or self.parameters.query:
+            file_import.add_from_import(
+                "typing", "Dict", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL
+            )
         file_import.add_from_import(
             "typing", "Any", ImportType.STDLIB, typing_section=TypingSection.CONDITIONAL
         )
         file_import.add_from_import("msrest", "Serializer", ImportType.AZURECORE)
         if self.parameters.has_body and (
             self.code_model.options["builders_visibility"] != "embedded" or
-            self.code_model.options["add_python_3_operation_files"]
+            self.code_model.options["add_python3_operation_files"]
         ):
             file_import.define_mypy_type("JSONType", "Any")
         return file_import

package/autorest/codegen/models/request_builder_parameter.py

@@ -29,12 +29,13 @@ class RequestBuilderParameter(ParameterOnlyPathAndBodyPositional):
 
     @property
     def name_in_high_level_operation(self) -> str:
+        template = "{}" if self.code_model.options["version_tolerant"] else "_{}"
         if self.is_multipart:
-            return "files"
+            return template.format("files")
         if self.is_data_input:
-            return "data"
+            return template.format("data")
         if self.is_body and not self.constant:
-            return self.serialized_name
+            return f"_{self.serialized_name}"
         name = self.yaml_data["language"]["python"]["name"]
         if self.implementation == "Client" and self.in_method_code:
             # for these, we're passing the client params to the request builder.

package/autorest/codegen/models/request_builder_parameter_list.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-import re
 from copy import copy
 from typing import List, Optional, Tuple, TypeVar, Dict
 from .request_builder_parameter import RequestBuilderParameter
@@ -13,12 +12,11 @@ from .primitive_schemas import AnySchema, JSONSchema
 from .dictionary_schema import DictionarySchema
 from .base_schema import BaseSchema
 from .schema_request import SchemaRequest
+from .utils import JSON_REGEXP
 
 T = TypeVar('T')
 OrderedSet = Dict[T, None]
 
-_REQUEST_BUILDER_BODY_NAMES = ["files", "json", "content", "data"]
-_JSON_REGEXP = re.compile(r'^(application|text)/([0-9a-z+.]+\+)?json$')
 
 def _update_content_types(content_types_to_assign: List[str], param: Parameter):
     return [
@@ -44,6 +42,7 @@ class RequestBuilderParameterList(ParameterList):
     def _change_body_param_name(self, parameter: Parameter, name: str) -> None:
         self.body_kwarg_names[name] = None
         parameter.serialized_name = name
+        parameter.is_body_kwarg = True
 
     def _is_json(self, body_method_param: Parameter) -> bool:
         if 'json' in body_method_param.serialization_formats:
@@ -59,7 +58,7 @@ class RequestBuilderParameterList(ParameterList):
             if sr.yaml_data.get("protocol", {}).get('http', {}).get('knownMediaType') == "json"
         ):
             return True
-        return any(c for c in self.content_types if _JSON_REGEXP.match(c))
+        return any(c for c in self.content_types if JSON_REGEXP.match(c))
 
     @property
     def body_kwargs_to_get(self) -> List[Parameter]:
@@ -97,7 +96,6 @@ class RequestBuilderParameterList(ParameterList):
             "Multipart input for files. See the template in our example to find the input shape. " +
             file_kwarg.description
         )
-        file_kwarg.is_multipart = False
         file_kwarg.content_types = [
             c for c in content_types_to_assign
             if c == "multipart/form-data"
@@ -119,7 +117,6 @@ class RequestBuilderParameterList(ParameterList):
             "Pass in dictionary that contains form data to include in the body of the request. " +
             data_kwarg.description
         )
-        data_kwarg.is_data_input = False
         data_kwarg.content_types = [
             c for c in content_types_to_assign
             if c == "application/x-www-form-urlencoded"
@@ -140,7 +137,7 @@ class RequestBuilderParameterList(ParameterList):
         json_kwarg.schema = JSONSchema(namespace="", yaml_data={})
         json_kwarg.content_types = [
             c for c in content_types_to_assign
-            if _JSON_REGEXP.match(c)
+            if JSON_REGEXP.match(c)
         ]
         content_types_to_assign = _update_content_types(content_types_to_assign, json_kwarg)
         return content_types_to_assign, json_kwarg
@@ -208,7 +205,7 @@ class RequestBuilderParameterList(ParameterList):
         if not self._json_body:
             try:
                 json_param = next(
-                    b for b in self.body if b.serialized_name not in _REQUEST_BUILDER_BODY_NAMES and
+                    b for b in self.body if not b.is_body_kwarg and
                     b.is_json_parameter
                 )
                 self._json_body = json_param.schema
@@ -217,10 +214,10 @@ class RequestBuilderParameterList(ParameterList):
                 raise ValueError("There is no JSON body in these parameters")
         return self._json_body
 
-    def kwargs_to_pop(self, is_python_3_file: bool) -> List[Parameter]:
+    def kwargs_to_pop(self, is_python3_file: bool) -> List[Parameter]:
         # we don't want to pop the body kwargs in py2.7. We send them straight to HttpRequest
         kwargs_to_pop = self.kwargs
-        if not is_python_3_file:
+        if not is_python3_file:
             kwargs_to_pop += [k for k in self.keyword_only if not (k.is_body and not k.constant)]
         return kwargs_to_pop
 
@@ -240,9 +237,19 @@ class RequestBuilderParameterList(ParameterList):
         seen_content_type = False
 
         for parameter in parameters:
+
+            if (
+                parameter.location == ParameterLocation.Body and
+                (parameter.is_data_input or parameter.is_multipart) and
+                not parameter.is_body_kwarg
+            ):
+                # if i am a part of files or data, and i'm not the files or
+                # data kwarg, ignore me
+                continue
             if (
                 parameter.location == ParameterLocation.Body and
-                parameter.serialized_name not in _REQUEST_BUILDER_BODY_NAMES
+                not parameter.is_body_kwarg and
+                not parameter.constant
             ):
                 # we keep the original body param from the swagger for documentation purposes
                 # we don't want it in the method signature

package/autorest/codegen/models/rest.py

@@ -19,10 +19,11 @@ class Rest(BaseModel):
         super(Rest, self). __init__(yaml_data=yaml_data)
         self.request_builders = request_builders
 
-    def imports(self) -> FileImport:
+    def imports(self, builder_group_name: str) -> FileImport:
         file_import = FileImport()
         for request_builder in self.request_builders:
-            file_import.merge(request_builder.imports())
+            if request_builder.builder_group_name == builder_group_name:
+                file_import.merge(request_builder.imports())
         return file_import
 
     @classmethod

package/autorest/codegen/models/utils.py

@@ -0,0 +1,8 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import re
+
+JSON_REGEXP = re.compile(r'^(application|text)/(.+\+)?json$')