@autorest/python 5.17.0 → 6.0.0-rc.1

package/autorest/codegen/models/model_type.py

@@ -47,7 +47,7 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
         *,
         properties: Optional[List[Property]] = None,
         parents: Optional[List["ModelType"]] = None,
-        discriminated_subtypes: Optional[Dict[str, str]] = None,
+        discriminated_subtypes: Optional[Dict[str, "ModelType"]] = None,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
         self.name: str = self.yaml_data["name"]
@@ -61,6 +61,7 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
         )
         self._created_json_template_representation = False
         self.is_public: bool = self.yaml_data.get("isPublic", True)
+        self.snake_case_name: str = self.yaml_data["snakeCaseName"]
 
     @property
     def is_xml(self) -> bool:
@@ -111,6 +112,10 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
         # but we don't want to write a serialization context for an object.
         return super().xml_serialization_ctxt
 
+    @property
+    def discriminated_subtypes_name_mapping(self) -> Dict[str, str]:
+        return {k: v.name for k, v in self.discriminated_subtypes.items()}
+
     def get_json_template_representation(
         self,
         *,
@@ -121,6 +126,11 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
         if self._created_json_template_representation:
             return "..."  # do this to avoid loop
         self._created_json_template_representation = True
+        if self.discriminated_subtypes:
+            # we will instead print the discriminated subtypes
+            self._created_json_template_representation = False
+            return self.snake_case_name
+
         # don't add additional properties, because there's not really a concept of
         # additional properties in the template
         representation = {
@@ -135,20 +145,30 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
                 if not (p.is_discriminator or p.client_name == "additional_properties")
             ]
         }
-        try:
-            # add discriminator prop if there is one
-            discriminator = next(p for p in self.properties if p.is_discriminator)
-            representation[discriminator.rest_api_name] = (
-                self.discriminator_value or discriminator.rest_api_name
-            )
-        except StopIteration:
-            pass
+        if self.discriminator and self.discriminator_value:
+            representation[
+                f'"{self.discriminator.rest_api_name}"'
+            ] = f'"{self.discriminator_value}"'
 
         # once we've finished, we want to reset created_json_template_representation to false
         # so we can call it again
         self._created_json_template_representation = False
         return representation
 
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+        is_polymorphic_subtype = (
+            self.discriminator_value and not self.discriminated_subtypes
+        )
+        if (
+            self.name not in (m.name for m in polymorphic_subtypes)
+            and is_polymorphic_subtype
+        ):
+            polymorphic_subtypes.append(self)
+        for discriminated_subtype in self.discriminated_subtypes.values():
+            discriminated_subtype.get_polymorphic_subtypes(polymorphic_subtypes)
+        for property in self.properties:
+            property.get_polymorphic_subtypes(polymorphic_subtypes)
+
     @classmethod
     def from_yaml(
         cls, yaml_data: Dict[str, Any], code_model: "CodeModel"
@@ -172,7 +192,10 @@ class ModelType(BaseType):  # pylint: disable=too-many-instance-attributes
         ]
         self.properties = _get_properties(self, properties)
         # checking to see if this is a polymorphic class
-        self.discriminated_subtypes = self.yaml_data.get("discriminatedSubtypes", {})
+        self.discriminated_subtypes = {
+            k: cast(ModelType, build_type(v, code_model))
+            for k, v in self.yaml_data.get("discriminatedSubtypes", {}).items()
+        }
 
     @property
     def has_readonly_or_constant_property(self) -> bool:
@@ -215,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 []
@@ -204,9 +199,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         file_import.add_submodule_import(
             "typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL
         )
-        if not self.abstract:
-            for param in self.parameters.method:
-                file_import.merge(param.imports(async_mode, **kwargs))
+        for param in self.parameters.method:
+            file_import.merge(param.imports(async_mode, **kwargs))
 
         response_types = [
             r.type_annotation(async_mode=async_mode) for r in self.responses if r.type
@@ -218,6 +212,8 @@ class OperationBase(  # pylint: disable=too-many-public-methods
         return file_import
 
     def imports_for_multiapi(self, async_mode: bool, **kwargs: Any) -> FileImport:
+        if self.abstract:
+            return FileImport()
         file_import = self._imports_shared(async_mode, **kwargs)
         for response in self.responses:
             file_import.merge(
@@ -273,22 +269,16 @@ 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)
 
         for response in self.responses:
@@ -301,48 +291,44 @@ class OperationBase(  # pylint: disable=too-many-public-methods
             file_import.merge(self.parameters.body_parameter.type.imports(**kwargs))
 
         # Exceptions
-        if self.abstract:
-            file_import.add_import("abc", ImportType.STDLIB)
-        else:
-            file_import.add_submodule_import(
-                "azure.core.exceptions", "map_error", ImportType.AZURECORE
-            )
-            if self.code_model.options["azure_arm"]:
-                file_import.add_submodule_import(
-                    "azure.mgmt.core.exceptions", "ARMErrorFormat", ImportType.AZURECORE
-                )
-            file_import.add_submodule_import(
-                "azure.core.exceptions", "HttpResponseError", ImportType.AZURECORE
-            )
+        file_import.add_submodule_import(
+            "azure.core.exceptions", "map_error", ImportType.AZURECORE
+        )
+        if self.code_model.options["azure_arm"]:
             file_import.add_submodule_import(
-                "azure.core.exceptions",
-                "ClientAuthenticationError",
-                ImportType.AZURECORE,
+                "azure.mgmt.core.exceptions", "ARMErrorFormat", ImportType.AZURECORE
             )
+        file_import.add_submodule_import(
+            "azure.core.exceptions", "HttpResponseError", ImportType.AZURECORE
+        )
+        file_import.add_submodule_import(
+            "azure.core.exceptions",
+            "ClientAuthenticationError",
+            ImportType.AZURECORE,
+        )
+        file_import.add_submodule_import(
+            "azure.core.exceptions", "ResourceNotFoundError", ImportType.AZURECORE
+        )
+        file_import.add_submodule_import(
+            "azure.core.exceptions", "ResourceExistsError", ImportType.AZURECORE
+        )
+
+        if self.has_kwargs_to_pop_with_default(
+            self.parameters.kwargs_to_pop, ParameterLocation.HEADER
+        ) or self.has_kwargs_to_pop_with_default(
+            self.parameters.kwargs_to_pop, ParameterLocation.QUERY
+        ):
             file_import.add_submodule_import(
-                "azure.core.exceptions", "ResourceNotFoundError", ImportType.AZURECORE
+                "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
             )
+        if self.deprecated:
+            file_import.add_import("warnings", ImportType.STDLIB)
+
+        if self.code_model.need_request_converter:
+            relative_path = "..." if async_mode else ".."
             file_import.add_submodule_import(
-                "azure.core.exceptions", "ResourceExistsError", ImportType.AZURECORE
+                f"{relative_path}_vendor", "_convert_request", ImportType.LOCAL
             )
-
-            kwargs_to_pop = self.parameters.kwargs_to_pop(is_python3_file)
-            if self.has_kwargs_to_pop_with_default(
-                kwargs_to_pop, ParameterLocation.HEADER
-            ) or self.has_kwargs_to_pop_with_default(
-                kwargs_to_pop, ParameterLocation.QUERY
-            ):
-                file_import.add_submodule_import(
-                    "azure.core.utils", "case_insensitive_dict", ImportType.AZURECORE
-                )
-            if self.deprecated:
-                file_import.add_import("warnings", ImportType.STDLIB)
-
-            if self.code_model.need_request_converter:
-                relative_path = "..." if async_mode else ".."
-                file_import.add_submodule_import(
-                    f"{relative_path}_vendor", "_convert_request", ImportType.LOCAL
-                )
         if async_mode:
             file_import.add_submodule_import(
                 "azure.core.pipeline.transport",
@@ -382,10 +368,9 @@ class OperationBase(  # pylint: disable=too-many-public-methods
                 f"distributed_trace",
                 ImportType.AZURECORE,
             )
-        if not self.abstract:
-            file_import.merge(
-                self.get_request_builder_import(self.request_builder, async_mode)
-            )
+        file_import.merge(
+            self.get_request_builder_import(self.request_builder, async_mode)
+        )
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
         return file_import
@@ -439,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,
@@ -464,23 +435,20 @@ 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:
             file_import.add_submodule_import(
                 f"azure.core.tracing.decorator_async",
                 f"distributed_trace_async",
                 ImportType.AZURECORE,
             )
-        if self.abstract:
-            return file_import
         if (
             self.has_response_body
             and not self.has_optional_return_type

package/autorest/codegen/models/operation_group.py

@@ -36,14 +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")
-        if self.has_abstract_operations:
-            base_classes.append("abc.ABC")
         return ", ".join(base_classes)
 
     def imports_for_multiapi(self, async_mode: bool) -> FileImport:
@@ -69,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"]:
@@ -89,6 +84,12 @@ class OperationGroup(BaseModel):
                 )
         if self.code_model.need_mixin_abc:
             file_import.add_submodule_import(".._vendor", "MixinABC", ImportType.LOCAL)
+        if self.has_abstract_operations:
+            file_import.add_submodule_import(
+                ".._vendor", "raise_if_not_implemented", ImportType.LOCAL
+            )
+        if all(o.abstract for o in self.operations):
+            return file_import
         file_import.add_submodule_import(
             "typing", "TypeVar", ImportType.STDLIB, TypingSection.CONDITIONAL
         )

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,11 +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",

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,10 +403,15 @@ class RequestBuilderParameterList(_RequestBuilderParameterList):
 class OverloadedRequestBuilderParameterList(_RequestBuilderParameterList):
     """Parameter list for OverloadedRequestBuilder"""
 
-    def method_signature(self, is_python3_file: bool, async_mode: bool) -> List[str]:
-        return self.method_signature_positional(
-            is_python3_file, async_mode
-        ) + self.method_signature_kwargs(is_python3_file)
+    def method_signature_keyword_only(self, async_mode: bool) -> List[str]:
+        """Signature for keyword only parameters"""
+        if not self.keyword_only:
+            return []
+        return ["*,"] + [
+            parameter.method_signature(async_mode)
+            for parameter in self.keyword_only
+            if parameter.location != ParameterLocation.BODY
+        ]
 
 
 class _ClientGlobalParameterList(
@@ -471,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/property.py

@@ -13,6 +13,7 @@ from .utils import add_to_description, add_to_pylint_disable
 
 if TYPE_CHECKING:
     from .code_model import CodeModel
+    from .model_type import ModelType
 
 
 class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
@@ -105,6 +106,19 @@ class Property(BaseModel):  # pylint: disable=too-many-instance-attributes
             description=description,
         )
 
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+        from .model_type import ModelType
+
+        if isinstance(self.type, ModelType):
+            is_polymorphic_subtype = (
+                self.type.discriminator_value and not self.type.discriminated_subtypes
+            )
+            if (
+                self.type.name not in (m.name for m in polymorphic_subtypes)
+                and is_polymorphic_subtype
+            ):
+                polymorphic_subtypes.append(self.type)
+
     @property
     def validation(self) -> Optional[Dict[str, Any]]:
         retval: Dict[str, Any] = {}