@autorest/python 6.0.0-rc.1 → 6.0.0

package/ChangeLog.md

@@ -1,5 +1,21 @@
 # Release History
 
+### 2022-06-24 - 6.0.0
+
+| Library                                                                 | Min Version |
+| ----------------------------------------------------------------------- | ----------- |
+| `@autorest/core`                                                        | `3.8.1`     |
+| `@autorest/modelerfour`                                                 | `4.23.5`    |
+| `azure-core` dep of generated code                                      | `1.24.0`    |
+| `isodate` dep of generated code                                         | `0.6.1`     |
+| `msrest` dep of generated code (If generating legacy code)              | `0.7.1`     |
+| `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
+
+**Breaking Changes**
+
+- Don't generate paging variables `maxpagesize` for DPG generations. Users should pass in `maxpagesize` to the `by_page` method of their
+pager  #1320
+
 ### 2022-06-17 - 6.0.0-rc.1
 
 | Library                                                                 | Min Version |
@@ -7,7 +23,8 @@
 | `@autorest/core`                                                        | `3.8.1`     |
 | `@autorest/modelerfour`                                                 | `4.23.5`    |
 | `azure-core` dep of generated code                                      | `1.24.0`    |
-| `msrest` dep of generated code (If generating legacy code               | `0.7.1`     |
+| `isodate` dep of generated code                                         | `0.6.1`     |
+| `msrest` dep of generated code (If generating legacy code)              | `0.7.1`     |
 | `azure-mgmt-core` dep of generated code (If generating mgmt plane code) | `1.3.0`     |
 
 **Breaking Changes**
@@ -15,7 +32,7 @@
 - Default to generating DPG SDKs with `--version-tolerant` now defaulting to `true`. For a list of flag default changes, please
 see [here](https://github.com/Azure/autorest.python/issues/1186)  #1304
 - Only generate Python3 SDKs  #1297
-- Don't reformat initial query parameters into the next link  #1297
+- Don't reformat initial query parameters into the next link. However, we do append `api-version` parameters if they are not present in the next link  #1297  #1309
 - Don't generate operations with more than two body types. SDK authors need to implement this operation themselves  #1300
 
 **New Features**

package/autorest/codegen/models/paging_operation.py

@@ -140,7 +140,21 @@ 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.code_model.client.parameters
+        ]:
+            file_import.add_submodule_import(
+                "urllib.parse", "urlparse", ImportType.STDLIB
+            )
+            file_import.add_submodule_import(
+                "urllib.parse", "urljoin", ImportType.STDLIB
+            )
+            file_import.add_submodule_import(
+                "urllib.parse", "parse_qs", ImportType.STDLIB
+            )
+            file_import.add_submodule_import(
+                "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
+            )
         return file_import
 
 

package/autorest/codegen/serializers/builder_serializer.py

@@ -1133,15 +1133,38 @@ class _PagingOperationSerializer(
             template_url = "next_link"
 
         request_builder = builder.next_request_builder or builder.request_builder
-        if builder.next_request_builder or self.code_model.is_legacy:
+        if builder.next_request_builder:
             return self._call_request_builder_helper(
                 builder,
                 request_builder,
                 template_url=template_url,
                 is_next_request=True,
             )
-        retval = ['request = HttpRequest("GET", next_link)']
+        retval: List[str] = []
+        query_str = ""
+        next_link_str = "next_link"
+        try:
+            api_version_param = next(
+                p
+                for p in self.code_model.client.parameters
+                if p.rest_api_name == "api-version"
+            )
+            retval.append("# make call to next link with the client's api-version")
+            retval.append("_parsed_next_link = urlparse(next_link)")
+            retval.append(
+                "_next_request_params = case_insensitive_dict(parse_qs(_parsed_next_link.query))"
+            )
+            retval.append(
+                f'_next_request_params["api-version"] = {api_version_param.full_client_name}'
+            )
+            query_str = ", params=_next_request_params"
+            next_link_str = "urljoin(next_link, _parsed_next_link.path)"
+        except StopIteration:
+            pass
+
+        retval.append(f'request = HttpRequest("GET", {next_link_str}{query_str})')
         retval.extend(self._postprocess_http_request(builder, "request.url"))
+
         return retval
 
     def _prepare_request_callback(self, builder: PagingOperationType) -> List[str]:

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

@@ -106,7 +106,7 @@ class RawDeserializer:
                 except NameError:
                     pass
 
-                return ET.fromstring(data_as_str)
+                return ET.fromstring(data_as_str)  # nosec
             except ET.ParseError:
                 # It might be because the server has an issue, and returned JSON with
                 # content-type XML....
@@ -831,7 +831,7 @@ class Serializer(object):
             return custom_serializer(data)
         if data_type == 'str':
             return cls.serialize_unicode(data)
-        return eval(data_type)(data)
+        return eval(data_type)(data)  # nosec
 
     @classmethod
     def serialize_unicode(cls, data):
@@ -1765,7 +1765,7 @@ class Deserializer(object):
 
         if data_type == 'str':
             return self.deserialize_unicode(attr)
-        return eval(data_type)(attr)
+        return eval(data_type)(attr)  # nosec
 
     @staticmethod
     def deserialize_unicode(data):

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

@@ -85,7 +85,7 @@ setup(
         {% if code_model.is_legacy %}
         "{{ dependency_msrest }}",
         {% else %}
-        "isodate>=0.6.1",
+        "isodate<1.0.0,>=0.6.1",
         {% endif %}
         {% if azure_arm %}
         "{{ dependency_azure_mgmt_core }}",

package/autorest/preprocess/__init__.py

@@ -12,6 +12,16 @@ from .python_mappings import PadType
 from .. import YamlUpdatePlugin
 
 
+def _remove_paging_maxpagesize(yaml_data: Dict[str, Any]) -> None:
+    # we don't expose maxpagesize for version tolerant generation
+    # users should be passing this into `by_page`
+    yaml_data["parameters"] = [
+        p
+        for p in yaml_data.get("parameters", [])
+        if p["restApiName"].lower() not in ["maxpagesize", "$maxpagesize"]
+    ]
+
+
 def update_description(
     description: Optional[str], default_description: str = ""
 ) -> str:
@@ -85,6 +95,10 @@ def update_paging_response(yaml_data: Dict[str, Any]) -> None:
 class PreProcessPlugin(YamlUpdatePlugin):
     """Add Python naming information."""
 
+    @property
+    def version_tolerant(self) -> bool:
+        return bool(self._autorestapi.get_boolean_value("version-tolerant", True))
+
     def get_operation_updater(
         self, yaml_data: Dict[str, Any]
     ) -> Callable[[Dict[str, Any]], None]:
@@ -144,13 +158,16 @@ class PreProcessPlugin(YamlUpdatePlugin):
     def update_lro_paging_operation(self, yaml_data: Dict[str, Any]) -> None:
         self.update_lro_operation(yaml_data)
         self.update_paging_operation(yaml_data)
+        yaml_data["discriminator"] = "lropaging"
         for response in yaml_data.get("responses", []):
             response["discriminator"] = "lropaging"
+        for overload in yaml_data.get("overloads", []):
+            self.update_lro_paging_operation(overload)
 
     def update_lro_operation(self, yaml_data: Dict[str, Any]) -> None:
         self.update_operation(yaml_data)
         self._update_lro_operation_helper(yaml_data)
-        for overload in yaml_data["overloads"]:
+        for overload in yaml_data.get("overloads", []):
             self._update_lro_operation_helper(overload)
 
     def update_paging_operation(self, yaml_data: Dict[str, Any]) -> None:
@@ -164,15 +181,18 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if yaml_data.get("nextOperation")
             else yaml_data["responses"][0]
         )
-        # if we're in version tolerant, hide the paging model
-        if self._autorestapi.get_boolean_value("version-tolerant"):
+        if self.version_tolerant:
+            # if we're in version tolerant, hide the paging model
             returned_response_object["type"]["isPublic"] = False
+            _remove_paging_maxpagesize(yaml_data)
         item_type = next(
             p["type"]["elementType"]
             for p in returned_response_object["type"]["properties"]
-            if p["restApiName"] == yaml_data["itemName"]
+            if p["restApiName"] == (yaml_data.get("itemName") or "value")
         )
         if yaml_data.get("nextOperation"):
+            if self.version_tolerant:
+                _remove_paging_maxpagesize(yaml_data["nextOperation"])
             yaml_data["nextOperation"]["groupName"] = pad_reserved_words(
                 yaml_data["nextOperation"]["groupName"], PadType.OPERATION_GROUP
             )

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@autorest/python",
-    "version": "6.0.0-rc.1",
+    "version": "6.0.0",
     "description": "The Python extension for generators in AutoRest.",
     "scripts": {
         "prepare": "node run-python3.js prepare.py",
@@ -27,7 +27,7 @@
         "@autorest/system-requirements": "~1.0.0"
     },
     "devDependencies": {
-        "@microsoft.azure/autorest.testserver": "^3.3.29"
+        "@microsoft.azure/autorest.testserver": "^3.3.31"
     },
     "files": [
         "autorest/**/*.py",