Fixing evaluation upload (#40867)

Author: singankit

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_azure/_token_manager.py

@@ -5,11 +5,12 @@
 import logging
 import time
 import inspect
-from typing import cast, Optional, Union
+from typing import cast, Optional, Union, Any
 
 from azure.core.credentials import TokenCredential, AccessToken
 from azure.identity import AzureCliCredential, DefaultAzureCredential, ManagedIdentityCredential
 from azure.ai.evaluation._exceptions import ErrorBlame, ErrorCategory, ErrorTarget, EvaluationException
+
 from ..simulator._model_tools._identity_manager import APITokenManager, AZURE_TOKEN_REFRESH_INTERVAL
 
 
@@ -71,15 +72,19 @@ def get_aad_credential(self) -> Union[DefaultAzureCredential, ManagedIdentityCre
             # Fall back to using the parent implementation
             return super().get_aad_credential()
 
-    def get_token(self) -> AccessToken:
+    def get_token(
+            self, scopes = None, claims: Union[str, None] = None, tenant_id: Union[str, None] = None, enable_cae: bool = False, **kwargs: Any) -> AccessToken:
         """Get the API token. If the token is not available or has expired, refresh the token.
 
         :return: API token
         :rtype: str
         """
         if self._token_needs_update():
             credential = cast(TokenCredential, self.credential)
-            access_token = credential.get_token(self.token_scope)
+            token_scope = self.token_scope
+            if scopes:
+                token_scope = scopes
+            access_token = credential.get_token(token_scope)
             self._update_token(access_token)
 
         return cast(AccessToken, self.token)  # check for none is hidden in the _token_needs_update method

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_common/onedp/_configuration.py

@@ -47,7 +47,7 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCr
         self.endpoint = endpoint
         self.credential = credential
         self.api_version = api_version
-        self.credential_scopes = kwargs.pop("credential_scopes", ["https://cognitiveservices.azure.com/.default"])
+        self.credential_scopes = kwargs.pop("credential_scopes", ["https://ai.azure.com/.default"])
         kwargs.setdefault("sdk_moniker", "ai-projects-onedp/{}".format(VERSION))
         self.polling_interval = kwargs.get("polling_interval", 30)
         self._configure(**kwargs)

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/simulator/_model_tools/_identity_manager.py

@@ -8,7 +8,7 @@
 import os
 import time
 from abc import ABC, abstractmethod
-from typing import Optional, Union
+from typing import Optional, Union, Any
 
 from azure.ai.evaluation._constants import TokenScope
 from azure.core.credentials import AccessToken, TokenCredential
@@ -77,7 +77,8 @@ def get_aad_credential(self) -> Union[DefaultAzureCredential, ManagedIdentityCre
         return DefaultAzureCredential()
 
     @abstractmethod
-    def get_token(self) -> str:
+    def get_token(
+            self, scopes: Union[str, None] = None, claims: Union[str, None] = None, tenant_id: Union[str, None] = None, enable_cae: bool = False, **kwargs: Any) -> AccessToken:
         """Async method to get the API token. Subclasses should implement this method.
 
         :return: API token