@autorest/python 6.1.7 → 6.1.9

package/autorest/_utils.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
+from typing import Any, Dict, Tuple
 import re
 import argparse
 
@@ -37,7 +37,9 @@ def to_snake_case(name: str) -> str:
     return re.sub("[A-Z]+", replace_upper_characters, name)
 
 
-def parse_args(need_cadl_file: bool = True):
+def parse_args(
+    need_cadl_file: bool = True,
+) -> Tuple[argparse.Namespace, Dict[str, Any]]:
     parser = argparse.ArgumentParser(
         description="Run mypy against target folder. Add a local custom plugin to the path prior to execution. "
     )
@@ -60,7 +62,24 @@ def parse_args(need_cadl_file: bool = True):
         required=False,
         action="store_true",
     )
-    return parser.parse_args()
+    args, unknown_args = parser.parse_known_args()
+
+    def _get_value(value: Any) -> Any:
+        if value == "true":
+            return True
+        if value == "false":
+            return False
+        try:
+            return int(value)
+        except ValueError:
+            pass
+        return value
+
+    unknown_args_ret = {
+        ua.strip("--").split("=")[0]: _get_value(ua.strip("--").split("=")[1])
+        for ua in unknown_args
+    }
+    return args, unknown_args_ret
 
 
 def get_body_type_for_description(body_parameter: Dict[str, Any]) -> str:

package/autorest/black/__init__.py

@@ -54,5 +54,5 @@ class BlackScriptPluginAutorest(BlackScriptPlugin, PluginAutorest):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args(need_cadl_file=False)
-    BlackScriptPlugin(output_folder=args.output_folder).process()
+    args, unknown_args = parse_args(need_cadl_file=False)
+    BlackScriptPlugin(output_folder=args.output_folder, **unknown_args).process()

package/autorest/cadlflags/__init__.py

@@ -124,5 +124,7 @@ class CadlFlags(YamlUpdatePlugin):  # pylint: disable=abstract-method
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
-    CadlFlags(output_folder=args.output_folder, cadl_file=args.cadl_file).process()
+    args, unknown_args = parse_args()
+    CadlFlags(
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
+    ).process()

package/autorest/codegen/__init__.py

@@ -361,5 +361,7 @@ class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
-    CodeGenerator(output_folder=args.output_folder, cadl_file=args.cadl_file).process()
+    args, unknown_args = parse_args()
+    CodeGenerator(
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
+    ).process()

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/m2r/__init__.py

@@ -68,5 +68,7 @@ class M2RAutorest(YamlUpdatePluginAutorest, M2R):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
-    M2R(output_folder=args.output_folder, cadl_file=args.cadl_file).process()
+    args, unknown_args = parse_args()
+    M2R(
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
+    ).process()

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/preprocess/__init__.py

@@ -363,7 +363,7 @@ class PreProcessPluginAutorest(YamlUpdatePluginAutorest, PreProcessPlugin):
 
 if __name__ == "__main__":
     # CADL pipeline will call this
-    args = parse_args()
+    args, unknown_args = parse_args()
     PreProcessPlugin(
-        output_folder=args.output_folder, cadl_file=args.cadl_file
+        output_folder=args.output_folder, cadl_file=args.cadl_file, **unknown_args
     ).process()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.1.7",
+  "version": "6.1.9",
   "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": [