@autorest/python 6.40.0 → 6.41.0

package/generator/build/lib/pygen/codegen/models/paging_operation.py

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

package/generator/build/lib/pygen/codegen/models/parameter.py

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

package/generator/build/lib/pygen/codegen/templates/serialization.py.jinja2

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

package/generator/build/lib/pygen/preprocess/__init__.py

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

package/generator/pygen/codegen/models/paging_operation.py

@@ -96,6 +96,10 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             return self._get_attr_name(wire_name)
         return wire_name
 
+    @property
+    def next_link_is_nested(self) -> bool:
+        return self.yaml_data.get("nextLinkIsNested", False)
+
     @property
     def item_name(self) -> str:
         wire_name = self.yaml_data["itemName"]

package/generator/pygen/codegen/models/parameter.py

@@ -63,7 +63,7 @@ class _ParameterBase(BaseModel, abc.ABC):  # pylint: disable=too-many-instance-a
         self.wire_name: str = yaml_data.get("wireName", "")
         self.client_name: str = self.yaml_data["clientName"]
         self.optional: bool = self.yaml_data["optional"]
-        self.implementation: str = yaml_data.get("implementation", None)
+        self.implementation: Optional[str] = yaml_data.get("implementation", None)
         self.location: ParameterLocation = self.yaml_data["location"]
         self.client_default_value = self.yaml_data.get("clientDefaultValue", None)
         self.in_docstring = self.yaml_data.get("inDocstring", True)

package/generator/pygen/codegen/serializers/builder_serializer.py

@@ -1383,6 +1383,13 @@ class _PagingOperationSerializer(_OperationSerializer[PagingOperationType]):
                 cont_token_property = "None"
             elif self.code_model.options["models-mode"] == "msrest":
                 cont_token_property = f"deserialized.{next_link_name} or None"
+            elif builder.next_link_is_nested:
+                next_link_name_array = next_link_name.split(".")
+                access = (
+                    "".join([f'.get("{i}", {{}})' for i in next_link_name_array[:-1]])
+                    + f'.get("{next_link_name_array[-1]}")'
+                )
+                cont_token_property = f"deserialized{access} or None"
             else:
                 cont_token_property = f'deserialized.get("{next_link_name}") or None'
         list_type = "AsyncList" if self.async_mode else "iter"

package/generator/pygen/codegen/templates/serialization.py.jinja2

@@ -783,7 +783,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
             # If dependencies is empty, try with current data class
             # It has to be a subclass of Enum anyway
-            enum_type = self.dependencies.get(data_type, data.__class__)
+            enum_type = self.dependencies.get(data_type, cast(type, data.__class__))
             if issubclass(enum_type, Enum):
                 return Serializer.serialize_enum(data, enum_obj=enum_type)
 

package/generator/pygen/preprocess/__init__.py

@@ -213,7 +213,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
             and not any(t for t in ["flattened", "groupedBy"] if body_parameter.get(t))
         ):
             origin_type = body_parameter["type"]["type"]
-            is_dpg_model = body_parameter["type"].get("base") == "dpg"
+            model_type = (
+                body_parameter["type"] if origin_type == "model" else body_parameter["type"].get("elementType", {})
+            )
+            is_dpg_model = model_type.get("base") == "dpg"
             body_parameter["type"] = {
                 "type": "combined",
                 "types": [body_parameter["type"]],
@@ -222,8 +225,15 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
-                body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+            if self.options["models-mode"] == "dpg" and is_dpg_model:
+                if origin_type == "model":
+                    body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
+                else:
+                    # dict or list
+                    # copy the original dict / list type
+                    any_obj_list_or_dict = copy.deepcopy(body_parameter["type"]["types"][0])
+                    any_obj_list_or_dict["elementType"] = KNOWN_TYPES["any-object"]
+                    body_parameter["type"]["types"].insert(1, any_obj_list_or_dict)
             code_model["types"].append(body_parameter["type"])
 
     def pad_reserved_words(self, name: str, pad_type: PadType):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.40.0",
+  "version": "6.41.0",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.17.0",
+    "@typespec/http-client-python": "~0.18.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"