@autorest/python 6.5.1 → 6.6.0

package/autorest/codegen/models/operation.py

@@ -331,7 +331,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             )
         return file_import
 
-    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
+    def imports(  # pylint: disable=too-many-branches
+        self, async_mode: bool, **kwargs: Any
+    ) -> FileImport:
         if self.abstract:
             return FileImport()
         file_import = self._imports_shared(async_mode, **kwargs)
@@ -356,6 +358,12 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(
                 self.parameters.body_parameter.type.imports(operation=self, **kwargs)
             )
+        if not async_mode:
+            for param in self.parameters.headers:
+                if param.wire_name.lower() == "repeatability-request-id":
+                    file_import.add_import("uuid", ImportType.STDLIB)
+                elif param.wire_name.lower() == "repeatability-first-sent":
+                    file_import.add_import("datetime", ImportType.STDLIB)
 
         # Exceptions
         errors = [

package/autorest/codegen/models/parameter.py

@@ -52,6 +52,9 @@ class ParameterDelimeter(str, Enum):
     COMMA = "comma"
 
 
+SPECIAL_HANDLE_HEADERS = ["repeatability-request-id", "repeatability-first-sent"]
+
+
 class _ParameterBase(
     BaseModel, abc.ABC
 ):  # pylint: disable=too-many-instance-attributes
@@ -90,6 +93,10 @@ class _ParameterBase(
         self.default_to_unset_sentinel: bool = self.yaml_data.get(
             "defaultToUnsetSentinel", False
         )
+        self.is_special_handle_header: bool = (
+            self.location == ParameterLocation.HEADER
+            and self.wire_name.lower() in SPECIAL_HANDLE_HEADERS
+        )
 
     @property
     def constant(self) -> bool:

package/autorest/codegen/models/parameter_list.py

@@ -213,7 +213,9 @@ class _ParameterListBase(
         method_params: List[Union[ParameterType, BodyParameterType]] = [
             p
             for p in self.parameters
-            if p.in_method_signature and p.implementation == self.implementation
+            if p.in_method_signature
+            and p.implementation == self.implementation
+            and not p.is_special_handle_header
         ]
         if self._body_parameter:
             if self._body_parameter.in_method_signature:

package/autorest/codegen/serializers/builder_serializer.py

@@ -437,6 +437,21 @@ class _BuilderBaseSerializer(Generic[BuilderType]):  # pylint: disable=abstract-
             ]
         return retval
 
+    @staticmethod
+    def _serialize_special_handle_header(param: Parameter) -> List[str]:
+        if param.wire_name.lower() == "repeatability-request-id":
+            return [
+                """if "Repeatability-Request-ID" not in _headers:""",
+                """    _headers["Repeatability-Request-ID"] = str(uuid.uuid4())""",
+            ]
+        if param.wire_name.lower() == "repeatability-first-sent":
+            return [
+                """if "Repeatability-First-Sent" not in _headers:""",
+                """    _headers["Repeatability-First-Sent"] = _SERIALIZER.serialize_data(datetime.datetime.now(),
+                "rfc-1123")""",
+            ]
+        raise ValueError(f"Unsupported special header: {param}")
+
     def serialize_path(self, builder: BuilderType) -> List[str]:
         return self.parameter_serializer.serialize_path(
             builder.parameters.path, self.serializer_name
@@ -548,12 +563,15 @@ class RequestBuilderSerializer(
     def serialize_headers(self, builder: RequestBuilderType) -> List[str]:
         retval = ["# Construct headers"]
         for parameter in builder.parameters.headers:
-            retval.extend(
-                self._serialize_parameter(
-                    parameter,
-                    kwarg_name="headers",
+            if parameter.is_special_handle_header:
+                retval.extend(self._serialize_special_handle_header(parameter))
+            else:
+                retval.extend(
+                    self._serialize_parameter(
+                        parameter,
+                        kwarg_name="headers",
+                    )
                 )
-            )
         return retval
 
     def serialize_query(self, builder: RequestBuilderType) -> List[str]:
@@ -710,6 +728,7 @@ class _OperationSerializer(
             )
             else PopKwargType.SIMPLE,
             check_client_input=not self.code_model.options["multiapi"],
+            operation_name=f"('{builder.name}')" if builder.group_name == "" else "",
         )
         cls_annotation = builder.cls_type_annotation(async_mode=self.async_mode)
         pylint_disable = ""

package/autorest/codegen/serializers/client_serializer.py

@@ -150,10 +150,16 @@ class ClientSerializer:
             og for og in self.client.operation_groups if not og.is_mixin
         ]
         for og in operation_groups:
+            if og.code_model.options["multiapi"]:
+                api_version = (
+                    f", '{og.api_versions[0]}'" if og.api_versions else ", None"
+                )
+            else:
+                api_version = ""
             retval.extend(
                 [
                     f"self.{og.property_name} = {og.class_name}({og.pylint_disable}",
-                    "    self._client, self._config, self._serialize, self._deserialize",
+                    f"    self._client, self._config, self._serialize, self._deserialize{api_version}",
                     ")",
                 ]
             )

package/autorest/codegen/serializers/parameter_serializer.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import List, Sequence, Union
+from typing import List, Sequence, Union, Optional
 from enum import Enum, auto
 
 
@@ -111,6 +111,7 @@ class ParameterSerializer:
         pop_headers_kwarg: PopKwargType,
         pop_params_kwarg: PopKwargType,
         check_client_input: bool = False,
+        operation_name: Optional[str] = None,
     ) -> List[str]:
         retval = []
 
@@ -142,9 +143,18 @@ class ParameterSerializer:
                         if kwarg.location == ParameterLocation.HEADER
                         else "params"
                     )
+                    if (
+                        kwarg.client_name == "api_version"
+                        and kwarg.code_model.options["multiapi"]
+                        and operation_name is not None
+                    ):
+                        default_value = (
+                            f"self._api_version{operation_name} or {default_value}"
+                        )
                     default_value = (
                         f"_{kwarg_dict}.pop('{kwarg.wire_name}', {default_value})"
                     )
+
                 retval.append(
                     f"{kwarg.client_name}: {type_annot} = kwargs.pop('{kwarg.client_name}', "
                     + f"{default_value})"

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

@@ -30,12 +30,22 @@ class {{ operation_group.class_name }}{{ base_class }}:{{ disable }}
         self._config = input_args.pop(0) if input_args else kwargs.pop("config")
         self._serialize = input_args.pop(0) if input_args else kwargs.pop("serializer")
         self._deserialize = input_args.pop(0) if input_args else kwargs.pop("deserializer")
+        {% if code_model.options["multiapi"] %}
+        self._api_version = input_args.pop(0) if input_args else kwargs.pop("api_version")
+        {% endif %}
 {{ check_abstract_methods() }}
 {% elif operation_group.has_abstract_operations %}
 
     def __init__(self){{ return_none_type_annotation }}:
 {{ check_abstract_methods() }}
 {% endif %}
+{% if operation_group.is_mixin and code_model.options["multiapi"] %}
+    def _api_version(self, op_name: str) -> str:  # pylint: disable=unused-argument
+        try:
+            return self._config.api_version
+        except:  # pylint: disable=bare-except
+            return ""
+{% endif %}
 {% for operation in operation_group.operations if not operation.abstract %}
 
 {% set request_builder = operation.request_builder %}

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

@@ -87,6 +87,8 @@ class {{ code_model.client.name }}({% if code_model.operation_mixin_group.mixin_
         else:
             raise ValueError("API version {} is not available".format(api_version))
         {% endif %}
+        if api_version:
+            kwargs.setdefault('api_version', api_version)
         self._config = {{ code_model.client.name }}Configuration({{ code_model.global_parameters.call }}{{ ", " if code_model.global_parameters.call }}**kwargs)
         self._client = {{ async_prefix }}{{ code_model.client.pipeline_client }}(base_url={{ code_model.host_variable_name }}, config=self._config, **kwargs)
         super({{ code_model.client.name }}, self).__init__(
@@ -132,7 +134,7 @@ class {{ code_model.client.name }}({% if code_model.operation_mixin_group.mixin_
         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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
     {% endfor %}
 
     {{ def }} close(self):

package/package.json

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