@typespec/http-client-python 0.9.3-dev.2 → 0.11.0

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

@@ -15,7 +15,7 @@ from .request_builder import (
     OverloadedRequestBuilder,
     get_request_builder,
 )
-from .parameter import Parameter, ParameterMethodLocation
+from .parameter import Parameter, ParameterMethodLocation, ParameterLocation
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
 from ...utils import extract_original_name, NAME_LENGTH_LIMIT
@@ -54,7 +54,7 @@ class _ClientConfigBase(Generic[ParameterListType], BaseModel):
         return self.yaml_data["name"]
 
 
-class Client(_ClientConfigBase[ClientGlobalParameterList]):
+class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=too-many-public-methods
     """Model representing our service client"""
 
     def __init__(
@@ -79,6 +79,27 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         self.request_id_header_name = self.yaml_data.get("requestIdHeaderName", None)
         self.has_etag: bool = yaml_data.get("hasEtag", False)
 
+        # 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
+
+    @property
+    def need_cloud_setting(self) -> bool:
+        return bool(
+            self.code_model.options.get("azure_arm", False)
+            and self.credential_scopes is not None
+            and self.endpoint_parameter is not None
+        )
+
+    @property
+    def endpoint_parameter(self) -> Optional[Parameter]:
+        return next((p for p in self.parameters.parameters if p.location == ParameterLocation.ENDPOINT_PATH), None)
+
     def _build_request_builders(
         self,
     ) -> List[Union[RequestBuilder, OverloadedRequestBuilder]]:
@@ -233,6 +254,10 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             "Self",
             ImportType.STDLIB,
         )
+        if self.need_cloud_setting:
+            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
@@ -332,6 +357,18 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         )
         return file_import
 
+    @property
+    def credential_scopes(self) -> Optional[List[str]]:
+        """Credential scopes for this client"""
+
+        if self.credential:
+            if hasattr(getattr(self.credential.type, "policy", None), "credential_scopes"):
+                return self.credential.type.policy.credential_scopes  # type: ignore
+            for t in getattr(self.credential.type, "types", []):
+                if hasattr(getattr(t, "policy", None), "credential_scopes"):
+                    return t.policy.credential_scopes
+        return None
+
     @classmethod
     def from_yaml(
         cls,

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

@@ -357,6 +357,9 @@ class Parameter(_ParameterBase):
         )
         if self.code_model.options["only_path_and_body_params_positional"] and query_or_header:
             return ParameterMethodLocation.KEYWORD_ONLY
+        # for optional path parameter, we need to use keyword only
+        if self.location == ParameterLocation.PATH and self.optional:
+            return ParameterMethodLocation.KEYWORD_ONLY
         return ParameterMethodLocation.POSITIONAL
 
     @classmethod

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

@@ -3,10 +3,10 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import List
+from typing import List, cast
 
 from . import utils
-from ..models import Client, ParameterMethodLocation
+from ..models import Client, ParameterMethodLocation, Parameter, ParameterLocation
 from .parameter_serializer import ParameterSerializer, PopKwargType
 from ...utils import build_policies
 
@@ -77,17 +77,40 @@ class ClientSerializer:
         retval.append('"""')
         return retval
 
-    def initialize_config(self) -> str:
+    def initialize_config(self) -> List[str]:
+        retval = []
+        additional_signatures = []
+        if self.client.need_cloud_setting:
+            additional_signatures.append("credential_scopes=credential_scopes")
+            endpoint_parameter = cast(Parameter, self.client.endpoint_parameter)
+            retval.extend(
+                [
+                    '_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud  # type: ignore',
+                    "_endpoints = get_arm_endpoints(_cloud)",
+                    f"if not {endpoint_parameter.client_name}:",
+                    f'    {endpoint_parameter.client_name} = _endpoints["resource_manager"]',
+                    'credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])',
+                ]
+            )
         config_name = f"{self.client.name}Configuration"
         config_call = ", ".join(
             [
-                f"{p.client_name}={p.client_name}"
+                (
+                    f"{p.client_name}="
+                    + (
+                        f"cast(str, {p.client_name})"
+                        if self.client.need_cloud_setting and p.location == ParameterLocation.ENDPOINT_PATH
+                        else p.client_name
+                    )
+                )
                 for p in self.client.config.parameters.method
                 if p.method_location != ParameterMethodLocation.KWARG
             ]
+            + additional_signatures
             + ["**kwargs"]
         )
-        return f"self._config = {config_name}({config_call})"
+        retval.append(f"self._config = {config_name}({config_call})")
+        return retval
 
     @property
     def host_variable_name(self) -> str:
@@ -104,8 +127,11 @@ class ClientSerializer:
         result = []
         pipeline_client_name = self.client.pipeline_class(async_mode)
         endpoint_name = "base_url" if self.client.code_model.is_azure_flavor else "endpoint"
+        host_variable_name = (
+            f"cast(str, {self.host_variable_name})" if self.client.need_cloud_setting else self.host_variable_name
+        )
         params = {
-            endpoint_name: self.host_variable_name,
+            endpoint_name: host_variable_name,
             "policies": "_policies",
         }
         if not self.client.code_model.is_legacy and self.client.request_id_header_name:

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

@@ -19,7 +19,7 @@ from .base_serializer import BaseSerializer
 VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
-    "azure-mgmt-core": "1.3.2",
+    "azure-mgmt-core": "1.5.0",
     "azure-core": "1.30.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
@@ -225,19 +225,33 @@ class GeneralSerializer(BaseSerializer):
                 if not enum.internal
             }
         )
-        cross_langauge_def_dict.update(
-            {
-                (
-                    f"{self.code_model.namespace}.{client.name}."
-                    + ("" if operation_group.is_mixin else f"{operation_group.property_name}.")
-                    + f"{operation.name}"
-                ): operation.cross_language_definition_id
-                for client in self.code_model.clients
-                for operation_group in client.operation_groups
-                for operation in operation_group.operations
-                if not operation.name.startswith("_")
-            }
-        )
+        for client in self.code_model.clients:
+            for operation_group in client.operation_groups:
+                for operation in operation_group.operations:
+                    if operation.name.startswith("_"):
+                        continue
+                    cross_langauge_def_dict.update(
+                        {
+                            f"{self.code_model.namespace}."
+                            + (
+                                f"{client.name}."
+                                if operation_group.is_mixin
+                                else f"operations.{operation_group.class_name}."
+                            )
+                            + f"{operation.name}": operation.cross_language_definition_id
+                        }
+                    )
+                    cross_langauge_def_dict.update(
+                        {
+                            f"{self.code_model.namespace}.aio."
+                            + (
+                                f"{client.name}."
+                                if operation_group.is_mixin
+                                else f"operations.{operation_group.class_name}."
+                            )
+                            + f"{operation.name}": operation.cross_language_definition_id
+                        }
+                    )
         return json.dumps(
             {
                 "CrossLanguagePackageId": self.code_model.cross_language_package_id,

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

@@ -109,6 +109,7 @@ class ParameterSerializer:
             return f"[{serialize_line} if q is not None else '' for q in {origin_name}]"
         return serialize_line
 
+    # pylint: disable=line-too-long
     def serialize_path(
         self,
         parameters: Union[
@@ -124,7 +125,11 @@ class ParameterSerializer:
             [
                 '    "{}": {},'.format(
                     path_parameter.wire_name,
-                    self.serialize_parameter(path_parameter, serializer_name),
+                    (
+                        f'"" if {path_parameter.full_client_name} is None else "/" + {self.serialize_parameter(path_parameter, serializer_name)}'
+                        if path_parameter.optional and isinstance(path_parameter, RequestBuilderParameter)
+                        else self.serialize_parameter(path_parameter, serializer_name)
+                    ),
                 )
                 for path_parameter in parameters
             ]

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

@@ -62,7 +62,7 @@ class SampleSerializer(BaseSerializer):
                 ImportType.SDKCORE,
             )
         for param in self.operation.parameters.positional + self.operation.parameters.keyword_only:
-            if not param.client_default_value and not param.optional and param.wire_name in self.sample_params:
+            if param.client_default_value is None and not param.optional and param.wire_name in self.sample_params:
                 imports.merge(param.type.imports_for_sample())
         return FileImportSerializer(imports, True)
 
@@ -80,7 +80,7 @@ class SampleSerializer(BaseSerializer):
             for p in (
                 self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
             )
-            if not (p.optional or p.client_default_value)
+            if not p.optional and p.client_default_value is None
         ]
         client_params = {
             p.client_name: special_param.get(

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

@@ -9,7 +9,7 @@
         {% if client.has_parameterized_host %}
         {{ serializer.host_variable_name }} = {{ keywords.escape_str(client.url) }}
         {% endif %}
-        {{ serializer.initialize_config() }}
+        {{ op_tools.serialize(serializer.initialize_config()) | indent(8) }}
         {{ op_tools.serialize(serializer.initialize_pipeline_client(async_mode)) | indent(8) }}
 
         {{ op_tools.serialize(serializer.serializers_and_operation_groups_properties()) | indent(8) }}

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

@@ -21,14 +21,8 @@ class {{ client.name }}Configuration:  {{ client.config.pylint_disable() }}
 {% if serializer.set_constants() %}
         {{ op_tools.serialize(serializer.set_constants()) | indent(8) -}}
 {% endif %}
-{% if client.credential %}
-    {% set cred_scopes = client.credential.type if client.credential.type.policy is defined and client.credential.type.policy.credential_scopes is defined %}
-    {% if not cred_scopes %}
-        {% set cred_scopes = client.credential.type.types | selectattr("policy.credential_scopes") | first if client.credential.type.types is defined %}
-    {% endif %}
-    {% if cred_scopes %}
-        self.credential_scopes = kwargs.pop('credential_scopes', {{ cred_scopes.policy.credential_scopes }})
-    {% endif %}
+{% if client.credential_scopes is not none %}
+        self.credential_scopes = kwargs.pop('credential_scopes', {{ client.credential_scopes }})
 {% endif %}
         kwargs.setdefault('sdk_moniker', '{{ client.config.sdk_moniker }}/{}'.format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)

package/generator/component-detection-pip-report.json

@@ -4,11 +4,11 @@
   "install": [
     {
       "download_info": {
-        "url": "https://files.pythonhosted.org/packages/54/21/f43f0a1fa8b06b32812e0975981f4677d28e0f3271601dc88ac5a5b83220/setuptools-78.1.0-py3-none-any.whl",
+        "url": "https://files.pythonhosted.org/packages/cc/ea/d53f2f8897c46a36df085964d07761ea4c2d1f2cf92019693b6742b7aabb/setuptools-79.0.0-py3-none-any.whl",
         "archive_info": {
-          "hash": "sha256=3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8",
+          "hash": "sha256=b9ab3a104bedb292323f53797b00864e10e434a3ab3906813a7169e4745b912a",
           "hashes": {
-            "sha256": "3e386e96793c8702ae83d17b853fb93d3e09ef82ec62722e61da5cd22376dcd8"
+            "sha256": "b9ab3a104bedb292323f53797b00864e10e434a3ab3906813a7169e4745b912a"
           }
         }
       },
@@ -18,7 +18,7 @@
       "metadata": {
         "metadata_version": "2.4",
         "name": "setuptools",
-        "version": "78.1.0",
+        "version": "79.0.0",
         "dynamic": [
           "license-file"
         ],
@@ -39,7 +39,6 @@
         "classifier": [
           "Development Status :: 5 - Production/Stable",
           "Intended Audience :: Developers",
-          "License :: OSI Approved :: MIT License",
           "Programming Language :: Python :: 3",
           "Programming Language :: Python :: 3 :: Only",
           "Topic :: Software Development :: Libraries :: Python Modules",

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

@@ -15,7 +15,7 @@ from .request_builder import (
     OverloadedRequestBuilder,
     get_request_builder,
 )
-from .parameter import Parameter, ParameterMethodLocation
+from .parameter import Parameter, ParameterMethodLocation, ParameterLocation
 from .lro_operation import LROOperation
 from .lro_paging_operation import LROPagingOperation
 from ...utils import extract_original_name, NAME_LENGTH_LIMIT
@@ -54,7 +54,7 @@ class _ClientConfigBase(Generic[ParameterListType], BaseModel):
         return self.yaml_data["name"]
 
 
-class Client(_ClientConfigBase[ClientGlobalParameterList]):
+class Client(_ClientConfigBase[ClientGlobalParameterList]):  # pylint: disable=too-many-public-methods
     """Model representing our service client"""
 
     def __init__(
@@ -79,6 +79,27 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         self.request_id_header_name = self.yaml_data.get("requestIdHeaderName", None)
         self.has_etag: bool = yaml_data.get("hasEtag", False)
 
+        # 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
+
+    @property
+    def need_cloud_setting(self) -> bool:
+        return bool(
+            self.code_model.options.get("azure_arm", False)
+            and self.credential_scopes is not None
+            and self.endpoint_parameter is not None
+        )
+
+    @property
+    def endpoint_parameter(self) -> Optional[Parameter]:
+        return next((p for p in self.parameters.parameters if p.location == ParameterLocation.ENDPOINT_PATH), None)
+
     def _build_request_builders(
         self,
     ) -> List[Union[RequestBuilder, OverloadedRequestBuilder]]:
@@ -233,6 +254,10 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
             "Self",
             ImportType.STDLIB,
         )
+        if self.need_cloud_setting:
+            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
@@ -332,6 +357,18 @@ class Client(_ClientConfigBase[ClientGlobalParameterList]):
         )
         return file_import
 
+    @property
+    def credential_scopes(self) -> Optional[List[str]]:
+        """Credential scopes for this client"""
+
+        if self.credential:
+            if hasattr(getattr(self.credential.type, "policy", None), "credential_scopes"):
+                return self.credential.type.policy.credential_scopes  # type: ignore
+            for t in getattr(self.credential.type, "types", []):
+                if hasattr(getattr(t, "policy", None), "credential_scopes"):
+                    return t.policy.credential_scopes
+        return None
+
     @classmethod
     def from_yaml(
         cls,

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

@@ -357,6 +357,9 @@ class Parameter(_ParameterBase):
         )
         if self.code_model.options["only_path_and_body_params_positional"] and query_or_header:
             return ParameterMethodLocation.KEYWORD_ONLY
+        # for optional path parameter, we need to use keyword only
+        if self.location == ParameterLocation.PATH and self.optional:
+            return ParameterMethodLocation.KEYWORD_ONLY
         return ParameterMethodLocation.POSITIONAL
 
     @classmethod

package/generator/pygen/codegen/serializers/client_serializer.py

@@ -3,10 +3,10 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import List
+from typing import List, cast
 
 from . import utils
-from ..models import Client, ParameterMethodLocation
+from ..models import Client, ParameterMethodLocation, Parameter, ParameterLocation
 from .parameter_serializer import ParameterSerializer, PopKwargType
 from ...utils import build_policies
 
@@ -77,17 +77,40 @@ class ClientSerializer:
         retval.append('"""')
         return retval
 
-    def initialize_config(self) -> str:
+    def initialize_config(self) -> List[str]:
+        retval = []
+        additional_signatures = []
+        if self.client.need_cloud_setting:
+            additional_signatures.append("credential_scopes=credential_scopes")
+            endpoint_parameter = cast(Parameter, self.client.endpoint_parameter)
+            retval.extend(
+                [
+                    '_cloud = kwargs.pop("cloud_setting", None) or settings.current.azure_cloud  # type: ignore',
+                    "_endpoints = get_arm_endpoints(_cloud)",
+                    f"if not {endpoint_parameter.client_name}:",
+                    f'    {endpoint_parameter.client_name} = _endpoints["resource_manager"]',
+                    'credential_scopes = kwargs.pop("credential_scopes", _endpoints["credential_scopes"])',
+                ]
+            )
         config_name = f"{self.client.name}Configuration"
         config_call = ", ".join(
             [
-                f"{p.client_name}={p.client_name}"
+                (
+                    f"{p.client_name}="
+                    + (
+                        f"cast(str, {p.client_name})"
+                        if self.client.need_cloud_setting and p.location == ParameterLocation.ENDPOINT_PATH
+                        else p.client_name
+                    )
+                )
                 for p in self.client.config.parameters.method
                 if p.method_location != ParameterMethodLocation.KWARG
             ]
+            + additional_signatures
             + ["**kwargs"]
         )
-        return f"self._config = {config_name}({config_call})"
+        retval.append(f"self._config = {config_name}({config_call})")
+        return retval
 
     @property
     def host_variable_name(self) -> str:
@@ -104,8 +127,11 @@ class ClientSerializer:
         result = []
         pipeline_client_name = self.client.pipeline_class(async_mode)
         endpoint_name = "base_url" if self.client.code_model.is_azure_flavor else "endpoint"
+        host_variable_name = (
+            f"cast(str, {self.host_variable_name})" if self.client.need_cloud_setting else self.host_variable_name
+        )
         params = {
-            endpoint_name: self.host_variable_name,
+            endpoint_name: host_variable_name,
             "policies": "_policies",
         }
         if not self.client.code_model.is_legacy and self.client.request_id_header_name:

package/generator/pygen/codegen/serializers/general_serializer.py

@@ -19,7 +19,7 @@ from .base_serializer import BaseSerializer
 VERSION_MAP = {
     "msrest": "0.7.1",
     "isodate": "0.6.1",
-    "azure-mgmt-core": "1.3.2",
+    "azure-mgmt-core": "1.5.0",
     "azure-core": "1.30.0",
     "typing-extensions": "4.6.0",
     "corehttp": "1.0.0b6",
@@ -225,19 +225,33 @@ class GeneralSerializer(BaseSerializer):
                 if not enum.internal
             }
         )
-        cross_langauge_def_dict.update(
-            {
-                (
-                    f"{self.code_model.namespace}.{client.name}."
-                    + ("" if operation_group.is_mixin else f"{operation_group.property_name}.")
-                    + f"{operation.name}"
-                ): operation.cross_language_definition_id
-                for client in self.code_model.clients
-                for operation_group in client.operation_groups
-                for operation in operation_group.operations
-                if not operation.name.startswith("_")
-            }
-        )
+        for client in self.code_model.clients:
+            for operation_group in client.operation_groups:
+                for operation in operation_group.operations:
+                    if operation.name.startswith("_"):
+                        continue
+                    cross_langauge_def_dict.update(
+                        {
+                            f"{self.code_model.namespace}."
+                            + (
+                                f"{client.name}."
+                                if operation_group.is_mixin
+                                else f"operations.{operation_group.class_name}."
+                            )
+                            + f"{operation.name}": operation.cross_language_definition_id
+                        }
+                    )
+                    cross_langauge_def_dict.update(
+                        {
+                            f"{self.code_model.namespace}.aio."
+                            + (
+                                f"{client.name}."
+                                if operation_group.is_mixin
+                                else f"operations.{operation_group.class_name}."
+                            )
+                            + f"{operation.name}": operation.cross_language_definition_id
+                        }
+                    )
         return json.dumps(
             {
                 "CrossLanguagePackageId": self.code_model.cross_language_package_id,

package/generator/pygen/codegen/serializers/parameter_serializer.py

@@ -109,6 +109,7 @@ class ParameterSerializer:
             return f"[{serialize_line} if q is not None else '' for q in {origin_name}]"
         return serialize_line
 
+    # pylint: disable=line-too-long
     def serialize_path(
         self,
         parameters: Union[
@@ -124,7 +125,11 @@ class ParameterSerializer:
             [
                 '    "{}": {},'.format(
                     path_parameter.wire_name,
-                    self.serialize_parameter(path_parameter, serializer_name),
+                    (
+                        f'"" if {path_parameter.full_client_name} is None else "/" + {self.serialize_parameter(path_parameter, serializer_name)}'
+                        if path_parameter.optional and isinstance(path_parameter, RequestBuilderParameter)
+                        else self.serialize_parameter(path_parameter, serializer_name)
+                    ),
                 )
                 for path_parameter in parameters
             ]

package/generator/pygen/codegen/serializers/sample_serializer.py

@@ -62,7 +62,7 @@ class SampleSerializer(BaseSerializer):
                 ImportType.SDKCORE,
             )
         for param in self.operation.parameters.positional + self.operation.parameters.keyword_only:
-            if not param.client_default_value and not param.optional and param.wire_name in self.sample_params:
+            if param.client_default_value is None and not param.optional and param.wire_name in self.sample_params:
                 imports.merge(param.type.imports_for_sample())
         return FileImportSerializer(imports, True)
 
@@ -80,7 +80,7 @@ class SampleSerializer(BaseSerializer):
             for p in (
                 self.code_model.clients[0].parameters.positional + self.code_model.clients[0].parameters.keyword_only
             )
-            if not (p.optional or p.client_default_value)
+            if not p.optional and p.client_default_value is None
         ]
         client_params = {
             p.client_name: special_param.get(

package/generator/pygen/codegen/templates/client.py.jinja2

@@ -9,7 +9,7 @@
         {% if client.has_parameterized_host %}
         {{ serializer.host_variable_name }} = {{ keywords.escape_str(client.url) }}
         {% endif %}
-        {{ serializer.initialize_config() }}
+        {{ op_tools.serialize(serializer.initialize_config()) | indent(8) }}
         {{ op_tools.serialize(serializer.initialize_pipeline_client(async_mode)) | indent(8) }}
 
         {{ op_tools.serialize(serializer.serializers_and_operation_groups_properties()) | indent(8) }}

package/generator/pygen/codegen/templates/config.py.jinja2

@@ -21,14 +21,8 @@ class {{ client.name }}Configuration:  {{ client.config.pylint_disable() }}
 {% if serializer.set_constants() %}
         {{ op_tools.serialize(serializer.set_constants()) | indent(8) -}}
 {% endif %}
-{% if client.credential %}
-    {% set cred_scopes = client.credential.type if client.credential.type.policy is defined and client.credential.type.policy.credential_scopes is defined %}
-    {% if not cred_scopes %}
-        {% set cred_scopes = client.credential.type.types | selectattr("policy.credential_scopes") | first if client.credential.type.types is defined %}
-    {% endif %}
-    {% if cred_scopes %}
-        self.credential_scopes = kwargs.pop('credential_scopes', {{ cred_scopes.policy.credential_scopes }})
-    {% endif %}
+{% if client.credential_scopes is not none %}
+        self.credential_scopes = kwargs.pop('credential_scopes', {{ client.credential_scopes }})
 {% endif %}
         kwargs.setdefault('sdk_moniker', '{{ client.config.sdk_moniker }}/{}'.format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_client_initialization_async.py

@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from specs.azure.clientgenerator.core.clientinitialization.aio import (
+    HeaderParamClient,
+    MultipleParamsClient,
+    MixedParamsClient,
+    PathParamClient,
+    ParamAliasClient,
+)
+from specs.azure.clientgenerator.core.clientinitialization.models import Input
+
+
+@pytest.mark.asyncio
+async def test_header_param_client():
+    async with HeaderParamClient("test-name-value") as client:
+        await client.with_query(id="test-id")
+        await client.with_body(Input(name="test-name"))
+
+
+@pytest.mark.asyncio
+async def test_multiple_params_client():
+    async with MultipleParamsClient("test-name-value", "us-west") as client:
+        await client.with_query(id="test-id")
+        await client.with_body(Input(name="test-name"))
+
+
+@pytest.mark.asyncio
+async def test_mixed_params_client():
+    async with MixedParamsClient("test-name-value") as client:
+        await client.with_query(region="us-west", id="test-id")
+        await client.with_body(Input(name="test-name"), region="us-west")
+
+
+@pytest.mark.asyncio
+async def test_path_param_client():
+    async with PathParamClient("sample-blob") as client:
+        await client.with_query(format="text")
+        await client.get_standalone()
+        await client.delete_standalone()
+
+
+@pytest.mark.asyncio
+async def test_param_alias_client():
+    async with ParamAliasClient("sample-blob") as client:
+        await client.with_aliased_name()
+        await client.with_original_name()