Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AB#3250444 Fixing user agent header name #3545

Merged
merged 3 commits into from
Jul 16, 2024
Merged

AB#3250444 Fixing user agent header name #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2909a14
Fixing user agent header name
singankit Jul 11, 2024
52f56c0
Appending user agent if clashing name present
singankit Jul 12, 2024
44ab29d
Reveiw comments fix
singankit Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/promptflow-evals/promptflow/evals/evaluators/_coherence/_coherence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(self, model_config: AzureOpenAIModelConfiguration):
model_config.api_version = "2024-02-15-preview"

prompty_model_config = {"configuration": model_config}
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-user-agent": USER_AGENT}}}) \
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-useragent": USER_AGENT}}}) \
if USER_AGENT and isinstance(model_config, AzureOpenAIModelConfiguration) else None

current_dir = os.path.dirname(__file__)
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-evals/promptflow/evals/evaluators/_fluency/_fluency.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def __init__(self, model_config: AzureOpenAIModelConfiguration):
model_config.api_version = "2024-02-15-preview"

prompty_model_config = {"configuration": model_config}
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-user-agent": USER_AGENT}}}) \
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-useragent": USER_AGENT}}}) \
if USER_AGENT and isinstance(model_config, AzureOpenAIModelConfiguration) else None
current_dir = os.path.dirname(__file__)
prompty_path = os.path.join(current_dir, "fluency.prompty")
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-evals/promptflow/evals/evaluators/_groundedness/_groundedness.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def __init__(self, model_config: AzureOpenAIModelConfiguration):

prompty_model_config = {"configuration": model_config}

prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-user-agent": USER_AGENT}}}) \
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-useragent": USER_AGENT}}}) \
if USER_AGENT and isinstance(model_config, AzureOpenAIModelConfiguration) else None

current_dir = os.path.dirname(__file__)
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-evals/promptflow/evals/evaluators/_relevance/_relevance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def __init__(self, model_config: AzureOpenAIModelConfiguration):
"configuration": model_config,
}

prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-user-agent": USER_AGENT}}})\
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-useragent": USER_AGENT}}})\
if USER_AGENT and isinstance(model_config, AzureOpenAIModelConfiguration) else None

current_dir = os.path.dirname(__file__)
Expand Down
2 changes: 1 addition & 1 deletion src/promptflow-evals/promptflow/evals/evaluators/_similarity/_similarity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def __init__(self, model_config: AzureOpenAIModelConfiguration):
model_config.api_version = "2024-02-15-preview"

prompty_model_config = {"configuration": model_config}
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-user-agent": USER_AGENT}}}) \
prompty_model_config.update({"parameters": {"extra_headers": {"x-ms-useragent": USER_AGENT}}}) \
if USER_AGENT and isinstance(model_config, AzureOpenAIModelConfiguration) else None
current_dir = os.path.dirname(__file__)
prompty_path = os.path.join(current_dir, "similarity.prompty")
Expand Down
9 changes: 8 additions & 1 deletion src/promptflow-tracing/promptflow/tracing/_integrations/_openai_injector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@ def inject_headers(kwargs):
injected_headers = get_aoai_telemetry_headers()
original_headers = kwargs.get("headers" if IS_LEGACY_OPENAI else "extra_headers")
if original_headers and isinstance(original_headers, dict):
injected_headers.update(original_headers)
for header in original_headers.keys():
if header in injected_headers:
# If the key already exists in injected_headers, concatenate the values with a space
injected_headers[header] = " ".join([injected_headers[header], original_headers[header]])
else:
# If the key does not exist in injected_headers, add it directly
injected_headers[header] = original_headers[header]

kwargs["headers" if IS_LEGACY_OPENAI else "extra_headers"] = injected_headers

if asyncio.iscoroutinefunction(f):
Expand Down
16 changes: 10 additions & 6 deletions src/promptflow-tracing/tests/unittests/test_openai_injector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,19 @@ def f(**kwargs):

if IS_LEGACY_OPENAI:
headers = "headers"
kwargs_1 = {"headers": {"a": 1, "b": 2}}
kwargs_1 = {"headers": {"a": 1, "b": 2, "x-ms-useragent": "user_agent_test"}}
kwargs_2 = {"headers": {"ms-azure-ai-promptflow-called-from": "aoai-tool"}}
else:
headers = "extra_headers"
kwargs_1 = {"extra_headers": {"a": 1, "b": 2}}
kwargs_1 = {"extra_headers": {"a": 1, "b": 2, "x-ms-useragent": "user_agent_test"}}
kwargs_2 = {"extra_headers": {"ms-azure-ai-promptflow-called-from": "aoai-tool"}}

injected_headers = get_aoai_telemetry_headers()
user_agent = injected_headers.get("x-ms-useragent", None)
assert user_agent is not None
assert f(a=1, b=2) == {"a": 1, "b": 2, headers: injected_headers}

merged_headers = {**injected_headers, "a": 1, "b": 2}
merged_headers = {**injected_headers, "a": 1, "b": 2, "x-ms-useragent": " ".join([user_agent, "user_agent_test"])}
assert f(**kwargs_1) == {headers: merged_headers}

aoai_tools_headers = injected_headers.copy()
Expand All @@ -70,17 +72,19 @@ async def f(**kwargs):

if IS_LEGACY_OPENAI:
headers = "headers"
kwargs_1 = {"headers": {"a": 1, "b": 2}}
kwargs_1 = {"headers": {"a": 1, "b": 2, "x-ms-useragent": "user_agent_test"}}
kwargs_2 = {"headers": {"ms-azure-ai-promptflow-called-from": "aoai-tool"}}
else:
headers = "extra_headers"
kwargs_1 = {"extra_headers": {"a": 1, "b": 2}}
kwargs_1 = {"extra_headers": {"a": 1, "b": 2, "x-ms-useragent": "user_agent_test"}}
kwargs_2 = {"extra_headers": {"ms-azure-ai-promptflow-called-from": "aoai-tool"}}

injected_headers = get_aoai_telemetry_headers()
user_agent = injected_headers.get("x-ms-useragent", None)
assert user_agent is not None
assert await f(a=1, b=2) == {"a": 1, "b": 2, headers: injected_headers}

merged_headers = {**injected_headers, "a": 1, "b": 2}
merged_headers = {**injected_headers, "a": 1, "b": 2, "x-ms-useragent": " ".join([user_agent, "user_agent_test"])}
assert await f(**kwargs_1) == {headers: merged_headers}

aoai_tools_headers = injected_headers.copy()
Expand Down
Loading