Merge pull request #1815 from weaviate/own_health_file

Own health file

Author: dirkkul

mock_tests/conftest.py

@@ -15,14 +15,14 @@
 from weaviate.proto.v1 import (
     batch_delete_pb2,
     batch_pb2,
-    health_pb2,
-    health_pb2_grpc,
     properties_pb2,
     search_get_pb2,
     tenants_pb2,
     weaviate_pb2_grpc,
 )
 
+from grpc_health.v1 import health_pb2, health_pb2_grpc
+
 MOCK_IP = "127.0.0.1"
 MOCK_PORT = 23536
 MOCK_PORT_GRPC = 23537

requirements-devel.txt

@@ -3,6 +3,7 @@ validators==0.34.0
 authlib==1.6.1
 grpcio==1.66.2
 grpcio-tools==1.66.2
+grpcio-health-checking==1.66.2
 pydantic==2.8.0
 deprecation==2.1.0
 

weaviate/connect/v4.py

@@ -81,7 +81,7 @@
     aggregate_pb2,
     batch_delete_pb2,
     batch_pb2,
-    health_pb2,
+    health_weaviate_pb2,
     search_get_pb2,
     tenants_pb2,
     weaviate_pb2_grpc,
@@ -322,30 +322,31 @@ def _ping_grpc(self, colour: executor.Colour) -> Union[None, Awaitable[None]]:
         try:
             res = self._grpc_channel.unary_unary(
                 "/grpc.health.v1.Health/Check",
-                request_serializer=health_pb2.HealthCheckRequest.SerializeToString,
-                response_deserializer=health_pb2.HealthCheckResponse.FromString,
-            )(health_pb2.HealthCheckRequest(), timeout=self.timeout_config.init)
+                request_serializer=health_weaviate_pb2.WeaviateHealthCheckRequest.SerializeToString,
+                response_deserializer=health_weaviate_pb2.WeaviateHealthCheckResponse.FromString,
+            )(health_weaviate_pb2.WeaviateHealthCheckRequest(), timeout=self.timeout_config.init)
             if colour == "async":
 
                 async def execute():
                     assert isinstance(res, Awaitable)
                     try:
                         return self.__handle_ping_response(
-                            cast(health_pb2.HealthCheckResponse, await res)
+                            cast(health_weaviate_pb2.WeaviateHealthCheckResponse, await res)
                         )
                     except Exception as e:
                         self.__handle_ping_exception(e)
 
                 return execute()
             assert not isinstance(res, Awaitable)
-            return self.__handle_ping_response(cast(health_pb2.HealthCheckResponse, res))
+            self.__handle_ping_response(cast(health_weaviate_pb2.WeaviateHealthCheckResponse, res))
+            return None
 
         except Exception as e:
             self.__handle_ping_exception(e)
         return None
 
-    def __handle_ping_response(self, res: health_pb2.HealthCheckResponse) -> None:
-        if res.status != health_pb2.HealthCheckResponse.SERVING:
+    def __handle_ping_response(self, res: health_weaviate_pb2.WeaviateHealthCheckResponse) -> None:
+        if res.status != health_weaviate_pb2.WeaviateHealthCheckResponse.SERVING:
             raise WeaviateGRPCUnavailableError(
                 f"v{self.server_version}", self._connection_params._grpc_address
             )

weaviate/proto/v1/__init__.py

@@ -22,16 +22,16 @@ def get_version(pkg: str)-> version.Version:
 if pb_version >= version.parse("6.30.0"):
     if grpc_version < version.parse("1.72.0"):
         raise WeaviateProtobufIncompatibility(pb_version, grpc_version)
-    from weaviate.proto.v1.v6300.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_pb2, health_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
+    from weaviate.proto.v1.v6300.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_weaviate_pb2, health_weaviate_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
 elif pb_version >= version.parse("5.26.1"):
     if grpc_version < version.parse("1.63.0"):
         raise WeaviateProtobufIncompatibility(pb_version, grpc_version)
-    from weaviate.proto.v1.v5261.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_pb2, health_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
+    from weaviate.proto.v1.v5261.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_weaviate_pb2, health_weaviate_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
 elif pb_version >= version.parse("4.21.6"):
-    from weaviate.proto.v1.v4216.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_pb2, health_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
+    from weaviate.proto.v1.v4216.v1 import weaviate_pb2_grpc, aggregate_pb2, base_pb2, base_search_pb2, batch_delete_pb2, batch_pb2, generative_pb2, health_weaviate_pb2, health_weaviate_pb2_grpc, properties_pb2, search_get_pb2, tenants_pb2
 else:
     raise RuntimeError(f"Unsupported protobuf version: {pb_version}. Only versions 4.21.6+ are supported.")
 
 __all__ = [
-    "aggregate_pb2", "base_pb2", "base_search_pb2", "batch_delete_pb2", "batch_pb2", "generative_pb2", "health_pb2", "health_pb2_grpc", "properties_pb2", "search_get_pb2", "tenants_pb2", "weaviate_pb2_grpc"
+    "aggregate_pb2", "base_pb2", "base_search_pb2", "batch_delete_pb2", "batch_pb2", "generative_pb2", "health_weaviate_pb2", "health_weaviate_pb2_grpc", "properties_pb2", "search_get_pb2", "tenants_pb2", "weaviate_pb2_grpc"
 ]

weaviate/proto/v1/v4216/v1/health_pb2.py

@@ -0,0 +1,26 @@
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from typing import ClassVar as _ClassVar, Optional as _Optional, Union as _Union
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class WeaviateHealthCheckRequest(_message.Message):
+    __slots__ = ["service"]
+    SERVICE_FIELD_NUMBER: _ClassVar[int]
+    service: str
+    def __init__(self, service: _Optional[str] = ...) -> None: ...
+
+class WeaviateHealthCheckResponse(_message.Message):
+    __slots__ = ["status"]
+    class ServingStatus(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+        __slots__ = []
+        UNKNOWN: _ClassVar[WeaviateHealthCheckResponse.ServingStatus]
+        SERVING: _ClassVar[WeaviateHealthCheckResponse.ServingStatus]
+        NOT_SERVING: _ClassVar[WeaviateHealthCheckResponse.ServingStatus]
+    UNKNOWN: WeaviateHealthCheckResponse.ServingStatus
+    SERVING: WeaviateHealthCheckResponse.ServingStatus
+    NOT_SERVING: WeaviateHealthCheckResponse.ServingStatus
+    STATUS_FIELD_NUMBER: _ClassVar[int]
+    status: WeaviateHealthCheckResponse.ServingStatus
+    def __init__(self, status: _Optional[_Union[WeaviateHealthCheckResponse.ServingStatus, str]] = ...) -> None: ...

weaviate/proto/v1/v4216/v1/health_pb2.pyi

@@ -0,0 +1,4 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+