Update to use latest proto

Author: tsmith023

weaviate/collections/aggregations/aggregate.py

@@ -90,11 +90,17 @@ def _to_aggregate_result(
             )
 
     def _to_result(
-        self, response: aggregate_pb2.AggregateReply, is_group_by: bool
+        self, response: aggregate_pb2.AggregateReply
     ) -> Union[AggregateReturn, AggregateGroupByReturn]:
-        if len(response.result.groups) == 0:
-            raise WeaviateQueryError("No results found in the aggregation query!", "gRPC")
-        if is_group_by:
+        if response.HasField("single_result"):
+            return AggregateReturn(
+                properties={
+                    aggregation.property: self.__parse_property_grpc(aggregation)
+                    for aggregation in response.single_result.aggregations.aggregations
+                },
+                total_count=response.single_result.objects_count,
+            )
+        if response.HasField("grouped_results"):
             return AggregateGroupByReturn(
                 groups=[
                     AggregateGroup(
@@ -105,21 +111,15 @@ def _to_result(
                         },
                         total_count=group.objects_count,
                     )
-                    for group in response.result.groups
+                    for group in response.grouped_results.groups
                 ]
             )
         else:
-            result = response.result.groups[0]
-            return AggregateReturn(
-                properties={
-                    aggregation.property: self.__parse_property_grpc(aggregation)
-                    for aggregation in result.aggregations.aggregations
-                },
-                total_count=result.objects_count,
-            )
+            _Warnings.unknown_type_encountered(response.WhichOneof("result"))
+            return AggregateReturn(properties={}, total_count=None)
 
     def __parse_grouped_by_value(
-        self, grouped_by: aggregate_pb2.AggregateGroup.GroupedBy
+        self, grouped_by: aggregate_pb2.AggregateReply.Group.GroupedBy
     ) -> GroupedBy:
         value: Union[
             str,
@@ -157,7 +157,7 @@ def __parse_grouped_by_value(
             )
         else:
             value = None
-            _Warnings.unknown_type_encountered(grouped_by.WhichOneof("GroupedBy"))
+            _Warnings.unknown_type_encountered(grouped_by.WhichOneof("value"))
         return GroupedBy(prop=grouped_by.path[0], value=value)
 
     def _to_group_by_result(
@@ -254,7 +254,7 @@ def __parse_property_gql(property_: dict, metric: _Metrics) -> AggregateResult:
 
     @staticmethod
     def __parse_property_grpc(
-        aggregation: aggregate_pb2.AggregateGroup.Aggregations.Aggregation,
+        aggregation: aggregate_pb2.AggregateReply.Aggregations.Aggregation,
     ) -> AggregateResult:
         if aggregation.HasField("text"):
             return AggregateText(

weaviate/collections/aggregations/hybrid.py

@@ -115,7 +115,7 @@ async def hybrid(
                 limit=group_by.limit if group_by is not None else None,
                 objects_count=total_count,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/aggregations/near_image.py

@@ -104,7 +104,7 @@ async def near_image(
                 objects_count=total_count,
                 object_limit=object_limit,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/aggregations/near_object.py

@@ -101,7 +101,7 @@ async def near_object(
                 objects_count=total_count,
                 object_limit=object_limit,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/aggregations/near_text.py

@@ -117,7 +117,7 @@ async def near_text(
                 objects_count=total_count,
                 object_limit=object_limit,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/aggregations/near_vector.py

@@ -121,7 +121,7 @@ async def near_vector(
                 objects_count=total_count,
                 object_limit=object_limit,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/aggregations/over_all.py

@@ -73,7 +73,7 @@ async def over_all(
                 limit=group_by.limit if group_by is not None else None,
                 objects_count=total_count,
             )
-            return self._to_result(reply, group_by is not None)
+            return self._to_result(reply)
 
 
 @syncify.convert

weaviate/collections/grpc/aggregate.py

@@ -37,7 +37,7 @@ def __init__(
 
     async def objects_count(self) -> int:
         res = await self.__call(self.__create_request(objects_count=True))
-        return res.result.groups[0].objects_count
+        return res.single_result.objects_count
 
     def hybrid(
         self,

weaviate/collections/queries/base.py

@@ -192,7 +192,7 @@ def __deserialize_list_value_prop_125(
             return [
                 self.__parse_nonref_properties_result(val) for val in value.object_values.values
             ]
-        _Warnings.unknown_type_encountered(value.WhichOneof("Value"))
+        _Warnings.unknown_type_encountered(value.WhichOneof("value"))
         return None
 
     def __deserialize_list_value_prop_123(self, value: properties_pb2.ListValue) -> List[Any]:
@@ -248,7 +248,7 @@ def __deserialize_non_ref_prop(self, value: properties_pb2.Value) -> Any:
         if value.HasField("null_value"):
             return None
 
-        _Warnings.unknown_type_encountered(value.WhichOneof("Value"))
+        _Warnings.unknown_type_encountered(value.WhichOneof("value"))
         return None
 
     def __parse_nonref_properties_result(