Consolidate user agent logic into reusable helper function

Co-authored-by: singankit <[email protected]>

Author: Copilot

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

@@ -38,6 +38,21 @@
 )
 
 
+def construct_user_agent_string(base_user_agent: str = USER_AGENT) -> str:
+    """Construct a user agent string with custom user agent from context if available.
+    
+    :param base_user_agent: The base user agent string to use. Defaults to USER_AGENT.
+    :type base_user_agent: str
+    :return: The constructed user agent string.
+    :rtype: str
+    """
+    custom_user_agent = get_current_user_agent()
+    if custom_user_agent:
+        return f"{base_user_agent} {custom_user_agent}"
+    else:
+        return base_user_agent
+
+
 class AzureMLWorkspace(NamedTuple):
     subscription_id: str
     resource_group_name: str
@@ -150,12 +165,11 @@ def _log_metrics_and_instance_results_onedp(
     )
 
     # Use custom user agent from context if available
-    custom_user_agent = get_current_user_agent()
     client_kwargs = {}
-    if custom_user_agent:
+    user_agent = construct_user_agent_string()
+    if user_agent != USER_AGENT:  # Only add custom policy if user agent is different from default
         # Create a user agent policy with the custom user agent
         from azure.core.pipeline.policies import UserAgentPolicy
-        user_agent = f"{USER_AGENT} {custom_user_agent}"
         client_kwargs["user_agent_policy"] = UserAgentPolicy(base_user_agent=user_agent)
 
     client = EvaluationServiceOneDPClient(

sdk/evaluation/azure-ai-evaluation/azure/ai/evaluation/_evaluators/_common/_base_prompty_eval.py

@@ -17,15 +17,14 @@
 from azure.ai.evaluation._constants import EVALUATION_PASS_FAIL_MAPPING
 from azure.ai.evaluation._exceptions import EvaluationException, ErrorBlame, ErrorCategory, ErrorTarget
 from ..._common.utils import construct_prompty_model_config, validate_model_config, parse_quality_evaluator_reason_score
+from ..._evaluate._utils import construct_user_agent_string
 from . import EvaluatorBase
 
 try:
     from ..._user_agent import USER_AGENT
 except ImportError:
     USER_AGENT = "None"
 
-from ..._context import get_current_user_agent
-
 T = TypeVar("T")
 
 
@@ -63,8 +62,7 @@ def __init__(self, *, result_key: str, prompty_file: str, model_config: dict, ev
 
         subclass_name = self.__class__.__name__
         base_user_agent = f"{USER_AGENT} (type=evaluator; subtype={subclass_name})"
-        custom_user_agent = get_current_user_agent()
-        user_agent = f"{base_user_agent} {custom_user_agent}" if custom_user_agent else base_user_agent
+        user_agent = construct_user_agent_string(base_user_agent)
         prompty_model_config = construct_prompty_model_config(
             validate_model_config(model_config),
             self._DEFAULT_OPEN_API_VERSION,

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

@@ -8,7 +8,7 @@
 from typing_extensions import Self, Unpack
 
 from azure.ai.evaluation._user_agent import USER_AGENT
-from azure.ai.evaluation._context import get_current_user_agent
+from azure.ai.evaluation._evaluate._utils import construct_user_agent_string
 from azure.core.configuration import Configuration
 from azure.core.pipeline import AsyncPipeline, Pipeline
 from azure.core.pipeline.policies import (
@@ -455,12 +455,7 @@ def get_http_client(**kwargs: Any) -> HttpPipeline:
     :returns: An HttpPipeline with a set of applied policies:
     :rtype: HttpPipeline
     """
-    # Use custom user agent from context if available, otherwise use default
-    custom_user_agent = get_current_user_agent()
-    if custom_user_agent:
-        user_agent = f"{USER_AGENT} {custom_user_agent}"
-    else:
-        user_agent = USER_AGENT
+    user_agent = construct_user_agent_string()
 
     kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=user_agent))
     return HttpPipeline(**kwargs)
@@ -472,12 +467,7 @@ def get_async_http_client(**kwargs: Any) -> AsyncHttpPipeline:
     :returns: An AsyncHttpPipeline with a set of applied policies:
     :rtype: AsyncHttpPipeline
     """
-    # Use custom user agent from context if available, otherwise use default
-    custom_user_agent = get_current_user_agent()
-    if custom_user_agent:
-        user_agent = f"{USER_AGENT} {custom_user_agent}"
-    else:
-        user_agent = USER_AGENT
+    user_agent = construct_user_agent_string()
 
     kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=user_agent))
     return AsyncHttpPipeline(**kwargs)