[WIP] Third party errors

weaviate/collections/classes/internal.py

@@ -50,7 +50,7 @@
 from weaviate.util import _to_beacons
 from weaviate.types import INCLUDE_VECTOR, UUID, UUIDS
 
-from weaviate.proto.v1 import search_get_pb2
+from weaviate.proto.v1 import search_get_pb2, generative_pb2
 
 
 @dataclass
@@ -208,8 +208,8 @@ def __init__(
         self.grouped = grouped
         self.grouped_properties = grouped_properties
 
-    def to_grpc(self) -> search_get_pb2.GenerativeSearch:
-        return search_get_pb2.GenerativeSearch(
+    def to_grpc(self) -> generative_pb2.GenerativeSearch:
+        return generative_pb2.GenerativeSearch(
             single_response_prompt=self.single,
             grouped_response_task=self.grouped,
             grouped_properties=self.grouped_properties,

weaviate/collections/grpc/query.py

@@ -53,6 +53,7 @@
     WeaviateQueryError,
     WeaviateUnsupportedFeatureError,
     WeaviateInvalidInputError,
+    WeaviateQueryThirdPartyError,
 )
 from weaviate.proto.v1 import search_get_pb2
 from weaviate.types import NUMBER, UUID
@@ -759,6 +760,7 @@ def __create_request(
         return search_get_pb2.SearchRequest(
             uses_123_api=True,
             uses_125_api=self.__uses_125_api,
+            uses_128_api=True,  # sets a new return format for errors. The client can handle both
             collection=self._name,
             limit=limit,
             offset=offset,
@@ -800,7 +802,17 @@ async def __call(self, request: search_get_pb2.SearchRequest) -> search_get_pb2.
                 metadata=self._connection.grpc_headers(),
                 timeout=self._connection.timeout_config.query,
             )
-            return cast(search_get_pb2.SearchReply, res)
+            sr = cast(search_get_pb2.SearchReply, res)
+            if sr.third_party_error is not None and sr.third_party_error.provider_name != "":
+                raise WeaviateQueryThirdPartyError(
+                    sr.third_party_error.full_error,
+                    sr.third_party_error.provider_name,
+                    sr.third_party_error.error_from_provider,
+                    sr.third_party_error.status_code,
+                    sr.third_party_error.request_id,
+                    "GRPC search",
+                )
+            return sr
         except AioRpcError as e:
             raise WeaviateQueryError(str(e), "GRPC search")  # pyright: ignore
 

weaviate/exceptions.py

@@ -224,15 +224,45 @@ def __init__(self, message: str):
 class WeaviateQueryError(WeaviateBaseError):
     """Is raised if a query (either gRPC or GraphQL) to Weaviate fails in any way."""
 
-    def __init__(self, message: str, protocol_type: str):
-        msg = f"""Query call with protocol {protocol_type} failed with message {message}."""
+    def __init__(self, message: str, protocol_type: str, add_message: bool = True):
+        if add_message:
+            msg = f"""Query call with protocol {protocol_type} failed with message {message}."""
+        else:
+            msg = message
         super().__init__(msg)
-        self.message = message
+        self.message = msg
 
 
 WeaviateQueryException = WeaviateQueryError
 
 
+class WeaviateQueryThirdPartyError(WeaviateQueryError):
+    """Is raised if a query (either gRPC or GraphQL) to Weaviate fails in any way."""
+
+    def __init__(
+        self,
+        full_error: str,
+        provider_name: str,
+        provider_error: str,
+        error_code: int,
+        request_id: str,
+        protocol_type: str,
+    ):
+        request_id_str = f"with request_id {request_id} " if request_id else ""
+
+        msg = f"""
+        Full error message: {full_error}
+
+        Query {request_id_str}failed due to an error with a third party service:
+        Provider: {provider_name}
+        Error code: {error_code}
+        Error from provider: {provider_error}
+
+        """
+        super().__init__(msg, protocol_type, False)
+        self.message = msg
+
+
 class WeaviateBatchError(WeaviateQueryError):
     """Is raised if a gRPC batch query to Weaviate fails in any way."""