@autorest/python 6.4.4 → 6.4.6

package/autorest/codegen/models/parameter.py

@@ -140,7 +140,11 @@ class _ParameterBase(
 
     def type_annotation(self, **kwargs: Any) -> str:
         kwargs["is_operation_file"] = True
-        type_annot = self.type.type_annotation(**kwargs)
+        # special logic for api-version parameter
+        if self.is_api_version:
+            type_annot = "str"
+        else:
+            type_annot = self.type.type_annotation(**kwargs)
         if self.optional and self.client_default_value is None:
             return f"Optional[{type_annot}]"
         return type_annot
@@ -176,9 +180,13 @@ class _ParameterBase(
 
     def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         file_import = self._imports_shared(async_mode, **kwargs)
-        file_import.merge(
-            self.type.imports(is_operation_file=True, async_mode=async_mode, **kwargs)
-        )
+        # special logic for api-version parameter
+        if not self.is_api_version:
+            file_import.merge(
+                self.type.imports(
+                    is_operation_file=True, async_mode=async_mode, **kwargs
+                )
+            )
         if self.default_to_unset_sentinel:
             file_import.add_submodule_import("typing", "Any", ImportType.STDLIB)
             file_import.define_mypy_type(

package/autorest/codegen/serializers/parameter_serializer.py

@@ -127,6 +127,7 @@ class ParameterSerializer:
         if pop_headers_kwarg != PopKwargType.NO or pop_params_kwarg != PopKwargType.NO:
             retval.append("")
         for kwarg in parameters:
+            type_annot = kwarg.type_annotation()
             if kwarg.client_default_value is not None or kwarg.optional:
                 if check_client_input and kwarg.check_client_input:
                     default_value = f"self._config.{kwarg.client_name}"
@@ -145,11 +146,10 @@ class ParameterSerializer:
                         f"_{kwarg_dict}.pop('{kwarg.rest_api_name}', {default_value})"
                     )
                 retval.append(
-                    f"{kwarg.client_name}: {kwarg.type_annotation()} = kwargs.pop('{kwarg.client_name}', "
+                    f"{kwarg.client_name}: {type_annot} = kwargs.pop('{kwarg.client_name}', "
                     + f"{default_value})"
                 )
             else:
-                type_annot = kwarg.type_annotation()
                 retval.append(
                     f"{kwarg.client_name}: {type_annot} = kwargs.pop('{kwarg.client_name}')"
                 )

package/autorest/codegen/templates/metadata.json.jinja2

@@ -1,7 +1,5 @@
 {% import 'operation_tools.jinja2' as op_tools %}
 {% import 'keywords.jinja2' as keywords %}
-{% set only_path = client.code_model.options["only_path_and_body_params_positional"] %}
-{% set method_location = "keywordOnly" if only_path else "positional" %}
 {
     "chosen_version": {{ chosen_version | tojson }},
     "total_api_version_list": {{ total_api_version_list | tojson }},
@@ -52,15 +50,15 @@
                     "description": "API version to use if no profile is provided, or if missing in profile.",
                     "docstring_type": "str",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 },
                 {% if not client.has_parameterized_host %}
-                "{{ "endpoint" if only_path else "base_url" }}": {
+                "base_url": {
                     "signature": {{ client.parameters.host.method_signature(async_mode=False) | tojson }},
                     "description": "Service URL",
                     "docstring_type": "str",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 },
                 {% endif %}
                 "profile": {
@@ -68,7 +66,7 @@
                     "description": "A profile definition, from KnownProfiles to dict.",
                     "docstring_type": "azure.profiles.KnownProfiles",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 }
             },
             "async": {
@@ -77,15 +75,15 @@
                     "description": "API version to use if no profile is provided, or if missing in profile.",
                     "docstring_type": "str",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 },
                 {% if not client.has_parameterized_host %}
-                "{{ "endpoint" if only_path else "base_url" }}": {
+                "base_url": {
                     "signature": {{ client.parameters.host.method_signature(async_mode=True) | tojson }},
                     "description": "Service URL",
                     "docstring_type": "str",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 },
                 {% endif %}
                 "profile": {
@@ -93,7 +91,7 @@
                     "description": "A profile definition, from KnownProfiles to dict.",
                     "docstring_type": "azure.profiles.KnownProfiles",
                     "required": false,
-                    "method_location": {{ method_location | tojson }}
+                    "method_location": "positional"
                 }
             }
         }

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

@@ -631,7 +631,7 @@ class Serializer(object):
                         if xml_desc.get("attr", False):
                             if xml_ns:
                                 ET.register_namespace(xml_prefix, xml_ns)
-                                xml_name = "{}{}".format(xml_ns, xml_name)
+                                xml_name = "{% raw %}{{{}}}{}{% endraw %}".format(xml_ns, xml_name)
                             serialized.set(xml_name, new_attr)  # type: ignore
                             continue
                         if xml_desc.get("text", False):
@@ -1273,7 +1273,7 @@ def _extract_name_from_internal_type(internal_type):
     xml_name = internal_type_xml_map.get("name", internal_type.__name__)
     xml_ns = internal_type_xml_map.get("ns", None)
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{% raw %}{{{}}}{}{% endraw %}".format(xml_ns, xml_name)
     return xml_name
 
 
@@ -1297,7 +1297,7 @@ def xml_key_extractor(attr, attr_desc, data):
     # Integrate namespace if necessary
     xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{% raw %}{{{}}}{}{% endraw %}".format(xml_ns, xml_name)
 
     # If it's an attribute, that's simple
     if xml_desc.get("attr", False):

package/autorest/m4reformatter/__init__.py

@@ -994,11 +994,7 @@ class M4Reformatter(
             if name == "$host":
                 # I am the non-parameterized endpoint. Modify name based off of flag
 
-                client_name = (
-                    "endpoint"
-                    if self.only_path_and_body_parameters_positional
-                    else "base_url"
-                )
+                client_name = "endpoint" if self.version_tolerant else "base_url"
                 global_parameter["language"]["default"]["description"] = "Service URL."
             elif (
                 global_parameter.get("origin") == "modelerfour:synthesized/api-version"
@@ -1129,7 +1125,7 @@ class M4Reformatter(
             "skipUrlEncoding": True,
             "inOverload": False,
         }
-        if self.only_path_and_body_parameters_positional:
+        if self.version_tolerant:
             parameters.append(credential)
         else:
             parameters.insert(0, credential)

package/autorest/preprocess/__init__.py

@@ -325,14 +325,22 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
         code_model: Dict[str, Any],
         yaml_data: Dict[str, Any],
         is_overload: bool = False,
+        item_type: Optional[Dict[str, Any]] = None,
     ) -> None:
         self.update_lro_operation(code_model, yaml_data, is_overload=is_overload)
-        self.update_paging_operation(code_model, yaml_data, is_overload=is_overload)
+        self.update_paging_operation(
+            code_model, yaml_data, is_overload=is_overload, item_type=item_type
+        )
         yaml_data["discriminator"] = "lropaging"
         for response in yaml_data.get("responses", []):
             response["discriminator"] = "lropaging"
         for overload in yaml_data.get("overloads", []):
-            self.update_lro_paging_operation(code_model, overload, is_overload=True)
+            self.update_lro_paging_operation(
+                code_model,
+                overload,
+                is_overload=True,
+                item_type=yaml_data["responses"][0]["itemType"],
+            )
 
     def update_lro_operation(
         self,

package/package.json

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

package/requirements.txt

@@ -6,7 +6,7 @@ json-rpc==1.14.0
 m2r2==0.3.3
 MarkupSafe==2.1.2
 mistune==0.8.4
-pathspec==0.11.0
-platformdirs==3.1.0
+pathspec==0.11.1
+platformdirs==3.2.0
 PyYAML==6.0
 tomli==2.0.1