@autorest/python 6.2.1 → 6.2.3

package/autorest/codegen/models/paging_operation.py

@@ -143,7 +143,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             file_import.merge(
                 self.get_request_builder_import(self.next_request_builder, async_mode)
             )
-        elif "api-version" in [p.rest_api_name for p in self.client.parameters]:
+        elif any(p.is_api_version for p in self.client.parameters):
             file_import.add_import("urllib.parse", ImportType.STDLIB)
             file_import.add_submodule_import(
                 "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE

package/autorest/codegen/models/parameter.py

@@ -86,6 +86,7 @@ class _ParameterBase(
         self.grouper: bool = self.yaml_data.get("grouper", False)
         self.check_client_input: bool = self.yaml_data.get("checkClientInput", False)
         self.added_on: Optional[str] = self.yaml_data.get("addedOn")
+        self.is_api_version: bool = self.yaml_data.get("isApiVersion", False)
 
     @property
     def constant(self) -> bool:
@@ -93,7 +94,9 @@ class _ParameterBase(
         Checking to see if it's required, because if not, we don't consider it
         a constant because it can have a value of None.
         """
-        return not self.optional and isinstance(self.type, ConstantType)
+        return (not self.optional or self.is_api_version) and isinstance(
+            self.type, ConstantType
+        )
 
     @property
     def description(self) -> str:

package/autorest/codegen/serializers/builder_serializer.py

@@ -1203,7 +1203,9 @@ class _PagingOperationSerializer(
         next_link_str = "next_link"
         try:
             api_version_param = next(
-                p for p in builder.client.parameters if p.rest_api_name == "api-version"
+                p
+                for p in builder.client.parameters
+                if p.is_api_version and p.location == ParameterLocation.QUERY
             )
             retval.append("# make call to next link with the client's api-version")
             retval.append("_parsed_next_link = urllib.parse.urlparse(next_link)")

package/autorest/codegen/serializers/model_serializer.py

@@ -248,10 +248,9 @@ class DpgModelSerializer(_ModelSerializer):
 
     @staticmethod
     def declare_property(prop: Property) -> List[str]:
-        attribute_key = _ModelSerializer.escape_dot(prop.rest_api_name)
         args = []
-        if prop.client_name != attribute_key or prop.is_discriminator:
-            args.append(f'name="{attribute_key}"')
+        if prop.client_name != prop.rest_api_name or prop.is_discriminator:
+            args.append(f'name="{prop.rest_api_name}"')
         if prop.readonly:
             args.append("readonly=True")
         if prop.client_default_value is not None:

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

@@ -92,7 +92,7 @@ setup(
         "azure-core<2.0.0,>=1.24.0",
         {% endif %}
         {% if code_model.need_typing_extensions %}
-        "typing_extensions>=4.3.0; python_version<'3.8.0'",
+        "typing-extensions>=4.3.0; python_version<'3.8.0'",
         {% endif %}
     ],
     {% if package_mode %}

package/autorest/m4reformatter/__init__.py

@@ -280,35 +280,6 @@ def update_type(yaml_data: Dict[str, Any]) -> Dict[str, Any]:
     return updated_type
 
 
-def update_parameter_base(
-    yaml_data: Dict[str, Any], *, override_client_name: Optional[str] = None
-) -> Dict[str, Any]:
-    location = yaml_data["protocol"].get("http", {}).get("in")
-    if not location:
-        location = "other"
-    if location == "uri":
-        location = "endpointPath"
-    grouped_by = (
-        yaml_data["groupedBy"]["language"]["default"]["name"]
-        if yaml_data.get("groupedBy")
-        else None
-    )
-    client_name: str = override_client_name or yaml_data["language"]["default"]["name"]
-    if grouped_by and client_name[0] != "_":
-        # this is an m4 bug, doesn't hide constant grouped params, patching m4 for now
-        client_name = "_" + client_name
-    return {
-        "optional": not yaml_data.get("required", False),
-        "description": yaml_data["language"]["default"]["description"],
-        "clientName": client_name,
-        "restApiName": yaml_data["language"]["default"].get("serializedName"),
-        "clientDefaultValue": yaml_data.get("clientDefaultValue"),
-        "location": location,
-        "groupedBy": grouped_by,
-        "checkClientInput": yaml_data.get("checkClientInput", False),
-    }
-
-
 def update_parameter_delimiter(style: Optional[str]) -> Optional[str]:
     if not style:
         return None
@@ -458,6 +429,45 @@ class M4Reformatter(
             or self.version_tolerant
         )
 
+    def update_parameter_base(
+        self, yaml_data: Dict[str, Any], *, override_client_name: Optional[str] = None
+    ) -> Dict[str, Any]:
+        location = yaml_data["protocol"].get("http", {}).get("in")
+        if not location:
+            location = "other"
+        if location == "uri":
+            location = "endpointPath"
+        grouped_by = (
+            yaml_data["groupedBy"]["language"]["default"]["name"]
+            if yaml_data.get("groupedBy")
+            else None
+        )
+        client_name: str = (
+            override_client_name or yaml_data["language"]["default"]["name"]
+        )
+        if grouped_by and client_name[0] != "_":
+            # this is an m4 bug, doesn't hide constant grouped params, patching m4 for now
+            client_name = "_" + client_name
+        if yaml_data.get("origin") == "modelerfour:synthesized/api-version":
+            yaml_data["inDocstring"] = False
+            if self.legacy:
+                yaml_data["implementation"] = "Method"
+                yaml_data["checkClientInput"] = self.check_client_input
+            yaml_data["isApiVersion"] = True
+        return {
+            "optional": not yaml_data.get("required", False),
+            "description": yaml_data["language"]["default"]["description"],
+            "clientName": client_name,
+            "restApiName": yaml_data["language"]["default"].get("serializedName"),
+            "clientDefaultValue": yaml_data.get("clientDefaultValue"),
+            "location": location,
+            "groupedBy": grouped_by,
+            "checkClientInput": yaml_data.get("checkClientInput", False),
+            "inDocstring": yaml_data.get("inDocstring", True),
+            "isApiVersion": yaml_data.get("isApiVersion", False),
+            "implementation": yaml_data.get("implementation"),
+        }
+
     def update_overloads(
         self,
         group_name: str,
@@ -646,7 +656,7 @@ class M4Reformatter(
     ) -> Dict[str, Any]:
         flattened = body_param.get("flattened")
         is_partial_body = body_param.get("isPartialBody")
-        param_base = update_parameter_base(body_param)
+        param_base = self.update_parameter_base(body_param)
         body_param = copy.deepcopy(param_base)
         body_param["type"] = body_type
         body_param["contentTypes"] = content_types or [
@@ -811,11 +821,6 @@ class M4Reformatter(
             ):
                 continue
             seen_client_names.add(client_name)
-            if param.get("origin") == "modelerfour:synthesized/api-version":
-                param["inDocstring"] = False
-                if self.legacy:
-                    param["implementation"] = "Method"
-                    param["checkClientInput"] = self.check_client_input
             if has_flattened_body and param.get("targetProperty"):
                 retval.append(self.update_flattened_parameter(param, body_parameter))
                 continue
@@ -910,7 +915,7 @@ class M4Reformatter(
         in_overload: bool = False,
         in_overriden: bool = False,
     ) -> Dict[str, Any]:
-        param_base = update_parameter_base(
+        param_base = self.update_parameter_base(
             yaml_data, override_client_name=override_client_name
         )
         type = get_type(yaml_data["schema"])
@@ -948,13 +953,17 @@ class M4Reformatter(
 
                 client_name = "base_url" if self.legacy else "endpoint"
                 global_parameter["language"]["default"]["description"] = "Service URL."
-            elif name == "api_version":
+            elif (
+                global_parameter.get("origin") == "modelerfour:synthesized/api-version"
+            ):
                 self.check_client_input = True
-            global_params.append(
-                self.update_parameter(
-                    global_parameter, override_client_name=client_name
-                )
+            param = self.update_parameter(
+                global_parameter, override_client_name=client_name
             )
+            if global_parameter.get("origin") == "modelerfour:synthesized/api-version":
+                param["implementation"] = "Client"
+                param["checkClientInput"] = False
+            global_params.append(param)
         return global_params
 
     def get_token_credential(self, credential_scopes: List[str]) -> Dict[str, Any]:

package/autorest/preprocess/helpers.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 from typing import Any, Dict
+import re
 from .python_mappings import PadType, RESERVED_WORDS, REDEFINED_BUILTINS
 
 
@@ -12,6 +13,7 @@ def pad_reserved_words(name: str, pad_type: PadType):
     if not name:
         # we'll pass in empty operation groups sometime etc.
         return name
+    name = pad_special_chars(name)
     name_prefix = "_" if name[0] == "_" else ""
     name = name[1:] if name[0] == "_" else name
     if name.lower() in RESERVED_WORDS[pad_type]:
@@ -22,3 +24,7 @@ def pad_reserved_words(name: str, pad_type: PadType):
 def add_redefined_builtin_info(name: str, yaml_data: Dict[str, Any]) -> None:
     if name in REDEFINED_BUILTINS:
         yaml_data["pylintDisable"] = "redefined-builtin"
+
+
+def pad_special_chars(name: str) -> str:
+    return re.sub(r"[^A-z0-9_]", "_", name)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.2.1",
+  "version": "6.2.3",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",