Switch to enums, remove repeated path

Author: trengrj

weaviate/collections/grpc/query.py

@@ -540,37 +540,50 @@ def _metadata_to_grpc(self, metadata: _MetadataQuery) -> search_get_pb2.Metadata
             vectors=metadata.vectors,
         )
 
+    _CURVE_TO_PROTO = {
+        "exp": search_get_pb2.DECAY_CURVE_EXPONENTIAL,
+        "gauss": search_get_pb2.DECAY_CURVE_GAUSS,
+        "linear": search_get_pb2.DECAY_CURVE_LINEAR,
+    }
+
+    _MODIFIER_TO_PROTO = {
+        "none": search_get_pb2.PROPERTY_VALUE_MODIFIER_NONE,
+        "log1p": search_get_pb2.PROPERTY_VALUE_MODIFIER_LOG1P,
+        "sqrt": search_get_pb2.PROPERTY_VALUE_MODIFIER_SQRT,
+    }
+
     def __boost_to_grpc(
         self, boost: Optional[_Boost]
     ) -> Optional[search_get_pb2.Boost]:
         if boost is None:
             return None
         conditions = []
         for cond in boost.conditions:
-            grpc_cond = search_get_pb2.BoostCondition(
-                filter=_FilterToGRPC.convert(cond.filter) if cond.filter is not None else None,
-                decay=(
+            grpc_cond = search_get_pb2.BoostCondition(weight=cond.weight)
+            if cond.filter is not None:
+                grpc_cond.filter.CopyFrom(_FilterToGRPC.convert(cond.filter))
+            elif cond.decay is not None:
+                grpc_cond.decay.CopyFrom(
                     search_get_pb2.DecayFunction(
-                        path=[cond.decay.property],
+                        property=cond.decay.property,
                         origin=cond.decay.origin,
                         scale=cond.decay.scale,
                         offset=cond.decay.offset,
-                        curve=cond.decay.curve,
+                        curve=self._CURVE_TO_PROTO.get(
+                            cond.decay.curve, search_get_pb2.DECAY_CURVE_EXPONENTIAL
+                        ) if cond.decay.curve is not None else search_get_pb2.DECAY_CURVE_EXPONENTIAL,
                         decay_value=cond.decay.decay_value,
                     )
-                    if cond.decay is not None
-                    else None
-                ),
-                property_value=(
+                )
+            elif cond.property_value is not None:
+                grpc_cond.property_value.CopyFrom(
                     search_get_pb2.PropertyValueFunction(
-                        path=[cond.property_value.property],
-                        modifier=cond.property_value.modifier,
+                        property=cond.property_value.property,
+                        modifier=self._MODIFIER_TO_PROTO.get(
+                            cond.property_value.modifier, search_get_pb2.PROPERTY_VALUE_MODIFIER_NONE
+                        ) if cond.property_value.modifier is not None else search_get_pb2.PROPERTY_VALUE_MODIFIER_NONE,
                     )
-                    if cond.property_value is not None
-                    else None
-                ),
-                weight=cond.weight,
-            )
+                )
             conditions.append(grpc_cond)
         return search_get_pb2.Boost(conditions=conditions, weight=boost.weight, depth=boost.depth)
 

weaviate/proto/v1/v4216/v1/search_get_pb2.py

@@ -3,12 +3,31 @@ from weaviate.proto.v1.v4216.v1 import base_search_pb2 as _base_search_pb2
 from weaviate.proto.v1.v4216.v1 import generative_pb2 as _generative_pb2
 from weaviate.proto.v1.v4216.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
 from google.protobuf import message as _message
 from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Mapping, Optional as _Optional, Union as _Union
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
+class PropertyValueModifier(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    PROPERTY_VALUE_MODIFIER_NONE: _ClassVar[PropertyValueModifier]
+    PROPERTY_VALUE_MODIFIER_LOG1P: _ClassVar[PropertyValueModifier]
+    PROPERTY_VALUE_MODIFIER_SQRT: _ClassVar[PropertyValueModifier]
+
+class DecayCurve(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    DECAY_CURVE_EXPONENTIAL: _ClassVar[DecayCurve]
+    DECAY_CURVE_GAUSS: _ClassVar[DecayCurve]
+    DECAY_CURVE_LINEAR: _ClassVar[DecayCurve]
+PROPERTY_VALUE_MODIFIER_NONE: PropertyValueModifier
+PROPERTY_VALUE_MODIFIER_LOG1P: PropertyValueModifier
+PROPERTY_VALUE_MODIFIER_SQRT: PropertyValueModifier
+DECAY_CURVE_EXPONENTIAL: DecayCurve
+DECAY_CURVE_GAUSS: DecayCurve
+DECAY_CURVE_LINEAR: DecayCurve
+
 class SearchRequest(_message.Message):
     __slots__ = ("collection", "tenant", "consistency_level", "properties", "metadata", "group_by", "limit", "offset", "autocut", "after", "sort_by", "filters", "hybrid_search", "bm25_search", "near_vector", "near_object", "near_text", "near_image", "near_audio", "near_video", "near_depth", "near_thermal", "near_imu", "generative", "rerank", "boost", "uses_123_api", "uses_125_api", "uses_127_api")
     COLLECTION_FIELD_NUMBER: _ClassVar[int]
@@ -326,37 +345,37 @@ class Boost(_message.Message):
     def __init__(self, conditions: _Optional[_Iterable[_Union[BoostCondition, _Mapping]]] = ..., weight: _Optional[float] = ..., depth: _Optional[int] = ...) -> None: ...
 
 class BoostCondition(_message.Message):
-    __slots__ = ("filter", "decay", "weight", "property_value")
+    __slots__ = ("filter", "decay", "property_value", "weight")
     FILTER_FIELD_NUMBER: _ClassVar[int]
     DECAY_FIELD_NUMBER: _ClassVar[int]
-    WEIGHT_FIELD_NUMBER: _ClassVar[int]
     PROPERTY_VALUE_FIELD_NUMBER: _ClassVar[int]
+    WEIGHT_FIELD_NUMBER: _ClassVar[int]
     filter: _base_pb2.Filters
     decay: DecayFunction
-    weight: float
     property_value: PropertyValueFunction
-    def __init__(self, filter: _Optional[_Union[_base_pb2.Filters, _Mapping]] = ..., decay: _Optional[_Union[DecayFunction, _Mapping]] = ..., weight: _Optional[float] = ..., property_value: _Optional[_Union[PropertyValueFunction, _Mapping]] = ...) -> None: ...
+    weight: float
+    def __init__(self, filter: _Optional[_Union[_base_pb2.Filters, _Mapping]] = ..., decay: _Optional[_Union[DecayFunction, _Mapping]] = ..., property_value: _Optional[_Union[PropertyValueFunction, _Mapping]] = ..., weight: _Optional[float] = ...) -> None: ...
 
 class PropertyValueFunction(_message.Message):
-    __slots__ = ("path", "modifier")
-    PATH_FIELD_NUMBER: _ClassVar[int]
+    __slots__ = ("property", "modifier")
+    PROPERTY_FIELD_NUMBER: _ClassVar[int]
     MODIFIER_FIELD_NUMBER: _ClassVar[int]
-    path: _containers.RepeatedScalarFieldContainer[str]
-    modifier: str
-    def __init__(self, path: _Optional[_Iterable[str]] = ..., modifier: _Optional[str] = ...) -> None: ...
+    property: str
+    modifier: PropertyValueModifier
+    def __init__(self, property: _Optional[str] = ..., modifier: _Optional[_Union[PropertyValueModifier, str]] = ...) -> None: ...
 
 class DecayFunction(_message.Message):
-    __slots__ = ("path", "origin", "scale", "offset", "curve", "decay_value")
-    PATH_FIELD_NUMBER: _ClassVar[int]
+    __slots__ = ("property", "origin", "scale", "offset", "curve", "decay_value")
+    PROPERTY_FIELD_NUMBER: _ClassVar[int]
     ORIGIN_FIELD_NUMBER: _ClassVar[int]
     SCALE_FIELD_NUMBER: _ClassVar[int]
     OFFSET_FIELD_NUMBER: _ClassVar[int]
     CURVE_FIELD_NUMBER: _ClassVar[int]
     DECAY_VALUE_FIELD_NUMBER: _ClassVar[int]
-    path: _containers.RepeatedScalarFieldContainer[str]
+    property: str
     origin: str
     scale: str
     offset: str
-    curve: str
+    curve: DecayCurve
     decay_value: float
-    def __init__(self, path: _Optional[_Iterable[str]] = ..., origin: _Optional[str] = ..., scale: _Optional[str] = ..., offset: _Optional[str] = ..., curve: _Optional[str] = ..., decay_value: _Optional[float] = ...) -> None: ...
+    def __init__(self, property: _Optional[str] = ..., origin: _Optional[str] = ..., scale: _Optional[str] = ..., offset: _Optional[str] = ..., curve: _Optional[_Union[DecayCurve, str]] = ..., decay_value: _Optional[float] = ...) -> None: ...

weaviate/proto/v1/v4216/v1/search_get_pb2.pyi

@@ -4,7 +4,7 @@
 import warnings
 
 
-GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_GENERATED_VERSION = '1.64.1'
 GRPC_VERSION = grpc.__version__
 EXPECTED_ERROR_RELEASE = '1.65.0'
 SCHEDULED_RELEASE_DATE = 'June 25, 2024'

weaviate/proto/v1/v5261/v1/aggregate_pb2_grpc.py

@@ -4,7 +4,7 @@
 import warnings
 
 
-GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_GENERATED_VERSION = '1.64.1'
 GRPC_VERSION = grpc.__version__
 EXPECTED_ERROR_RELEASE = '1.65.0'
 SCHEDULED_RELEASE_DATE = 'June 25, 2024'