ran tox -e ruff, even though tox -e flake8 was fine

Signed-off-by: Filinto Duran <[email protected]>

Author: filintod

dapr/aio/clients/grpc/client.py

@@ -1770,11 +1770,15 @@ async def converse_alpha1(
             response = await self._stub.ConverseAlpha1(request)
 
             outputs = [
-                conversation.ConversationResultAlpha1(result=output.result, parameters=output.parameters)
+                conversation.ConversationResultAlpha1(
+                    result=output.result, parameters=output.parameters
+                )
                 for output in response.outputs
             ]
 
-            return conversation.ConversationResponseAlpha1(context_id=response.contextID, outputs=outputs)
+            return conversation.ConversationResponseAlpha1(
+                context_id=response.contextID, outputs=outputs
+            )
 
         except grpc.aio.AioRpcError as err:
             raise DaprGrpcError(err) from err
@@ -1862,11 +1866,14 @@ async def converse_alpha2(
 
         try:
             response, call = await self.retry_policy.run_rpc_async(
-                self._stub.ConverseAlpha2, request)
+                self._stub.ConverseAlpha2, request
+            )
 
             outputs = conversation._get_outputs_from_grpc_response(response)
 
-            return conversation.ConversationResponseAlpha2(context_id=response.context_id, outputs=outputs)
+            return conversation.ConversationResponseAlpha2(
+                context_id=response.context_id, outputs=outputs
+            )
 
         except grpc.aio.AioRpcError as err:
             raise DaprGrpcError(err) from err

dapr/clients/grpc/client.py

@@ -1774,11 +1774,15 @@ def converse_alpha1(
             response, call = self.retry_policy.run_rpc(self._stub.ConverseAlpha1.with_call, request)
 
             outputs = [
-                conversation.ConversationResultAlpha1(result=output.result, parameters=output.parameters)
+                conversation.ConversationResultAlpha1(
+                    result=output.result, parameters=output.parameters
+                )
                 for output in response.outputs
             ]
 
-            return conversation.ConversationResponseAlpha1(context_id=response.contextID, outputs=outputs)
+            return conversation.ConversationResponseAlpha1(
+                context_id=response.contextID, outputs=outputs
+            )
         except RpcError as err:
             raise DaprGrpcError(err) from err
 

dapr/clients/grpc/conversation.py

@@ -71,12 +71,14 @@ def _indent_lines(title: str, text: str, indent: int) -> str:
 
 class HasNameAndContent:
     """Mixin Protocol for name and content typing."""
+
     name: Optional[str] = None
     content: List[ConversationMessageContent] = field(default_factory=list)
 
 
 class UserTracePrintMixin(HasNameAndContent):
     """Mixin for trace_print for text based message content from user to LLM."""
+
     def trace_print(self, indent: int = 0) -> None:
         base = ' ' * indent
         if self.name:
@@ -577,7 +579,9 @@ def create_tool_message(tool_id: str, name: str, content: Any) -> ConversationMe
     )
 
 
-def _get_outputs_from_grpc_response(response: api_v1.ConversationResponseAlpha2) -> List[ConversationResultAlpha2]:
+def _get_outputs_from_grpc_response(
+    response: api_v1.ConversationResponseAlpha2,
+) -> List[ConversationResultAlpha2]:
     """Helper to get outputs from a Converse gRPC response from dapr sidecar."""
     outputs: List[ConversationResultAlpha2] = []
     for output in response.outputs:
@@ -591,11 +595,7 @@ def _get_outputs_from_grpc_response(response: api_v1.ConversationResponseAlpha2)
                 )
                 if not tool_call.id:
                     tool_call.id = _generate_unique_tool_call_id()
-                tool_calls.append(
-                    ConversationToolCalls(
-                        id=tool_call.id, function=function_call
-                    )
-                )
+                tool_calls.append(ConversationToolCalls(id=tool_call.id, function=function_call))
 
             result_message = ConversationResultAlpha2Message(
                 content=choice.message.content, tool_calls=tool_calls

examples/conversation/conversation_alpha2.py

@@ -18,10 +18,10 @@
 
 with DaprClient() as d:
     inputs = [
+        ConversationInputAlpha2(messages=[create_user_message("What's Dapr?")], scrub_pii=True),
         ConversationInputAlpha2(
-            messages=[create_user_message("What's Dapr?")], scrub_pii=True),
-        ConversationInputAlpha2(
-            messages=[create_user_message('Give a brief overview.')], scrub_pii=True),
+            messages=[create_user_message('Give a brief overview.')], scrub_pii=True
+        ),
     ]
 
     metadata = {

tests/clients/test_conversation.py

@@ -929,44 +929,38 @@ async def echo(value: str, delay: float = 0.0) -> str:
 
 class TestIndentLines(unittest.TestCase):
     def test_single_line_with_indent(self):
-        result = conversation._indent_lines("Note", "Hello", 2)
-        self.assertEqual(result, "  Note: Hello")
+        result = conversation._indent_lines('Note', 'Hello', 2)
+        self.assertEqual(result, '  Note: Hello')
 
     def test_multiline_example(self):
-        text = "This is a long\nmultiline\ntext block"
-        result = conversation._indent_lines("Description", text, 4)
+        text = 'This is a long\nmultiline\ntext block'
+        result = conversation._indent_lines('Description', text, 4)
         expected = (
-            "    Description: This is a long\n"
-            "                 multiline\n"
-            "                 text block"
+            '    Description: This is a long\n'
+            '                 multiline\n'
+            '                 text block'
         )
         self.assertEqual(result, expected)
 
     def test_zero_indent(self):
-        result = conversation._indent_lines("Title", "Line one\nLine two", 0)
-        expected = (
-            "Title: Line one\n"
-            "       Line two"
-        )
+        result = conversation._indent_lines('Title', 'Line one\nLine two', 0)
+        expected = 'Title: Line one\n' '       Line two'
         self.assertEqual(result, expected)
 
     def test_empty_string(self):
-        result = conversation._indent_lines("Empty", "", 3)
+        result = conversation._indent_lines('Empty', '', 3)
         # Should end with a space after colon
-        self.assertEqual(result, "   Empty: ")
+        self.assertEqual(result, '   Empty: ')
 
     def test_none_text(self):
-        result = conversation._indent_lines("NoneCase", None, 1)
-        self.assertEqual(result, " NoneCase: ")
+        result = conversation._indent_lines('NoneCase', None, 1)
+        self.assertEqual(result, ' NoneCase: ')
 
     def test_title_length_affects_indent(self):
         # Title length is 1, indent_after_first_line should be indent + len(title) + 2
         # indent=2, len(title)=1 => 2 + 1 + 2 = 5 spaces on continuation lines
-        result = conversation._indent_lines("T", "a\nb", 2)
-        expected = (
-            "  T: a\n"
-            "     b"
-        )
+        result = conversation._indent_lines('T', 'a\nb', 2)
+        expected = '  T: a\n' '     b'
         self.assertEqual(result, expected)
 
 

tests/clients/test_dapr_grpc_client_async.py

@@ -1178,7 +1178,9 @@ async def test_converse_alpha2_basic_user_message(self):
             )
         )
 
-        input_alpha2 = conversation.ConversationInputAlpha2(messages=[user_message], scrub_pii=False)
+        input_alpha2 = conversation.ConversationInputAlpha2(
+            messages=[user_message], scrub_pii=False
+        )
 
         response = await dapr.converse_alpha2(name='test-llm', inputs=[input_alpha2])
 
@@ -1232,7 +1234,9 @@ async def test_converse_alpha2_with_tools_weather_request(self):
         self.assertEqual(len(choice.message.tool_calls), 1)
         tool_call = choice.message.tool_calls[0]
         self.assertEqual(tool_call.function.name, 'get_weather')
-        self.assertEqual(tool_call.function.arguments, '{"location": "San Francisco", "unit": "celsius"}')
+        self.assertEqual(
+            tool_call.function.arguments, '{"location": "San Francisco", "unit": "celsius"}'
+        )
         self.assertTrue(tool_call.id.startswith('call_'))
         await dapr.close()
 
@@ -1242,7 +1246,9 @@ async def test_converse_alpha2_system_message(self):
 
         system_message = conversation.ConversationMessage(
             of_system=conversation.ConversationMessageOfSystem(
-                content=[conversation.ConversationMessageContent(text='You are a helpful assistant.')]
+                content=[
+                    conversation.ConversationMessageContent(text='You are a helpful assistant.')
+                ]
             )
         )
 
@@ -1325,9 +1331,7 @@ async def test_converse_alpha2_assistant_message(self):
 
         self.assertIsNotNone(response)
         choice = response.outputs[0].choices[0]
-        self.assertEqual(
-            choice.message.content, 'Assistant continued: I understand your request.'
-        )
+        self.assertEqual(choice.message.content, 'Assistant continued: I understand your request.')
         await dapr.close()
 
     async def test_converse_alpha2_multiple_messages(self):
@@ -1357,9 +1361,7 @@ async def test_converse_alpha2_multiple_messages(self):
             response.outputs[0].choices[0].message.content,
             'System acknowledged: You are helpful.',
         )
-        self.assertEqual(
-            response.outputs[0].choices[1].message.content, 'Response to user: Hello!'
-        )
+        self.assertEqual(response.outputs[0].choices[1].message.content, 'Response to user: Hello!')
         await dapr.close()
 
     async def test_converse_alpha2_with_context_and_options(self):
@@ -1392,9 +1394,7 @@ async def test_converse_alpha2_with_context_and_options(self):
         self.assertIsNotNone(response)
         self.assertEqual(response.context_id, 'chat-session-123')
         choice = response.outputs[0].choices[0]
-        self.assertEqual(
-            choice.message.content, 'Response to user: Continue our conversation'
-        )
+        self.assertEqual(choice.message.content, 'Response to user: Continue our conversation')
         await dapr.close()
 
     async def test_converse_alpha2_error_handling(self):