resolve conflict

Signed-off-by: Kosuke Morimoto <[email protected]>

dockers/dev/Dockerfile

@@ -142,6 +142,7 @@ RUN --mount=type=bind,target=.,rw \
     && make telepresence/install \
     && make ngt/install \
     && make faiss/install \
+    && make usearch/install \
     && rm -rf ${GOPATH}/src/github.com/${ORG}/${REPO}/*
 # skipcq: DOK-DL3002
 USER root:root

rust/bin/agent/Cargo.toml

@@ -22,12 +22,12 @@ edition = "2021"
 
 [dependencies]
 algorithm = { version = "0.1.0", path = "../../libs/algorithm" }
-anyhow = "1.0.86"
+anyhow = "1.0.88"
 cargo = "0.81.0"
-prost = "0.13.1"
-prost-types = "0.13.1"
+prost = "0.13.2"
+prost-types = "0.13.2"
 proto = { version = "0.1.0", path = "../../libs/proto" }
-tokio = { version = "1.39.3", features = ["full"] }
-tokio-stream = { version = "0.1.15", features = ["full"] }
+tokio = { version = "1.40.0", features = ["full"] }
+tokio-stream = { version = "0.1.16", features = ["full"] }
 tonic = "0.12.2"
 tonic-types = "0.12.2"

rust/libs/algorithm/Cargo.toml

@@ -19,7 +19,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.86"
+anyhow = "1.0.88"
 faiss = { version = "0.1.0", path = "../algorithms/faiss" }
 ngt = { version = "0.1.0", path = "../algorithms/ngt" }
 proto = { version = "0.1.0", path = "../proto" }

rust/libs/algorithms/ngt/Cargo.toml

@@ -19,11 +19,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0.86"
-cxx = { version = "1.0.126", features = ["c++20"] }
+anyhow = "1.0.88"
+cxx = { version = "1.0.128", features = ["c++20"] }
 
 [build-dependencies]
-cxx-build = "1.0.126"
+cxx-build = "1.0.128"
 miette = { version = "7.2.0", features = ["fancy"] }
 
 [dev-dependencies]

rust/libs/observability/Cargo.toml

@@ -24,10 +24,10 @@ edition = "2021"
 opentelemetry = { version = "0.23" }
 opentelemetry_sdk = { version = "0.23", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.16.0", features = ["http-proto", "reqwest-client", "logs"] }
-tokio = { version = "1.39.3", features = ["full"] }
-serde_json = { version="1.0.127" }
+tokio = { version = "1.40.0", features = ["full"] }
+serde_json = { version="1.0.128" }
 opentelemetry-semantic-conventions = { version = "0.16.0"}
 scopeguard = { version = "1.2.0"}
 paste = {version = "1.0.15"}
-anyhow = { version = "1.0.86"}
+anyhow = { version = "1.0.88"}
 url = { version = "2.5.2"}

rust/libs/proto/Cargo.toml

@@ -22,7 +22,7 @@ edition = "2021"
 
 [dependencies]
 futures-core = "0.3.30"
-prost = "0.13.1"
-prost-types = "0.13.1"
+prost = "0.13.2"
+prost-types = "0.13.2"
 tonic = "0.12.2"
 tonic-types = "0.12.2"

rust/libs/proto/src/filter.egress.v1.tonic.rs

@@ -17,6 +17,8 @@ pub mod filter_client {
     #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
+    /** Represent the egress filter service.
+*/
     #[derive(Debug, Clone)]
     pub struct FilterClient<T> {
         inner: tonic::client::Grpc<T>,
@@ -187,6 +189,8 @@ pub mod filter_server {
             tonic::Status,
         >;
     }
+    /** Represent the egress filter service.
+*/
     #[derive(Debug)]
     pub struct FilterServer<T: Filter> {
         inner: Arc<T>,

rust/libs/proto/src/filter.ingress.v1.tonic.rs

@@ -17,6 +17,8 @@ pub mod filter_client {
     #![allow(unused_variables, dead_code, missing_docs, clippy::let_unit_value)]
     use tonic::codegen::*;
     use tonic::codegen::http::Uri;
+    /** Represent the ingress filter service.
+*/
     #[derive(Debug, Clone)]
     pub struct FilterClient<T> {
         inner: tonic::client::Grpc<T>,
@@ -187,6 +189,8 @@ pub mod filter_server {
             tonic::Status,
         >;
     }
+    /** Represent the ingress filter service.
+*/
     #[derive(Debug)]
     pub struct FilterServer<T: Filter> {
         inner: Arc<T>,

rust/libs/proto/src/meta.v1.tonic.rs

@@ -97,6 +97,7 @@ pub mod meta_client {
             self.inner = self.inner.max_encoding_message_size(limit);
             self
         }
+        ///
         pub async fn get(
             &mut self,
             request: impl tonic::IntoRequest<super::super::super::payload::v1::meta::Key>,
@@ -176,6 +177,7 @@ pub mod meta_server {
     /// Generated trait containing gRPC methods that should be implemented for use with MetaServer.
     #[async_trait]
     pub trait Meta: Send + Sync + 'static {
+        ///
         async fn get(
             &self,
             request: tonic::Request<super::super::super::payload::v1::meta::Key>,

rust/libs/proto/src/payload.v1.rs

@@ -1602,6 +1602,49 @@ impl ::prost::Name for Mirror {
 const NAME: &'static str = "Mirror";
 const PACKAGE: &'static str = "payload.v1";
 fn full_name() -> ::prost::alloc::string::String { "payload.v1.Mirror".into() }fn type_url() -> ::prost::alloc::string::String { "/payload.v1.Mirror".into() }}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, Copy, PartialEq, ::prost::Message)]
+pub struct Meta {
+}
+/// Nested message and enum types in `Meta`.
+pub mod meta {
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Key {
+        #[prost(string, tag="1")]
+        pub key: ::prost::alloc::string::String,
+    }
+impl ::prost::Name for Key {
+const NAME: &'static str = "Key";
+const PACKAGE: &'static str = "payload.v1";
+fn full_name() -> ::prost::alloc::string::String { "payload.v1.Meta.Key".into() }fn type_url() -> ::prost::alloc::string::String { "/payload.v1.Meta.Key".into() }}
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct Value {
+        #[prost(message, optional, tag="1")]
+        pub value: ::core::option::Option<::prost_types::Any>,
+    }
+impl ::prost::Name for Value {
+const NAME: &'static str = "Value";
+const PACKAGE: &'static str = "payload.v1";
+fn full_name() -> ::prost::alloc::string::String { "payload.v1.Meta.Value".into() }fn type_url() -> ::prost::alloc::string::String { "/payload.v1.Meta.Value".into() }}
+    #[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct KeyValue {
+        #[prost(message, optional, tag="1")]
+        pub key: ::core::option::Option<Key>,
+        #[prost(message, optional, tag="2")]
+        pub value: ::core::option::Option<Value>,
+    }
+impl ::prost::Name for KeyValue {
+const NAME: &'static str = "KeyValue";
+const PACKAGE: &'static str = "payload.v1";
+fn full_name() -> ::prost::alloc::string::String { "payload.v1.Meta.KeyValue".into() }fn type_url() -> ::prost::alloc::string::String { "/payload.v1.Meta.KeyValue".into() }}
+}
+impl ::prost::Name for Meta {
+const NAME: &'static str = "Meta";
+const PACKAGE: &'static str = "payload.v1";
+fn full_name() -> ::prost::alloc::string::String { "payload.v1.Meta".into() }fn type_url() -> ::prost::alloc::string::String { "/payload.v1.Meta".into() }}
 /// Represent an empty message.
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, Copy, PartialEq, ::prost::Message)]

rust/libs/proto/src/vald.v1.tonic.rs

@@ -124,6 +124,8 @@ pub mod filter_client {
                 .insert(GrpcMethod::new("vald.v1.Filter", "SearchObject"));
             self.inner.unary(req, path, codec).await
         }
+        /** A method to search multiple objects.
+*/
         pub async fn multi_search_object(
             &mut self,
             request: impl tonic::IntoRequest<
@@ -475,6 +477,8 @@ pub mod filter_server {
             tonic::Response<super::super::super::payload::v1::search::Response>,
             tonic::Status,
         >;
+        /** A method to search multiple objects.
+*/
         async fn multi_search_object(
             &self,
             request: tonic::Request<
@@ -4042,6 +4046,8 @@ pub mod search_client {
             req.extensions_mut().insert(GrpcMethod::new("vald.v1.Search", "Search"));
             self.inner.unary(req, path, codec).await
         }
+        /** A method to search indexed vectors by ID.
+*/
         pub async fn search_by_id(
             &mut self,
             request: impl tonic::IntoRequest<
@@ -4392,6 +4398,8 @@ pub mod search_server {
             tonic::Response<super::super::super::payload::v1::search::Response>,
             tonic::Status,
         >;
+        /** A method to search indexed vectors by ID.
+*/
         async fn search_by_id(
             &self,
             request: tonic::Request<super::super::super::payload::v1::search::IdRequest>,