@autorest/python 6.38.1 → 6.39.0

package/generator/build/lib/pygen/codegen/templates/serialization.py.jinja2

@@ -17,7 +17,6 @@ import re
 import sys
 import codecs
 from typing import (
-    Dict,
     Any,
     cast,
     Optional,
@@ -27,7 +26,6 @@ from typing import (
     Mapping,
     Callable,
     MutableMapping,
-    List,
 )
 
 try:
@@ -225,12 +223,12 @@ class Model:
     serialization and deserialization.
     """
 
-    _subtype_map: Dict[str, Dict[str, Any]] = {}
-    _attribute_map: Dict[str, Dict[str, Any]] = {}
-    _validation: Dict[str, Dict[str, Any]] = {}
+    _subtype_map: dict[str, dict[str, Any]] = {}
+    _attribute_map: dict[str, dict[str, Any]] = {}
+    _validation: dict[str, dict[str, Any]] = {}
 
     def __init__(self, **kwargs: Any) -> None:
-        self.additional_properties: Optional[Dict[str, Any]] = {}
+        self.additional_properties: Optional[dict[str, Any]] = {}
         for k in kwargs:  # pylint: disable=consider-using-dict-items
             if k not in self._attribute_map:
                 _LOGGER.warning("%s is not a known attribute of class %s and will be ignored", k, self.__class__)
@@ -307,7 +305,7 @@ class Model:
     def as_dict(
         self,
         keep_readonly: bool = True,
-        key_transformer: Callable[[str, Dict[str, Any], Any], Any] = attribute_transformer,
+        key_transformer: Callable[[str, dict[str, Any], Any], Any] = attribute_transformer,
         **kwargs: Any
     ) -> JSON:
         """Return a dict that can be serialized using json.dump.
@@ -376,7 +374,7 @@ class Model:
     def from_dict(
         cls,
         data: Any,
-        key_extractors: Optional[Callable[[str, Dict[str, Any], Any], Any]] = None,
+        key_extractors: Optional[Callable[[str, dict[str, Any], Any], Any]] = None,
         content_type: Optional[str] = None,
     ) -> Self:
         """Parse a dict using given key extractor return a model.
@@ -410,7 +408,7 @@ class Model:
             return {}
         result = dict(cls._subtype_map[key])
         for valuetype in cls._subtype_map[key].values():
-            result.update(objects[valuetype]._flatten_subtype(key, objects))  # pylint: disable=protected-access
+            result |= objects[valuetype]._flatten_subtype(key, objects)  # pylint: disable=protected-access
         return result
 
     @classmethod
@@ -524,7 +522,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
             "[]": self.serialize_iter,
             "{}": self.serialize_dict,
         }
-        self.dependencies: Dict[str, type] = dict(classes) if classes else {}
+        self.dependencies: dict[str, type] = dict(classes) if classes else {}
         self.key_transformer = full_restapi_key_transformer
         self.client_side_validation = True
 
@@ -575,7 +573,7 @@ class Serializer:  # pylint: disable=too-many-public-methods
 
                 if attr_name == "additional_properties" and attr_desc["key"] == "":
                     if target_obj.additional_properties is not None:
-                        serialized.update(target_obj.additional_properties)
+                        serialized |= target_obj.additional_properties
                     continue
                 try:
 
@@ -1180,7 +1178,7 @@ def rest_key_extractor(attr, attr_desc, data):  # pylint: disable=unused-argumen
 
     while "." in key:
         # Need the cast, as for some reasons "split" is typed as list[str | Any]
-        dict_keys = cast(List[str], _FLATTEN.split(key))
+        dict_keys = cast(list[str], _FLATTEN.split(key))
         if len(dict_keys) == 1:
             key = _decode_attribute_map_key(dict_keys[0])
             break
@@ -1382,7 +1380,7 @@ class Deserializer:
             "duration": (isodate.Duration, datetime.timedelta),
             "iso-8601": (datetime.datetime),
         }
-        self.dependencies: Dict[str, type] = dict(classes) if classes else {}
+        self.dependencies: dict[str, type] = dict(classes) if classes else {}
         self.key_extractors = [rest_key_extractor, xml_key_extractor]
         # Additional properties only works if the "rest_key_extractor" is used to
         # extract the keys. Making it to work whatever the key extractor is too much

package/generator/build/lib/pygen/codegen/templates/utils.py.jinja2

@@ -66,9 +66,9 @@ FileType = Union[
     # file (or bytes)
     FileContent,
     # (filename, file (or bytes))
-    Tuple[Optional[str], FileContent],
+    tuple[Optional[str], FileContent],
     # (filename, file (or bytes), content_type)
-    Tuple[Optional[str], FileContent, Optional[str]],
+    tuple[Optional[str], FileContent, Optional[str]],
 ]
 
 def serialize_multipart_data_entry(data_entry: Any) -> Any:
@@ -77,10 +77,10 @@ def serialize_multipart_data_entry(data_entry: Any) -> Any:
     return data_entry
 
 def prepare_multipart_form_data(
-    body: Mapping[str, Any], multipart_fields: List[str], data_fields: List[str]
-) -> Tuple[List[FileType], Dict[str, Any]]:
-    files: List[FileType] = []
-    data: Dict[str, Any] = {}
+    body: Mapping[str, Any], multipart_fields: list[str], data_fields: list[str]
+) -> tuple[list[FileType], dict[str, Any]]:
+    files: list[FileType] = []
+    data: dict[str, Any] = {}
     for multipart_field in multipart_fields:
         multipart_entry = body.get(multipart_field)
         if isinstance(multipart_entry, list):

package/generator/build/lib/pygen/preprocess/__init__.py

@@ -5,7 +5,7 @@
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
 import copy
-from typing import Callable, Dict, Any, List, Optional
+from typing import Callable, Any, Optional
 
 from ..utils import to_snake_case, extract_original_name
 from .helpers import (
@@ -26,8 +26,8 @@ from ..utils import (
 
 
 def update_overload_section(
-    overload: Dict[str, Any],
-    yaml_data: Dict[str, Any],
+    overload: dict[str, Any],
+    yaml_data: dict[str, Any],
     section: str,
 ):
     try:
@@ -42,7 +42,7 @@ def update_overload_section(
         raise ValueError(overload["name"]) from exc
 
 
-def add_overload(yaml_data: Dict[str, Any], body_type: Dict[str, Any], for_flatten_params=False):
+def add_overload(yaml_data: dict[str, Any], body_type: dict[str, Any], for_flatten_params=False):
     overload = copy.deepcopy(yaml_data)
     overload["isOverload"] = True
     overload["bodyParameter"]["type"] = body_type
@@ -80,7 +80,7 @@ def add_overload(yaml_data: Dict[str, Any], body_type: Dict[str, Any], for_flatt
     return overload
 
 
-def add_overloads_for_body_param(yaml_data: Dict[str, Any]) -> None:
+def add_overloads_for_body_param(yaml_data: dict[str, Any]) -> None:
     """If we added a body parameter type, add overloads for that type"""
     body_parameter = yaml_data["bodyParameter"]
     if not (
@@ -121,7 +121,7 @@ def update_operation_group_class_name(prefix: str, class_name: str) -> str:
     return class_name + "Operations"
 
 
-def update_paging_response(yaml_data: Dict[str, Any]) -> None:
+def update_paging_response(yaml_data: dict[str, Any]) -> None:
     yaml_data["discriminator"] = "paging"
 
 
@@ -148,23 +148,35 @@ HEADERS_CONVERT_IN_METHOD = {
         },
     },
 }
+CLOUD_SETTING = {
+    "optional": True,
+    "description": "The cloud setting for which to get the ARM endpoint.",
+    "clientName": "cloud_setting",
+    "implementation": "Client",
+    "location": "keyword",
+    "type": {
+        "type": "sdkcore",
+        "name": "AzureClouds",
+        "isTypingOnly": True,
+    },
+}
 
 
-def get_wire_name_lower(parameter: Dict[str, Any]) -> str:
+def get_wire_name_lower(parameter: dict[str, Any]) -> str:
     return (parameter.get("wireName") or "").lower()
 
 
-def headers_convert(yaml_data: Dict[str, Any], replace_data: Any) -> None:
+def headers_convert(yaml_data: dict[str, Any], replace_data: Any) -> None:
     if isinstance(replace_data, dict):
         for k, v in replace_data.items():
             yaml_data[k] = v
 
 
-def has_json_content_type(yaml_data: Dict[str, Any]) -> bool:
+def has_json_content_type(yaml_data: dict[str, Any]) -> bool:
     return any(ct for ct in yaml_data.get("contentTypes", []) if JSON_REGEXP.match(ct))
 
 
-def has_multi_part_content_type(yaml_data: Dict[str, Any]) -> bool:
+def has_multi_part_content_type(yaml_data: dict[str, Any]) -> bool:
     return any(ct for ct in yaml_data.get("contentTypes", []) if ct == "multipart/form-data")
 
 
@@ -189,8 +201,8 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def add_body_param_type(
         self,
-        code_model: Dict[str, Any],
-        body_parameter: Dict[str, Any],
+        code_model: dict[str, Any],
+        body_parameter: dict[str, Any],
     ):
         # only add overload for special content type
         if (  # pylint: disable=too-many-boolean-expressions
@@ -231,7 +243,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             return name_prefix + name + pad_type
         return name_prefix + name
 
-    def update_types(self, yaml_data: List[Dict[str, Any]]) -> None:
+    def update_types(self, yaml_data: list[dict[str, Any]]) -> None:
         for type in yaml_data:
             for property in type.get("properties", []):
                 property["description"] = update_description(property.get("description", ""))
@@ -268,8 +280,9 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for v in HEADERS_CONVERT_IN_METHOD.values():
             if isinstance(v, dict) and "type" in v:
                 yaml_data.append(v["type"])
+        yaml_data.append(CLOUD_SETTING["type"])  # type: ignore
 
-    def update_client(self, yaml_data: Dict[str, Any]) -> None:
+    def update_client(self, yaml_data: dict[str, Any]) -> None:
         yaml_data["description"] = update_description(yaml_data["description"], default_description=yaml_data["name"])
         yaml_data["legacyFilename"] = to_snake_case(yaml_data["name"].replace(" ", "_"))
         parameters = yaml_data["parameters"]
@@ -325,7 +338,11 @@ class PreProcessPlugin(YamlUpdatePlugin):
                     o["hasEtag"] = True
                     yaml_data["hasEtag"] = True
 
-    def get_operation_updater(self, yaml_data: Dict[str, Any]) -> Callable[[Dict[str, Any], Dict[str, Any]], None]:
+        # add client signature cloud_setting for arm
+        if self.azure_arm and yaml_data["parameters"]:
+            yaml_data["parameters"].append(CLOUD_SETTING)
+
+    def get_operation_updater(self, yaml_data: dict[str, Any]) -> Callable[[dict[str, Any], dict[str, Any]], None]:
         if yaml_data["discriminator"] == "lropaging":
             return self.update_lro_paging_operation
         if yaml_data["discriminator"] == "lro":
@@ -334,7 +351,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             return self.update_paging_operation
         return self.update_operation
 
-    def update_parameter(self, yaml_data: Dict[str, Any]) -> None:
+    def update_parameter(self, yaml_data: dict[str, Any]) -> None:
         yaml_data["description"] = update_description(yaml_data.get("description", ""))
         if not (yaml_data["location"] == "header" and yaml_data["clientName"] in ("content_type", "accept")):
             yaml_data["clientName"] = self.pad_reserved_words(yaml_data["clientName"].lower(), PadType.PARAMETER)
@@ -358,8 +375,8 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_operation(
         self,
-        code_model: Dict[str, Any],
-        yaml_data: Dict[str, Any],
+        code_model: dict[str, Any],
+        yaml_data: dict[str, Any],
         *,
         is_overload: bool = False,
     ) -> None:
@@ -390,7 +407,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             self.add_body_param_type(code_model, body_parameter)
             add_overloads_for_body_param(yaml_data)
 
-    def _update_lro_operation_helper(self, yaml_data: Dict[str, Any]) -> None:
+    def _update_lro_operation_helper(self, yaml_data: dict[str, Any]) -> None:
         for response in yaml_data.get("responses", []):
             response["discriminator"] = "lro"
             response["pollerSync"] = response.get("pollerSync") or "azure.core.polling.LROPoller"
@@ -410,10 +427,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_lro_paging_operation(
         self,
-        code_model: Dict[str, Any],
-        yaml_data: Dict[str, Any],
+        code_model: dict[str, Any],
+        yaml_data: dict[str, Any],
         is_overload: bool = False,
-        item_type: Optional[Dict[str, Any]] = None,
+        item_type: Optional[dict[str, Any]] = None,
     ) -> None:
         self.update_lro_operation(code_model, yaml_data, is_overload=is_overload)
         self.update_paging_operation(code_model, yaml_data, is_overload=is_overload, item_type=item_type)
@@ -430,11 +447,11 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_lro_operation(
         self,
-        code_model: Dict[str, Any],
-        yaml_data: Dict[str, Any],
+        code_model: dict[str, Any],
+        yaml_data: dict[str, Any],
         is_overload: bool = False,
     ) -> None:
-        def convert_initial_operation_response_type(data: Dict[str, Any]) -> None:
+        def convert_initial_operation_response_type(data: dict[str, Any]) -> None:
             for response in data.get("responses", []):
                 response["type"] = KNOWN_TYPES["binary"]
 
@@ -449,10 +466,10 @@ class PreProcessPlugin(YamlUpdatePlugin):
 
     def update_paging_operation(
         self,
-        code_model: Dict[str, Any],
-        yaml_data: Dict[str, Any],
+        code_model: dict[str, Any],
+        yaml_data: dict[str, Any],
         is_overload: bool = False,
-        item_type: Optional[Dict[str, Any]] = None,
+        item_type: Optional[dict[str, Any]] = None,
     ) -> None:
         self.update_operation(code_model, yaml_data, is_overload=is_overload)
         item_type = item_type or yaml_data["itemType"]["elementType"]
@@ -470,7 +487,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
         for overload in yaml_data.get("overloads", []):
             self.update_paging_operation(code_model, overload, is_overload=True, item_type=item_type)
 
-    def update_operation_groups(self, code_model: Dict[str, Any], client: Dict[str, Any]) -> None:
+    def update_operation_groups(self, code_model: dict[str, Any], client: dict[str, Any]) -> None:
         operation_groups_yaml_data = client.get("operationGroups", [])
         for operation_group in operation_groups_yaml_data:
             operation_group["identifyName"] = self.pad_reserved_words(
@@ -491,7 +508,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if operation_group.get("operationGroups"):
                 self.update_operation_groups(code_model, operation_group)
 
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
+    def update_yaml(self, yaml_data: dict[str, Any]) -> None:
         """Convert in place the YAML str."""
         self.update_types(yaml_data["types"])
         yaml_data["types"] += KNOWN_TYPES.values()

package/generator/build/lib/pygen/preprocess/helpers.py

@@ -4,14 +4,14 @@
 # license information.
 # --------------------------------------------------------------------------
 import re
-from typing import Any, Dict
+from typing import Any
 from .python_mappings import (
     REDEFINED_BUILTINS,
     BUILTIN_PACKAGES,
 )
 
 
-def add_redefined_builtin_info(name: str, yaml_data: Dict[str, Any]) -> None:
+def add_redefined_builtin_info(name: str, yaml_data: dict[str, Any]) -> None:
     if name in REDEFINED_BUILTINS:
         yaml_data["pylintDisable"] = "redefined-builtin"
 

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

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, Tuple, List
+from typing import Any
 import re
 import argparse
 
@@ -12,7 +12,7 @@ TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
 VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE
 
 
-def update_enum_value(name: str, value: Any, description: str, enum_type: Dict[str, Any]) -> Dict[str, Any]:
+def update_enum_value(name: str, value: Any, description: str, enum_type: dict[str, Any]) -> dict[str, Any]:
     return {
         "name": name,
         "type": "enumvalue",
@@ -49,7 +49,7 @@ def to_snake_case(name: str) -> str:
 
 def parse_args(
     need_tsp_file: bool = True,
-) -> Tuple[argparse.Namespace, Dict[str, Any]]:
+) -> tuple[argparse.Namespace, dict[str, Any]]:
     parser = argparse.ArgumentParser(
         description="Run mypy against target folder. Add a local custom plugin to the path prior to execution. "
     )
@@ -92,7 +92,7 @@ def parse_args(
     return args, unknown_args_ret
 
 
-def get_body_type_for_description(body_parameter: Dict[str, Any]) -> str:
+def get_body_type_for_description(body_parameter: dict[str, Any]) -> str:
     if body_parameter["type"]["type"] == "binary":
         return "binary"
     if body_parameter["type"]["type"] == "string":
@@ -101,7 +101,7 @@ def get_body_type_for_description(body_parameter: Dict[str, Any]) -> str:
 
 
 # used if we want to get a string / binary type etc
-KNOWN_TYPES: Dict[str, Dict[str, Any]] = {
+KNOWN_TYPES: dict[str, dict[str, Any]] = {
     "string": {"type": "string"},
     "binary": {"type": "binary"},
     "anydict": {"type": "dict", "elementType": {"type": "any"}},
@@ -118,7 +118,7 @@ def build_policies(
     *,
     is_azure_flavor: bool = False,
     tracing: bool = True,
-) -> List[str]:
+) -> list[str]:
     if is_azure_flavor:
         # for Azure
         async_prefix = "Async" if async_mode else ""

package/generator/pygen/__init__.py

@@ -8,7 +8,7 @@ import logging
 from pathlib import Path
 import json
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Iterator, Optional, Union, List
+from typing import Any, Iterator, Optional, Union
 
 import yaml
 from .utils import TYPESPEC_PACKAGE_MODE, VALID_PACKAGE_MODE
@@ -33,7 +33,6 @@ class OptionsDict(MutableMapping):
         "head-as-boolean": True,
         "keep-version-file": False,
         "low-level-client": False,
-        "multiapi": False,
         "no-async": False,
         "no-namespace-folders": False,
         "polymorphic-examples": 5,
@@ -42,11 +41,11 @@ class OptionsDict(MutableMapping):
         "generation-subdir": None,  # subdirectory to generate the code in
     }
 
-    def __init__(self, options: Optional[Dict[str, Any]] = None) -> None:
+    def __init__(self, options: Optional[dict[str, Any]] = None) -> None:
         self._data = options.copy() if options else {}
         self._validate_combinations()
 
-    def __getitem__(self, key: str) -> Any: # pylint: disable=too-many-return-statements
+    def __getitem__(self, key: str) -> Any:  # pylint: disable=too-many-return-statements
         if key == "head-as-boolean" and self.get("azure-arm"):
             # override to always true if azure-arm is set
             return True
@@ -109,7 +108,12 @@ class OptionsDict(MutableMapping):
         if key == "combine-operation-files":
             return self.get("version-tolerant")
         if key == "package-pprint-name":
-            return " ".join([i.capitalize() for i in str(self.get("package-name", "")).split("-")])
+            package_names = self.get("package-name", "").split("-")
+            return (
+                (package_names[-1].capitalize() + " Management")
+                if self.get("azure-arm")
+                else " ".join([i.capitalize() for i in package_names])
+            )
         if key == "builders-visibility":
             # Default to public if low-level client is not set, otherwise embedded
             return "embedded" if not self.get("low-level-client") else "public"
@@ -143,16 +147,6 @@ class OptionsDict(MutableMapping):
                 "If you want operation files, pass in flag --show-operations"
             )
 
-        if self.get("multiapi") and self.get("version-tolerant"):
-            raise ValueError(
-                "Can not currently generate version tolerant multiapi SDKs. "
-                "We are working on creating a new multiapi SDK for version tolerant and it is not available yet."
-            )
-
-        # If multiapi, do not generate default pyproject.toml
-        if self.get("multiapi"):
-            self["keep-setup-py"] = True
-
         if self.get("client-side-validation") and self.get("version-tolerant"):
             raise ValueError("Can not generate version tolerant with --client-side-validation. ")
 
@@ -200,7 +194,7 @@ class OptionsDict(MutableMapping):
         for key in self.DEFAULTS:
             if key not in all_keys:
                 all_keys.add(key)
-        all_keys.update(self.DEFAULTS.keys())
+        all_keys |= self.DEFAULTS.keys()
         return KeysView({key: None for key in all_keys})
 
     def values(self) -> ValuesView[Any]:
@@ -213,7 +207,7 @@ class OptionsDict(MutableMapping):
 class ReaderAndWriter:
     def __init__(self, *, output_folder: Union[str, Path], **kwargs: Any) -> None:
         self.output_folder = Path(output_folder)
-        self._list_file: List[str] = []
+        self._list_file: list[str] = []
         try:
             with open(
                 Path(self.output_folder) / Path("..") / Path("python.json"),
@@ -229,9 +223,6 @@ class ReaderAndWriter:
             _LOGGER.warning("Loading python.json file. This behavior will be depreacted")
         self.options.update(python_json)
 
-    def get_output_folder(self) -> Path:
-        return self.output_folder
-
     def read_file(self, path: Union[str, Path]) -> str:
         """Directly reading from disk"""
         # make path relative to output folder
@@ -257,7 +248,7 @@ class ReaderAndWriter:
         except FileNotFoundError:
             pass
 
-    def list_file(self) -> List[str]:
+    def list_file(self) -> list[str]:
         return [str(f.relative_to(self.output_folder)) for f in self.output_folder.glob("**/*") if f.is_file()]
 
 
@@ -281,7 +272,7 @@ class Plugin(ReaderAndWriter, ABC):
 class YamlUpdatePlugin(Plugin):
     """A plugin that update the YAML as input."""
 
-    def get_yaml(self) -> Dict[str, Any]:
+    def get_yaml(self) -> dict[str, Any]:
         # tsp file doesn't have to be relative to output folder
         with open(self.options["tsp_file"], "r", encoding="utf-8-sig") as fd:
             return yaml.safe_load(fd.read())
@@ -302,7 +293,7 @@ class YamlUpdatePlugin(Plugin):
         return True
 
     @abstractmethod
-    def update_yaml(self, yaml_data: Dict[str, Any]) -> None:
+    def update_yaml(self, yaml_data: dict[str, Any]) -> None:
         """The code-model-v4-no-tags yaml model tree.
 
         :rtype: updated yaml

package/generator/pygen/codegen/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Dict, Any
+from typing import Any
 import yaml
 
 
@@ -20,7 +20,7 @@ _LOGGER = logging.getLogger(__name__)
 class CodeGenerator(Plugin):
 
     @staticmethod
-    def sort_exceptions(yaml_data: Dict[str, Any]) -> None:
+    def sort_exceptions(yaml_data: dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
             for group in client.get("operationGroups", []):
                 for operation in group.get("operations", []):
@@ -37,7 +37,7 @@ class CodeGenerator(Plugin):
                     )
 
     @staticmethod
-    def remove_cloud_errors(yaml_data: Dict[str, Any]) -> None:
+    def remove_cloud_errors(yaml_data: dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
             for group in client.get("operationGroups", []):
                 for operation in group.get("operations", []):
@@ -60,7 +60,7 @@ class CodeGenerator(Plugin):
                     del yaml_data["schemas"]["objects"][i]
                     break
 
-    def get_yaml(self) -> Dict[str, Any]:
+    def get_yaml(self) -> dict[str, Any]:
         # tsp file doesn't have to be relative to output folder
         with open(self.options["tsp_file"], "r", encoding="utf-8-sig") as fd:
             return yaml.safe_load(fd.read())

package/generator/pygen/codegen/models/__init__.py

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import logging
-from typing import Any, Dict, Union, Optional
+from typing import Any, Union, Optional
 from .base import BaseModel
 from .base_builder import BaseBuilder, ParameterListType
 from .code_model import CodeModel
@@ -155,7 +155,7 @@ TYPE_TO_OBJECT = {
 _LOGGER = logging.getLogger(__name__)
 
 
-def build_type(yaml_data: Dict[str, Any], code_model: CodeModel) -> BaseType:
+def build_type(yaml_data: dict[str, Any], code_model: CodeModel) -> BaseType:
     yaml_id = id(yaml_data)
     try:
         return code_model.lookup_type(yaml_id)

package/generator/pygen/codegen/models/base.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Dict, TYPE_CHECKING, List, Optional
+from typing import Any, TYPE_CHECKING, Optional
 from abc import ABC, abstractmethod
 from .imports import FileImport
 
@@ -20,7 +20,7 @@ class BaseModel:
     :type yaml_data: dict[str, Any]
     """
 
-    def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
+    def __init__(self, yaml_data: dict[str, Any], code_model: "CodeModel") -> None:
         self.yaml_data = yaml_data
         self.code_model = code_model
 
@@ -39,21 +39,18 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
     :type yaml_data: dict[str, Any]
     """
 
-    def __init__(self, yaml_data: Dict[str, Any], code_model: "CodeModel") -> None:
+    def __init__(self, yaml_data: dict[str, Any], code_model: "CodeModel") -> None:
         super().__init__(yaml_data, code_model)
         self.type = yaml_data["type"]  # the type discriminator
-        self.api_versions: List[str] = yaml_data.get("apiVersions", [])  # api versions this type is in.
+        self.api_versions: list[str] = yaml_data.get("apiVersions", [])  # api versions this type is in.
 
     @classmethod
-    def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "BaseType":
+    def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "BaseType":
         return cls(yaml_data=yaml_data, code_model=code_model)
 
     def imports(self, **kwargs) -> FileImport:  # pylint: disable=unused-argument
         return FileImport(self.code_model)
 
-    def imports_for_multiapi(self, **kwargs: Any) -> FileImport:
-        return self.imports(**kwargs)
-
     def imports_for_sample(self) -> FileImport:
         return FileImport(self.code_model)
 
@@ -62,7 +59,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         return repr(value)
 
     @property
-    def xml_metadata(self) -> Dict[str, Any]:
+    def xml_metadata(self) -> dict[str, Any]:
         """XML metadata for the type, if the type has it."""
         return self.yaml_data.get("xmlMetadata", {})
 
@@ -132,7 +129,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """
 
     @property
-    def validation(self) -> Optional[Dict[str, Any]]:
+    def validation(self) -> Optional[dict[str, Any]]:
         """Whether there's any validation constraints on this type.
 
         Even though we generate validation maps if there are validation constraints,
@@ -162,7 +159,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """Template of what this schema would look like as JSON input"""
 
     def get_polymorphic_subtypes(
-        self, polymorphic_subtypes: List["ModelType"]  # pylint: disable=unused-argument
+        self, polymorphic_subtypes: list["ModelType"]  # pylint: disable=unused-argument
     ) -> None:
         return None
 
@@ -172,7 +169,7 @@ class BaseType(BaseModel, ABC):  # pylint: disable=too-many-public-methods
         """Template of what an instance check of a variable for this type would look like"""
 
     @property
-    def serialization_constraints(self) -> List[str]:
+    def serialization_constraints(self) -> list[str]:
         """Whether there are any serialization constraints when serializing this type."""
         return []