Improves error handling

Signed-off-by: Elena Kolevska <[email protected]>

Author: elena-kolevska

dapr/aio/clients/grpc/client.py

@@ -1741,7 +1741,7 @@ async def converse_alpha1(
             ConversationResponse containing the conversation results
 
         Raises:
-            DaprInternalError: If the Dapr runtime returns an error
+            DaprGrpcError: If the Dapr runtime returns an error
         """
         inputs_pb = [
             api_v1.ConversationInput(content=inp.content, role=inp.role, scrubPII=inp.scrub_pii)
@@ -1768,8 +1768,8 @@ async def converse_alpha1(
 
             return ConversationResponse(context_id=response.contextID, outputs=outputs)
 
-        except Exception as e:
-            raise DaprInternalError(f'Error invoking conversation API: {e}')
+        except grpc.aio.AioRpcError as err:
+            raise DaprGrpcError(err) from err
 
     async def wait(self, timeout_s: float):
         """Waits for sidecar to be available within the timeout.

dapr/clients/grpc/client.py

@@ -1743,7 +1743,7 @@ def converse_alpha1(
             ConversationResponse containing the conversation results
 
         Raises:
-            DaprInternalError: If the Dapr runtime returns an error
+            DaprGrpcError: If the Dapr runtime returns an error
         """
 
         inputs_pb = [
@@ -1770,9 +1770,8 @@ def converse_alpha1(
             ]
 
             return ConversationResponse(context_id=response.contextID, outputs=outputs)
-
-        except Exception as e:
-            raise DaprInternalError(f'Error invoking conversation API: {e}')
+        except RpcError as err:
+            raise DaprGrpcError(err) from err
 
     def wait(self, timeout_s: float):
         """Waits for sidecar to be available within the timeout.

tests/clients/test_dapr_grpc_client.py

@@ -25,7 +25,7 @@
 
 from google.rpc import status_pb2, code_pb2
 
-from dapr.clients.exceptions import DaprGrpcError, DaprInternalError
+from dapr.clients.exceptions import DaprGrpcError
 from dapr.clients.grpc.client import DaprGrpcClient
 from dapr.clients import DaprClient
 from dapr.clients.grpc.subscription import StreamInactiveError
@@ -1229,19 +1229,10 @@ def test_converse_alpha1_error_handling(self):
 
         inputs = [ConversationInput(content='Hello', role='user')]
 
-        with self.assertRaises(DaprInternalError) as context:
+        with self.assertRaises(DaprGrpcError) as context:
             dapr.converse_alpha1(name='test-llm', inputs=inputs)
         self.assertTrue('Invalid argument' in str(context.exception))
 
-    def test_converse_alpha1_empty_inputs(self):
-        dapr = DaprGrpcClient(f'{self.scheme}localhost:{self.grpc_port}')
-
-        # Test with empty inputs list
-        response = dapr.converse_alpha1(name='test-llm', inputs=[])
-
-        self.assertIsNotNone(response)
-        self.assertEqual(len(response.outputs), 0)
-
 
 if __name__ == '__main__':
     unittest.main()

tests/clients/test_dapr_grpc_client_async.py

@@ -23,7 +23,7 @@
 
 from dapr.aio.clients.grpc.client import DaprGrpcClientAsync
 from dapr.aio.clients import DaprClient
-from dapr.clients.exceptions import DaprGrpcError, DaprInternalError
+from dapr.clients.exceptions import DaprGrpcError
 from dapr.common.pubsub.subscription import StreamInactiveError
 from dapr.proto import common_v1
 from .fake_dapr_server import FakeDaprSidecar
@@ -1159,21 +1159,11 @@ async def test_converse_alpha1_error_handling(self):
 
         inputs = [ConversationInput(content='Hello', role='user')]
 
-        with self.assertRaises(DaprInternalError) as context:
+        with self.assertRaises(DaprGrpcError) as context:
             await dapr.converse_alpha1(name='test-llm', inputs=inputs)
         self.assertTrue('Invalid argument' in str(context.exception))
         await dapr.close()
 
-    async def test_converse_alpha1_empty_inputs(self):
-        dapr = DaprGrpcClientAsync(f'{self.scheme}localhost:{self.grpc_port}')
-
-        # Test with empty inputs list
-        response = await dapr.converse_alpha1(name='test-llm', inputs=[])
-
-        self.assertIsNotNone(response)
-        self.assertEqual(len(response.outputs), 0)
-        await dapr.close()
-
 
 if __name__ == '__main__':
     unittest.main()