first commit (Azure#40872)

Author: w-javed

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

@@ -49,7 +49,7 @@ def __init__(
         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/_common/rai_service.py

@@ -45,7 +45,7 @@
     "DEFAULT": Template("<Human>{$query}</><System>{$response}</>"),
 }
 ML_WORKSPACE  = "https://management.azure.com/.default"
-COG_SRV_WORKSPACE = "https://cognitiveservices.azure.com/.default"
+COG_SRV_WORKSPACE = "https://ai.azure.com/.default"
 
 INFERENCE_OF_SENSITIVE_ATTRIBUTES = "inference_sensitive_attributes"
 

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_constants.py

@@ -85,7 +85,7 @@ class TokenScope(str, enum.Enum):
     """Defines the scope of the token used to access Azure resources."""
 
     DEFAULT_AZURE_MANAGEMENT = "https://management.azure.com/.default"
-    COGNITIVE_SERVICES_MANAGEMENT = "https://cognitiveservices.azure.com/.default"
+    COGNITIVE_SERVICES_MANAGEMENT = "https://ai.azure.com/.default"
     AZURE_ML = "https://ml.azure.com/.default"
 
 

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_evaluate/_evaluate.py

@@ -695,7 +695,7 @@ def evaluate(
     evaluation_name: Optional[str] = None,
     target: Optional[Callable] = None,
     evaluator_config: Optional[Dict[str, EvaluatorConfig]] = None,
-    azure_ai_project: Optional[AzureAIProject] = None,
+    azure_ai_project: Optional[Union[str, AzureAIProject]] = None,
     output_path: Optional[Union[str, os.PathLike]] = None,
     fail_on_evaluator_errors: bool = False,
     **kwargs,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_evaluate/_utils.py

@@ -180,7 +180,7 @@ def _log_metrics_and_instance_results_onedp(
 
         create_evaluation_result_response = client.create_evaluation_result(
             name=uuid.uuid4(),
-            path=tmp_path,
+            path=tmpdir,
             metrics=metrics
         )
 

sdk/evaluation/azure-ai-evaluation/tests/conftest.py

@@ -513,11 +513,11 @@ def azure_cred_onedp() -> TokenCredential:
 
     try:
         credential = AzureCliCredential()
-        token = credential.get_token("https://cognitiveservices.azure.com/.default")
+        token = credential.get_token("https://ai.azure.com/.default")
     except Exception:
         credential = DefaultAzureCredential()
         # ensure we can get token
-        token = credential.get_token("https://cognitiveservices.azure.com/.default")
+        token = credential.get_token("https://ai.azure.com/.default")
 
     assert token is not None
     return credential