cocoindex 0.1.46__tar.gz → 0.1.48__tar.gz

{cocoindex-0.1.46 → cocoindex-0.1.48}/Cargo.lock

@@ -993,7 +993,7 @@ dependencies = [
 
 [[package]]
 name = "cocoindex"
-version = "0.1.46"
+version = "0.1.48"
 dependencies = [
  "anyhow",
  "async-openai",

{cocoindex-0.1.46 → cocoindex-0.1.48}/Cargo.toml

@@ -2,7 +2,7 @@
 name = "cocoindex"
 # Version used for local development is always higher than others to take precedence.
 # Will be overridden for specific release versions.
-version = "0.1.46"
+version = "0.1.48"
 edition = "2024"
 
 [profile.release]

{cocoindex-0.1.46 → cocoindex-0.1.48}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cocoindex
-Version: 0.1.46
+Version: 0.1.48
 Requires-Dist: sentence-transformers>=3.3.1
 Requires-Dist: click>=8.1.8
 Requires-Dist: rich>=14.0.0

{cocoindex-0.1.46 → cocoindex-0.1.48}/examples/image_search/main.py

@@ -12,13 +12,16 @@ from fastapi import FastAPI, Query
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from qdrant_client import QdrantClient
+from typing import Any
 
 from PIL import Image
 from transformers import CLIPModel, CLIPProcessor
 
 
-QDRANT_GRPC_URL = os.getenv("QDRANT_GRPC_URL", "http://localhost:6334/")
+QDRANT_URL = os.getenv("QDRANT_URL", "http://localhost:6334/")
+QDRANT_COLLECTION = "ImageSearch"
 CLIP_MODEL_NAME = "openai/clip-vit-large-patch14"
+CLIP_MODEL_DIMENSION = 768
 
 
 @functools.cache
@@ -40,7 +43,9 @@ def embed_query(text: str) -> list[float]:
 
 
 @cocoindex.op.function(cache=True, behavior_version=1, gpu=True)
-def embed_image(img_bytes: bytes) -> cocoindex.Vector[cocoindex.Float32, Literal[384]]:
+def embed_image(
+    img_bytes: bytes,
+) -> cocoindex.Vector[cocoindex.Float32, Literal[CLIP_MODEL_DIMENSION]]:
     """
     Convert image to embedding using CLIP model.
     """
@@ -56,7 +61,7 @@ def embed_image(img_bytes: bytes) -> cocoindex.Vector[cocoindex.Float32, Literal
 @cocoindex.flow_def(name="ImageObjectEmbedding")
 def image_object_embedding_flow(
     flow_builder: cocoindex.FlowBuilder, data_scope: cocoindex.DataScope
-):
+) -> None:
     data_scope["images"] = flow_builder.add_source(
         cocoindex.sources.LocalFile(
             path="img", included_patterns=["*.jpg", "*.jpeg", "*.png"], binary=True
@@ -73,14 +78,11 @@ def image_object_embedding_flow(
             filename=img["filename"],
             embedding=img["embedding"],
         )
+
     img_embeddings.export(
         "img_embeddings",
-        cocoindex.storages.Qdrant(
-            collection_name="image_search",
-            grpc_url=QDRANT_GRPC_URL,
-        ),
+        cocoindex.storages.Qdrant(collection_name=QDRANT_COLLECTION),
         primary_key_fields=["id"],
-        setup_by_user=True,
     )
 
 
@@ -99,11 +101,11 @@ app.mount("/img", StaticFiles(directory="img"), name="img")
 
 # --- CocoIndex initialization on startup ---
 @app.on_event("startup")
-def startup_event():
+def startup_event() -> None:
     load_dotenv()
     cocoindex.init()
     # Initialize Qdrant client
-    app.state.qdrant_client = QdrantClient(url=QDRANT_GRPC_URL, prefer_grpc=True)
+    app.state.qdrant_client = QdrantClient(url=QDRANT_URL, prefer_grpc=True)
     app.state.live_updater = cocoindex.FlowLiveUpdater(image_object_embedding_flow)
     app.state.live_updater.start()
 
@@ -112,13 +114,13 @@ def startup_event():
 def search(
     q: str = Query(..., description="Search query"),
     limit: int = Query(5, description="Number of results"),
-):
+) -> Any:
     # Get the embedding for the query
     query_embedding = embed_query(q)
 
     # Search in Qdrant
     search_results = app.state.qdrant_client.search(
-        collection_name="image_search",
+        collection_name=QDRANT_COLLECTION,
         query_vector=("embedding", query_embedding),
         limit=limit,
     )

{cocoindex-0.1.46 → cocoindex-0.1.48}/examples/text_embedding_qdrant/main.py

@@ -1,11 +1,10 @@
 from dotenv import load_dotenv
 from qdrant_client import QdrantClient
-from qdrant_client.http.models import Filter, FieldCondition, MatchValue
 import cocoindex
 
 # Define Qdrant connection constants
-QDRANT_GRPC_URL = "http://localhost:6334"
-QDRANT_COLLECTION = "cocoindex"
+QDRANT_URL = "http://localhost:6334"
+QDRANT_COLLECTION = "TextEmbedding"
 
 
 @cocoindex.transform_flow()
@@ -26,7 +25,7 @@ def text_to_embedding(
 @cocoindex.flow_def(name="TextEmbeddingWithQdrant")
 def text_embedding_flow(
     flow_builder: cocoindex.FlowBuilder, data_scope: cocoindex.DataScope
-):
+) -> None:
     """
     Define an example flow that embeds text into a vector database.
     """
@@ -57,17 +56,14 @@ def text_embedding_flow(
 
     doc_embeddings.export(
         "doc_embeddings",
-        cocoindex.storages.Qdrant(
-            collection_name=QDRANT_COLLECTION, grpc_url=QDRANT_GRPC_URL
-        ),
+        cocoindex.storages.Qdrant(collection_name=QDRANT_COLLECTION),
         primary_key_fields=["id"],
-        setup_by_user=True,
     )
 
 
-def _main():
+def _main() -> None:
     # Initialize Qdrant client
-    client = QdrantClient(url=QDRANT_GRPC_URL, prefer_grpc=True)
+    client = QdrantClient(url=QDRANT_URL, prefer_grpc=True)
 
     # Run queries in a loop to demonstrate the query capabilities.
     while True:
@@ -87,6 +83,8 @@ def _main():
         for result in search_results:
             score = result.score
             payload = result.payload
+            if payload is None:
+                continue
             print(f"[{score:.3f}] {payload['filename']}")
             print(f"    {payload['text']}")
             print("---")

{cocoindex-0.1.46 → cocoindex-0.1.48}/python/cocoindex/storages.py

@@ -16,13 +16,20 @@ class Postgres(op.StorageSpec):
     table_name: str | None = None
 
 
+@dataclass
+class QdrantConnection:
+    """Connection spec for Qdrant."""
+
+    grpc_url: str
+    api_key: str | None = None
+
+
 @dataclass
 class Qdrant(op.StorageSpec):
     """Storage powered by Qdrant - https://qdrant.tech/."""
 
     collection_name: str
-    grpc_url: str = "http://localhost:6334/"
-    api_key: str | None = None
+    connection: AuthEntryReference[QdrantConnection] | None = None
 
 
 @dataclass

{cocoindex-0.1.46 → cocoindex-0.1.48}/src/ops/factory_bases.rs

@@ -309,6 +309,12 @@ pub trait StorageFactoryBase: ExportTargetFactory + Send + Sync + 'static {
         Vec<(Self::Key, Self::SetupState)>,
     )>;
 
+    /// Deserialize the setup key from a JSON value.
+    /// You can override this method to provide a custom deserialization logic, e.g. to perform backward compatible deserialization.
+    fn deserialize_setup_key(key: serde_json::Value) -> Result<Self::Key> {
+        Ok(serde_json::from_value(key)?)
+    }
+
     /// Will not be called if it's setup by user.
     /// It returns an error if the target only supports setup by user.
     async fn check_setup_status(
@@ -421,7 +427,7 @@ impl<T: StorageFactoryBase> ExportTargetFactory for T {
         existing_states: setup::CombinedState<serde_json::Value>,
         auth_registry: &Arc<AuthRegistry>,
     ) -> Result<Box<dyn setup::ResourceSetupStatus>> {
-        let key: T::Key = serde_json::from_value(key.clone())?;
+        let key: T::Key = Self::deserialize_setup_key(key.clone())?;
         let desired_state: Option<T::SetupState> = desired_state
             .map(|v| serde_json::from_value(v.clone()))
             .transpose()?;
@@ -438,12 +444,12 @@ impl<T: StorageFactoryBase> ExportTargetFactory for T {
     }
 
     fn describe_resource(&self, key: &serde_json::Value) -> Result<String> {
-        let key: T::Key = serde_json::from_value(key.clone())?;
+        let key: T::Key = Self::deserialize_setup_key(key.clone())?;
         StorageFactoryBase::describe_resource(self, &key)
     }
 
     fn normalize_setup_key(&self, key: &serde_json::Value) -> Result<serde_json::Value> {
-        let key: T::Key = serde_json::from_value(key.clone())?;
+        let key: T::Key = Self::deserialize_setup_key(key.clone())?;
         Ok(serde_json::to_value(key)?)
     }
 

{cocoindex-0.1.46 → cocoindex-0.1.48}/src/ops/registration.rs

@@ -3,7 +3,7 @@ use super::{
     storages,
 };
 use anyhow::Result;
-use std::sync::{Arc, LazyLock, RwLock, RwLockReadGuard};
+use std::sync::{LazyLock, RwLock, RwLockReadGuard};
 
 fn register_executor_factories(registry: &mut ExecutorFactoryRegistry) -> Result<()> {
     let reqwest_client = reqwest::Client::new();
@@ -17,7 +17,7 @@ fn register_executor_factories(registry: &mut ExecutorFactoryRegistry) -> Result
     functions::extract_by_llm::Factory.register(registry)?;
 
     storages::postgres::Factory::default().register(registry)?;
-    Arc::new(storages::qdrant::Factory::default()).register(registry)?;
+    storages::qdrant::register(registry)?;
     storages::kuzu::register(registry, reqwest_client)?;
 
     storages::neo4j::Factory::new().register(registry)?;

{cocoindex-0.1.46 → cocoindex-0.1.48}/src/ops/storages/neo4j.rs

@@ -696,6 +696,7 @@ impl components::SetupOperator for SetupComponentOperator {
     type Key = ComponentKey;
     type State = ComponentState;
     type SetupState = SetupState;
+    type Context = ();
 
     fn describe_key(&self, key: &Self::Key) -> String {
         format!("{} {}", key.kind.describe(), key.name)
@@ -724,7 +725,7 @@ impl components::SetupOperator for SetupComponentOperator {
         current == desired
     }
 
-    async fn create(&self, state: &ComponentState) -> Result<()> {
+    async fn create(&self, state: &ComponentState, _context: &Self::Context) -> Result<()> {
         let graph = self.graph_pool.get_graph(&self.conn_spec).await?;
         let key = state.key();
         let qualifier = CORE_ELEMENT_MATCHER_VAR;
@@ -762,7 +763,7 @@ impl components::SetupOperator for SetupComponentOperator {
         Ok(graph.run(query).await?)
     }
 
-    async fn delete(&self, key: &ComponentKey) -> Result<()> {
+    async fn delete(&self, key: &ComponentKey, _context: &Self::Context) -> Result<()> {
         let graph = self.graph_pool.get_graph(&self.conn_spec).await?;
         let query = neo4rs::query(&format!(
             "DROP {kind} {name} IF EXISTS",
@@ -1131,7 +1132,7 @@ impl StorageFactoryBase for Factory {
             }
         }
 
-        apply_component_changes(components).await?;
+        apply_component_changes(components, &()).await?;
         Ok(())
     }
 }