@autorest/python 6.2.2 → 6.2.4

package/autorest/codegen/models/client.py

@@ -172,10 +172,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             )
 
         for gp in self.parameters:
-            if (
-                gp.method_location == ParameterMethodLocation.KWARG
-                and gp not in self.parameters.kwargs_to_pop
-            ):
+            if gp.method_location == ParameterMethodLocation.KWARG:
                 continue
             file_import.merge(gp.imports(async_mode))
         file_import.add_submodule_import(

package/autorest/codegen/models/parameter_list.py

@@ -393,6 +393,15 @@ class _RequestBuilderParameterList(
             p for p in super().path if p.location != ParameterLocation.ENDPOINT_PATH
         ]
 
+    @property
+    def constant(
+        self,
+    ) -> List[Union[RequestBuilderParameter, RequestBuilderBodyParameterType]]:
+        """All constant parameters"""
+        return [
+            p for p in super().constant if p.location != ParameterLocation.ENDPOINT_PATH
+        ]
+
 
 class RequestBuilderParameterList(_RequestBuilderParameterList):
     """Parameter list for Request Builder"""
@@ -463,15 +472,6 @@ class ClientGlobalParameterList(_ClientGlobalParameterList[ClientParameter]):
         except StopIteration:
             return None
 
-    @property
-    def kwargs_to_pop(self) -> List[Union[ClientParameter, BodyParameter]]:
-        """We only want to pass base url path parameters in the client"""
-        return [
-            k
-            for k in super().kwargs_to_pop
-            if k.location == ParameterLocation.ENDPOINT_PATH
-        ]
-
 
 class ConfigGlobalParameterList(_ClientGlobalParameterList[ConfigParameter]):
     """Parameter list for config"""

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/serializers/sample_serializer.py

@@ -87,6 +87,15 @@ class SampleSerializer:
 
         return client_params
 
+    @staticmethod
+    def handle_param(param: Any) -> str:
+        if isinstance(param, str):
+            if any(i in param for i in '\r\n"'):
+                return f'"""{param}"""'
+            return f'"{param}"'
+
+        return str(param)
+
     # prepare operation parameters
     def _operation_params(self) -> Dict[str, Any]:
         params_positional = [
@@ -94,7 +103,6 @@ class SampleSerializer:
             for p in self.operation.parameters.positional
             if not p.client_default_value
         ]
-        cls = lambda x: f'"{x}"' if isinstance(x, str) else str(x)
         failure_info = "fail to find required param named {} in example file {}"
         operation_params = {}
         for param in params_positional:
@@ -103,7 +111,7 @@ class SampleSerializer:
             if not param.optional:
                 if not param_value:
                     raise Exception(failure_info.format(name, self.sample_origin_name))
-                operation_params[param.client_name] = cls(param_value)
+                operation_params[param.client_name] = self.handle_param(param_value)
         return operation_params
 
     def _operation_group_name(self) -> str:

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

@@ -5,9 +5,6 @@
     {{ serializer.init_signature_and_response_type_annotation(async_mode) | indent }}
     {% if serializer.should_init_super %}
         super().__init__()
-    {% endif %}
-    {% if client.parameters.kwargs_to_pop %}
-        {{ op_tools.serialize(serializer.pop_kwargs_from_signature()) | indent(8) }}
     {% endif %}
         {% if client.has_parameterized_host %}
         {{ serializer.host_variable_name }} = {{ keywords.escape_str(client.url) }}

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/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.2",
+  "version": "6.2.4",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",