@autorest/python 6.1.8 → 6.1.10

package/autorest/codegen/models/model_type.py

@@ -75,7 +75,8 @@ class ModelType(
     @property
     def serialization_type(self) -> str:
         if self.code_model.options["models_mode"] == "msrest":
-            return f"{'' if self.is_public else (self.code_model.models_filename + '.')}{self.name}"
+            private_model_path = f"_models.{self.code_model.models_filename}."
+            return f"{'' if self.is_public else private_model_path}{self.name}"
         if self.code_model.options["models_mode"] == "dpg":
             return f"{'' if self.is_public else '_models.'}_models.{self.name}"
         return "object"

package/autorest/codegen/serializers/builder_serializer.py

@@ -1258,9 +1258,12 @@ class _PagingOperationSerializer(
         response = builder.responses[0]
         deserialized = "pipeline_response.http_response.json()"
         if self.code_model.options["models_mode"] == "msrest":
-            deserialized = (
-                f'self._deserialize("{response.serialization_type}", pipeline_response)'
-            )
+            deserialize_type = response.serialization_type
+            pylint_disable = "  # pylint: disable=protected-access"
+            if isinstance(response.type, ModelType) and response.type.is_public:
+                deserialize_type = f'"{response.serialization_type}"'
+                pylint_disable = ""
+            deserialized = f"self._deserialize(\n    {deserialize_type}, pipeline_response{pylint_disable}\n)"
         elif self.code_model.options["models_mode"] == "dpg":
             deserialized = (
                 f"_deserialize({response.serialization_type}, pipeline_response)"
@@ -1440,6 +1443,7 @@ class _LROOperationSerializer(_OperationSerializer[LROOperationType]):
                 retval.append("    response_headers = {}")
             if (
                 not self.code_model.options["models_mode"]
+                or self.code_model.options["models_mode"] == "dpg"
                 or builder.lro_response.headers
             ):
                 retval.append("    response = pipeline_response.http_response")

package/autorest/m4reformatter/__init__.py

@@ -386,7 +386,7 @@ def update_response(
 def _get_default_content_type(  # pylint: disable=too-many-return-statements
     content_types: Iterable[str],
 ) -> Optional[str]:
-    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct)]
+    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct.split(";")[0])]
     if json_values:
         if "application/json" in json_values:
             return "application/json"

package/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2

@@ -29,10 +29,11 @@ class {{ code_model.client.name }}OperationsMixin(object):
         mixin_instance = OperationClass()
         mixin_instance._client = self._client
         mixin_instance._config = self._config
+        mixin_instance._config.api_version = api_version
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
         {% if not code_model.client.client_side_validation %}
         mixin_instance._serialize.client_side_validation = False
         {% endif %}
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return {{ "await " if mixin_operation.coroutine(async_mode) }}mixin_instance.{{ mixin_operation.name }}({{ mixin_operation.call(async_mode) }})
-{% endfor %}
+{% endfor %}

package/autorest/multiapi/templates/multiapi_service_client.py.jinja2

@@ -135,6 +135,7 @@ class {{ code_model.client.name }}({% if code_model.operation_mixin_group.mixin_
         {% endfor %}
         else:
             raise ValueError("API version {} does not have operation group '{{ operation_group.name }}'".format(api_version))
+        self._config.api_version = api_version
         return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
     {% endfor %}
 

package/autorest/postprocess/__init__.py

@@ -131,11 +131,13 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             f for f in folders if f.stem in ["operations", "_operations"]
         ]
         for operations_folder in operations_folders:
-            aio = ".aio" if operations_folder.parent.stem == "aio" else ""
+            sub_namespace = ".".join(
+                str(operations_folder.relative_to(self.base_folder)).split(os.sep)
+            )
             self.fix_imports_in_init(
                 generated_file_name="_operations",
                 folder_path=operations_folder,
-                namespace=f"{self.namespace}{aio}.{operations_folder.stem}",
+                namespace=f"{self.namespace}.{sub_namespace}",
             )
         shutil.rmtree(f"{str(self.output_folder)}/.temp_folder")
         return True
@@ -155,7 +157,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             k: None for k in customized_objects_str.split(",")
         }.keys()  # filter out duplicates
         file = (folder_path / "__init__.py").relative_to(self.output_folder)
-        file_content = self.read_file(file)
+        file_content = self.read_file(file).replace("\r\n", "\n")
         added_objs = []
         for obj in customized_objects:
             if f" import {obj}\n" in file_content:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.1.8",
+  "version": "6.1.10",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "@autorest/system-requirements": "~1.0.0"
   },
   "devDependencies": {
-    "@microsoft.azure/autorest.testserver": "^3.3.38",
+    "@microsoft.azure/autorest.testserver": "^3.3.41",
     "typescript": "^4.8.3"
   },
   "files": [