Skip to content

Commit acb2d83

Browse files
lmolkovalmolkova
committed
update recordings
1 parent 130e16b commit acb2d83

File tree

10 files changed

+368
-397
lines changed

10 files changed

+368
-397
lines changed

‎sdk/ai/azure-ai-inference/assets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
"AssetsRepo": "Azure/azure-sdk-assets",
33
"AssetsRepoPrefixPath": "python",
44
"TagPrefix": "python/ai/azure-ai-inference",
5-
"Tag": "python/ai/azure-ai-inference_3f06cee8a7"
5+
"Tag": "python/ai/azure-ai-inference_01cf9f82e3"
66
}

‎sdk/ai/azure-ai-inference/tests/test_client_tracing.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def test_chat_completion_tracing_content_unicode(self, **kwargs):
342342
],
343343
)
344344
processor.force_flush()
345-
spans = exporter.get_spans_by_name_starts_with("chat ")
345+
spans = exporter.get_spans_by_name_starts_with("chat")
346346
assert len(spans) == 1
347347
expected_events = [
348348
{
@@ -397,14 +397,12 @@ def test_chat_completion_streaming_tracing_content_recording_disabled(self, **kw
397397
)
398398
response_content = ""
399399
for update in response:
400-
if update.choices:
400+
if update.choices and update.choices[0].delta.content:
401401
response_content = response_content + update.choices[0].delta.content
402402
client.close()
403403

404404
processor.force_flush()
405-
spans = exporter.get_spans_by_name_starts_with("chat ")
406-
if len(spans) == 0:
407-
spans = exporter.get_spans_by_name("chat")
405+
spans = exporter.get_spans_by_name_starts_with("chat")
408406
assert len(spans) == 1
409407
span = spans[0]
410408
expected_attributes = [
@@ -456,7 +454,7 @@ def test_chat_completion_streaming_tracing_content_recording_enabled(self, **kwa
456454
)
457455
response_content = ""
458456
for update in response:
459-
if update.choices:
457+
if update.choices and update.choices[0].delta.content:
460458
response_content = response_content + update.choices[0].delta.content
461459
client.close()
462460

@@ -580,9 +578,7 @@ def get_weather(city: str) -> str:
580578
# With the additional tools information on hand, get another response from the model
581579
response = client.complete(messages=messages, tools=[weather_description])
582580
processor.force_flush()
583-
spans = exporter.get_spans_by_name_starts_with("chat ")
584-
if len(spans) == 0:
585-
spans = exporter.get_spans_by_name("chat")
581+
spans = exporter.get_spans_by_name_starts_with("chat")
586582
assert len(spans) == 2
587583
expected_attributes = [
588584
("gen_ai.operation.name", "chat"),

‎sdk/ai/azure-ai-projects/azure/ai/projects/telemetry/agents/_ai_agents_instrumentor.py

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,9 @@ def _add_tool_message_events(
518518
body = {"content": tool_output["output"], "id": tool_output["tool_call_id"]}
519519
else:
520520
body = {"content": "", "id": tool_output["tool_call_id"]}
521-
span.span_instance.add_event("gen_ai.tool.message", {"gen_ai.event.content": json.dumps(body, ensure_ascii=False)})
521+
span.span_instance.add_event(
522+
"gen_ai.tool.message", {"gen_ai.event.content": json.dumps(body, ensure_ascii=False)}
523+
)
522524
return True
523525

524526
return False
@@ -1330,33 +1332,33 @@ def inner(*args, **kwargs): # pylint: disable=R0911
13301332
class_function_name = function.__qualname__
13311333

13321334
if class_function_name.startswith("AgentsOperations.create_agent"):
1333-
kwargs.setdefault('merge_span', True)
1335+
kwargs.setdefault("merge_span", True)
13341336
return self.trace_create_agent(function, *args, **kwargs)
13351337
if class_function_name.startswith("AgentsOperations.create_thread"):
1336-
kwargs.setdefault('merge_span', True)
1338+
kwargs.setdefault("merge_span", True)
13371339
return self.trace_create_thread(function, *args, **kwargs)
13381340
if class_function_name.startswith("AgentsOperations.create_message"):
1339-
kwargs.setdefault('merge_span', True)
1341+
kwargs.setdefault("merge_span", True)
13401342
return self.trace_create_message(function, *args, **kwargs)
13411343
if class_function_name.startswith("AgentsOperations.create_run"):
1342-
kwargs.setdefault('merge_span', True)
1344+
kwargs.setdefault("merge_span", True)
13431345
return self.trace_create_run(OperationName.START_THREAD_RUN, function, *args, **kwargs)
13441346
if class_function_name.startswith("AgentsOperations.create_and_process_run"):
1345-
kwargs.setdefault('merge_span', True)
1347+
kwargs.setdefault("merge_span", True)
13461348
return self.trace_create_run(OperationName.PROCESS_THREAD_RUN, function, *args, **kwargs)
13471349
if class_function_name.startswith("AgentsOperations.submit_tool_outputs_to_run"):
1348-
kwargs.setdefault('merge_span', True)
1350+
kwargs.setdefault("merge_span", True)
13491351
return self.trace_submit_tool_outputs(False, function, *args, **kwargs)
13501352
if class_function_name.startswith("AgentsOperations.submit_tool_outputs_to_stream"):
1351-
kwargs.setdefault('merge_span', True)
1353+
kwargs.setdefault("merge_span", True)
13521354
return self.trace_submit_tool_outputs(True, function, *args, **kwargs)
13531355
if class_function_name.startswith("AgentsOperations._handle_submit_tool_outputs"):
13541356
return self.trace_handle_submit_tool_outputs(function, *args, **kwargs)
13551357
if class_function_name.startswith("AgentsOperations.create_stream"):
1356-
kwargs.setdefault('merge_span', True)
1358+
kwargs.setdefault("merge_span", True)
13571359
return self.trace_create_stream(function, *args, **kwargs)
13581360
if class_function_name.startswith("AgentsOperations.list_messages"):
1359-
kwargs.setdefault('merge_span', True)
1361+
kwargs.setdefault("merge_span", True)
13601362
return self.trace_list_messages(function, *args, **kwargs)
13611363
if class_function_name.startswith("AgentRunStream.__exit__"):
13621364
return self.handle_run_stream_exit(function, *args, **kwargs)
@@ -1398,33 +1400,33 @@ async def inner(*args, **kwargs): # pylint: disable=R0911
13981400
class_function_name = function.__qualname__
13991401

14001402
if class_function_name.startswith("AgentsOperations.create_agent"):
1401-
kwargs.setdefault('merge_span', True)
1403+
kwargs.setdefault("merge_span", True)
14021404
return await self.trace_create_agent_async(function, *args, **kwargs)
14031405
if class_function_name.startswith("AgentsOperations.create_thread"):
1404-
kwargs.setdefault('merge_span', True)
1406+
kwargs.setdefault("merge_span", True)
14051407
return await self.trace_create_thread_async(function, *args, **kwargs)
14061408
if class_function_name.startswith("AgentsOperations.create_message"):
1407-
kwargs.setdefault('merge_span', True)
1409+
kwargs.setdefault("merge_span", True)
14081410
return await self.trace_create_message_async(function, *args, **kwargs)
14091411
if class_function_name.startswith("AgentsOperations.create_run"):
1410-
kwargs.setdefault('merge_span', True)
1412+
kwargs.setdefault("merge_span", True)
14111413
return await self.trace_create_run_async(OperationName.START_THREAD_RUN, function, *args, **kwargs)
14121414
if class_function_name.startswith("AgentsOperations.create_and_process_run"):
1413-
kwargs.setdefault('merge_span', True)
1415+
kwargs.setdefault("merge_span", True)
14141416
return await self.trace_create_run_async(OperationName.PROCESS_THREAD_RUN, function, *args, **kwargs)
14151417
if class_function_name.startswith("AgentsOperations.submit_tool_outputs_to_run"):
1416-
kwargs.setdefault('merge_span', True)
1418+
kwargs.setdefault("merge_span", True)
14171419
return await self.trace_submit_tool_outputs_async(False, function, *args, **kwargs)
14181420
if class_function_name.startswith("AgentsOperations.submit_tool_outputs_to_stream"):
1419-
kwargs.setdefault('merge_span', True)
1421+
kwargs.setdefault("merge_span", True)
14201422
return await self.trace_submit_tool_outputs_async(True, function, *args, **kwargs)
14211423
if class_function_name.startswith("AgentsOperations._handle_submit_tool_outputs"):
14221424
return await self.trace_handle_submit_tool_outputs_async(function, *args, **kwargs)
14231425
if class_function_name.startswith("AgentsOperations.create_stream"):
1424-
kwargs.setdefault('merge_span', True)
1426+
kwargs.setdefault("merge_span", True)
14251427
return await self.trace_create_stream_async(function, *args, **kwargs)
14261428
if class_function_name.startswith("AgentsOperations.list_messages"):
1427-
kwargs.setdefault('merge_span', True)
1429+
kwargs.setdefault("merge_span", True)
14281430
return await self.trace_list_messages_async(function, *args, **kwargs)
14291431
if class_function_name.startswith("AsyncAgentRunStream.__aexit__"):
14301432
return self.handle_run_stream_exit(function, *args, **kwargs)

‎sdk/ai/azure-ai-projects/samples/agents/async_samples/sample_agents_basics_async_with_azure_monitor_tracing.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
scenario = os.path.basename(__file__)
3333
tracer = trace.get_tracer(__name__)
3434

35+
3536
async def main() -> None:
3637

3738
async with DefaultAzureCredential() as creds:
@@ -51,7 +52,9 @@ async def main() -> None:
5152
async with project_client:
5253
project_client.telemetry.enable()
5354
agent = await project_client.agents.create_agent(
54-
model=os.environ["MODEL_DEPLOYMENT_NAME"], name="my-assistant", instructions="You are helpful assistant"
55+
model=os.environ["MODEL_DEPLOYMENT_NAME"],
56+
name="my-assistant",
57+
instructions="You are helpful assistant",
5558
)
5659
print(f"Created agent, agent ID: {agent.id}")
5760

‎sdk/ai/azure-ai-projects/samples/agents/sample_agents_basics_with_azure_monitor_tracing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
with tracer.start_as_current_span(scenario):
5353
with project_client:
54-
#project_client.telemetry.enable()
54+
# project_client.telemetry.enable()
5555
# [END enable_tracing]
5656
agent = project_client.agents.create_agent(
5757
model=os.environ["MODEL_DEPLOYMENT_NAME"], name="my-assistant", instructions="You are helpful assistant"

‎sdk/ai/azure-ai-projects/tests/telemetry/telemetry_test_base.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@
1515
Set these environment variables before running the test:
1616
set AZURE_AI_PROJECTS_DIAGNOSTICS_TEST_PROJECT_CONNECTION_STRING=
1717
"""
18-
servicePreparerTelemetryTests = functools.partial(
18+
agentClientPreparer = functools.partial(
1919
EnvironmentVariableLoader,
20-
"azure_ai_projects_telemetry_test",
21-
azure_ai_projects_telemetry_tests_project_connection_string="region.api.azureml.ms;00000000-0000-0000-0000-000000000000;rg-name;project-name",
20+
"azure_ai_projects",
21+
azure_ai_projects_agents_tests_project_connection_string="region.api.azureml.ms;00000000-0000-0000-0000-000000000000;rg-resour-cegr-oupfoo1;abcd-abcdabcdabcda-abcdefghijklm",
22+
azure_ai_projects_agents_tests_data_path="azureml://subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg-resour-cegr-oupfoo1/workspaces/abcd-abcdabcdabcda-abcdefghijklm/datastores/workspaceblobstore/paths/LocalUpload/000000000000/product_info_1.md",
2223
)
2324

2425
# Set to True to enable SDK logging
@@ -43,7 +44,7 @@ class TelemetryTestBase(AzureRecordedTestCase):
4344
)
4445

4546
def get_sync_client(self, **kwargs) -> AIProjectClient:
46-
conn_str = kwargs.pop("azure_ai_projects_telemetry_tests_project_connection_string")
47+
conn_str = kwargs.pop("azure_ai_projects_agents_tests_project_connection_string")
4748
project_client = AIProjectClient.from_connection_string(
4849
credential=self.get_credential(AIProjectClient, is_async=False),
4950
conn_str=conn_str,
@@ -52,7 +53,7 @@ def get_sync_client(self, **kwargs) -> AIProjectClient:
5253
return project_client
5354

5455
def get_async_client(self, **kwargs) -> AIProjectClientAsync:
55-
conn_str = kwargs.pop("azure_ai_projects_telemetry_tests_project_connection_string")
56+
conn_str = kwargs.pop("azure_ai_projects_agents_tests_project_connection_string")
5657
project_client = AIProjectClientAsync.from_connection_string(
5758
credential=self.get_credential(AIProjectClientAsync, is_async=True),
5859
conn_str=conn_str,

0 commit comments

Comments
 (0)