[evaluation] chore: re-enable black in ci (#41668)

* chore: re-enable black in ci

* style: reformat

Author: kdestin

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

@@ -54,9 +54,12 @@
 # in ai.projects. So we only import it if it's available and the user has ai.projects.
 try:
     from ._converters._ai_services import AIAgentConverter
+
     _patch_all.append("AIAgentConverter")
 except ImportError:
-    print("[INFO] Could not import AIAgentConverter. Please install the dependency with `pip install azure-ai-projects`.")
+    print(
+        "[INFO] Could not import AIAgentConverter. Please install the dependency with `pip install azure-ai-projects`."
+    )
 
 
 __all__ = [
@@ -101,4 +104,4 @@
     "AzureOpenAITextSimilarityGrader",
 ]
 
-__all__.extend([p for p in _patch_all if p not in __all__])
+__all__.extend([p for p in _patch_all if p not in __all__])

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/__init__.py

@@ -7,4 +7,4 @@
 
 __all__ = [
     "AzureOpenAIGrader",
-]
+]

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/aoai_grader.py

@@ -11,7 +11,7 @@
 
 
 @experimental
-class AzureOpenAIGrader():
+class AzureOpenAIGrader:
     """
     Base class for Azure OpenAI grader wrappers, recommended only for use by experienced OpenAI API users.
     Combines a model configuration and any grader configuration
@@ -38,16 +38,20 @@ class AzureOpenAIGrader():
 
     id = "aoai://general"
 
-    def __init__(self, *, model_config : Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration], grader_config: Dict[str, Any], **kwargs: Any):
+    def __init__(
+        self,
+        *,
+        model_config: Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
+        grader_config: Dict[str, Any],
+        **kwargs: Any,
+    ):
         self._model_config = model_config
         self._grader_config = grader_config
 
         if kwargs.get("validate", True):
             self._validate_model_config()
             self._validate_grader_config()
 
-
-
     def _validate_model_config(self) -> None:
         """Validate the model configuration that this grader wrapper is using."""
         if "api_key" not in self._model_config or not self._model_config.get("api_key"):
@@ -58,7 +62,7 @@ def _validate_model_config(self) -> None:
                 category=ErrorCategory.INVALID_VALUE,
                 target=ErrorTarget.AOAI_GRADER,
             )
-    
+
     def _validate_grader_config(self) -> None:
         """Validate the grader configuration that this grader wrapper is using."""
 
@@ -72,24 +76,24 @@ def get_client(self) -> Any:
         :return: The OpenAI client.
         :rtype: [~openai.OpenAI, ~openai.AzureOpenAI]
         """
-        default_headers = {
-            "User-Agent": UserAgentSingleton().value
-        }
+        default_headers = {"User-Agent": UserAgentSingleton().value}
         if "azure_endpoint" in self._model_config:
-           from openai import AzureOpenAI
-           # TODO set default values?
-           return AzureOpenAI(
+            from openai import AzureOpenAI
+
+            # TODO set default values?
+            return AzureOpenAI(
                 azure_endpoint=self._model_config["azure_endpoint"],
-                api_key=self._model_config.get("api_key", None), # Default-style access to appease linters.
-                api_version=DEFAULT_AOAI_API_VERSION, # Force a known working version
+                api_key=self._model_config.get("api_key", None),  # Default-style access to appease linters.
+                api_version=DEFAULT_AOAI_API_VERSION,  # Force a known working version
                 azure_deployment=self._model_config.get("azure_deployment", ""),
-                default_headers=default_headers
+                default_headers=default_headers,
             )
         from openai import OpenAI
+
         # TODO add default values for base_url and organization?
         return OpenAI(
             api_key=self._model_config["api_key"],
             base_url=self._model_config.get("base_url", ""),
             organization=self._model_config.get("organization", ""),
-            default_headers=default_headers
+            default_headers=default_headers,
         )

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/label_grader.py

@@ -9,6 +9,7 @@
 
 from .aoai_grader import AzureOpenAIGrader
 
+
 @experimental
 class AzureOpenAILabelGrader(AzureOpenAIGrader):
     """
@@ -47,7 +48,7 @@ class AzureOpenAILabelGrader(AzureOpenAIGrader):
     def __init__(
         self,
         *,
-        model_config : Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
+        model_config: Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
         input: List[Dict[str, str]],
         labels: List[str],
         model: str,

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/string_check_grader.py

@@ -10,6 +10,7 @@
 
 from .aoai_grader import AzureOpenAIGrader
 
+
 @experimental
 class AzureOpenAIStringCheckGrader(AzureOpenAIGrader):
     """
@@ -43,7 +44,7 @@ class AzureOpenAIStringCheckGrader(AzureOpenAIGrader):
     def __init__(
         self,
         *,
-        model_config : Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
+        model_config: Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
         input: str,
         name: str,
         operation: Literal[

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_aoai/text_similarity_grader.py

@@ -10,6 +10,7 @@
 
 from .aoai_grader import AzureOpenAIGrader
 
+
 @experimental
 class AzureOpenAITextSimilarityGrader(AzureOpenAIGrader):
     """
@@ -57,7 +58,7 @@ class AzureOpenAITextSimilarityGrader(AzureOpenAIGrader):
     def __init__(
         self,
         *,
-        model_config : Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
+        model_config: Union[AzureOpenAIModelConfiguration, OpenAIModelConfiguration],
         evaluation_metric: Literal[
             "fuzzy_match",
             "bleu",

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

@@ -19,6 +19,7 @@
 
 class AzureEnvironmentMetadata(TypedDict):
     """Configuration for various Azure environments. All endpoints include a trailing slash."""
+
     portal_endpoint: str
     """The management portal for the Azure environment (e.g. https://portal.azure.com/)"""
     resource_manager_endpoint: str
@@ -107,15 +108,15 @@ async def get_cloud_async(self, name: str, *, update_cached: bool = True) -> Opt
 
         def case_insensitive_match(d: Mapping[str, Any], key: str) -> Optional[Any]:
             key = key.strip().lower()
-            return next((v for k,v in d.items() if k.strip().lower() == key), None)
+            return next((v for k, v in d.items() if k.strip().lower() == key), None)
 
         async with _ASYNC_LOCK:
             cloud = _KNOWN_AZURE_ENVIRONMENTS.get(name) or case_insensitive_match(_KNOWN_AZURE_ENVIRONMENTS, name)
             if cloud:
                 return cloud
-            default_endpoint = (_KNOWN_AZURE_ENVIRONMENTS
-                .get(_DEFAULT_AZURE_ENV_NAME, {})
-                .get("resource_manager_endpoint"))
+            default_endpoint = _KNOWN_AZURE_ENVIRONMENTS.get(_DEFAULT_AZURE_ENV_NAME, {}).get(
+                "resource_manager_endpoint"
+            )
 
         metadata_url = self.get_default_metadata_url(default_endpoint)
         clouds = await self.get_clouds_async(metadata_url=metadata_url, update_cached=update_cached)
@@ -124,10 +125,7 @@ def case_insensitive_match(d: Mapping[str, Any], key: str) -> Optional[Any]:
         return cloud_metadata
 
     async def get_clouds_async(
-        self,
-        *,
-        metadata_url: Optional[str] = None,
-        update_cached: bool = True
+        self, *, metadata_url: Optional[str] = None, update_cached: bool = True
     ) -> Mapping[str, AzureEnvironmentMetadata]:
         metadata_url = metadata_url or self.get_default_metadata_url()
 
@@ -149,7 +147,8 @@ def get_default_metadata_url(default_endpoint: Optional[str] = None) -> str:
         default_endpoint = default_endpoint or "https://management.azure.com/"
         metadata_url = os.getenv(
             _ENV_ARM_CLOUD_METADATA_URL,
-            f"{default_endpoint}metadata/endpoints?api-version={AzureEnvironmentClient.DEFAULT_API_VERSION}")
+            f"{default_endpoint}metadata/endpoints?api-version={AzureEnvironmentClient.DEFAULT_API_VERSION}",
+        )
         return metadata_url
 
     @staticmethod
@@ -197,7 +196,7 @@ def append_trailing_slash(url: str) -> str:
 
 def recursive_update(d: Dict, u: Mapping) -> None:
     """Recursively update a dictionary.
-    
+
     :param Dict d: The dictionary to update.
     :param Mapping u: The mapping to update from.
     """

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

@@ -73,7 +73,13 @@ def get_aad_credential(self) -> Union[DefaultAzureCredential, ManagedIdentityCre
             return super().get_aad_credential()
 
     def get_token(
-            self, scopes = None, claims: Union[str, None] = None, tenant_id: Union[str, None] = None, enable_cae: bool = False, **kwargs: Any) -> AccessToken:
+        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

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_common/constants.py

@@ -5,8 +5,17 @@
 
 from azure.core import CaseInsensitiveEnumMeta
 
-PROMPT_BASED_REASON_EVALUATORS = ["coherence", "relevance", "retrieval", "groundedness", "fluency", "intent_resolution",
-                                  "tool_call_accurate", "response_completeness", "task_adherence"]
+PROMPT_BASED_REASON_EVALUATORS = [
+    "coherence",
+    "relevance",
+    "retrieval",
+    "groundedness",
+    "fluency",
+    "intent_resolution",
+    "tool_call_accurate",
+    "response_completeness",
+    "task_adherence",
+]
 
 
 class CommonConstants:

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_common/evaluation_onedp_client.py

@@ -6,13 +6,22 @@
 from typing import Union, Any, Dict
 from azure.core.credentials import AzureKeyCredential, TokenCredential
 from azure.ai.evaluation._common.onedp import AIProjectClient as RestEvaluationServiceClient
-from azure.ai.evaluation._common.onedp.models import (PendingUploadRequest, PendingUploadType, EvaluationResult,
-                                                      ResultType, AssetCredentialRequest, EvaluationUpload, InputDataset, RedTeamUpload)
+from azure.ai.evaluation._common.onedp.models import (
+    PendingUploadRequest,
+    PendingUploadType,
+    EvaluationResult,
+    ResultType,
+    AssetCredentialRequest,
+    EvaluationUpload,
+    InputDataset,
+    RedTeamUpload,
+)
 from azure.storage.blob import ContainerClient
 from .utils import upload
 
 LOGGER = logging.getLogger(__name__)
 
+
 class EvaluationServiceOneDPClient:
 
     def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCredential"], **kwargs: Any) -> None:
@@ -23,7 +32,15 @@ def __init__(self, endpoint: str, credential: Union[AzureKeyCredential, "TokenCr
         )
 
     def create_evaluation_result(
-            self, *, name: str, path: str, version=1, metrics: Dict[str, int]=None, result_type: ResultType=ResultType.EVALUATION, **kwargs) -> EvaluationResult:
+        self,
+        *,
+        name: str,
+        path: str,
+        version=1,
+        metrics: Dict[str, int] = None,
+        result_type: ResultType = ResultType.EVALUATION,
+        **kwargs,
+    ) -> EvaluationResult:
         """Create and upload evaluation results to Azure evaluation service.
 
         This method uploads evaluation results from a local path to Azure Blob Storage
@@ -49,17 +66,20 @@ def create_evaluation_result(
         :raises: Various exceptions from the underlying API calls or upload process
         """
 
-        LOGGER.debug(f"Creating evaluation result for {name} with version {version} type {result_type} from path {path}")
+        LOGGER.debug(
+            f"Creating evaluation result for {name} with version {version} type {result_type} from path {path}"
+        )
         start_pending_upload_response = self.rest_client.evaluation_results.start_pending_upload(
             name=name,
             version=version,
             body=PendingUploadRequest(pending_upload_type=PendingUploadType.TEMPORARY_BLOB_REFERENCE),
-            **kwargs
+            **kwargs,
         )
 
         LOGGER.debug(f"Uploading {path} to {start_pending_upload_response.blob_reference_for_consumption.blob_uri}")
         with ContainerClient.from_container_url(
-            start_pending_upload_response.blob_reference_for_consumption.credential.sas_uri) as container_client:
+            start_pending_upload_response.blob_reference_for_consumption.credential.sas_uri
+        ) as container_client:
             upload(path=path, container_client=container_client, logger=LOGGER)
 
         LOGGER.debug(f"Creating evaluation result version for {name} with version {version}")
@@ -73,7 +93,7 @@ def create_evaluation_result(
             ),
             name=name,
             version=version,
-            **kwargs
+            **kwargs,
         )
 
         return create_version_response
@@ -90,10 +110,7 @@ def start_evaluation_run(self, *, evaluation: EvaluationUpload, **kwargs) -> Eva
         :rtype: EvaluationUpload
         :raises: Various exceptions from the underlying API calls
         """
-        upload_run_response = self.rest_client.evaluations.upload_run(
-            evaluation=evaluation,
-            **kwargs
-        )
+        upload_run_response = self.rest_client.evaluations.upload_run(evaluation=evaluation, **kwargs)
 
         return upload_run_response
 
@@ -112,11 +129,7 @@ def update_evaluation_run(self, *, name: str, evaluation: EvaluationUpload, **kw
         :rtype: EvaluationUpload
         :raises: Various exceptions from the underlying API calls
         """
-        update_run_response = self.rest_client.evaluations.upload_update_run(
-            name=name,
-            evaluation=evaluation,
-            **kwargs
-        )
+        update_run_response = self.rest_client.evaluations.upload_update_run(name=name, evaluation=evaluation, **kwargs)
 
         return update_run_response
 
@@ -132,10 +145,7 @@ def start_red_team_run(self, *, red_team: RedTeamUpload, **kwargs):
         :rtype: ~azure.ai.evaluation._common.onedp.models.RedTeamUpload
         :raises: Various exceptions from the underlying API calls
         """
-        upload_run_response = self.rest_client.red_teams.upload_run(
-            redteam=red_team,
-            **kwargs
-        )
+        upload_run_response = self.rest_client.red_teams.upload_run(redteam=red_team, **kwargs)
 
         return upload_run_response
 
@@ -154,10 +164,6 @@ def update_red_team_run(self, *, name: str, red_team: RedTeamUpload, **kwargs):
         :rtype: ~azure.ai.evaluation._common.onedp.models.RedTeamUpload
         :raises: Various exceptions from the underlying API calls
         """
-        update_run_response = self.rest_client.red_teams.upload_update_run(
-            name=name,
-            redteam=red_team,
-            **kwargs
-        )
+        update_run_response = self.rest_client.red_teams.upload_update_run(name=name, redteam=red_team, **kwargs)
 
-        return update_run_response
+        return update_run_response