azure-ai-evaluation 1.0.0__py3-none-any.whl → 1.0.0b1__py3-none-any.whl

azure/ai/evaluation/_common/rai_service.py

@@ -3,34 +3,30 @@
 # ---------------------------------------------------------
 import asyncio
 import importlib.metadata
-import math
 import re
 import time
-import json
-import html
 from ast import literal_eval
-from typing import Dict, List, Optional, Union, cast
+from typing import Dict, List
 from urllib.parse import urlparse
-from string import Template
 
 import jwt
+import numpy as np
+from azure.core.credentials import TokenCredential
+from azure.identity import DefaultAzureCredential
 
-from promptflow.core._errors import MissingRequiredPackage
-from azure.ai.evaluation._exceptions import ErrorBlame, ErrorCategory, ErrorTarget, EvaluationException
-from azure.ai.evaluation._http_utils import AsyncHttpPipeline, get_async_http_client
+from azure.ai.evaluation._http_utils import get_async_http_client
+from azure.ai.evaluation._exceptions import EvaluationException, ErrorBlame, ErrorCategory, ErrorTarget
 from azure.ai.evaluation._model_configurations import AzureAIProject
-from azure.core.credentials import TokenCredential
-from azure.core.exceptions import HttpResponseError
-from azure.core.pipeline.policies import AsyncRetryPolicy
 
 from .constants import (
     CommonConstants,
     EvaluationMetrics,
     RAIService,
     Tasks,
+    _InternalAnnotationTasks,
     _InternalEvaluationMetrics,
 )
-from .utils import get_harm_severity_level, retrieve_content_type
+from .utils import get_harm_severity_level
 
 try:
     version = importlib.metadata.version("azure-ai-evaluation")
@@ -38,39 +34,6 @@ except importlib.metadata.PackageNotFoundError:
     version = "unknown"
 USER_AGENT = "{}/{}".format("azure-ai-evaluation", version)
 
-USER_TEXT_TEMPLATE_DICT: Dict[str, Template] = {
-    "DEFAULT": Template("<Human>{$query}</><System>{$response}</>"),
-}
-
-
-def get_formatted_template(data: dict, annotation_task: str) -> str:
-    """Given the task and input data, produce a formatted string that will serve as the main
-    payload for the RAI service. Requires specific per-task logic.
-
-    :param data: The data to incorporate into the payload.
-    :type data: dict
-    :param annotation_task: The annotation task to use. This determines the template to use.
-    :type annotation_task: str
-    :return: The formatted based on the data and task template.
-    :rtype: str
-    """
-    # Template class doesn't play nice with json dumping/loading, just handle groundedness'
-    # JSON format manually.
-    # Template was: Template('{"question": "$query", "answer": "$response", "context": "$context"}'),
-    if annotation_task == Tasks.GROUNDEDNESS:
-        as_dict = {
-            "question": data.get("query", ""),
-            "answer": data.get("response", ""),
-            "context": data.get("context", ""),
-        }
-        return json.dumps(as_dict)
-    as_dict = {
-        "query": html.escape(data.get("query", "")),
-        "response": html.escape(data.get("response", "")),
-    }
-    user_text = USER_TEXT_TEMPLATE_DICT.get(annotation_task, USER_TEXT_TEMPLATE_DICT["DEFAULT"]).substitute(**as_dict)
-    return user_text.replace("'", '\\"')
-
 
 def get_common_headers(token: str) -> Dict:
     """Get common headers for the HTTP request
@@ -90,13 +53,7 @@ def get_common_headers(token: str) -> Dict:
     }
 
 
-def get_async_http_client_with_timeout() -> AsyncHttpPipeline:
-    return get_async_http_client().with_policies(
-        retry_policy=AsyncRetryPolicy(timeout=CommonConstants.DEFAULT_HTTP_TIMEOUT)
-    )
-
-
-async def ensure_service_availability(rai_svc_url: str, token: str, capability: Optional[str] = None) -> None:
+async def ensure_service_availability(rai_svc_url: str, token: str, capability: str = None) -> None:
     """Check if the Responsible AI service is available in the region and has the required capability, if relevant.
 
     :param rai_svc_url: The Responsible AI service URL.
@@ -111,36 +68,34 @@ async def ensure_service_availability(rai_svc_url: str, token: str, capability:
     svc_liveness_url = rai_svc_url + "/checkannotation"
 
     async with get_async_http_client() as client:
-        response = await client.get(svc_liveness_url, headers=headers)
+        response = await client.get(  # pylint: disable=too-many-function-args,unexpected-keyword-arg
+            svc_liveness_url, headers=headers, timeout=CommonConstants.DEFAULT_HTTP_TIMEOUT
+        )
 
-        if response.status_code != 200:
-            msg = (
-                f"RAI service is unavailable in this region, or you lack the necessary permissions "
-                f"to access the AI project. Status Code: {response.status_code}"
-            )
-            raise EvaluationException(
-                message=msg,
-                internal_message=msg,
-                target=ErrorTarget.RAI_CLIENT,
-                category=ErrorCategory.SERVICE_UNAVAILABLE,
-                blame=ErrorBlame.USER_ERROR,
-                tsg_link="https://aka.ms/azsdk/python/evaluation/safetyevaluator/troubleshoot",
-            )
+    if response.status_code != 200:
+        msg = f"RAI service is not available in this region. Status Code: {response.status_code}"
+        raise EvaluationException(
+            message=msg,
+            internal_message=msg,
+            target=ErrorTarget.UNKNOWN,
+            category=ErrorCategory.SERVICE_UNAVAILABLE,
+            blame=ErrorBlame.USER_ERROR,
+        )
 
-        capabilities = response.json()
-        if capability and capability not in capabilities:
-            msg = f"The needed capability '{capability}' is not supported by the RAI service in this region."
-            raise EvaluationException(
-                message=msg,
-                internal_message=msg,
-                target=ErrorTarget.RAI_CLIENT,
-                category=ErrorCategory.SERVICE_UNAVAILABLE,
-                blame=ErrorBlame.USER_ERROR,
-                tsg_link="https://aka.ms/azsdk/python/evaluation/safetyevaluator/troubleshoot",
-            )
+    capabilities = response.json()
 
+    if capability and capability not in capabilities:
+        msg = f"Capability '{capability}' is not available in this region"
+        raise EvaluationException(
+            message=msg,
+            internal_message=msg,
+            target=ErrorTarget.RAI_CLIENT,
+            category=ErrorCategory.SERVICE_UNAVAILABLE,
+            blame=ErrorBlame.USER_ERROR,
+        )
 
-def generate_payload(normalized_user_text: str, metric: str, annotation_task: str) -> Dict:
+
+def generate_payload(normalized_user_text: str, metric: str) -> Dict:
     """Generate the payload for the annotation request
 
     :param normalized_user_text: The normalized user text to be entered as the "UserTextList" in the payload.
@@ -148,18 +103,19 @@ def generate_payload(normalized_user_text: str, metric: str, annotation_task: st
     :param metric: The evaluation metric to use. This determines the task type, and whether a "MetricList" is needed
         in the payload.
     :type metric: str
-    :param annotation_task: The annotation task to be passed to service
-    :type annotation_task: str
     :return: The payload for the annotation request.
     :rtype: Dict
     """
     include_metric = True
-    task = annotation_task
+    task = Tasks.CONTENT_HARM
     if metric == EvaluationMetrics.PROTECTED_MATERIAL:
+        task = Tasks.PROTECTED_MATERIAL
         include_metric = False
     elif metric == _InternalEvaluationMetrics.ECI:
+        task = _InternalAnnotationTasks.ECI
         include_metric = False
     elif metric == EvaluationMetrics.XPIA:
+        task = Tasks.XPIA
         include_metric = False
     return (
         {
@@ -175,35 +131,39 @@ def generate_payload(normalized_user_text: str, metric: str, annotation_task: st
     )
 
 
-async def submit_request(data: dict, metric: str, rai_svc_url: str, token: str, annotation_task: str) -> str:
+async def submit_request(query: str, response: str, metric: str, rai_svc_url: str, token: str) -> str:
     """Submit request to Responsible AI service for evaluation and return operation ID
 
-    :param data: The data to evaluate.
-    :type data: dict
+    :param query: The query to evaluate.
+    :type query: str
+    :param response: The response to evaluate.
+    :type response: str
     :param metric: The evaluation metric to use.
     :type metric: str
     :param rai_svc_url: The Responsible AI service URL.
     :type rai_svc_url: str
     :param token: The Azure authentication token.
     :type token: str
-    :param annotation_task: The annotation task to use.
-    :type annotation_task: str
     :return: The operation ID.
     :rtype: str
     """
-    normalized_user_text = get_formatted_template(data, annotation_task)
-    payload = generate_payload(normalized_user_text, metric, annotation_task=annotation_task)
+    user_text = f"<Human>{query}</><System>{response}</>"
+    normalized_user_text = user_text.replace("'", '\\"')
+    payload = generate_payload(normalized_user_text, metric)
 
     url = rai_svc_url + "/submitannotation"
     headers = get_common_headers(token)
 
-    async with get_async_http_client_with_timeout() as client:
-        http_response = await client.post(url, json=payload, headers=headers)
+    async with get_async_http_client() as client:
+        response = await client.post(  # pylint: disable=too-many-function-args,unexpected-keyword-arg
+            url, json=payload, headers=headers, timeout=CommonConstants.DEFAULT_HTTP_TIMEOUT
+        )
+
+    if response.status_code != 202:
+        print("Fail evaluating '%s' with error message: %s" % (payload["UserTextList"], response.text))
+        response.raise_for_status()
 
-    if http_response.status_code != 202:
-        print("Fail evaluating '%s' with error message: %s" % (payload["UserTextList"], http_response.text()))
-        http_response.raise_for_status()
-    result = http_response.json()
+    result = response.json()
     operation_id = result["location"].split("/")[-1]
     return operation_id
 
@@ -230,8 +190,10 @@ async def fetch_result(operation_id: str, rai_svc_url: str, credential: TokenCre
         token = await fetch_or_reuse_token(credential, token)
         headers = get_common_headers(token)
 
-        async with get_async_http_client_with_timeout() as client:
-            response = await client.get(url, headers=headers)
+        async with get_async_http_client() as client:
+            response = await client.get(  # pylint: disable=too-many-function-args,unexpected-keyword-arg
+                url, headers=headers, timeout=CommonConstants.DEFAULT_HTTP_TIMEOUT
+            )
 
         if response.status_code == 200:
             return response.json()
@@ -246,95 +208,64 @@ async def fetch_result(operation_id: str, rai_svc_url: str, credential: TokenCre
 
 
 def parse_response(  # pylint: disable=too-many-branches,too-many-statements
-    batch_response: List[Dict], metric_name: str, metric_display_name: Optional[str] = None
-) -> Dict[str, Union[str, float]]:
+    batch_response: List[Dict], metric_name: str
+) -> Dict:
     """Parse the annotation response from Responsible AI service for a content harm evaluation.
 
     :param batch_response: The annotation response from Responsible AI service.
     :type batch_response: List[Dict]
     :param metric_name: The evaluation metric to use.
     :type metric_name: str
-    :param metric_display_name: The evaluation metric display name to use. If unset, use the metric_name.
-    :type metric_display_name: Optional[str]
     :return: The parsed annotation result.
-    :rtype: Dict[str, Union[str, float]]
+    :rtype: List[List[Dict]]
     """
-    if metric_display_name is None:
-        metric_display_name = metric_name
-
     # non-numeric metrics
-    if metric_name in {
-        EvaluationMetrics.PROTECTED_MATERIAL,
-        _InternalEvaluationMetrics.ECI,
-        EvaluationMetrics.XPIA,
-    }:
-        result = {}
-        if not batch_response or len(batch_response[0]) == 0:
-            return {}
-        if metric_name == EvaluationMetrics.PROTECTED_MATERIAL and metric_name not in batch_response[0]:
-            pm_metric_names = {"artwork", "fictional_characters", "logos_and_brands"}
-            for pm_metric_name in pm_metric_names:
-                response = batch_response[0][pm_metric_name]
-                response = response.replace("false", "False")
-                response = response.replace("true", "True")
-                parsed_response = literal_eval(response)
-                result[pm_metric_name + "_label"] = parsed_response["label"] if "label" in parsed_response else math.nan
-                result[pm_metric_name + "_reason"] = (
-                    parsed_response["reasoning"] if "reasoning" in parsed_response else ""
-                )
-            return result
-        if metric_name not in batch_response[0]:
+    if metric_name in {EvaluationMetrics.PROTECTED_MATERIAL, _InternalEvaluationMetrics.ECI, EvaluationMetrics.XPIA}:
+        if not batch_response or len(batch_response[0]) == 0 or metric_name not in batch_response[0]:
             return {}
         response = batch_response[0][metric_name]
         response = response.replace("false", "False")
         response = response.replace("true", "True")
         parsed_response = literal_eval(response)
+        result = {}
         # Use label instead of score since these are assumed to be boolean results.
-        # Use math.nan as null value since it's ignored by aggregations rather than treated as 0.
-        result[metric_display_name + "_label"] = parsed_response["label"] if "label" in parsed_response else math.nan
-        result[metric_display_name + "_reason"] = parsed_response["reasoning"] if "reasoning" in parsed_response else ""
+        # Use np.nan as null value since it's ignored by aggregations rather than treated as 0.
+        result[metric_name + "_label"] = parsed_response["label"] if "label" in parsed_response else np.nan
+        result[metric_name + "_reason"] = parsed_response["reasoning"] if "reasoning" in parsed_response else ""
 
         if metric_name == EvaluationMetrics.XPIA:
             # Add "manipulated_content", "intrusion" and "information_gathering" to the result
-            # if present else set them to math.nan
-            result[metric_display_name + "_manipulated_content"] = (
-                parsed_response["manipulated_content"] if "manipulated_content" in parsed_response else math.nan
+            # if present else set them to np.nan
+            result[metric_name + "_manipulated_content"] = (
+                parsed_response["manipulated_content"] if "manipulated_content" in parsed_response else np.nan
             )
-            result[metric_display_name + "_intrusion"] = (
-                parsed_response["intrusion"] if "intrusion" in parsed_response else math.nan
+            result[metric_name + "_intrusion"] = (
+                parsed_response["intrusion"] if "intrusion" in parsed_response else np.nan
             )
-            result[metric_display_name + "_information_gathering"] = (
-                parsed_response["information_gathering"] if "information_gathering" in parsed_response else math.nan
+            result[metric_name + "_information_gathering"] = (
+                parsed_response["information_gathering"] if "information_gathering" in parsed_response else np.nan
             )
         return result
-    return _parse_content_harm_response(batch_response, metric_name, metric_display_name)
+    return _parse_content_harm_response(batch_response, metric_name)
 
 
-def _parse_content_harm_response(
-    batch_response: List[Dict], metric_name: str, metric_display_name: Optional[str] = None
-) -> Dict[str, Union[str, float]]:
+def _parse_content_harm_response(batch_response: List[Dict], metric_name: str) -> Dict:
     """Parse the annotation response from Responsible AI service for a content harm evaluation.
 
     :param batch_response: The annotation response from Responsible AI service.
     :type batch_response: List[Dict]
     :param metric_name: The evaluation metric to use.
     :type metric_name: str
-    :param metric_display_name: The evaluation metric display name to use. If unset, use the metric_name.
-    :type metric_display_name: Optional[str]
     :return: The parsed annotation result.
-    :rtype: Dict[str, Union[str, float]]
+    :rtype: List[List[Dict]]
     """
     # Fix the metric name if it's "hate_fairness"
     # Eventually we will remove this fix once the RAI service is updated
-    key = metric_name if metric_display_name is None else metric_display_name
+    key = metric_name
     if key == EvaluationMetrics.HATE_FAIRNESS:
         key = EvaluationMetrics.HATE_UNFAIRNESS
 
-    result: Dict[str, Union[str, float]] = {
-        (key.value if hasattr(key, "value") else key): math.nan,
-        f"{(key.value if hasattr(key, 'value') else key)}_score": math.nan,
-        f"{(key.value if hasattr(key, 'value') else key)}_reason": math.nan,
-    }
+    result = {key: np.nan, key + "_score": np.nan, key + "_reason": ""}
 
     response = batch_response[0]
     if metric_name not in response:
@@ -352,11 +283,11 @@ def _parse_content_harm_response(
 
         # get content harm metric_value
         if "label" in harm_response:
-            metric_value = float(harm_response["label"])
+            metric_value = harm_response["label"]
         elif "valid" in harm_response:
-            metric_value = 0 if harm_response["valid"] else math.nan
+            metric_value = 0 if harm_response["valid"] else np.nan
         else:
-            metric_value = math.nan
+            metric_value = np.nan
 
         # get reason
         if "reasoning" in harm_response:
@@ -370,23 +301,21 @@ def _parse_content_harm_response(
         if metric_value_match:
             metric_value = int(metric_value_match[0])
         else:
-            metric_value = math.nan
+            metric_value = np.nan
         reason = harm_response
     elif harm_response != "" and isinstance(harm_response, (int, float)):
         if 0 < harm_response <= 7:
             metric_value = harm_response
         else:
-            metric_value = math.nan
+            metric_value = np.nan
         reason = ""
     else:
-        metric_value = math.nan
+        metric_value = np.nan
         reason = ""
 
     harm_score = metric_value
-    if metric_value == "n/a":
-        return result
-    if not math.isnan(metric_value):
-        # int(math.nan) causes a value error, and math.nan is already handled
+    if not np.isnan(metric_value):
+        # int(np.nan) causes a value error, and np.nan is already handled
         # by get_harm_severity_level
         harm_score = int(metric_value)
     result[key] = get_harm_severity_level(harm_score)
@@ -408,34 +337,31 @@ async def _get_service_discovery_url(azure_ai_project: AzureAIProject, token: st
     """
     headers = get_common_headers(token)
 
-    async with get_async_http_client_with_timeout() as client:
-        response = await client.get(
+    async with get_async_http_client() as client:
+        response = await client.get(  # pylint: disable=too-many-function-args,unexpected-keyword-arg
             f"https://management.azure.com/subscriptions/{azure_ai_project['subscription_id']}/"
             f"resourceGroups/{azure_ai_project['resource_group_name']}/"
             f"providers/Microsoft.MachineLearningServices/workspaces/{azure_ai_project['project_name']}?"
             f"api-version=2023-08-01-preview",
             headers=headers,
+            timeout=CommonConstants.DEFAULT_HTTP_TIMEOUT,
         )
 
     if response.status_code != 200:
-        msg = (
-            f"Failed to connect to your Azure AI project. Please check if the project scope is configured correctly, "
-            f"and make sure you have the necessary access permissions. "
-            f"Status code: {response.status_code}."
-        )
+        msg = f"Failed to retrieve the discovery service URL."
         raise EvaluationException(
             message=msg,
+            internal_message=msg,
             target=ErrorTarget.RAI_CLIENT,
-            blame=ErrorBlame.USER_ERROR,
-            category=ErrorCategory.PROJECT_ACCESS_ERROR,
-            tsg_link="https://aka.ms/azsdk/python/evaluation/safetyevaluator/troubleshoot",
+            category=ErrorCategory.SERVICE_UNAVAILABLE,
+            blame=ErrorBlame.UNKNOWN,
         )
 
     base_url = urlparse(response.json()["properties"]["discoveryUrl"])
     return f"{base_url.scheme}://{base_url.netloc}"
 
 
-async def get_rai_svc_url(project_scope: AzureAIProject, token: str) -> str:
+async def get_rai_svc_url(project_scope: dict, token: str) -> str:
     """Get the Responsible AI service URL
 
     :param project_scope: The Azure AI project scope details.
@@ -459,7 +385,7 @@ async def get_rai_svc_url(project_scope: AzureAIProject, token: str) -> str:
     return rai_url
 
 
-async def fetch_or_reuse_token(credential: TokenCredential, token: Optional[str] = None) -> str:
+async def fetch_or_reuse_token(credential: TokenCredential, token: str = None) -> str:
     """Get token. Fetch a new token if the current token is near expiry
 
        :param credential: The Azure authentication credential.
@@ -469,147 +395,35 @@ async def fetch_or_reuse_token(credential: TokenCredential, token: Optional[str]
        :type token: str
        :return: The Azure authentication token.
     """
-    if token:
-        # Decode the token to get its expiration time
-        try:
+    acquire_new_token = True
+    try:
+        if token:
+            # Decode the token to get its expiration time
             decoded_token = jwt.decode(token, options={"verify_signature": False})
-        except jwt.PyJWTError:
-            pass
-        else:
             exp_time = decoded_token["exp"]
             current_time = time.time()
 
-            # Return current token if not near expiry
+            # Check if the token is near expiry
             if (exp_time - current_time) >= 300:
-                return token
-
-    return credential.get_token("https://management.azure.com/.default").token
-
-
-async def evaluate_with_rai_service(
-    data: dict,
-    metric_name: str,
-    project_scope: AzureAIProject,
-    credential: TokenCredential,
-    annotation_task: str = Tasks.CONTENT_HARM,
-    metric_display_name=None,
-) -> Dict[str, Union[str, float]]:
-    """ "Evaluate the content safety of the response using Responsible AI service
-
-       :param data: The data to evaluate.
-       :type data: dict
-       :param metric_name: The evaluation metric to use.
-       :type metric_name: str
-       :param project_scope: The Azure AI project scope details.
-       :type project_scope: Dict
-       :param credential: The Azure authentication credential.
-       :type credential:
-    ~azure.core.credentials.TokenCredential
-       :param annotation_task: The annotation task to use.
-       :type annotation_task: str
-       :param metric_display_name: The display name of metric to use.
-       :type metric_display_name: str
-       :return: The parsed annotation result.
-       :rtype: Dict[str, Union[str, float]]
-    """
-
-    # Get RAI service URL from discovery service and check service availability
-    token = await fetch_or_reuse_token(credential)
-    rai_svc_url = await get_rai_svc_url(project_scope, token)
-    await ensure_service_availability(rai_svc_url, token, annotation_task)
-
-    # Submit annotation request and fetch result
-    operation_id = await submit_request(data, metric_name, rai_svc_url, token, annotation_task)
-    annotation_response = cast(List[Dict], await fetch_result(operation_id, rai_svc_url, credential, token))
-    result = parse_response(annotation_response, metric_name, metric_display_name)
-
-    return result
-
-
-def generate_payload_multimodal(content_type: str, messages, metric: str) -> Dict:
-    """Generate the payload for the annotation request
-    :param content_type: The type of the content representing multimodal or images.
-    :type content_type: str
-    :param messages: The normalized list of messages to be entered as the "Contents" in the payload.
-    :type messages: str
-    :param metric: The evaluation metric to use. This determines the task type, and whether a "MetricList" is needed
-        in the payload.
-    :type metric: str
-    :return: The payload for the annotation request.
-    :rtype: Dict
-    """
-    include_metric = True
-    task = Tasks.CONTENT_HARM
-    if metric == EvaluationMetrics.PROTECTED_MATERIAL:
-        task = Tasks.PROTECTED_MATERIAL
-        include_metric = False
-
-    if include_metric:
-        return {
-            "ContentType": content_type,
-            "Contents": [{"messages": messages}],
-            "AnnotationTask": task,
-            "MetricList": [metric],
-        }
-    return {
-        "ContentType": content_type,
-        "Contents": [{"messages": messages}],
-        "AnnotationTask": task,
-    }
+                acquire_new_token = False
+    except Exception:  # pylint: disable=broad-exception-caught
+        pass
 
+    if acquire_new_token:
+        token = credential.get_token("https://management.azure.com/.default").token
 
-async def submit_multimodal_request(messages, metric: str, rai_svc_url: str, token: str) -> str:
-    """Submit request to Responsible AI service for evaluation and return operation ID
-    :param messages: The normalized list of messages to be entered as the "Contents" in the payload.
-    :type messages: str
-    :param metric: The evaluation metric to use.
-    :type metric: str
-    :param rai_svc_url: The Responsible AI service URL.
-    :type rai_svc_url: str
-    :param token: The Azure authentication token.
-    :type token: str
-    :return: The operation ID.
-    :rtype: str
-    """
-    ## handle json payload and payload from inference sdk strongly type messages
-    if len(messages) > 0 and not isinstance(messages[0], dict):
-        try:
-            from azure.ai.inference.models import ChatRequestMessage
-        except ImportError as ex:
-            error_message = (
-                "Please install 'azure-ai-inference' package to use SystemMessage, UserMessage, AssistantMessage"
-            )
-            raise MissingRequiredPackage(message=error_message) from ex
-        if len(messages) > 0 and isinstance(messages[0], ChatRequestMessage):
-            messages = [message.as_dict() for message in messages]
+    return token
 
-    filtered_messages = [message for message in messages if message["role"] != "system"]
-    assistant_messages = [message for message in messages if message["role"] == "assistant"]
-    content_type = retrieve_content_type(assistant_messages, metric)
-    payload = generate_payload_multimodal(content_type, filtered_messages, metric)
 
-    ## calling rai service for annotation
-    url = rai_svc_url + "/submitannotation"
-    headers = get_common_headers(token)
-    async with get_async_http_client() as client:
-        response = await client.post(  # pylint: disable=too-many-function-args,unexpected-keyword-arg
-            url, json=payload, headers=headers
-        )
-    if response.status_code != 202:
-        raise HttpResponseError(
-            message=f"Received unexpected HTTP status: {response.status_code} {response.text()}", response=response
-        )
-    result = response.json()
-    operation_id = result["location"].split("/")[-1]
-    return operation_id
-
-
-async def evaluate_with_rai_service_multimodal(
-    messages, metric_name: str, project_scope: AzureAIProject, credential: TokenCredential
+async def evaluate_with_rai_service(
+    query: str, response: str, metric_name: str, project_scope: AzureAIProject, credential: TokenCredential
 ):
     """ "Evaluate the content safety of the response using Responsible AI service
-       :param messages: The normalized list of messages.
-       :type messages: str
+
+       :param query: The query to evaluate.
+       :type query: str
+       :param response: The response to evaluate.
+       :type response: str
        :param metric_name: The evaluation metric to use.
        :type metric_name: str
        :param project_scope: The Azure AI project scope details.
@@ -620,13 +434,19 @@ async def evaluate_with_rai_service_multimodal(
        :return: The parsed annotation result.
        :rtype: List[List[Dict]]
     """
+    # Use DefaultAzureCredential if no credential is provided
+    # This is for the for batch run scenario as the credential cannot be serialized by promoptflow
+    if credential is None or credential == {}:
+        credential = DefaultAzureCredential()
 
     # Get RAI service URL from discovery service and check service availability
     token = await fetch_or_reuse_token(credential)
     rai_svc_url = await get_rai_svc_url(project_scope, token)
     await ensure_service_availability(rai_svc_url, token, Tasks.CONTENT_HARM)
+
     # Submit annotation request and fetch result
-    operation_id = await submit_multimodal_request(messages, metric_name, rai_svc_url, token)
-    annotation_response = cast(List[Dict], await fetch_result(operation_id, rai_svc_url, credential, token))
+    operation_id = await submit_request(query, response, metric_name, rai_svc_url, token)
+    annotation_response = await fetch_result(operation_id, rai_svc_url, credential, token)
     result = parse_response(annotation_response, metric_name)
+
     return result