@autorest/python 6.1.9 → 6.1.11

package/autorest/codegen/models/__init__.py

@@ -159,7 +159,7 @@ def build_type(yaml_data: Dict[str, Any], code_model: CodeModel) -> BaseType:
         response.fill_instance_from_yaml(yaml_data, code_model)
     else:
         object_type = yaml_data.get("type")
-        if object_type is None:
+        if object_type not in TYPE_TO_OBJECT:
             _LOGGER.warning(
                 'Unrecognized definition type "%s" is found, falling back it as "string"! ',
                 yaml_data["type"],

package/autorest/codegen/models/paging_operation.py

@@ -143,15 +143,7 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         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_import("urllib.parse", ImportType.STDLIB)
             file_import.add_submodule_import(
                 "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
             )

package/autorest/codegen/serializers/builder_serializer.py

@@ -1208,15 +1208,20 @@ class _PagingOperationSerializer(
                 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("_parsed_next_link = urllib.parse.urlparse(next_link)")
+            retval.extend(
+                [
+                    "_next_request_params = case_insensitive_dict({",
+                    "    key: [urllib.parse.quote(v) for v in value]"
+                    "    for key, value in urllib.parse.parse_qs(_parsed_next_link.query).items()"
+                    "})",
+                ]
             )
             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)"
+            next_link_str = "urllib.parse.urljoin(next_link, _parsed_next_link.path)"
         except StopIteration:
             pass
 

package/autorest/m4reformatter/__init__.py

@@ -386,7 +386,7 @@ def update_response(
 def _get_default_content_type(  # pylint: disable=too-many-return-statements
     content_types: Iterable[str],
 ) -> Optional[str]:
-    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct)]
+    json_values = [ct for ct in content_types if JSON_REGEXP.match(ct.split(";")[0])]
     if json_values:
         if "application/json" in json_values:
             return "application/json"

package/autorest/postprocess/__init__.py

@@ -131,11 +131,13 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             f for f in folders if f.stem in ["operations", "_operations"]
         ]
         for operations_folder in operations_folders:
-            aio = ".aio" if operations_folder.parent.stem == "aio" else ""
+            sub_namespace = ".".join(
+                str(operations_folder.relative_to(self.base_folder)).split(os.sep)
+            )
             self.fix_imports_in_init(
                 generated_file_name="_operations",
                 folder_path=operations_folder,
-                namespace=f"{self.namespace}{aio}.{operations_folder.stem}",
+                namespace=f"{self.namespace}.{sub_namespace}",
             )
         shutil.rmtree(f"{str(self.output_folder)}/.temp_folder")
         return True
@@ -155,7 +157,7 @@ class PostProcessPlugin(Plugin):  # pylint: disable=abstract-method
             k: None for k in customized_objects_str.split(",")
         }.keys()  # filter out duplicates
         file = (folder_path / "__init__.py").relative_to(self.output_folder)
-        file_content = self.read_file(file)
+        file_content = self.read_file(file).replace("\r\n", "\n")
         added_objs = []
         for obj in customized_objects:
             if f" import {obj}\n" in file_content:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.1.9",
+  "version": "6.1.11",
   "description": "The Python extension for generators in AutoRest.",
   "repository": {
     "type": "git",