@autorest/python 6.38.2 → 6.40.0

package/README.md

@@ -23,7 +23,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio
 
 #### Python code gen
 
-```yaml !$(multiapiscript) && !$(multiclientscript)
+```yaml !$(multiclientscript)
 # default values for version tolerant and black
 black: true
 ```
@@ -39,7 +39,7 @@ modelerfour:
   flatten-payloads: true
 ```
 
-```yaml !$(multiapiscript) && !$(multiclientscript)
+```yaml !$(multiclientscript)
 pass-thru:
   - model-deduplicator
   - subset-reducer
@@ -99,25 +99,6 @@ scope-codegen/emitter:
 output-artifact: python-files
 ```
 
-# Multiapi script pipeline
-
-```yaml $(multiapiscript)
-pipeline:
-  python/multiapiscript:
-    scope: multiapiscript
-    output-artifact: python-files
-
-  python/multiapiscript/emitter:
-    input: multiapiscript
-    scope: scope-multiapiscript/emitter
-
-scope-multiapiscript/emitter:
-  input-artifact: python-files
-  output-uri-expr: $key
-
-output-artifact: python-files
-```
-
 # Black script pipeline
 
 ```yaml $(black)
@@ -173,12 +154,6 @@ help-content:
       - key: basic-setup-py
         description: Whether to generate a build script for setuptools to package your SDK.  Defaults to `false`, generally not suggested if you are going to wrap the generated code
         type: bool
-      - key: multiapi
-        description: Whether to generate a multiapi client.
-        type: bool
-      - key: default-api
-        description: In the case of `--multiapi`, you can override the default service API version with this flag. If not specified, we use the latest GA service version as the default API.
-        type: string
       - key: no-namespace-folders
         description: Specify if you don't want pkgutil-style namespace folders. Defaults to `false`.
         type: bool

package/autorest/codegen.py

@@ -69,7 +69,6 @@ class CodeGeneratorAutorest(CodeGenerator, PluginAutorest):
             "package-version": self._autorestapi.get_value("package-version"),
             "client-side-validation": self._autorestapi.get_boolean_value("client-side-validation"),
             "tracing": self._autorestapi.get_boolean_value("trace"),
-            "multiapi": self._autorestapi.get_boolean_value("multiapi", False),
             "polymorphic-examples": self._autorestapi.get_value("polymorphic-examples"),
             "models-mode": self._autorestapi.get_value("models-mode"),
             "builders-visibility": self._autorestapi.get_value("builders-visibility"),

package/autorest/jsonrpc/server.py

@@ -26,7 +26,6 @@ def GetPluginNames():
         "preprocess",
         "m4reformatter",
         "black",
-        "multiapiscript",
         "multiclientscript",
     ]
 
@@ -53,8 +52,6 @@ def Process(plugin_name: str, session_id: str) -> bool:
             from ..codegen import CodeGeneratorAutorest as PluginToLoad  # type: ignore
         elif plugin_name == "black":
             from ..black import BlackScriptPluginAutorest as PluginToLoad  # type: ignore
-        elif plugin_name == "multiapiscript":
-            from ..multiapi import MultiApiScriptPluginAutorest as PluginToLoad  # type: ignore
         elif plugin_name == "multiclientscript":
             from ..multiclient import MultiClientPluginAutorest as PluginToLoad  # type: ignore
         else:

package/generator/build/lib/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,7 +41,7 @@ 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()
 
@@ -148,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. ")
 
@@ -205,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]:
@@ -218,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"),
@@ -234,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
@@ -262,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()]
 
 
@@ -286,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())
@@ -307,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/build/lib/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

package/generator/build/lib/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/build/lib/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/build/lib/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 []
 

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

@@ -5,8 +5,6 @@
 # --------------------------------------------------------------------------
 import logging
 from typing import (
-    List,
-    Dict,
     Any,
     Generic,
     TypeVar,
@@ -52,7 +50,7 @@ class BaseBuilder(
 
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         client: "Client",
         name: str,
@@ -70,9 +68,9 @@ class BaseBuilder(
         self.want_tracing: bool = yaml_data.get("wantTracing", True)
         self.group_name: str = yaml_data["groupName"]  # either operationGroup or client I am on
         self.is_overload: bool = yaml_data["isOverload"]
-        self.api_versions: List[str] = yaml_data["apiVersions"]
+        self.api_versions: list[str] = yaml_data["apiVersions"]
         self.added_on: Optional[str] = yaml_data.get("addedOn")
-        self.external_docs: Optional[Dict[str, Any]] = yaml_data.get("externalDocs")
+        self.external_docs: Optional[dict[str, Any]] = yaml_data.get("externalDocs")
         self.client_namespace: str = yaml_data.get("clientNamespace", code_model.namespace)
 
         if code_model.options["version-tolerant"] and yaml_data.get("abstract"):
@@ -114,7 +112,7 @@ class BaseBuilder(
             )
         return self._description or self.name
 
-    def method_signature(self, async_mode: bool, **kwargs: Any) -> List[str]:
+    def method_signature(self, async_mode: bool, **kwargs: Any) -> list[str]:
         if self.abstract:
             return ["*args,", "**kwargs"]
         return self.parameters.method_signature(async_mode, **kwargs)

package/generator/build/lib/pygen/codegen/models/client.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, TypeVar, Generic, Union, List, Optional
+from typing import Any, TYPE_CHECKING, TypeVar, Generic, Union, Optional
 
 from .base import BaseModel
 from .parameter_list import ClientGlobalParameterList, ConfigGlobalParameterList
@@ -35,7 +35,7 @@ class _ClientConfigBase(Generic[ParameterListType], BaseModel):
 
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         parameters: ParameterListType,
     ):
@@ -54,19 +54,19 @@ class _ClientConfigBase(Generic[ParameterListType], BaseModel):
         return self.yaml_data["name"]
 
 
-class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=too-many-public-methods
+class Client(_ClientConfigBase[ClientGlobalParameterList]):
     """Model representing our service client"""
 
     def __init__(
         self,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         parameters: ClientGlobalParameterList,
         *,
         is_subclient: bool = False,
     ):
         super().__init__(yaml_data, code_model, parameters)
-        self.operation_groups: List[OperationGroup] = []
+        self.operation_groups: list[OperationGroup] = []
         self.config = Config.from_yaml(yaml_data, self.code_model)
         self.is_subclient = is_subclient
         self.request_builders = self._build_request_builders()
@@ -81,12 +81,18 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
 
         # update the host parameter value. In later logic, SDK will overwrite it
         # with value from cloud_setting if users don't provide it.
-        if self.need_cloud_setting:
-            for p in self.parameters.parameters:
-                if p.location == ParameterLocation.ENDPOINT_PATH:
-                    p.client_default_value = None
-                    p.optional = True
-                    break
+        if self.code_model.options.get("azure-arm"):
+            if self.need_cloud_setting:
+                for p in self.parameters.parameters:
+                    if p.location == ParameterLocation.ENDPOINT_PATH:
+                        p.client_default_value = None
+                        p.optional = True
+                        break
+            else:
+                for idx, p in enumerate(self.parameters.parameters):
+                    if p.client_name == "cloud_setting":
+                        self.parameters.parameters.pop(idx)
+                        break
 
     @property
     def need_cloud_setting(self) -> bool:
@@ -102,10 +108,10 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
 
     def _build_request_builders(
         self,
-    ) -> List[Union[RequestBuilder, OverloadedRequestBuilder]]:
-        request_builders: List[Union[RequestBuilder, OverloadedRequestBuilder]] = []
+    ) -> list[Union[RequestBuilder, OverloadedRequestBuilder]]:
+        request_builders: list[Union[RequestBuilder, OverloadedRequestBuilder]] = []
 
-        def add_og_request_builder(og: Dict[str, Any]):
+        def add_og_request_builder(og: dict[str, Any]):
             for operation_yaml in og["operations"]:
                 request_builder = get_request_builder(
                     operation_yaml,
@@ -203,7 +209,43 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         except StopIteration as exc:
             raise KeyError(f"No operation with id {operation_id} found.") from exc
 
-    def _imports_shared(self, async_mode: bool, **kwargs) -> FileImport:
+    @property
+    def has_mixin(self) -> bool:
+        """Do we want a mixin ABC class for typing purposes?"""
+        return any(og for og in self.operation_groups if og.is_mixin)
+
+    @property
+    def lro_operations(self) -> list["OperationType"]:
+        """all LRO operations in this SDK?"""
+        return [operation for operation_group in self.operation_groups for operation in operation_group.lro_operations]
+
+    @property
+    def has_public_lro_operations(self) -> bool:
+        """Are there any public LRO operations in this SDK?"""
+        return any(not operation.internal for operation in self.lro_operations)
+
+    @property
+    def has_operations(self) -> bool:
+        return any(operation_group.has_operations for operation_group in self.operation_groups)
+
+    def link_lro_initial_operations(self) -> None:
+        """Link each LRO operation to its initial operation"""
+        for operation_group in self.operation_groups:
+            for operation in operation_group.operations:
+                if isinstance(operation, (LROOperation, LROPagingOperation)):
+                    operation.initial_operation = self.lookup_operation(id(operation.yaml_data["initialOperation"]))
+
+    @property
+    def has_abstract_operations(self) -> bool:
+        """Whether there is abstract operation in any operation group."""
+        return any(og.has_abstract_operations for og in self.operation_groups)
+
+    @property
+    def has_non_abstract_operations(self) -> bool:
+        """Whether there is non-abstract operation in any operation group."""
+        return any(og.has_non_abstract_operations for og in self.operation_groups)
+
+    def imports(self, async_mode: bool, **kwargs) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.add_submodule_import("typing", "Any", ImportType.STDLIB, TypingSection.CONDITIONAL)
         if self.code_model.options["azure-arm"]:
@@ -259,46 +301,6 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
             file_import.add_submodule_import("typing", "cast", ImportType.STDLIB)
             file_import.add_submodule_import("azure.core.settings", "settings", ImportType.SDKCORE)
             file_import.add_submodule_import("azure.mgmt.core.tools", "get_arm_endpoints", ImportType.SDKCORE)
-        return file_import
-
-    @property
-    def has_mixin(self) -> bool:
-        """Do we want a mixin ABC class for typing purposes?"""
-        return any(og for og in self.operation_groups if og.is_mixin)
-
-    @property
-    def lro_operations(self) -> List["OperationType"]:
-        """all LRO operations in this SDK?"""
-        return [operation for operation_group in self.operation_groups for operation in operation_group.lro_operations]
-
-    @property
-    def has_public_lro_operations(self) -> bool:
-        """Are there any public LRO operations in this SDK?"""
-        return any(not operation.internal for operation in self.lro_operations)
-
-    @property
-    def has_operations(self) -> bool:
-        return any(operation_group.has_operations for operation_group in self.operation_groups)
-
-    def link_lro_initial_operations(self) -> None:
-        """Link each LRO operation to its initial operation"""
-        for operation_group in self.operation_groups:
-            for operation in operation_group.operations:
-                if isinstance(operation, (LROOperation, LROPagingOperation)):
-                    operation.initial_operation = self.lookup_operation(id(operation.yaml_data["initialOperation"]))
-
-    @property
-    def has_abstract_operations(self) -> bool:
-        """Whether there is abstract operation in any operation group."""
-        return any(og.has_abstract_operations for og in self.operation_groups)
-
-    @property
-    def has_non_abstract_operations(self) -> bool:
-        """Whether there is non-abstract operation in any operation group."""
-        return any(og.has_non_abstract_operations for og in self.operation_groups)
-
-    def imports(self, async_mode: bool, **kwargs) -> FileImport:
-        file_import = self._imports_shared(async_mode, **kwargs)
         if async_mode:
             file_import.add_submodule_import("typing", "Awaitable", ImportType.STDLIB)
             file_import.add_submodule_import(
@@ -334,32 +336,11 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
         if self.code_model.model_types and self.code_model.options["models-mode"] == "msrest":
             path_to_models = ".." if async_mode else "."
             file_import.add_submodule_import(path_to_models, "models", ImportType.LOCAL, alias="_models")
-        elif self.code_model.options["models-mode"] == "msrest":
-            # in this case, we have client_models = {} in the service client, which needs a type annotation
-            # this import will always be commented, so will always add it to the typing section
-            file_import.add_submodule_import("typing", "Dict", ImportType.STDLIB)
         file_import.add_submodule_import("copy", "deepcopy", ImportType.STDLIB)
         return file_import
 
-    def imports_for_multiapi(self, async_mode: bool, **kwargs) -> FileImport:
-        file_import = self._imports_shared(async_mode, **kwargs)
-        file_import.add_submodule_import("typing", "Optional", ImportType.STDLIB, TypingSection.CONDITIONAL)
-        try:
-            mixin_operation = next(og for og in self.operation_groups if og.is_mixin)
-            file_import.add_submodule_import("._operations_mixin", mixin_operation.class_name, ImportType.LOCAL)
-        except StopIteration:
-            pass
-        file_import.add_submodule_import("azure.profiles", "KnownProfiles", import_type=ImportType.SDKCORE)
-        file_import.add_submodule_import("azure.profiles", "ProfileDefinition", import_type=ImportType.SDKCORE)
-        file_import.add_submodule_import(
-            "azure.profiles.multiapiclient",
-            "MultiApiClientMixin",
-            import_type=ImportType.SDKCORE,
-        )
-        return file_import
-
     @property
-    def credential_scopes(self) -> Optional[List[str]]:
+    def credential_scopes(self) -> Optional[list[str]]:
         """Credential scopes for this client"""
 
         if self.credential:
@@ -373,7 +354,7 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=t
     @classmethod
     def from_yaml(
         cls,
-        yaml_data: Dict[str, Any],
+        yaml_data: dict[str, Any],
         code_model: "CodeModel",
         *,
         is_subclient: bool = False,
@@ -413,7 +394,7 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
     def name(self) -> str:
         return f"{super().name}Configuration"
 
-    def _imports_shared(self, async_mode: bool, **kwargs: Any) -> FileImport:
+    def imports(self, async_mode: bool, **kwargs) -> FileImport:
         file_import = FileImport(self.code_model)
         file_import.add_submodule_import(
             "pipeline" if self.code_model.is_azure_flavor else "runtime",
@@ -432,11 +413,6 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
             policy = "AsyncARMChallengeAuthenticationPolicy" if async_mode else "ARMChallengeAuthenticationPolicy"
             file_import.add_submodule_import("azure.mgmt.core.policies", "ARMHttpLoggingPolicy", ImportType.SDKCORE)
             file_import.add_submodule_import("azure.mgmt.core.policies", policy, ImportType.SDKCORE)
-
-        return file_import
-
-    def imports(self, async_mode: bool, **kwargs) -> FileImport:
-        file_import = self._imports_shared(async_mode, **kwargs)
         for gp in self.parameters:
             if gp.method_location == ParameterMethodLocation.KWARG and gp not in self.parameters.kwargs_to_pop:
                 continue
@@ -448,25 +424,8 @@ class Config(_ClientConfigBase[ConfigGlobalParameterList]):
             )
         return file_import
 
-    def imports_for_multiapi(self, async_mode: bool, **kwargs: Any) -> FileImport:
-        file_import = self._imports_shared(async_mode, **kwargs)
-        for gp in self.parameters:
-            if (
-                gp.method_location == ParameterMethodLocation.KWARG
-                and gp not in self.parameters.kwargs_to_pop
-                and gp.client_name == "api_version"
-            ):
-                continue
-            file_import.merge(
-                gp.imports_for_multiapi(
-                    async_mode=async_mode,
-                    **kwargs,
-                )
-            )
-        return file_import
-
     @classmethod
-    def from_yaml(cls, yaml_data: Dict[str, Any], code_model: "CodeModel") -> "Config":
+    def from_yaml(cls, yaml_data: dict[str, Any], code_model: "CodeModel") -> "Config":
         return cls(
             yaml_data=yaml_data,
             code_model=code_model,