@autorest/python 5.9.1 → 5.9.2

package/ChangeLog.md

@@ -1,5 +1,18 @@
 # Change Log
 
+### 2021-10-05 - 5.9.2
+
+| Library | Min Version
+| --------------- | -------
+|`@autorest/core` |  `3.6.2`
+|`@autorest/modelerfour` | `4.19.1`
+|`azure-core` dep of generated code | `1.19.0`
+|`msrest` dep of generated code | `0.6.21`
+|`azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`
+
+**New Features**
+- Updating generated code for `azure-core` release `1.19.0`.
+
 ### 2021-09-27 - 5.9.1
 
 | Library | Min Version

package/autorest/codegen/models/code_model.py

@@ -349,14 +349,7 @@ class CodeModel:  # pylint: disable=too-many-instance-attributes
 
     @property
     def need_request_converter(self) -> bool:
-        if not self.options["show_operations"]:
-            return False
-        if not self.options["version_tolerant"]:
-            return True
-        for og in self.operation_groups:
-            if any(o for o in og.operations if o.use_pipeline_transport):
-                return True
-        return False
+        return self.options["show_operations"] and not self.options["version_tolerant"]
 
     @property
     def need_format_url(self) -> bool:

package/autorest/codegen/models/lro_operation.py

@@ -45,7 +45,6 @@ class LROOperation(Operation):
         )
         self.lro_options = yaml_data.get("extensions", {}).get("x-ms-long-running-operation-options", {})
         self.name = "begin_" + self.name
-        self.use_pipeline_transport = True
 
     @property
     def lro_response(self) -> Optional[SchemaResponse]:
@@ -91,7 +90,6 @@ class LROOperation(Operation):
             want_tracing=False,
         )
         operation.request_builder = self.request_builder
-        operation.use_pipeline_transport = True
         return operation
 
     @property

package/autorest/codegen/models/operation.py

@@ -52,7 +52,6 @@ class Operation(BaseBuilder):  # pylint: disable=too-many-public-methods, too-ma
         self.want_tracing = want_tracing
         self._request_builder: Optional[RequestBuilder] = None
         self.deprecated = False
-        self.use_pipeline_transport = False
 
     @property
     def python_name(self) -> str:

package/autorest/codegen/models/paging_operation.py

@@ -51,7 +51,6 @@ class PagingOperation(Operation):
         self.operation_name: str = yaml_data["extensions"]["x-ms-pageable"].get("operationName")
         self.next_operation: Optional[Operation] = None
         self.override_success_response_to_200 = override_success_response_to_200
-        self.use_pipeline_transport = True
 
     def _get_response(self) -> SchemaResponse:
         response = self.responses[0]

package/autorest/codegen/models/request_builder.py

@@ -101,7 +101,9 @@ class RequestBuilder(BaseBuilder):
             create_parameters(yaml_data, RequestBuilderParameter.from_yaml)
         )
         parameter_list = RequestBuilderParameterList(parameters + multiple_media_type_parameters)
-        parameter_list.add_body_kwargs()
+
+        schema_requests = [SchemaRequest.from_yaml(yaml) for yaml in yaml_data["requests"]]
+        parameter_list.add_body_kwargs(schema_requests)
 
         request_builder_class = cls(
             yaml_data=yaml_data,
@@ -109,7 +111,7 @@ class RequestBuilder(BaseBuilder):
             url=first_request["protocol"]["http"]["path"],
             method=first_request["protocol"]["http"]["method"].upper(),
             multipart=first_request["protocol"]["http"].get("multipart", False),
-            schema_requests=[SchemaRequest.from_yaml(yaml) for yaml in yaml_data["requests"]],
+            schema_requests=schema_requests,
             parameters=parameter_list,
             description=yaml_data["language"]["python"]["description"],
             responses=[SchemaResponse.from_yaml(yaml) for yaml in yaml_data.get("responses", [])],

package/autorest/codegen/models/request_builder_parameter_list.py

@@ -11,6 +11,7 @@ from .parameter import ParameterLocation, Parameter
 from .primitive_schemas import IOSchema, AnySchema
 from .dictionary_schema import DictionarySchema
 from .base_schema import BaseSchema
+from .schema_request import SchemaRequest
 
 T = TypeVar('T')
 OrderedSet = Dict[T, None]
@@ -32,7 +33,7 @@ class RequestBuilderParameterList(ParameterList):
         self.body_kwarg_names[name] = None
         parameter.serialized_name = name
 
-    def add_body_kwargs(self) -> None:
+    def add_body_kwargs(self, schema_requests: List[SchemaRequest]) -> None:
         try:
             body_kwargs_added = []
             body_method_param = next(
@@ -71,7 +72,10 @@ class RequestBuilderParameterList(ParameterList):
                     data_kwarg.description
                 )
                 body_kwargs_added.append(data_kwarg)
-            if any([ct for ct in self.content_types if "json" in ct]):
+            if (
+                any(sr for sr in schema_requests if not sr.is_stream_request) and
+                any([ct for ct in self.content_types if "json" in ct])
+            ):
                 json_kwarg = copy(body_method_param)
                 self._change_body_param_name(json_kwarg, "json")
                 json_kwarg.description = (

package/autorest/codegen/serializers/builder_serializer.py

@@ -776,7 +776,7 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
         template_url = template_url or f"self.{builder.name}.metadata['url']"
         retval.append(f"    template_url={template_url},")
         retval.append(f")")
-        if not self.code_model.options["version_tolerant"] or builder.use_pipeline_transport:
+        if not self.code_model.options["version_tolerant"]:
             pass_files = ""
             if "files" in builder.body_kwargs_to_pass_to_request_builder:
                 pass_files = ", files"
@@ -795,7 +795,6 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
 
     def response_headers_and_deserialization(
         self,
-        builder: BuilderType,
         response: SchemaResponse,
     ) -> List[str]:
         retval: List[str] = [
@@ -820,14 +819,8 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
             else:
                 is_xml = any(["xml" in ct for ct in response.media_types])
                 deserialized_value = ""
-                if is_xml:
-                    deserialized_value = "ET.fromstring(response.text())"
-                elif builder.use_pipeline_transport:
-                    deserialized_value = "_loads(response.body())"
-                else:
-                    deserialized_value = "response.json()"
-                response_body = "response.body()" if builder.use_pipeline_transport else "response.content"
-                retval.append(f"if {response_body}:")
+                deserialized_value = "ET.fromstring(response.text())" if is_xml else "response.json()"
+                retval.append(f"if response.content:")
                 retval.append(f"    deserialized = {deserialized_value}")
                 retval.append("else:")
                 retval.append("    deserialized = None")
@@ -870,12 +863,12 @@ class _OperationBaseSerializer(_BuilderBaseSerializer):  # pylint: disable=abstr
                         retval.append(f"if response.status_code == {status_code}:")
                         retval.extend([
                             f"    {line}"
-                            for line in self.response_headers_and_deserialization(builder, response)
+                            for line in self.response_headers_and_deserialization(response)
                         ])
                         retval.append("")
             else:
                 retval.extend(self.response_headers_and_deserialization(
-                    builder, builder.responses[0]
+                    builder.responses[0]
                 ))
                 retval.append("")
         retval.append("if cls:")
@@ -1258,7 +1251,7 @@ class _LROOperationBaseSerializer(_OperationBaseSerializer):  # pylint: disable=
             retval.append("    response = pipeline_response.http_response")
             retval.extend([
                 f"    {line}"
-                for line in self.response_headers_and_deserialization(builder, builder.lro_response)
+                for line in self.response_headers_and_deserialization(builder.lro_response)
             ])
         retval.append("    if cls:")
         retval.append("        return cls(pipeline_response, {}, {})".format(

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

@@ -18,6 +18,6 @@
     {{ op_tools.serialize(operation_serializer.pop_kwargs_from_signature(operation)) | indent }}
     {% endif %}
     {{ op_tools.serialize(operation_serializer.call_request_builder(operation)) | indent }}
-    pipeline_response = {{ keywords.await }}self._client.send_request(request, {{ stream_request_parameter }}, _return_pipeline_response=True, **kwargs)
+    pipeline_response = {{ keywords.await }}self._client._pipeline.run(request, {{ stream_request_parameter }}, **kwargs)
     {{ op_tools.serialize(operation_serializer.handle_response(operation)) | indent }}
 {{ operation.python_name }}.metadata = {'url': {{ keywords.escape_str(request_builder.url) }}}  # type: ignore

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

@@ -16,7 +16,7 @@ VERSION = "{{ code_model.options.get('package_version', '0.0.0') }}"
 # prerequisite: setuptools
 # http://pypi.python.org/pypi/setuptools
 
-REQUIRES = ["msrest>=0.6.21", "azure-core<2.0.0,>=1.18.0"{{ azure_mgmt_core_import }}]
+REQUIRES = ["msrest>=0.6.21", "azure-core<2.0.0,>=1.19.0"{{ azure_mgmt_core_import }}]
 
 setup(
     name=NAME,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "5.9.1",
+    "version": "5.9.2",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@azure-tools/extension": "~3.2.1"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.0.35"
+        "@microsoft.azure/autorest.testserver": "^3.0.41"
     },
     "files": [
         "autorest/**/*.py",