feat: Update proto to support highlight score (#3194)

milvus-io/milvus#46994

Signed-off-by: junjie.jiang <junjie.jiang@zilliz.com>

Author: junjiejiangjjj

pymilvus/client/search_result.py

@@ -1,4 +1,5 @@
 import logging
+from collections import UserDict
 from typing import Any, Dict, List, Optional, Tuple, Union
 
 import numpy as np
@@ -98,7 +99,10 @@ def __init__(
         if len(highlight_results) > 0:
             for i, hit in enumerate(top_k_res):
                 hit["highlight"] = {
-                    result.field_name: list(result.datas[i + start].fragments)
+                    result.field_name: {
+                        "fragments": list(result.datas[i + start].fragments),
+                        "scores": list(result.datas[i + start].scores),
+                    }
                     for result in highlight_results
                 }
 
@@ -711,9 +715,6 @@ def __str__(self) -> str:
     __repr__ = __str__
 
 
-from collections import UserDict
-
-
 class Hit(UserDict):
     """Enhanced result in dict that can get data in dict[dict]
 

pymilvus/grpc_gen/common_pb2.py

@@ -1026,10 +1026,12 @@ class ReplicateCheckpoint(_message.Message):
     def __init__(self, cluster_id: _Optional[str] = ..., pchannel: _Optional[str] = ..., message_id: _Optional[_Union[MessageID, _Mapping]] = ..., time_tick: _Optional[int] = ...) -> None: ...
 
 class HighlightData(_message.Message):
-    __slots__ = ("fragments",)
+    __slots__ = ("fragments", "scores")
     FRAGMENTS_FIELD_NUMBER: _ClassVar[int]
+    SCORES_FIELD_NUMBER: _ClassVar[int]
     fragments: _containers.RepeatedScalarFieldContainer[str]
-    def __init__(self, fragments: _Optional[_Iterable[str]] = ...) -> None: ...
+    scores: _containers.RepeatedScalarFieldContainer[float]
+    def __init__(self, fragments: _Optional[_Iterable[str]] = ..., scores: _Optional[_Iterable[float]] = ...) -> None: ...
 
 class HighlightResult(_message.Message):
     __slots__ = ("field_name", "datas")

pymilvus/grpc_gen/common_pb2.pyi

@@ -2989,3 +2989,25 @@ class AlterCollectionSchemaResponse(_message.Message):
     alter_status: _common_pb2.Status
     index_status: _common_pb2.Status
     def __init__(self, alter_status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ..., index_status: _Optional[_Union[_common_pb2.Status, _Mapping]] = ...) -> None: ...
+
+class BatchUpdateManifestRequest(_message.Message):
+    __slots__ = ("base", "db_name", "collection_name", "field_names", "items")
+    BASE_FIELD_NUMBER: _ClassVar[int]
+    DB_NAME_FIELD_NUMBER: _ClassVar[int]
+    COLLECTION_NAME_FIELD_NUMBER: _ClassVar[int]
+    FIELD_NAMES_FIELD_NUMBER: _ClassVar[int]
+    ITEMS_FIELD_NUMBER: _ClassVar[int]
+    base: _common_pb2.MsgBase
+    db_name: str
+    collection_name: str
+    field_names: _containers.RepeatedScalarFieldContainer[str]
+    items: _containers.RepeatedCompositeFieldContainer[BatchUpdateManifestItem]
+    def __init__(self, base: _Optional[_Union[_common_pb2.MsgBase, _Mapping]] = ..., db_name: _Optional[str] = ..., collection_name: _Optional[str] = ..., field_names: _Optional[_Iterable[str]] = ..., items: _Optional[_Iterable[_Union[BatchUpdateManifestItem, _Mapping]]] = ...) -> None: ...
+
+class BatchUpdateManifestItem(_message.Message):
+    __slots__ = ("segment_id", "manifest_version")
+    SEGMENT_ID_FIELD_NUMBER: _ClassVar[int]
+    MANIFEST_VERSION_FIELD_NUMBER: _ClassVar[int]
+    segment_id: int
+    manifest_version: int
+    def __init__(self, segment_id: _Optional[int] = ..., manifest_version: _Optional[int] = ...) -> None: ...

pymilvus/grpc_gen/milvus-proto

@@ -651,6 +651,11 @@ def __init__(self, channel):
                 request_serializer=milvus__pb2.AlterCollectionSchemaRequest.SerializeToString,
                 response_deserializer=milvus__pb2.AlterCollectionSchemaResponse.FromString,
                 )
+        self.BatchUpdateManifest = channel.unary_unary(
+                '/milvus.proto.milvus.MilvusService/BatchUpdateManifest',
+                request_serializer=milvus__pb2.BatchUpdateManifestRequest.SerializeToString,
+                response_deserializer=common__pb2.Status.FromString,
+                )
 
 
 class MilvusServiceServicer(object):
@@ -1425,6 +1430,12 @@ def AlterCollectionSchema(self, request, context):
         context.set_details('Method not implemented!')
         raise NotImplementedError('Method not implemented!')
 
+    def BatchUpdateManifest(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
 
 def add_MilvusServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
@@ -2043,6 +2054,11 @@ def add_MilvusServiceServicer_to_server(servicer, server):
                     request_deserializer=milvus__pb2.AlterCollectionSchemaRequest.FromString,
                     response_serializer=milvus__pb2.AlterCollectionSchemaResponse.SerializeToString,
             ),
+            'BatchUpdateManifest': grpc.unary_unary_rpc_method_handler(
+                    servicer.BatchUpdateManifest,
+                    request_deserializer=milvus__pb2.BatchUpdateManifestRequest.FromString,
+                    response_serializer=common__pb2.Status.SerializeToString,
+            ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
             'milvus.proto.milvus.MilvusService', rpc_method_handlers)
@@ -5375,6 +5391,33 @@ def AlterCollectionSchema(request,
             metadata,
             )
 
+    @staticmethod
+    def BatchUpdateManifest(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/milvus.proto.milvus.MilvusService/BatchUpdateManifest',
+            milvus__pb2.BatchUpdateManifestRequest.SerializeToString,
+            common__pb2.Status.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            )
+
 
 class ProxyServiceStub(object):
     """Missing associated documentation comment in .proto file."""