@autorest/python 6.38.1 → 6.39.0

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

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Dict, Optional, List, Any, TYPE_CHECKING, Union
+from typing import Optional, Any, TYPE_CHECKING, Union
 
 from .base import BaseModel
 from .base import BaseType
@@ -21,7 +21,7 @@ if TYPE_CHECKING:
 class ResponseHeader(BaseModel):
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         type: BaseType,
     ) -> None:
@@ -33,7 +33,7 @@ class ResponseHeader(BaseModel):
         return self.type.serialization_type(**kwargs)
 
     @classmethod
-    def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "ResponseHeader":
+    def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "ResponseHeader":
         from . import build_type
 
         return cls(
@@ -46,14 +46,14 @@ class ResponseHeader(BaseModel):
 class Response(BaseModel):
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         *,
-        headers: Optional[List[ResponseHeader]] = None,
+        headers: Optional[list[ResponseHeader]] = None,
         type: Optional[BaseType] = None,
     ) -> None:
         super().__init__(yaml_data=yaml_data, code_model=code_model)
-        self.status_codes: List[Union[int, str, List[int]]] = yaml_data["statusCodes"]
+        self.status_codes: list[Union[int, str, list[int]]] = yaml_data["statusCodes"]
         self.headers = headers or []
         self.type = type
         self.nullable = yaml_data.get("nullable")
@@ -66,7 +66,7 @@ class Response(BaseModel):
             return "".join([f'.get("{field}", {{}})' for field in field.split(".")])
         return ""
 
-    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: list["ModelType"]) -> None:
         if self.type:
             self.type.get_polymorphic_subtypes(polymorphic_subtypes)
 
@@ -111,7 +111,7 @@ class Response(BaseModel):
             return f"{self.type.docstring_type(**kwargs)} or None"
         return self.type.docstring_type(**kwargs) if self.type else "None"
 
-    def _imports_shared(self, **kwargs: Any) -> FileImport:
+    def imports(self, **kwargs: Any) -> FileImport:
         file_import = FileImport(self.code_model)
         if self.type:
             file_import.merge(self.type.imports(**kwargs))
@@ -127,12 +127,6 @@ class Response(BaseModel):
             )
         return file_import
 
-    def imports(self, **kwargs: Any) -> FileImport:
-        return self._imports_shared(**kwargs)
-
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        return self._imports_shared(**kwargs)
-
     def _get_import_type(self, input_path: str) -> ImportType:
         # helper function to return imports for responses based off
         # of whether we're importing from the core library, or users
@@ -140,7 +134,7 @@ class Response(BaseModel):
         return ImportType.SDKCORE if self.code_model.core_library.split(".")[0] in input_path else ImportType.THIRDPARTY
 
     @classmethod
-    def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "Response":
+    def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "Response":
         type = code_model.lookup_type(id(yaml_data["type"])) if yaml_data.get("type") else None
         # use ByteIteratorType if we are returning a binary type
         default_content_type = yaml_data.get("defaultContentType", "application/json")
@@ -170,7 +164,7 @@ class PagingResponse(Response):
             or f"{self.code_model.core_library}.{default_paging_submodule}.AsyncItemPaged"
         )
 
-    def get_polymorphic_subtypes(self, polymorphic_subtypes: List["ModelType"]) -> None:
+    def get_polymorphic_subtypes(self, polymorphic_subtypes: list["ModelType"]) -> None:
         return self.item_type.get_polymorphic_subtypes(polymorphic_subtypes)
 
     def get_json_template_representation(self) -> Any:
@@ -198,17 +192,13 @@ class PagingResponse(Response):
     def docstring_type(self, **kwargs: Any) -> str:
         return f"~{self.get_pager_path(kwargs['async_mode'])}[{self.item_type.docstring_type(**kwargs)}]"
 
-    def _imports_shared(self, **kwargs: Any) -> FileImport:
-        file_import = super()._imports_shared(**kwargs)
+    def imports(self, **kwargs: Any) -> FileImport:
+        file_import = super().imports(**kwargs)
         async_mode = kwargs.get("async_mode", False)
         pager = self.get_pager(async_mode)
         pager_path = self.get_pager_import_path(async_mode)
 
         file_import.add_submodule_import(pager_path, pager, self._get_import_type(pager_path))
-        return file_import
-
-    def imports(self, **kwargs: Any) -> FileImport:
-        file_import = self._imports_shared(**kwargs)
         async_mode = kwargs.get("async_mode")
         if async_mode:
             file_import.add_submodule_import(
@@ -219,9 +209,6 @@ class PagingResponse(Response):
 
         return file_import
 
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        return self._imports_shared(**kwargs)
-
 
 class LROResponse(Response):
     def get_poller_path(self, async_mode: bool) -> str:
@@ -270,16 +257,12 @@ class LROResponse(Response):
             base_description += "either "
         return base_description + super_text
 
-    def _imports_shared(self, **kwargs: Any) -> FileImport:
-        file_import = super()._imports_shared(**kwargs)
+    def imports(self, **kwargs: Any) -> FileImport:
+        file_import = super().imports(**kwargs)
         async_mode = kwargs["async_mode"]
         poller_import_path = ".".join(self.get_poller_path(async_mode).split(".")[:-1])
         poller = self.get_poller(async_mode)
         file_import.add_submodule_import(poller_import_path, poller, self._get_import_type(poller_import_path))
-        return file_import
-
-    def imports(self, **kwargs: Any) -> FileImport:
-        file_import = self._imports_shared(**kwargs)
         async_mode = kwargs["async_mode"]
 
         default_polling_method_import_path = ".".join(self.get_polling_method_path(async_mode).split(".")[:-1])
@@ -306,9 +289,6 @@ class LROResponse(Response):
         )
         return file_import
 
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        return self._imports_shared(**kwargs)
-
 
 class LROPagingResponse(LROResponse, PagingResponse):
     def type_annotation(self, **kwargs: Any) -> str:
@@ -325,18 +305,13 @@ class LROPagingResponse(LROResponse, PagingResponse):
             base_description += "either "
         return base_description + Response.docstring_text(self)
 
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        file_import = LROResponse.imports_for_multiapi(self, **kwargs)
-        file_import.merge(PagingResponse.imports_for_multiapi(self, **kwargs))
-        return file_import
-
     def imports(self, **kwargs: Any) -> FileImport:
         file_import = LROResponse.imports(self, **kwargs)
         file_import.merge(PagingResponse.imports(self, **kwargs))
         return file_import
 
 
-def get_response(yaml_data: Dict[str, Any], code_model: "CodeModel") -> Response:
+def get_response(yaml_data: dict[str, Any], code_model: "CodeModel") -> Response:
     if yaml_data["discriminator"] == "lropaging":
         return LROPagingResponse.from_yaml(yaml_data, code_model)
     if yaml_data["discriminator"] == "lro":

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

@@ -3,12 +3,12 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import TypeVar, Dict
+from typing import TypeVar
 
 from enum import Enum
 
 T = TypeVar("T")
-OrderedSet = Dict[T, None]
+OrderedSet = dict[T, None]
 
 
 def add_to_description(description: str, entry: str) -> str:

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

@@ -7,7 +7,7 @@ import logging
 import json
 from collections import namedtuple
 import re
-from typing import List, Any, Union, Optional
+from typing import Any, Optional, Union
 from pathlib import Path
 from packaging.version import parse as parse_version
 from jinja2 import PackageLoader, Environment, FileSystemLoader, StrictUndefined
@@ -28,7 +28,6 @@ from .model_init_serializer import ModelInitSerializer
 from .model_serializer import DpgModelSerializer, MsrestModelSerializer
 from .operations_init_serializer import OperationsInitSerializer
 from .operation_groups_serializer import OperationGroupsSerializer
-from .metadata_serializer import MetadataSerializer
 from .request_builders_serializer import RequestBuildersSerializer
 from .patch_serializer import PatchSerializer
 from .sample_serializer import SampleSerializer
@@ -99,7 +98,7 @@ class JinjaSerializer(ReaderAndWriter):
         return self.code_model.options["show-operations"] and bool(self.code_model.has_operations)
 
     @property
-    def serialize_loop(self) -> List[AsyncInfo]:
+    def serialize_loop(self) -> list[AsyncInfo]:
         sync_loop = AsyncInfo(async_mode=False, async_path="")
         async_loop = AsyncInfo(async_mode=True, async_path="aio/")
         return [sync_loop, async_loop] if self.has_aio_folder else [sync_loop]
@@ -151,7 +150,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # write apiview-properties.json
                 if self.code_model.options.get("emit-cross-language-definition-file"):
                     self.write_file(
-                        generation_path / Path("apiview-properties.json"),
+                        self._root_of_sdk / Path("apiview-properties.json"),
                         general_serializer.serialize_cross_language_definition_file(),
                     )
 
@@ -165,7 +164,7 @@ class JinjaSerializer(ReaderAndWriter):
                 # add _metadata.json
                 if self.code_model.metadata:
                     self.write_file(
-                        Path("./_metadata.json"),
+                        self._root_of_sdk / "_metadata.json",
                         json.dumps(self.code_model.metadata, indent=2),
                     )
             elif client_namespace_type.clients:
@@ -205,8 +204,6 @@ class JinjaSerializer(ReaderAndWriter):
                 self._serialize_and_write_operations_folder(
                     client_namespace_type.operation_groups, env=env, namespace=client_namespace
                 )
-                if self.code_model.options["multiapi"]:
-                    self._serialize_and_write_metadata(env=env, namespace=client_namespace)
 
             # if there are only operations under this namespace, we need to add general __init__.py into `aio` folder
             # to make sure all generated files could be packed into .zip/.whl/.tgz package
@@ -216,11 +213,17 @@ class JinjaSerializer(ReaderAndWriter):
                     general_serializer.serialize_pkgutil_init_file(),
                 )
 
-    def _serialize_and_write_package_files(self) -> None:
+    # path where README.md is
+    @property
+    def _root_of_sdk(self) -> Path:
         root_of_sdk = Path(".")
         if self.code_model.options["no-namespace-folders"]:
             compensation = Path("../" * (self.code_model.namespace.count(".") + 1))
             root_of_sdk = root_of_sdk / compensation
+        return root_of_sdk
+
+    def _serialize_and_write_package_files(self) -> None:
+        root_of_sdk = self._root_of_sdk
         if self.code_model.options["package-mode"] in VALID_PACKAGE_MODE:
             env = Environment(
                 loader=PackageLoader("pygen.codegen", "templates/packaging_templates"),
@@ -247,15 +250,15 @@ class JinjaSerializer(ReaderAndWriter):
             if not self.code_model.is_azure_flavor and template_name == "dev_requirements.txt.jinja2":
                 continue
             file = template_name.replace(".jinja2", "")
-            output_name = root_of_sdk / file
-            if not self.read_file(output_name) or file in _REGENERATE_FILES:
+            output_file = root_of_sdk / file
+            if not self.read_file(output_file) or file in _REGENERATE_FILES:
                 if self.keep_version_file and file == "setup.py" and not self.code_model.options["azure-arm"]:
                     # don't regenerate setup.py file if the version file is more up to date for data-plane
                     continue
-                file_path = self.get_output_folder() / Path(output_name)
+                file_content = self.read_file(output_file) if file == "pyproject.toml" else ""
                 self.write_file(
-                    output_name,
-                    serializer.serialize_package_file(template_name, file_path, **params),
+                    output_file,
+                    serializer.serialize_package_file(template_name, file_content, **params),
                 )
 
     def _keep_patch_file(self, path_file: Path, env: Environment):
@@ -268,7 +271,7 @@ class JinjaSerializer(ReaderAndWriter):
             )
 
     def _serialize_and_write_models_folder(
-        self, env: Environment, namespace: str, models: List[ModelType], enums: List[EnumType]
+        self, env: Environment, namespace: str, models: list[ModelType], enums: list[EnumType]
     ) -> None:
         # Write the models folder
         models_path = self.code_model.get_generation_dir(namespace) / "models"
@@ -311,7 +314,7 @@ class JinjaSerializer(ReaderAndWriter):
         self,
         env: Environment,
         rest_path: Path,
-        request_builders: List[Union[RequestBuilder, OverloadedRequestBuilder]],
+        request_builders: list[Union[RequestBuilder, OverloadedRequestBuilder]],
     ) -> None:
         group_name = request_builders[0].group_name
         output_path = rest_path / Path(group_name) if group_name else rest_path
@@ -336,7 +339,7 @@ class JinjaSerializer(ReaderAndWriter):
         )
 
     def _serialize_and_write_operations_folder(
-        self, operation_groups: List[OperationGroup], env: Environment, namespace: str
+        self, operation_groups: list[OperationGroup], env: Environment, namespace: str
     ) -> None:
         operations_folder_name = self.code_model.operations_folder_name(namespace)
         generation_path = self.code_model.get_generation_dir(namespace)
@@ -405,7 +408,7 @@ class JinjaSerializer(ReaderAndWriter):
     def _serialize_client_and_config_files(
         self,
         namespace: str,
-        clients: List[Client],
+        clients: list[Client],
         env: Environment,
     ) -> None:
         generation_path = self.code_model.get_generation_dir(namespace)
@@ -482,11 +485,7 @@ class JinjaSerializer(ReaderAndWriter):
 
         # write the empty py.typed file
         pytyped_value = "# Marker file for PEP 561."
-        # TODO: remove this when we remove legacy multiapi generation
-        if self.code_model.options["multiapi"]:
-            self.write_file(self.code_model.get_generation_dir(namespace) / Path("py.typed"), pytyped_value)
-        else:
-            self.write_file(root_dir / Path("py.typed"), pytyped_value)
+        self.write_file(root_dir / Path("py.typed"), pytyped_value)
 
         # write _validation.py
         if any(og for client in self.code_model.clients for og in client.operation_groups if og.need_validation):
@@ -502,40 +501,29 @@ class JinjaSerializer(ReaderAndWriter):
                 TypesSerializer(code_model=self.code_model, env=env).serialize(),
             )
 
-    def _serialize_and_write_metadata(self, env: Environment, namespace: str) -> None:
-        metadata_serializer = MetadataSerializer(self.code_model, env)
-        self.write_file(
-            self.code_model.get_generation_dir(namespace) / Path("_metadata.json"), metadata_serializer.serialize()
-        )
-
     # pylint: disable=line-too-long
     @property
     def sample_additional_folder(self) -> Path:
         # For special package, we need to additional folder when generate samples.
-        # For example, azure-mgmt-resource is combined by multiple modules, and each module is multiapi package.
+        # For example, azure-mgmt-resource is combined by multiple modules, and each module is a package.
         # one of namespace is "azure.mgmt.resource.resources.v2020_01_01", then additional folder is "resources"
         # so that we could avoid conflict when generate samples.
         # python config: https://github.com/Azure/azure-rest-api-specs/blob/main/specification/resources/resource-manager/readme.python.md
         # generated SDK: https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource/generated_samples
-        namespace_config = get_namespace_config(self.code_model.namespace, self.code_model.options["multiapi"])
+        namespace_config = get_namespace_config(self.code_model.namespace)
         num_of_namespace = namespace_config.count(".") + 1
         num_of_package_namespace = (
-            get_namespace_from_package_name(self.code_model.options.get("namespace", "")).count(".") + 1
+            get_namespace_from_package_name(self.code_model.options.get("package-name", "")).count(".") + 1
         )
         if num_of_namespace > num_of_package_namespace:
             return Path("/".join(namespace_config.split(".")[num_of_package_namespace:]))
         return Path("")
 
     def _serialize_and_write_sample(self, env: Environment):
-        out_path = Path("./generated_samples")
+        out_path = self._root_of_sdk / "generated_samples"
         for client in self.code_model.clients:
             for op_group in client.operation_groups:
                 for operation in op_group.operations:
-                    if (
-                        self.code_model.options["multiapi"]
-                        and operation.api_versions[0] != self.code_model.options["default-api-version"]
-                    ):
-                        continue
                     samples = operation.yaml_data.get("samples")
                     if not samples or operation.name.startswith("_"):
                         continue
@@ -561,7 +549,7 @@ class JinjaSerializer(ReaderAndWriter):
 
     def _serialize_and_write_test(self, env: Environment):
         self.code_model.for_test = True
-        out_path = Path("./generated_tests")
+        out_path = self._root_of_sdk / "generated_tests"
         general_serializer = TestGeneralSerializer(code_model=self.code_model, env=env)
         self.write_file(out_path / "conftest.py", general_serializer.serialize_conftest())
         if not self.code_model.options["azure-arm"]:
@@ -575,10 +563,6 @@ class JinjaSerializer(ReaderAndWriter):
 
         for client in self.code_model.clients:
             for og in client.operation_groups:
-                if self.code_model.options["multiapi"] and any(
-                    o.api_versions[0] != self.code_model.options["default-api-version"] for o in og.operations
-                ):
-                    continue
                 test_serializer = TestSerializer(self.code_model, env, client=client, operation_group=og)
                 for async_mode in (True, False):
                     try: