@autorest/python 5.19.0 → 6.0.1

package/autorest/codegen/models/lro_operation.py

@@ -33,7 +33,6 @@ class LROOperationBase(OperationBase[LROResponseType]):
         overloads: Optional[List[Operation]] = None,
         public: bool = True,
         want_tracing: bool = True,
-        abstract: bool = False,
     ) -> None:
         super().__init__(
             code_model=code_model,
@@ -46,7 +45,6 @@ class LROOperationBase(OperationBase[LROResponseType]):
             overloads=overloads,
             public=public,
             want_tracing=want_tracing,
-            abstract=abstract,
         )
         self.name = "begin_" + self.name
         self.lro_options: Dict[str, Any] = self.yaml_data.get("lroOptions", {})
@@ -120,10 +118,8 @@ class LROOperationBase(OperationBase[LROResponseType]):
     def get_no_polling_method(self, async_mode: bool) -> str:
         return self.responses[0].get_no_polling_method(async_mode)
 
-    def imports(
-        self, async_mode: bool, is_python3_file: bool, **kwargs: Any
-    ) -> FileImport:
-        file_import = super().imports(async_mode, is_python3_file, **kwargs)
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
+        file_import = super().imports(async_mode, **kwargs)
         if self.abstract:
             return file_import
         if async_mode:

package/autorest/codegen/models/lro_paging_operation.py

@@ -25,15 +25,9 @@ class LROPagingOperation(
     def cls_type_annotation(self, *, async_mode: bool) -> str:
         return f"ClsType[{Response.type_annotation(self.responses[0], async_mode=async_mode)}]"  # pylint: disable=no-member
 
-    def imports(
-        self, async_mode: bool, is_python3_file: bool, **kwargs: Any
-    ) -> FileImport:
-        lro_imports = LROOperationBase.imports(
-            self, async_mode, is_python3_file, **kwargs
-        )
-        paging_imports = PagingOperationBase.imports(
-            self, async_mode, is_python3_file, **kwargs
-        )
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
+        lro_imports = LROOperationBase.imports(self, async_mode, **kwargs)
+        paging_imports = PagingOperationBase.imports(self, async_mode, **kwargs)
 
         file_import = lro_imports
         file_import.merge(paging_imports)

package/autorest/codegen/models/model_type.py

@@ -238,13 +238,8 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
                     relative_path, "models", ImportType.LOCAL, alias="_models"
                 )
             else:
-                # a little hacky, but we only do this for version tolerant
-                # models files, which are all python3 only
-                models_filename = self.code_model.get_models_filename(
-                    is_python3_file=True
-                )
                 file_import.add_submodule_import(
-                    f"{relative_path}models.{models_filename}",
+                    f"{relative_path}models.{self.code_model.models_filename}",
                     self.name,
                     ImportType.LOCAL,
                 )

package/autorest/codegen/models/operation.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-import logging
 from itertools import chain
 from typing import (
     Dict,
@@ -43,8 +42,6 @@ from .request_builder import OverloadedRequestBuilder, RequestBuilder
 if TYPE_CHECKING:
     from .code_model import CodeModel
 
-_LOGGER = logging.getLogger(__name__)
-
 ResponseType = TypeVar(
     "ResponseType",
     bound=Union[Response, PagingResponse, LROResponse, LROPagingResponse],
@@ -67,7 +64,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         overloads: Optional[List["Operation"]] = None,
         public: bool = True,
         want_tracing: bool = True,
-        abstract: bool = False,
     ) -> None:
         super().__init__(
             code_model=code_model,
@@ -75,7 +71,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             name=name,
             parameters=parameters,
             overloads=overloads,
-            abstract=abstract,
             want_tracing=want_tracing,
         )
         self.overloads: List["Operation"] = overloads or []
@@ -274,22 +269,14 @@ class OperationBase(  # pylint: disable=too-many-public-methods
                     alias="rest",
                 )
         if self.code_model.options["builders_visibility"] == "embedded" and async_mode:
-            suffix = (
-                "_py3"
-                if self.code_model.options["add_python3_operation_files"]
-                and not self.code_model.options["python3_only"]
-                else ""
-            )
             file_import.add_submodule_import(
-                f"...{self.code_model.operations_folder_name}.{self.filename}{suffix}",
+                f"...{self.code_model.operations_folder_name}.{self.filename}",
                 request_builder.name,
                 import_type=ImportType.LOCAL,
             )
         return file_import
 
-    def imports(
-        self, async_mode: bool, is_python3_file: bool, **kwargs: Any
-    ) -> FileImport:
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         if self.abstract:
             return FileImport()
         file_import = self._imports_shared(async_mode, **kwargs)
@@ -326,11 +313,10 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             "azure.core.exceptions", "ResourceExistsError", ImportType.AZURECORE
         )
 
-        kwargs_to_pop = self.parameters.kwargs_to_pop(is_python3_file)
         if self.has_kwargs_to_pop_with_default(
-            kwargs_to_pop, ParameterLocation.HEADER
+            self.parameters.kwargs_to_pop, ParameterLocation.HEADER
         ) or self.has_kwargs_to_pop_with_default(
-            kwargs_to_pop, ParameterLocation.QUERY
+            self.parameters.kwargs_to_pop, ParameterLocation.QUERY
         ):
             file_import.add_submodule_import(
                 "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
@@ -438,20 +424,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             cls.from_yaml(overload, code_model)
             for overload in yaml_data.get("overloads", [])
         ]
-        abstract = False
-        if (
-            code_model.options["version_tolerant"]
-            and parameter_list.has_body
-            and isinstance(parameter_list.body_parameter, MultipartBodyParameter)
-        ):
-            _LOGGER.warning(
-                'Not going to generate operation "%s" because it has multipart / urlencoded body parameters. '
-                "Multipart / urlencoded body parameters are not supported for version tolerant generation right now. "
-                'Please write your own custom operation in the "_patch.py" file '
-                "following https://aka.ms/azsdk/python/dpcodegen/python/customize",
-                name,
-            )
-            abstract = True
 
         return cls(
             yaml_data=yaml_data,
@@ -463,15 +435,12 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             responses=responses,
             exceptions=exceptions,
             want_tracing=not yaml_data["isOverload"],
-            abstract=abstract,
         )
 
 
 class Operation(OperationBase[Response]):
-    def imports(
-        self, async_mode: bool, is_python3_file: bool, **kwargs: Any
-    ) -> FileImport:
-        file_import = super().imports(async_mode, is_python3_file, **kwargs)
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
+        file_import = super().imports(async_mode, **kwargs)
         if self.abstract:
             return file_import
         if async_mode:

package/autorest/codegen/models/operation_group.py

@@ -36,12 +36,11 @@ class OperationGroup(BaseModel):
     def has_abstract_operations(self) -> bool:
         return any(o for o in self.operations if o.abstract)
 
-    def base_class(self, async_mode: bool) -> str:
+    @property
+    def base_class(self) -> str:
         base_classes: List[str] = []
         if self.is_mixin and self.code_model.need_mixin_abc:
             base_classes.append("MixinABC")
-        if not (async_mode or self.code_model.options["python3_only"]):
-            base_classes.append("object")
         return ", ".join(base_classes)
 
     def imports_for_multiapi(self, async_mode: bool) -> FileImport:
@@ -67,15 +66,13 @@ class OperationGroup(BaseModel):
             return "  # type: ignore"
         return ""
 
-    def imports(self, async_mode: bool, is_python3_file: bool) -> FileImport:
+    def imports(self, async_mode: bool) -> FileImport:
         file_import = FileImport()
 
         relative_path = "..." if async_mode else ".."
         for operation in self.operations:
             file_import.merge(
-                operation.imports(
-                    async_mode, is_python3_file, relative_path=relative_path
-                )
+                operation.imports(async_mode, relative_path=relative_path)
             )
         # for multiapi
         if not self.code_model.options["version_tolerant"]:

package/autorest/codegen/models/paging_operation.py

@@ -38,7 +38,6 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
         overloads: Optional[List[Operation]] = None,
         public: bool = True,
         want_tracing: bool = True,
-        abstract: bool = False,
         override_success_response_to_200: bool = False,
     ) -> None:
         super().__init__(
@@ -52,7 +51,6 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
             overloads=overloads,
             public=public,
             want_tracing=want_tracing,
-            abstract=abstract,
         )
         self.next_request_builder: Optional[
             Union[RequestBuilder, OverloadedRequestBuilder]
@@ -127,13 +125,11 @@ class PagingOperationBase(OperationBase[PagingResponseType]):
     def has_optional_return_type(self) -> bool:
         return False
 
-    def imports(
-        self, async_mode: bool, is_python3_file: bool, **kwargs: Any
-    ) -> FileImport:
+    def imports(self, async_mode: bool, **kwargs: Any) -> FileImport:
         if self.abstract:
             return FileImport()
         file_import = self._imports_shared(async_mode, **kwargs)
-        file_import.merge(super().imports(async_mode, is_python3_file, **kwargs))
+        file_import.merge(super().imports(async_mode, **kwargs))
         if self.code_model.options["tracing"] and self.want_tracing:
             file_import.add_submodule_import(
                 "azure.core.tracing.decorator",
@@ -144,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/models/parameter.py

@@ -179,15 +179,11 @@ class _ParameterBase(
     def in_method_signature(self) -> bool:
         ...
 
-    def method_signature(self, is_python3_file: bool, async_mode: bool) -> str:
+    def method_signature(self, async_mode: bool) -> str:
         type_annot = self.type_annotation(async_mode=async_mode)
-        if is_python3_file:
-            if self.client_default_value is not None or self.optional:
-                return f"{self.client_name}: {type_annot} = {self.client_default_value_declaration},"
-            return f"{self.client_name}: {type_annot},"
         if self.client_default_value is not None or self.optional:
-            return f"{self.client_name}={self.client_default_value_declaration},  # type: {type_annot}"
-        return f"{self.client_name},  # type: {type_annot}"
+            return f"{self.client_name}: {type_annot} = {self.client_default_value_declaration},"
+        return f"{self.client_name}: {type_annot},"
 
 
 class _BodyParameterBase(_ParameterBase):

package/autorest/codegen/models/parameter_list.py

@@ -235,49 +235,36 @@ class _ParameterListBase(
         """Sorted method params. First positional, then keyword only, then kwarg"""
         return self.positional + self.keyword_only + self.kwarg
 
-    def method_signature(self, is_python3_file: bool, async_mode: bool) -> List[str]:
+    def method_signature(self, async_mode: bool) -> List[str]:
         """Method signature for this parameter list."""
         return method_signature_helper(
-            positional=self.method_signature_positional(is_python3_file, async_mode),
-            keyword_only=self.method_signature_keyword_only(
-                is_python3_file, async_mode
-            ),
-            kwarg_params=self.method_signature_kwargs(is_python3_file),
+            positional=self.method_signature_positional(async_mode),
+            keyword_only=self.method_signature_keyword_only(async_mode),
+            kwarg_params=self.method_signature_kwargs,
         )
 
-    def method_signature_positional(
-        self, is_python3_file: bool, async_mode: bool
-    ) -> List[str]:
+    def method_signature_positional(self, async_mode: bool) -> List[str]:
         """Signature for positional parameters"""
-        return [
-            parameter.method_signature(is_python3_file, async_mode)
-            for parameter in self.positional
-        ]
+        return [parameter.method_signature(async_mode) for parameter in self.positional]
 
-    def method_signature_keyword_only(
-        self, is_python3_file: bool, async_mode: bool
-    ) -> List[str]:
+    def method_signature_keyword_only(self, async_mode: bool) -> List[str]:
         """Signature for keyword only parameters"""
-        if not (self.keyword_only and is_python3_file):
+        if not self.keyword_only:
             return []
         return ["*,"] + [
-            parameter.method_signature(is_python3_file, async_mode)
-            for parameter in self.keyword_only
+            parameter.method_signature(async_mode) for parameter in self.keyword_only
         ]
 
-    @staticmethod
-    def method_signature_kwargs(is_python3_file: bool) -> List[str]:
+    @property
+    def method_signature_kwargs(self) -> List[str]:
         """Signature for kwargs"""
-        return ["**kwargs: Any"] if is_python3_file else ["**kwargs  # type: Any"]
+        return ["**kwargs: Any"]
 
-    def kwargs_to_pop(
-        self, is_python3_file: bool
-    ) -> List[Union[ParameterType, BodyParameterType]]:
+    @property
+    def kwargs_to_pop(self) -> List[Union[ParameterType, BodyParameterType]]:
         """Method kwargs we want to pop"""
         # don't want to pop bodies unless it's a constant
         kwargs_to_pop = self.kwarg
-        if not is_python3_file:
-            kwargs_to_pop += self.keyword_only
         return [
             k
             for k in kwargs_to_pop
@@ -416,14 +403,12 @@ class RequestBuilderParameterList(_RequestBuilderParameterList):
 class OverloadedRequestBuilderParameterList(_RequestBuilderParameterList):
     """Parameter list for OverloadedRequestBuilder"""
 
-    def method_signature_keyword_only(
-        self, is_python3_file: bool, async_mode: bool
-    ) -> List[str]:
+    def method_signature_keyword_only(self, async_mode: bool) -> List[str]:
         """Signature for keyword only parameters"""
-        if not (self.keyword_only and is_python3_file):
+        if not self.keyword_only:
             return []
         return ["*,"] + [
-            parameter.method_signature(is_python3_file, async_mode)
+            parameter.method_signature(async_mode)
             for parameter in self.keyword_only
             if parameter.location != ParameterLocation.BODY
         ]
@@ -478,13 +463,12 @@ class ClientGlobalParameterList(_ClientGlobalParameterList[ClientParameter]):
         except StopIteration:
             return None
 
-    def kwargs_to_pop(
-        self, is_python3_file: bool
-    ) -> List[Union[ClientParameter, BodyParameter]]:
+    @property
+    def kwargs_to_pop(self) -> List[Union[ClientParameter, BodyParameter]]:
         """We only want to pass base url path parameters in the client"""
         return [
             k
-            for k in super().kwargs_to_pop(is_python3_file=is_python3_file)
+            for k in super().kwargs_to_pop
             if k.location == ParameterLocation.ENDPOINT_PATH
         ]
 

package/autorest/codegen/models/request_builder.py

@@ -3,7 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-import logging
 from typing import (
     Any,
     Callable,
@@ -22,12 +21,10 @@ from .parameter_list import (
     OverloadedRequestBuilderParameterList,
 )
 from .imports import FileImport, ImportType, TypingSection, MsrestImportType
-from .request_builder_parameter import RequestBuilderMultipartBodyParameter
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
 
-_LOGGER = logging.getLogger(__name__)
 ParameterListType = TypeVar(
     "ParameterListType",
     bound=Union[RequestBuilderParameterList, OverloadedRequestBuilderParameterList],
@@ -43,7 +40,6 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
         parameters: ParameterListType,
         *,
         overloads: Optional[List["RequestBuilder"]] = None,
-        abstract: bool = False,
     ) -> None:
         super().__init__(
             code_model=code_model,
@@ -51,7 +47,6 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             name=name,
             parameters=parameters,
             overloads=overloads,
-            abstract=abstract,
             want_tracing=False,
         )
         self.overloads: List["RequestBuilder"] = overloads or []
@@ -147,23 +142,7 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             RequestBuilder.from_yaml(rb_yaml_data, code_model)
             for rb_yaml_data in yaml_data.get("overloads", [])
         ]
-        abstract = False
         parameter_list = cls.parameter_list_type()(yaml_data, code_model)
-        if (
-            code_model.options["version_tolerant"]
-            and parameter_list.has_body
-            and isinstance(
-                parameter_list.body_parameter, RequestBuilderMultipartBodyParameter
-            )
-        ):
-            _LOGGER.warning(
-                'Not going to generate operation "%s" because it has multipart / urlencoded body parameters. '
-                "Multipart / urlencoded body parameters are not supported for version tolerant generation right now. "
-                'Please write your own custom operation in the "_patch.py" file '
-                "following https://aka.ms/azsdk/python/dpcodegen/python/customize",
-                name,
-            )
-            abstract = True
 
         return cls(
             yaml_data=yaml_data,
@@ -171,7 +150,6 @@ class RequestBuilderBase(BaseBuilder[ParameterListType]):
             name=name,
             parameters=parameter_list,
             overloads=overloads,
-            abstract=abstract,
         )