@autorest/python 6.7.4 → 6.7.6

package/autorest/codegen/models/client.py

@@ -85,8 +85,6 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         request_builders: List[Union[RequestBuilder, OverloadedRequestBuilder]] = []
         for og_group in self.yaml_data["operationGroups"]:
             for operation_yaml in og_group["operations"]:
-                if operation_yaml["discriminator"] in ("lro", "lropaging"):
-                    continue
                 request_builder = get_request_builder(
                     operation_yaml,
                     code_model=self.code_model,

package/autorest/codegen/models/lro_operation.py

@@ -146,10 +146,6 @@ class LROOperationBase(OperationBase[LROResponseType]):
         file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
         return file_import
 
-    @classmethod
-    def get_request_builder(cls, yaml_data: Dict[str, Any], client: "Client"):
-        return client.lookup_request_builder(id(yaml_data["initialOperation"]))
-
 
 class LROOperation(LROOperationBase[LROResponse]):
     ...

package/autorest/codegen/models/parameter.py

@@ -406,9 +406,13 @@ class ClientParameter(Parameter):
     def method_location(self) -> ParameterMethodLocation:
         if self.constant:
             return ParameterMethodLocation.KWARG
-        if self.is_host and (
-            self.code_model.options["version_tolerant"]
-            or self.code_model.options["low_level_client"]
+        if (
+            self.is_host
+            and (
+                self.code_model.options["version_tolerant"]
+                or self.code_model.options["low_level_client"]
+            )
+            and not self.code_model.options["azure_arm"]
         ):
             # this means i am the base url
             return ParameterMethodLocation.KEYWORD_ONLY

package/autorest/codegen/models/request_builder.py

@@ -57,6 +57,10 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         self.method: str = yaml_data["method"]
         self.want_tracing = False
 
+    @property
+    def is_lro(self) -> bool:
+        return self.yaml_data.get("discriminator") in ("lro", "lropaging")
+
     @property
     def pylint_disable(self) -> str:
         if len(self.name) > NAME_LENGTH_LIMIT:

package/autorest/codegen/serializers/operation_groups_serializer.py

@@ -48,6 +48,7 @@ class OperationGroupsSerializer:
             and r.group_name == operation_group.property_name
             and not r.is_overload
             and not r.abstract
+            and not r.is_lro  # lro has already initial builder
         ]
 
     def serialize(self) -> str:

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

@@ -1918,7 +1918,7 @@ class Deserializer(object):
         if re.search(r"[^\W\d_]", attr, re.I + re.U):  # type: ignore
             raise DeserializationError("Date must have only digits and -. Received: %s" % attr)
         # This must NOT use defaultmonth/defaultday. Using None ensure this raises an exception.
-        return isodate.parse_date(attr, defaultmonth=None, defaultday=None)
+        return isodate.parse_date(attr, defaultmonth=0, defaultday=0)
 
     @staticmethod
     def deserialize_time(attr):

package/autorest/preprocess/__init__.py

@@ -201,6 +201,10 @@ HEADERS_CONVERT_IN_METHOD = {
 }
 
 
+def get_wire_name_lower(parameter: Dict[str, Any]) -> str:
+    return (parameter.get("wireName") or "").lower()
+
+
 def headers_convert(yaml_data: Dict[str, Any], replace_data: Any) -> None:
     if isinstance(replace_data, dict):
         for k, v in replace_data.items():
@@ -307,19 +311,41 @@ class PreProcessPlugin(YamlUpdatePlugin):  # pylint: disable=abstract-method
         yaml_data["builderPadName"] = to_snake_case(prop_name)
         for og in yaml_data["operationGroups"]:
             for o in og["operations"]:
+                property_if_match = None
+                property_if_none_match = None
                 for p in o["parameters"]:
+                    wire_name_lower = get_wire_name_lower(p)
                     if (
                         p["location"] == "header"
-                        and p["wireName"] == "client-request-id"
-                    ):
-                        yaml_data["requestIdHeaderName"] = p["wireName"]
-                    if (
-                        self.version_tolerant
-                        and p["location"] == "header"
-                        and p["clientName"] in ("if_match", "if_none_match")
+                        and wire_name_lower == "client-request-id"
                     ):
-                        o["hasEtag"] = True
-                        yaml_data["hasEtag"] = True
+                        yaml_data["requestIdHeaderName"] = wire_name_lower
+                    if self.version_tolerant and p["location"] == "header":
+                        if wire_name_lower == "if-match":
+                            property_if_match = p
+                        elif wire_name_lower == "if-none-match":
+                            property_if_none_match = p
+                # pylint: disable=line-too-long
+                # some service(e.g. https://github.com/Azure/azure-rest-api-specs/blob/main/specification/cosmos-db/data-plane/Microsoft.Tables/preview/2019-02-02/table.json)
+                # only has one, so we need to add "if-none-match" or "if-match" if it's missing
+                if not property_if_match and property_if_none_match:
+                    property_if_match = property_if_none_match.copy()
+                    property_if_match["wireName"] = "if-match"
+                if not property_if_none_match and property_if_match:
+                    property_if_none_match = property_if_match.copy()
+                    property_if_none_match["wireName"] = "if-none-match"
+
+                if property_if_match and property_if_none_match:
+                    # arrange if-match and if-none-match to the end of parameters
+                    o["parameters"] = [
+                        item
+                        for item in o["parameters"]
+                        if get_wire_name_lower(item)
+                        not in ("if-match", "if-none-match")
+                    ] + [property_if_match, property_if_none_match]
+
+                    o["hasEtag"] = True
+                    yaml_data["hasEtag"] = True
 
     def get_operation_updater(
         self, yaml_data: Dict[str, Any]

package/package.json

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