Skip to content

Commit

Permalink
Merge pull request #9 from qdrant/v0.10.1
Browse files Browse the repository at this point in the history
upd version to v0.10.1, remove deprecated
  • Loading branch information
generall authored Sep 19, 2022
2 parents b8421a6 + 0fea19c commit af108ed
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 70 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "qdrant-client"
version = "0.10.0"
version = "0.10.1"
edition = "2021"
authors = ["Qdrant Team <[email protected]>"]
description = "Rust client for Qdrant Vector Search Engine"
Expand Down
12 changes: 6 additions & 6 deletions proto/collections.proto
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ message OptimizersConfigDiff {

message CreateCollection {
string collection_name = 1; // Name of the collection
optional uint64 vector_size = 2 [deprecated = true]; // Size of the vectors
optional Distance distance = 3 [deprecated = true]; // Distance function used for comparing vectors
reserved 2; // Deprecated
reserved 3; // Deprecated
optional HnswConfigDiff hnsw_config = 4; // Configuration of vector index
optional WalConfigDiff wal_config = 5; // Configuration of the Write-Ahead-Log
optional OptimizersConfigDiff optimizers_config = 6; // Configuration of the optimizers
Expand All @@ -176,8 +176,8 @@ message CollectionOperationResponse {
}

message CollectionParams {
optional uint64 vector_size = 1 [deprecated = true]; // Size of the vectors
optional Distance distance = 2 [deprecated = true]; // Distance function used for comparing vectors
reserved 1; // Deprecated
reserved 2; // Deprecated
uint32 shard_number = 3; // Number of shards in collection
bool on_disk_payload = 4; // If true - point's payload will not be stored in memory
optional VectorsConfig vectors_config = 5; // Configuration for vectors
Expand Down Expand Up @@ -220,8 +220,8 @@ message CollectionInfo {
OptimizerStatus optimizer_status = 2; // status of collection optimizers
uint64 vectors_count = 3; // number of vectors in the collection
uint64 segments_count = 4; // Number of independent segments
uint64 disk_data_size = 5 [deprecated = true]; // Used disk space
uint64 ram_data_size = 6 [deprecated = true]; // Used RAM (not implemented)
reserved 5; // Deprecated
reserved 6; // Deprecated
CollectionConfig config = 7; // Configuration
map<string, PayloadSchemaInfo> payload_schema = 8; // Collection data types
uint64 points_count = 9; // number of points in the collection
Expand Down
14 changes: 7 additions & 7 deletions proto/points.proto
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ message DeletePoints {
message GetPoints {
string collection_name = 1; // name of the collection
repeated PointId ids = 2; // List of points to retrieve
optional bool with_vector = 3 [deprecated = true]; // Return point vector with the result.
reserved 3; // deprecated "with_vector" field
WithPayloadSelector with_payload = 4; // Options for specifying which payload to include or not
optional WithVectorsSelector with_vectors = 5; // Options for specifying which vectors to include into response
}
Expand Down Expand Up @@ -139,7 +139,7 @@ message SearchPoints {
repeated float vector = 2; // vector
Filter filter = 3; // Filter conditions - return only those points that satisfy the specified conditions
uint64 limit = 4; // Max number of result
optional bool with_vector = 5 [deprecated = true]; // Return point vector with the result.
reserved 5; // deprecated "with_vector" field
WithPayloadSelector with_payload = 6; // Options for specifying which payload to include or not
SearchParams params = 7; // Search config
optional float score_threshold = 8; // If provided - cut off results with worse scores
Expand All @@ -158,7 +158,7 @@ message ScrollPoints {
Filter filter = 2; // Filter conditions - return only those points that satisfy the specified conditions
optional PointId offset = 3; // Start with this ID
optional uint32 limit = 4; // Max number of result
optional bool with_vector = 5 [deprecated = true]; // Return point vector with the result.
reserved 5; // deprecated "with_vector" field
WithPayloadSelector with_payload = 6; // Options for specifying which payload to include or not
optional WithVectorsSelector with_vectors = 7; // Options for specifying which vectors to include into response
}
Expand All @@ -169,7 +169,7 @@ message RecommendPoints {
repeated PointId negative = 3; // Try to avoid vectors like this
Filter filter = 4; // Filter conditions - return only those points that satisfy the specified conditions
uint64 limit = 5; // Max number of result
optional bool with_vector = 6 [deprecated = true]; // Return point vector with the result.
reserved 6; // deprecated "with_vector" field
WithPayloadSelector with_payload = 7; // Options for specifying which payload to include or not
SearchParams params = 8; // Search config
optional float score_threshold = 9; // If provided - cut off results with worse scores
Expand Down Expand Up @@ -213,7 +213,7 @@ message ScoredPoint {
PointId id = 1; // Point id
map<string, Value> payload = 2; // Payload
float score = 3; // Similarity score
repeated float vector = 4 [deprecated = true]; // Vector
reserved 4; // deprecated "vector" field
uint64 version = 5; // Last update operation applied to this point
optional Vectors vectors = 6; // Vectors to search
}
Expand Down Expand Up @@ -250,7 +250,7 @@ message CountResult {
message RetrievedPoint {
PointId id = 1;
map<string, Value> payload = 2;
repeated float vector = 3 [deprecated = true];
reserved 3; // deprecated "vector" field
optional Vectors vectors = 4;
}

Expand Down Expand Up @@ -360,7 +360,7 @@ message PointsIdsList {

message PointStruct {
PointId id = 1;
repeated float vector = 2 [deprecated = true];
reserved 2; // deprecated "vector" field
map<string, Value> payload = 3;
optional Vectors vectors = 4;
}
Expand Down
2 changes: 0 additions & 2 deletions src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,6 @@ impl QdrantClient {
.get(GetPoints {
collection_name: collection_name.to_string(),
ids: points,
with_vector: None,
with_payload: with_payload.map(|x| x.into()),
with_vectors: with_vectors.map(|x| x.into()),
})
Expand Down Expand Up @@ -598,7 +597,6 @@ impl PointStruct {
pub fn new(id: impl Into<PointId>, vectors: impl Into<Vectors>, payload: Payload) -> Self {
Self {
id: Some(id.into()),
vector: Vec::new(),
payload: payload.into(),
vectors: Some(vectors.into()),
}
Expand Down
3 changes: 0 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ mod tests {
)
}
),
vector_size: None,
distance: None,
..Default::default()
})
.await?;
Expand All @@ -62,7 +60,6 @@ mod tests {
vector: vec![11.; 10],
filter: None,
limit: 10,
with_vector: None,
with_payload: Some(true.into()),
params: None,
score_threshold: None,
Expand Down
50 changes: 0 additions & 50 deletions src/qdrant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -154,14 +154,6 @@ pub struct CreateCollection {
/// Name of the collection
#[prost(string, tag="1")]
pub collection_name: ::prost::alloc::string::String,
/// Size of the vectors
#[deprecated]
#[prost(uint64, optional, tag="2")]
pub vector_size: ::core::option::Option<u64>,
/// Distance function used for comparing vectors
#[deprecated]
#[prost(enumeration="Distance", optional, tag="3")]
pub distance: ::core::option::Option<i32>,
/// Configuration of vector index
#[prost(message, optional, tag="4")]
pub hnsw_config: ::core::option::Option<HnswConfigDiff>,
Expand Down Expand Up @@ -216,14 +208,6 @@ pub struct CollectionOperationResponse {
}
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct CollectionParams {
/// Size of the vectors
#[deprecated]
#[prost(uint64, optional, tag="1")]
pub vector_size: ::core::option::Option<u64>,
/// Distance function used for comparing vectors
#[deprecated]
#[prost(enumeration="Distance", optional, tag="2")]
pub distance: ::core::option::Option<i32>,
/// Number of shards in collection
#[prost(uint32, tag="3")]
pub shard_number: u32,
Expand Down Expand Up @@ -301,14 +285,6 @@ pub struct CollectionInfo {
/// Number of independent segments
#[prost(uint64, tag="4")]
pub segments_count: u64,
/// Used disk space
#[deprecated]
#[prost(uint64, tag="5")]
pub disk_data_size: u64,
/// Used RAM (not implemented)
#[deprecated]
#[prost(uint64, tag="6")]
pub ram_data_size: u64,
/// Configuration
#[prost(message, optional, tag="7")]
pub config: ::core::option::Option<CollectionConfig>,
Expand Down Expand Up @@ -1091,10 +1067,6 @@ pub struct GetPoints {
/// List of points to retrieve
#[prost(message, repeated, tag="2")]
pub ids: ::prost::alloc::vec::Vec<PointId>,
/// Return point vector with the result.
#[deprecated]
#[prost(bool, optional, tag="3")]
pub with_vector: ::core::option::Option<bool>,
/// Options for specifying which payload to include or not
#[prost(message, optional, tag="4")]
pub with_payload: ::core::option::Option<WithPayloadSelector>,
Expand Down Expand Up @@ -1269,10 +1241,6 @@ pub struct SearchPoints {
/// Max number of result
#[prost(uint64, tag="4")]
pub limit: u64,
/// Return point vector with the result.
#[deprecated]
#[prost(bool, optional, tag="5")]
pub with_vector: ::core::option::Option<bool>,
/// Options for specifying which payload to include or not
#[prost(message, optional, tag="6")]
pub with_payload: ::core::option::Option<WithPayloadSelector>,
Expand Down Expand Up @@ -1313,10 +1281,6 @@ pub struct ScrollPoints {
/// Max number of result
#[prost(uint32, optional, tag="4")]
pub limit: ::core::option::Option<u32>,
/// Return point vector with the result.
#[deprecated]
#[prost(bool, optional, tag="5")]
pub with_vector: ::core::option::Option<bool>,
/// Options for specifying which payload to include or not
#[prost(message, optional, tag="6")]
pub with_payload: ::core::option::Option<WithPayloadSelector>,
Expand All @@ -1341,10 +1305,6 @@ pub struct RecommendPoints {
/// Max number of result
#[prost(uint64, tag="5")]
pub limit: u64,
/// Return point vector with the result.
#[deprecated]
#[prost(bool, optional, tag="6")]
pub with_vector: ::core::option::Option<bool>,
/// Options for specifying which payload to include or not
#[prost(message, optional, tag="7")]
pub with_payload: ::core::option::Option<WithPayloadSelector>,
Expand Down Expand Up @@ -1416,10 +1376,6 @@ pub struct ScoredPoint {
/// Similarity score
#[prost(float, tag="3")]
pub score: f32,
/// Vector
#[deprecated]
#[prost(float, repeated, packed="false", tag="4")]
pub vector: ::prost::alloc::vec::Vec<f32>,
/// Last update operation applied to this point
#[prost(uint64, tag="5")]
pub version: u64,
Expand Down Expand Up @@ -1478,9 +1434,6 @@ pub struct RetrievedPoint {
pub id: ::core::option::Option<PointId>,
#[prost(map="string, message", tag="2")]
pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
#[deprecated]
#[prost(float, repeated, packed="false", tag="3")]
pub vector: ::prost::alloc::vec::Vec<f32>,
#[prost(message, optional, tag="4")]
pub vectors: ::core::option::Option<Vectors>,
}
Expand Down Expand Up @@ -1668,9 +1621,6 @@ pub struct PointsIdsList {
pub struct PointStruct {
#[prost(message, optional, tag="1")]
pub id: ::core::option::Option<PointId>,
#[deprecated]
#[prost(float, repeated, packed="false", tag="2")]
pub vector: ::prost::alloc::vec::Vec<f32>,
#[prost(map="string, message", tag="3")]
pub payload: ::std::collections::HashMap<::prost::alloc::string::String, Value>,
#[prost(message, optional, tag="4")]
Expand Down
2 changes: 1 addition & 1 deletion tests/integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function stop_docker()
# Ensure current path is project root
cd "$(dirname "$0")/../"

QDRANT_VERSION='v0.10.0'
QDRANT_VERSION='v0.10.1'

QDRANT_HOST='localhost:6333'

Expand Down

0 comments on commit af108ed

Please sign in to comment.