Skip to content

Commit 2ddc2a6

Browse files
Copilotsingankit
andcommitted
Update upload paths to use custom user agent for AI Foundry integration
Co-authored-by: singankit <[email protected]>
1 parent debedf0 commit 2ddc2a6

File tree

2 files changed

+31
-3
lines changed

2 files changed

+31
-3
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
from tqdm import tqdm
1717

1818
from azure.ai.evaluation._legacy._adapters.entities import Run
19+
from azure.ai.evaluation._context import get_current_user_agent
20+
from azure.ai.evaluation._user_agent import USER_AGENT
1921

2022
from azure.ai.evaluation._constants import (
2123
DEFAULT_EVALUATION_RESULTS_FILE_NAME,
@@ -146,9 +148,20 @@ def _log_metrics_and_instance_results_onedp(
146148
credentials = AzureMLTokenManager(
147149
TokenScope.COGNITIVE_SERVICES_MANAGEMENT.value, LOGGER, credential=kwargs.get("credential")
148150
)
151+
152+
# Use custom user agent from context if available
153+
custom_user_agent = get_current_user_agent()
154+
client_kwargs = {}
155+
if custom_user_agent:
156+
# Create a user agent policy with the custom user agent
157+
from azure.core.pipeline.policies import UserAgentPolicy
158+
user_agent = f"{USER_AGENT} {custom_user_agent}"
159+
client_kwargs["user_agent_policy"] = UserAgentPolicy(base_user_agent=user_agent)
160+
149161
client = EvaluationServiceOneDPClient(
150162
endpoint=project_url,
151-
credential=credentials
163+
credential=credentials,
164+
**client_kwargs
152165
)
153166

154167
# Massaging before artifacts are put on disk

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

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from typing_extensions import Self, Unpack
99

1010
from azure.ai.evaluation._user_agent import USER_AGENT
11+
from azure.ai.evaluation._context import get_current_user_agent
1112
from azure.core.configuration import Configuration
1213
from azure.core.pipeline import AsyncPipeline, Pipeline
1314
from azure.core.pipeline.policies import (
@@ -454,7 +455,14 @@ def get_http_client(**kwargs: Any) -> HttpPipeline:
454455
:returns: An HttpPipeline with a set of applied policies:
455456
:rtype: HttpPipeline
456457
"""
457-
kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=USER_AGENT))
458+
# Use custom user agent from context if available, otherwise use default
459+
custom_user_agent = get_current_user_agent()
460+
if custom_user_agent:
461+
user_agent = f"{USER_AGENT} {custom_user_agent}"
462+
else:
463+
user_agent = USER_AGENT
464+
465+
kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=user_agent))
458466
return HttpPipeline(**kwargs)
459467

460468

@@ -464,5 +472,12 @@ def get_async_http_client(**kwargs: Any) -> AsyncHttpPipeline:
464472
:returns: An AsyncHttpPipeline with a set of applied policies:
465473
:rtype: AsyncHttpPipeline
466474
"""
467-
kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=USER_AGENT))
475+
# Use custom user agent from context if available, otherwise use default
476+
custom_user_agent = get_current_user_agent()
477+
if custom_user_agent:
478+
user_agent = f"{USER_AGENT} {custom_user_agent}"
479+
else:
480+
user_agent = USER_AGENT
481+
482+
kwargs.setdefault("user_agent_policy", UserAgentPolicy(base_user_agent=user_agent))
468483
return AsyncHttpPipeline(**kwargs)

0 commit comments

Comments
 (0)