From 74a0280a8d657acf2aad68da052612c7aed4b61a Mon Sep 17 00:00:00 2001 From: Kosuke Morimoto Date: Fri, 13 Sep 2024 13:42:25 +0900 Subject: [PATCH] resolve conflict Signed-off-by: Kosuke Morimoto --- dockers/dev/Dockerfile | 1 + rust/Cargo.lock | 9 ++++ rust/bin/agent/Cargo.toml | 10 ++--- rust/libs/algorithm/Cargo.toml | 2 +- rust/libs/algorithms/ngt/Cargo.toml | 6 +-- rust/libs/observability/Cargo.toml | 6 +-- rust/libs/proto/Cargo.toml | 4 +- rust/libs/proto/src/filter.egress.v1.tonic.rs | 4 ++ .../libs/proto/src/filter.ingress.v1.tonic.rs | 4 ++ rust/libs/proto/src/meta.v1.tonic.rs | 2 + rust/libs/proto/src/payload.v1.rs | 43 +++++++++++++++++++ rust/libs/proto/src/vald.v1.tonic.rs | 8 ++++ 12 files changed, 85 insertions(+), 14 deletions(-) diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index a45fcbbe0f..8ac6845f43 100644 --- a/dockers/dev/Dockerfile +++ b/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 diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 6acfc8e80c..9be8b49b26 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -2604,6 +2604,15 @@ dependencies = [ "libc", ] +[[package]] +name = "meta" +version = "0.1.0" +dependencies = [ + "proto", + "tokio", + "tonic 0.12.2", +] + [[package]] name = "miette" version = "7.2.0" diff --git a/rust/bin/agent/Cargo.toml b/rust/bin/agent/Cargo.toml index f20fdef23d..42359f5209 100644 --- a/rust/bin/agent/Cargo.toml +++ b/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" diff --git a/rust/libs/algorithm/Cargo.toml b/rust/libs/algorithm/Cargo.toml index d3d6481518..7af0713ebf 100644 --- a/rust/libs/algorithm/Cargo.toml +++ b/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" } diff --git a/rust/libs/algorithms/ngt/Cargo.toml b/rust/libs/algorithms/ngt/Cargo.toml index 64517bf474..7e376d65be 100644 --- a/rust/libs/algorithms/ngt/Cargo.toml +++ b/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] diff --git a/rust/libs/observability/Cargo.toml b/rust/libs/observability/Cargo.toml index d6d947b92b..5f3e63e97b 100644 --- a/rust/libs/observability/Cargo.toml +++ b/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"} diff --git a/rust/libs/proto/Cargo.toml b/rust/libs/proto/Cargo.toml index 3fb9fcc5ef..9489c412d4 100644 --- a/rust/libs/proto/Cargo.toml +++ b/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" diff --git a/rust/libs/proto/src/filter.egress.v1.tonic.rs b/rust/libs/proto/src/filter.egress.v1.tonic.rs index 74102173ce..9627dbcf2c 100644 --- a/rust/libs/proto/src/filter.egress.v1.tonic.rs +++ b/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 { inner: tonic::client::Grpc, @@ -187,6 +189,8 @@ pub mod filter_server { tonic::Status, >; } + /** Represent the egress filter service. +*/ #[derive(Debug)] pub struct FilterServer { inner: Arc, diff --git a/rust/libs/proto/src/filter.ingress.v1.tonic.rs b/rust/libs/proto/src/filter.ingress.v1.tonic.rs index d8b462caa1..76f377386b 100644 --- a/rust/libs/proto/src/filter.ingress.v1.tonic.rs +++ b/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 { inner: tonic::client::Grpc, @@ -187,6 +189,8 @@ pub mod filter_server { tonic::Status, >; } + /** Represent the ingress filter service. +*/ #[derive(Debug)] pub struct FilterServer { inner: Arc, diff --git a/rust/libs/proto/src/meta.v1.tonic.rs b/rust/libs/proto/src/meta.v1.tonic.rs index b683ff6440..7f106ee0ca 100644 --- a/rust/libs/proto/src/meta.v1.tonic.rs +++ b/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, @@ -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, diff --git a/rust/libs/proto/src/payload.v1.rs b/rust/libs/proto/src/payload.v1.rs index 81498fb4f4..ee11217a6f 100644 --- a/rust/libs/proto/src/payload.v1.rs +++ b/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, + #[prost(message, optional, tag="2")] + pub value: ::core::option::Option, + } +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)] diff --git a/rust/libs/proto/src/vald.v1.tonic.rs b/rust/libs/proto/src/vald.v1.tonic.rs index 7cc2207e61..29843a4d93 100644 --- a/rust/libs/proto/src/vald.v1.tonic.rs +++ b/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, 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, tonic::Status, >; + /** A method to search indexed vectors by ID. +*/ async fn search_by_id( &self, request: tonic::Request,