chore: Handle all BasicValue types in search(), doc updates

Signed-off-by: Anush008 <[email protected]>

Author: Anush008

docs/docs/ops/storages.md

@@ -7,7 +7,7 @@ description: CocoIndex Built-in Storages
 
 ## Postgres
 
-`Postgres` exports data to Postgres database (with pgvector extension).
+Exports data to Postgres database (with pgvector extension).
 
 The spec takes the following fields:
 
@@ -17,10 +17,10 @@ The spec takes the following fields:
 
 ## Qdrant
 
-`Qdrant` exports data to a [Qdrant](https://qdrant.tech/) collection.
+Exports data to a [Qdrant](https://qdrant.tech/) collection.
 
 The spec takes the following fields:
 
-*   `qdrant_url` (type: `str`, required): The [gRPC URL](https://qdrant.tech/documentation/interfaces/#grpc-interface) of the Qdrant instance. Defaults to http://localhost:6334/.
+*   `qdrant_url` (type: `str`, required): The [gRPC URL](https://qdrant.tech/documentation/interfaces/#grpc-interface) of the Qdrant instance. Defaults to `http://localhost:6334/`.
 
 *   `collection` (type: `str`, required): The name of the collection to export the data to.

python/cocoindex/storages.py

@@ -16,6 +16,7 @@ class Qdrant(op.StorageSpec):
     """Storage powered by Qdrant - https://qdrant.tech/."""
 
     collection_name: str
+    grpc_url: str = "http://localhost:6334/"
 
 @dataclass
 class Neo4jConnectionSpec:

src/base/value.rs

@@ -174,10 +174,7 @@ impl std::fmt::Display for KeyValue {
 }
 
 impl KeyValue {
-    pub fn fields_iter<'a>(
-        &'a self,
-        num_fields: usize,
-    ) -> Result<impl Iterator<Item = &'a KeyValue>> {
+    pub fn fields_iter(&self, num_fields: usize) -> Result<impl Iterator<Item = &KeyValue>> {
         let slice = if num_fields == 1 {
             std::slice::from_ref(self)
         } else {

src/ops/storages/qdrant.rs

@@ -36,6 +36,7 @@ fn key_value_fields_iter<'a>(
 #[derive(Debug, Deserialize, Clone)]
 pub struct Spec {
     collection_name: String,
+    grpc_url: String,
 }
 
 pub struct Executor {
@@ -193,29 +194,53 @@ fn into_value(point: &ScoredPoint, schema: &FieldSchema) -> Result<Value> {
                     .get(field_name)
                     .map(|v| BasicValue::Json(Arc::from(v.clone().into_json()))),
 
-                BasicValueType::Vector(_) => {
-                    let vectors_options = point.vectors.clone().unwrap().vectors_options.unwrap();
-
-                    match vectors_options {
+                BasicValueType::Vector(_) => point
+                    .vectors
+                    .as_ref()
+                    .and_then(|v| v.vectors_options.as_ref())
+                    .and_then(|vectors_options| match vectors_options {
                         VectorsOptions::Vector(vector) => {
-                            let x = vector
+                            let values = vector
                                 .data
-                                .into_iter()
-                                .map(BasicValue::Float32)
+                                .iter()
+                                .map(|f| BasicValue::Float32(*f))
                                 .collect::<Vec<_>>();
-                            Some(BasicValue::Vector(Arc::from(x)))
+                            Some(BasicValue::Vector(Arc::from(values)))
                         }
                         VectorsOptions::Vectors(vectors) => {
-                            let vector = vectors.vectors[field_name].clone();
-                            let x = vector
-                                .data
-                                .into_iter()
-                                .map(BasicValue::Float32)
-                                .collect::<Vec<_>>();
-                            Some(BasicValue::Vector(Arc::from(x)))
+                            vectors.vectors.get(field_name).map(|vector| {
+                                let values = vector
+                                    .data
+                                    .iter()
+                                    .map(|f| BasicValue::Float32(*f))
+                                    .collect::<Vec<_>>();
+                                BasicValue::Vector(Arc::from(values))
+                            })
                         }
-                    }
-                }
+                    }),
+
+                BasicValueType::Date
+                | BasicValueType::LocalDateTime
+                | BasicValueType::OffsetDateTime
+                | BasicValueType::Time
+                | BasicValueType::Uuid => point.payload.get(field_name).and_then(|v| {
+                    v.as_str()
+                        .map(|s| BasicValue::Str(Arc::from(s.to_string())))
+                }),
+                BasicValueType::Range => point.payload.get(field_name).and_then(|v| {
+                    v.as_struct().and_then(|s| {
+                        let start = s.fields.get("start").and_then(|f| f.as_integer());
+                        let end = s.fields.get("end").and_then(|f| f.as_integer());
+
+                        match (start, end) {
+                            (Some(start), Some(end)) => Some(BasicValue::Range(RangeValue {
+                                start: start as usize,
+                                end: end as usize,
+                            })),
+                            _ => None,
+                        }
+                    })
+                }),
                 _ => {
                     anyhow::bail!("Unsupported value type")
                 }
@@ -243,7 +268,8 @@ impl QueryTarget for Executor {
                     .query(Query::new_nearest(query.vector))
                     .limit(query.limit as u64)
                     .using(query.vector_field_name)
-                    .with_payload(true),
+                    .with_payload(true)
+                    .with_vectors(true),
             )
             .await?
             .result;
@@ -300,21 +326,18 @@ impl StorageFactoryBase for Arc<Factory> {
         _storage_options: IndexOptions,
         _context: Arc<FlowInstanceContext>,
     ) -> Result<ExportTargetBuildOutput<Self>> {
-        // TODO(Anush008): Add as a field to the Spec
-
         if key_fields_schema.len() > 1 {
             api_bail!(
                 "Expected only one primary key for the point ID. Got {}.",
                 key_fields_schema.len()
             )
         }
 
-        let url = "http://localhost:6334/";
         let collection_name = spec.collection_name.clone();
 
         let executors = async move {
             let executor = Arc::new(Executor::new(
-                url.to_string(),
+                spec.grpc_url,
                 spec.collection_name.clone(),
                 key_fields_schema,
                 value_fields_schema,