update CI image and protos

ci/docker-compose-async.yml

@@ -9,7 +9,7 @@ services:
       - '8090'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - "8090:8090"
       - "50060:50051"

ci/docker-compose-azure.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8081:8081
     restart: on-failure:0

ci/docker-compose-cluster.yml

@@ -2,7 +2,7 @@
 version: '3.4'
 services:
   weaviate-node-1:
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     restart: on-failure:0
     ports:
       - "8087:8080"
@@ -26,7 +26,7 @@ services:
       - '8080'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8088:8080
       - "50059:50051"

ci/docker-compose-generative.yml

@@ -9,7 +9,7 @@ services:
       - '8086'
       - --scheme
       - http
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8086:8086
       - "50057:50051"

ci/docker-compose-okta-cc.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8082:8082
     restart: on-failure:0

ci/docker-compose-okta-users.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8083:8083
     restart: on-failure:0

ci/docker-compose-wcs.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - 8085:8085
     restart: on-failure:0

ci/docker-compose.yml

@@ -10,7 +10,7 @@ services:
       - --scheme
       - http
       - --write-timeout=600s
-    image: semitechnologies/weaviate:preview-add-filter-for-metadata-to-grpc-e025130
+    image: semitechnologies/weaviate:preview-introduce-custom-pb-properties-message-to-contain-type-aware-properties-within-search-result-a16955e
     ports:
       - "8080:8080"
       - "50051:50051"

integration/test_cluster.py

@@ -4,7 +4,7 @@
 
 import weaviate
 
-GIT_HASH = "e025130"
+GIT_HASH = "a16955e"
 SERVER_VERSION = "1.22.6"
 NODE_NAME = "node1"
 NUM_OBJECT = 10

weaviate/collections/queries/base.py

@@ -54,7 +54,7 @@
 from weaviate.connect import Connection
 from weaviate.exceptions import WeaviateGrpcUnavailable, WeaviateQueryException
 from weaviate.util import file_encoder_b64, parse_version_string
-from weaviate.proto.v1 import search_get_pb2, struct_pb2
+from weaviate.proto.v1 import search_get_pb2, properties_pb2
 
 T = TypeVar("T")
 
@@ -144,7 +144,8 @@ def __extract_generated_for_object(
     ) -> Optional[str]:
         return add_props.generative if add_props.generative_present else None
 
-    def __deserialize_non_ref_prop(self, value: struct_pb2.Value) -> Any:
+    def __deserialize_non_ref_prop(self, value: properties_pb2.Value) -> Any:
+        print(value)
         if value.HasField("uuid_value"):
             return uuid_lib.UUID(value.uuid_value)
         if value.HasField("date_value"):
@@ -165,7 +166,7 @@ def __deserialize_non_ref_prop(self, value: struct_pb2.Value) -> Any:
 
     def __parse_nonref_properties_result(
         self,
-        properties: struct_pb2.Struct,
+        properties: properties_pb2.Properties,
     ) -> dict:
         return {
             name: self.__deserialize_non_ref_prop(value)

weaviate/proto/v1/struct_pb2.pyi → weaviate/proto/v1/properties_pb2.pyi

@@ -11,7 +11,7 @@ from typing import (
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
-class Struct(_message.Message):
+class Properties(_message.Message):
     __slots__ = ["fields"]
 
     class FieldsEntry(_message.Message):
@@ -49,7 +49,7 @@ class Value(_message.Message):
     number_value: float
     string_value: str
     bool_value: bool
-    object_value: Struct
+    object_value: Properties
     list_value: ListValue
     date_value: str
     uuid_value: str
@@ -59,7 +59,7 @@ class Value(_message.Message):
         number_value: _Optional[float] = ...,
         string_value: _Optional[str] = ...,
         bool_value: bool = ...,
-        object_value: _Optional[_Union[Struct, _Mapping]] = ...,
+        object_value: _Optional[_Union[Properties, _Mapping]] = ...,
         list_value: _Optional[_Union[ListValue, _Mapping]] = ...,
         date_value: _Optional[str] = ...,
         uuid_value: _Optional[str] = ...,

weaviate/proto/v1/search_get_pb2.pyi

@@ -1,6 +1,6 @@
 from google.protobuf import struct_pb2 as _struct_pb2
 from weaviate.proto.v1 import base_pb2 as _base_pb2
-from weaviate.proto.v1 import struct_pb2 as _struct_pb2_1
+from weaviate.proto.v1 import properties_pb2 as _properties_pb2
 from google.protobuf.internal import containers as _containers
 from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
 from google.protobuf import descriptor as _descriptor
@@ -679,7 +679,7 @@ class PropertiesResult(_message.Message):
     object_array_properties: _containers.RepeatedCompositeFieldContainer[
         _base_pb2.ObjectArrayProperties
     ]
-    non_ref_props: _struct_pb2_1.Struct
+    non_ref_props: _properties_pb2.Properties
     def __init__(
         self,
         non_ref_properties: _Optional[_Union[_struct_pb2.Struct, _Mapping]] = ...,
@@ -702,7 +702,7 @@ class PropertiesResult(_message.Message):
         object_array_properties: _Optional[
             _Iterable[_Union[_base_pb2.ObjectArrayProperties, _Mapping]]
         ] = ...,
-        non_ref_props: _Optional[_Union[_struct_pb2_1.Struct, _Mapping]] = ...,
+        non_ref_props: _Optional[_Union[_properties_pb2.Properties, _Mapping]] = ...,
     ) -> None: ...
 
 class RefPropertiesResult(_message.Message):