Author: momento-github-actions-machine-user

examples/poetry.lock

@@ -23,6 +23,7 @@
     TopicSubscriptionItem,
 )
 from momento.responses.vector_index import (
+    CountItems,
     CreateIndex,
     DeleteIndex,
     DeleteItemBatch,
@@ -228,6 +229,18 @@ async def example_API_DeleteIndex(vector_client: PreviewVectorIndexClientAsync):
 # end example
 
 
+async def example_API_CountItems(vector_client: PreviewVectorIndexClientAsync):
+    response = await vector_client.count_items("test-index")
+    match response:
+        case CountItems.Success() as success:
+            print(f"Found {success.item_count} items")
+        case CountItems.Error() as error:
+            print(f"Error counting items in index 'test-index': {error.message}")
+
+
+# end example
+
+
 async def example_API_UpsertItemBatch(vector_client: PreviewVectorIndexClientAsync):
     response = await vector_client.upsert_item_batch(
         "test-index",
@@ -343,6 +356,7 @@ async def main():
     await example_API_InstantiateVectorClient()
     await example_API_CreateIndex(vector_client)
     await example_API_ListIndexes(vector_client)
+    await example_API_CountItems(vector_client)
     await example_API_UpsertItemBatch(vector_client)
     await example_API_GetItemBatch(vector_client)
     await example_API_GetItemMetadataBatch(vector_client)

examples/py310/doc-examples-python-apis.py

@@ -8,7 +8,7 @@ license = "Apache-2.0"
 [tool.poetry.dependencies]
 python = ">=3.7,<3.12"
 
-momento = "1.15.1"
+momento = "1.17.0"
 colorlog = "6.7.0"
 hdrhistogram = "^0.10.1"
 

examples/pyproject.toml

@@ -30,7 +30,7 @@ exclude = ["src/momento/internal/codegen.py"]
 [tool.poetry.dependencies]
 python = "^3.7"
 
-momento-wire-types = "^0.102.1"
+momento-wire-types = "^0.105.3"
 grpcio = "^1.46.0"
 # note if you bump this presigned url test need be updated
 pyjwt = "^2.4.0"

poetry.lock

@@ -149,7 +149,7 @@ async def search(
         top_k: int,
         metadata_fields: Optional[list[str]] | AllMetadata = None,
         score_threshold: Optional[float] = None,
-        filter_expression: Optional[FilterExpression] = None,
+        filter: Optional[FilterExpression] = None,
     ) -> SearchResponse:
         try:
             self._log_issuing_request("Search", {"index_name": index_name})
@@ -159,7 +159,7 @@ async def search(
             query_vector_pb = vectorindex_pb._Vector(elements=query_vector)
             metadata_fields_pb = _VectorIndexDataClient.__build_metadata_request(metadata_fields)
             no_score_threshold = _VectorIndexDataClient.__build_no_score_threshold(score_threshold)
-            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter_expression)
+            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter)
 
             request = vectorindex_pb._SearchRequest(
                 index_name=index_name,
@@ -168,7 +168,7 @@ async def search(
                 metadata_fields=metadata_fields_pb,
                 score_threshold=score_threshold,
                 no_score_threshold=no_score_threshold,
-                filter_expression=filter_expression_pb,
+                filter=filter_expression_pb,
             )
 
             response: vectorindex_pb._SearchResponse = await self._build_stub().Search(
@@ -189,7 +189,7 @@ async def search_and_fetch_vectors(
         top_k: int,
         metadata_fields: Optional[list[str]] | AllMetadata = None,
         score_threshold: Optional[float] = None,
-        filter_expression: Optional[FilterExpression] = None,
+        filter: Optional[FilterExpression] = None,
     ) -> SearchAndFetchVectorsResponse:
         try:
             self._log_issuing_request("SearchAndFetchVectors", {"index_name": index_name})
@@ -199,7 +199,7 @@ async def search_and_fetch_vectors(
             query_vector_pb = vectorindex_pb._Vector(elements=query_vector)
             metadata_fields_pb = _VectorIndexDataClient.__build_metadata_request(metadata_fields)
             no_score_threshold = _VectorIndexDataClient.__build_no_score_threshold(score_threshold)
-            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter_expression)
+            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter)
 
             request = vectorindex_pb._SearchAndFetchVectorsRequest(
                 index_name=index_name,
@@ -208,7 +208,7 @@ async def search_and_fetch_vectors(
                 metadata_fields=metadata_fields_pb,
                 score_threshold=score_threshold,
                 no_score_threshold=no_score_threshold,
-                filter_expression=filter_expression_pb,
+                filter=filter_expression_pb,
             )
 
             response: vectorindex_pb._SearchAndFetchVectorsResponse = await self._build_stub().SearchAndFetchVectors(

pyproject.toml

@@ -149,7 +149,7 @@ def search(
         top_k: int,
         metadata_fields: Optional[list[str]] | AllMetadata = None,
         score_threshold: Optional[float] = None,
-        filter_expression: Optional[FilterExpression] = None,
+        filter: Optional[FilterExpression] = None,
     ) -> SearchResponse:
         try:
             self._log_issuing_request("Search", {"index_name": index_name})
@@ -159,7 +159,7 @@ def search(
             query_vector_pb = vectorindex_pb._Vector(elements=query_vector)
             metadata_fields_pb = _VectorIndexDataClient.__build_metadata_request(metadata_fields)
             no_score_threshold = _VectorIndexDataClient.__build_no_score_threshold(score_threshold)
-            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter_expression)
+            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter)
 
             request = vectorindex_pb._SearchRequest(
                 index_name=index_name,
@@ -168,7 +168,7 @@ def search(
                 metadata_fields=metadata_fields_pb,
                 score_threshold=score_threshold,
                 no_score_threshold=no_score_threshold,
-                filter_expression=filter_expression_pb,
+                filter=filter_expression_pb,
             )
 
             response: vectorindex_pb._SearchResponse = self._build_stub().Search(
@@ -189,7 +189,7 @@ def search_and_fetch_vectors(
         top_k: int,
         metadata_fields: Optional[list[str]] | AllMetadata = None,
         score_threshold: Optional[float] = None,
-        filter_expression: Optional[FilterExpression] = None,
+        filter: Optional[FilterExpression] = None,
     ) -> SearchAndFetchVectorsResponse:
         try:
             self._log_issuing_request("SearchAndFetchVectors", {"index_name": index_name})
@@ -199,7 +199,7 @@ def search_and_fetch_vectors(
             query_vector_pb = vectorindex_pb._Vector(elements=query_vector)
             metadata_fields_pb = _VectorIndexDataClient.__build_metadata_request(metadata_fields)
             no_score_threshold = _VectorIndexDataClient.__build_no_score_threshold(score_threshold)
-            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter_expression)
+            filter_expression_pb = _VectorIndexDataClient.__build_filter_expression(filter)
 
             request = vectorindex_pb._SearchAndFetchVectorsRequest(
                 index_name=index_name,
@@ -208,7 +208,7 @@ def search_and_fetch_vectors(
                 metadata_fields=metadata_fields_pb,
                 score_threshold=score_threshold,
                 no_score_threshold=no_score_threshold,
-                filter_expression=filter_expression_pb,
+                filter=filter_expression_pb,
             )
 
             response: vectorindex_pb._SearchAndFetchVectorsResponse = self._build_stub().SearchAndFetchVectors(

src/momento/internal/aio/_vector_index_data_client.py

@@ -14,6 +14,7 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
+from typing import Iterable
 
 from momento_wire_types import vectorindex_pb2 as vectorindex_pb
 
@@ -258,3 +259,17 @@ def to_filter_expression_proto(self) -> vectorindex_pb._FilterExpression:
     def to_proto(self) -> vectorindex_pb._ListContainsExpression:
         # todo should make oneof defensively
         return vectorindex_pb._ListContainsExpression(field=self.field, string_value=self.value)
+
+
+@dataclass
+class IdInSet(FilterExpression):
+    """Represents an expression to test if an item id is in a set of ids."""
+
+    ids: Iterable[str]
+    """The set of ids to test id in set with."""
+
+    def to_filter_expression_proto(self) -> vectorindex_pb._FilterExpression:
+        return vectorindex_pb._FilterExpression(id_in_set_expression=self.to_proto())
+
+    def to_proto(self) -> vectorindex_pb._IdInSetExpression:
+        return vectorindex_pb._IdInSetExpression(ids=list(self.ids))