Run black tool on Agents (#42851)

Author: dargilco

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

@@ -458,19 +458,15 @@ def _process_tool_calls(self, step: RunStep) -> List[Dict[str, Any]]:
                     t.type: t.bing_grounding,
                 }
             elif isinstance(t, RunStepOpenAPIToolCall):
-                tool_call = {
-                    "id": t.id,
-                    "type": t.type,
-                    'function': t.as_dict().get('function', {})
-                }
+                tool_call = {"id": t.id, "type": t.type, "function": t.as_dict().get("function", {})}
             elif isinstance(t, RunStepMcpToolCall):
                 tool_call = {
                     "id": t.id,
                     "type": t.type,
                     "arguments": t.arguments,
                     "name": t.name,
                     "output": t.output,
-                    "server_label": t.server_label or ""
+                    "server_label": t.server_label or "",
                 }
             else:
                 # Works for Deep research
@@ -589,7 +585,7 @@ def _add_message_event(
     ) -> None:
         # TODO document new fields
 
-        event_body: dict[str, Any]= {}
+        event_body: dict[str, Any] = {}
         if _trace_agents_content:
             if isinstance(content, List):
                 for block in content:
@@ -2101,7 +2097,9 @@ def on_thread_message(self, message: "ThreadMessage") -> None:  # type: ignore[f
         # See work item 4636616 and 4636299 for details.
         # When the work item is resolved, change this code back to:
         # if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE}
-        if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE} or (message.status == MessageStatus.IN_PROGRESS and message.content):
+        if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE} or (
+            message.status == MessageStatus.IN_PROGRESS and message.content
+        ):
             self.last_message = message
 
         return retval  # type: ignore
@@ -2242,7 +2240,9 @@ async def on_thread_message(self, message: "ThreadMessage") -> None:  # type: ig
         # See work item 4636616 and 4636299 for details.
         # When the work item is resolved, change this code back to:
         # if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE}
-        if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE} or (message.status == MessageStatus.IN_PROGRESS and message.content):
+        if message.status in {MessageStatus.COMPLETED, MessageStatus.INCOMPLETE} or (
+            message.status == MessageStatus.IN_PROGRESS and message.content
+        ):
             self.last_message = message
 
         return retval  # type: ignore

sdk/ai/azure-ai-agents/setup.py

@@ -77,4 +77,4 @@
         "typing-extensions>=4.6.0",
     ],
     python_requires=">=3.9",
-)
+)

sdk/ai/azure-ai-agents/tests/gen_ai_trace_verifier.py

@@ -46,7 +46,9 @@ def check_span_attributes(self, span, attributes):
                 # Check if the attribute value matches the provided value
                 if attribute_value == "+":
                     if not isinstance(span.attributes[attribute_name], numbers.Number):
-                        raise AssertionError("Attribute value " + str(span.attributes[attribute_name]) + " is not a number")
+                        raise AssertionError(
+                            "Attribute value " + str(span.attributes[attribute_name]) + " is not a number"
+                        )
                     if span.attributes[attribute_name] < 0:
                         raise AssertionError("Attribute value " + str(span.attributes[attribute_name]) + " is negative")
                 elif attribute_value != "" and span.attributes[attribute_name] != attribute_value:
@@ -88,7 +90,9 @@ def check_decorator_span_attributes(self, span: Span, attributes: List[tuple]) -
             elif isinstance(attribute_value, dict):
                 # Check if both are dictionaries and compare them
                 if not isinstance(span_value, dict) or span_value != attribute_value:
-                    raise AssertionError("Attribute value dict " + str(span_value) + " does not match with " + str(attribute_value))
+                    raise AssertionError(
+                        "Attribute value dict " + str(span_value) + " does not match with " + str(attribute_value)
+                    )
             else:
                 # Check if the attribute value matches the provided value
                 if attribute_value == "+":
@@ -97,7 +101,9 @@ def check_decorator_span_attributes(self, span: Span, attributes: List[tuple]) -
                     if span_value < 0:
                         raise AssertionError("Attribute value " + str(span_value) + " is negative")
                 elif attribute_value != "" and span_value != attribute_value:
-                    raise AssertionError("Attribute value " + str(span_value) + " does not match with " + str(attribute_value))
+                    raise AssertionError(
+                        "Attribute value " + str(span_value) + " does not match with " + str(attribute_value)
+                    )
                 # Check if the attribute value in the span is not empty when the provided value is ""
                 elif attribute_value == "" and not span_value:
                     raise AssertionError("Expected non-empty attribute value")
@@ -127,7 +133,9 @@ def check_event_attributes(self, expected_dict, actual_dict):
                 actual_val = json.dumps(actual_dict)
             else:
                 actual_val = actual_dict
-            raise AssertionError(f"check_event_attributes: keys do not match: {set(expected_dict.keys())} != {set(actual_dict.keys())}. The actual dictionaries: {expected_val} != {actual_val}")
+            raise AssertionError(
+                f"check_event_attributes: keys do not match: {set(expected_dict.keys())} != {set(actual_dict.keys())}. The actual dictionaries: {expected_val} != {actual_val}"
+            )
         for key, expected_val in expected_dict.items():
             if key not in actual_dict:
                 raise AssertionError(f"check_event_attributes: key {key} not found in actuals")
@@ -145,21 +153,25 @@ def check_event_attributes(self, expected_dict, actual_dict):
                 if not isinstance(actual_val, list):
                     raise AssertionError(f"check_event_attributes: actual_val for {key}  is not list")
                 if len(expected_val) != len(actual_val):
-                    raise AssertionError(f"check_event_attributes: list lengths do not match for key {key}: expected {len(expected_val)}, actual {len(actual_val)}")
+                    raise AssertionError(
+                        f"check_event_attributes: list lengths do not match for key {key}: expected {len(expected_val)}, actual {len(actual_val)}"
+                    )
                 for expected_list, actual_list in zip(expected_val, actual_val):
                     self.check_event_attributes(expected_list, actual_list)
             elif isinstance(expected_val, str) and expected_val == "*":
                 if actual_val == "":
                     raise AssertionError(f"check_event_attributes: actual_val for {key} is empty")
             elif isinstance(expected_val, str) and expected_val == "+":
                 assert isinstance(actual_val, numbers.Number), f"The {key} is not a number."
-                assert actual_val > 0, f"The {key} is <0 {actual_val}" 
+                assert actual_val > 0, f"The {key} is <0 {actual_val}"
             elif expected_val != actual_val:
                 if isinstance(expected_val, dict):
                     expected_val = json.dumps(expected_val)
                 if isinstance(actual_val, dict):
                     actual_val = json.dumps(actual_val)
-                raise AssertionError(f"check_event_attributes: values do not match for key {key}: {expected_val} != {actual_val}")
+                raise AssertionError(
+                    f"check_event_attributes: values do not match for key {key}: {expected_val} != {actual_val}"
+                )
 
     def check_span_events(self, span, expected_events):
         print("Checking span: " + span.name)

sdk/ai/azure-ai-agents/tests/test_agents_client.py

@@ -3907,7 +3907,7 @@ def _get_mcp_tool(self):
             server_url="https://gitmcp.io/Azure/azure-rest-api-specs",
             allowed_tools=[],  # Optional: specify allowed tools
         )
-    
+
     @agentClientPreparer()
     @recorded_by_proxy
     def test_mcp_tool(self, **kwargs):
@@ -3928,16 +3928,20 @@ def test_mcp_tool(self, **kwargs):
                     content="Please summarize the Azure REST API specifications Readme",
                 )
                 mcp_tool.update_headers("SuperSecret", "123456")
-                run = agents_client.runs.create(thread_id=thread.id, agent_id=agent.id, tool_resources=mcp_tool.resources)
+                run = agents_client.runs.create(
+                    thread_id=thread.id, agent_id=agent.id, tool_resources=mcp_tool.resources
+                )
                 was_approved = False
                 while run.status in [RunStatus.QUEUED, RunStatus.IN_PROGRESS, RunStatus.REQUIRES_ACTION]:
                     time.sleep(self._sleep_time())
                     run = agents_client.runs.get(thread_id=thread.id, run_id=run.id)
-            
-                    if run.status == RunStatus.REQUIRES_ACTION and isinstance(run.required_action, SubmitToolApprovalAction):
+
+                    if run.status == RunStatus.REQUIRES_ACTION and isinstance(
+                        run.required_action, SubmitToolApprovalAction
+                    ):
                         tool_calls = run.required_action.submit_tool_approval.tool_calls
                         assert tool_calls, "No tool calls to approve."
-            
+
                         tool_approvals = []
                         for tool_call in tool_calls:
                             if isinstance(tool_call, RequiredMcpToolCall):
@@ -3948,15 +3952,15 @@ def test_mcp_tool(self, **kwargs):
                                         headers=mcp_tool.headers,
                                     )
                                 )
-            
+
                         if tool_approvals:
                             was_approved = True
                             agents_client.runs.submit_tool_outputs(
                                 thread_id=thread.id, run_id=run.id, tool_approvals=tool_approvals
                             )
                 assert was_approved, "The run was never approved."
                 assert run.status != RunStatus.FAILED, run.last_error
-            
+
                 is_activity_step_found = False
                 is_tool_call_step_found = False
                 for run_step in agents_client.run_steps.list(thread_id=thread.id, run_id=run.id):
@@ -3996,7 +4000,9 @@ def test_mcp_tool_streaming(self, **kwargs):
             mcp_tool.update_headers("SuperSecret", "123456")
 
             try:
-                with agents_client.runs.stream(thread_id=thread.id, agent_id=agent.id, tool_resources=mcp_tool.resources) as stream:
+                with agents_client.runs.stream(
+                    thread_id=thread.id, agent_id=agent.id, tool_resources=mcp_tool.resources
+                ) as stream:
                     is_started = False
                     received_message = False
                     got_expected_delta = False
@@ -4005,29 +4011,29 @@ def test_mcp_tool_streaming(self, **kwargs):
                     found_activity_details = False
                     found_tool_call_step = False
                     for event_type, event_data, _ in stream:
-            
+
                         if isinstance(event_data, MessageDeltaChunk):
                             received_message = True
-            
+
                         elif isinstance(event_data, RunStepDeltaChunk):
                             tool_calls_details = getattr(event_data.delta.step_details, "tool_calls")
                             if isinstance(tool_calls_details, list):
                                 for tool_call in tool_calls_details:
                                     if isinstance(tool_call, RunStepDeltaMcpToolCall):
                                         got_expected_delta = True
-            
+
                         elif isinstance(event_data, ThreadRun):
                             if event_type == AgentStreamEvent.THREAD_RUN_CREATED:
                                 is_started = True
                             if event_data.status == RunStatus.FAILED:
                                 raise AssertionError(event_data.last_error)
-            
+
                             if event_data.status == RunStatus.REQUIRES_ACTION and isinstance(
                                 event_data.required_action, SubmitToolApprovalAction
                             ):
                                 tool_calls = event_data.required_action.submit_tool_approval.tool_calls
                                 assert tool_calls, "No tool calls to approve."
-            
+
                                 tool_approvals = []
                                 for tool_call in tool_calls:
                                     if isinstance(tool_call, RequiredMcpToolCall):
@@ -4038,7 +4044,7 @@ def test_mcp_tool_streaming(self, **kwargs):
                                                 headers=mcp_tool.headers,
                                             )
                                         )
-            
+
                                 if tool_approvals:
                                     # Once we receive 'requires_action' status, the next event will be DONE.
                                     # Here we associate our existing event handler to the next stream.
@@ -4048,7 +4054,7 @@ def test_mcp_tool_streaming(self, **kwargs):
                                         tool_approvals=tool_approvals,
                                         event_handler=stream,
                                     )
-            
+
                         elif isinstance(event_data, RunStep):
                             if event_type == AgentStreamEvent.THREAD_RUN_STEP_CREATED:
                                 is_run_step_created = True
@@ -4059,11 +4065,10 @@ def test_mcp_tool_streaming(self, **kwargs):
                                 for tool_call in step_details.tool_calls:
                                     if isinstance(tool_call, RunStepMcpToolCall):
                                         found_tool_call_step = True
-                                
-            
+
                         elif event_type == AgentStreamEvent.ERROR:
                             raise AssertionError(event_data)
-            
+
                         elif event_type == AgentStreamEvent.DONE:
                             is_completed = True