cocoindex 0.1.31__tar.gz → 0.1.32__tar.gz

{cocoindex-0.1.31 → cocoindex-0.1.32}/Cargo.lock

@@ -533,7 +533,7 @@ dependencies = [
 
 [[package]]
 name = "cocoindex"
-version = "0.1.31"
+version = "0.1.32"
 dependencies = [
  "anyhow",
  "async-openai",
@@ -546,7 +546,6 @@ dependencies = [
  "bytes",
  "chrono",
  "config",
- "console-subscriber",
  "const_format",
  "derivative",
  "env_logger",
@@ -649,45 +648,6 @@ dependencies = [
  "yaml-rust2 0.8.1",
 ]
 
-[[package]]
-name = "console-api"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8030735ecb0d128428b64cd379809817e620a40e5001c54465b99ec5feec2857"
-dependencies = [
- "futures-core",
- "prost",
- "prost-types",
- "tonic",
- "tracing-core",
-]
-
-[[package]]
-name = "console-subscriber"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01"
-dependencies = [
- "console-api",
- "crossbeam-channel",
- "crossbeam-utils",
- "futures-task",
- "hdrhistogram",
- "humantime",
- "hyper-util",
- "prost",
- "prost-types",
- "serde",
- "serde_json",
- "thread_local",
- "tokio",
- "tokio-stream",
- "tonic",
- "tracing",
- "tracing-core",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -802,15 +762,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.12"
@@ -1328,8 +1279,8 @@ dependencies = [
  "aho-corasick",
  "bstr",
  "log",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -1439,19 +1390,6 @@ dependencies = [
  "hashbrown 0.15.2",
 ]
 
-[[package]]
-name = "hdrhistogram"
-version = "7.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
-dependencies = [
- "base64 0.21.7",
- "byteorder",
- "flate2",
- "nom",
- "num-traits",
-]
-
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -1543,12 +1481,6 @@ version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
-[[package]]
-name = "humantime"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
-
 [[package]]
 name = "hyper"
 version = "1.6.0"
@@ -2016,15 +1948,6 @@ version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
 [[package]]
 name = "matchit"
 version = "0.7.3"
@@ -2822,17 +2745,8 @@ checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.9",
- "regex-syntax 0.8.5",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
+ "regex-automata",
+ "regex-syntax",
 ]
 
 [[package]]
@@ -2843,15 +2757,9 @@ checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.5",
+ "regex-syntax",
 ]
 
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.5"
@@ -3348,15 +3256,6 @@ dependencies = [
  "digest",
 ]
 
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"
@@ -3768,16 +3667,6 @@ dependencies = [
  "syn 2.0.101",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
 [[package]]
 name = "time"
 version = "0.3.41"
@@ -4078,22 +3967,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
-dependencies = [
- "matchers",
- "once_cell",
- "regex",
- "sharded-slab",
- "thread_local",
- "tracing",
- "tracing-core",
 ]
 
 [[package]]
@@ -4104,7 +3977,7 @@ checksum = "b9ac5ea5e7f2f1700842ec071401010b9c59bf735295f6e9fa079c3dc035b167"
 dependencies = [
  "cc",
  "regex",
- "regex-syntax 0.8.5",
+ "regex-syntax",
  "serde_json",
  "streaming-iterator",
  "tree-sitter-language",
@@ -4476,12 +4349,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "valuable"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"

{cocoindex-0.1.31 → cocoindex-0.1.32}/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.31"
+version = "0.1.32"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -52,7 +52,6 @@ itertools = "0.14.0"
 derivative = "2.2.0"
 hex = "0.4.3"
 schemars = "0.8.22"
-console-subscriber = "0.4.1"
 env_logger = "0.11.7"
 reqwest = { version = "0.12.15", default-features = false, features = [
     "json",

{cocoindex-0.1.31 → cocoindex-0.1.32}/PKG-INFO

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

{cocoindex-0.1.31 → cocoindex-0.1.32}/python/cocoindex/setting.py

@@ -47,7 +47,7 @@ class ServerSettings:
     """Settings for the cocoindex server."""
 
     # The address to bind the server to.
-    address: str = "127.0.0.1:8080"
+    address: str = "127.0.0.1:49344"
 
     # The origins of the clients (e.g. CocoInsight UI) to allow CORS from.
     cors_origins: list[str] | None = None

{cocoindex-0.1.31 → cocoindex-0.1.32}/src/lib_context.rs

@@ -127,7 +127,6 @@ pub fn get_auth_registry() -> &'static Arc<AuthRegistry> {
 static LIB_INIT: OnceLock<()> = OnceLock::new();
 pub fn create_lib_context(settings: settings::Settings) -> Result<LibContext> {
     LIB_INIT.get_or_init(|| {
-        console_subscriber::init();
         let _ = env_logger::try_init();
 
         pyo3_async_runtimes::tokio::init_with_runtime(get_runtime()).unwrap();

cocoindex-0.1.32/src/server.rs

@@ -0,0 +1,90 @@
+use crate::prelude::*;
+
+use crate::{lib_context::LibContext, service};
+use axum::{routing, Router};
+use tower::ServiceBuilder;
+use tower_http::{
+    cors::{AllowOrigin, CorsLayer},
+    trace::TraceLayer,
+};
+
+#[derive(Deserialize, Debug)]
+pub struct ServerSettings {
+    pub address: String,
+    #[serde(default)]
+    pub cors_origins: Vec<String>,
+}
+
+/// Initialize the server and return a future that will actually handle requests.
+pub async fn init_server(
+    lib_context: Arc<LibContext>,
+    settings: ServerSettings,
+) -> Result<BoxFuture<'static, ()>> {
+    let mut cors = CorsLayer::default();
+    if !settings.cors_origins.is_empty() {
+        let origins: Vec<_> = settings
+            .cors_origins
+            .iter()
+            .map(|origin| origin.parse())
+            .collect::<Result<_, _>>()?;
+        cors = cors
+            .allow_origin(AllowOrigin::list(origins))
+            .allow_methods([
+                axum::http::Method::GET,
+                axum::http::Method::POST,
+                axum::http::Method::DELETE,
+            ])
+            .allow_headers([axum::http::header::CONTENT_TYPE]);
+    }
+    let app = Router::new()
+        .route(
+            "/cocoindex",
+            routing::get(|| async { "CocoIndex is running!" }),
+        )
+        .nest(
+            "/cocoindex/api",
+            Router::new()
+                .route("/flows", routing::get(service::flows::list_flows))
+                .route(
+                    "/flows/:flowInstName",
+                    routing::get(service::flows::get_flow_spec),
+                )
+                .route(
+                    "/flows/:flowInstName/schema",
+                    routing::get(service::flows::get_flow_schema),
+                )
+                .route(
+                    "/flows/:flowInstName/keys",
+                    routing::get(service::flows::get_keys),
+                )
+                .route(
+                    "/flows/:flowInstName/data",
+                    routing::get(service::flows::evaluate_data),
+                )
+                .route(
+                    "/flows/:flowInstName/update",
+                    routing::post(service::flows::update),
+                )
+                .route(
+                    "/flows/:flowInstName/search",
+                    routing::get(service::search::search),
+                )
+                .layer(
+                    ServiceBuilder::new()
+                        .layer(TraceLayer::new_for_http())
+                        .layer(cors),
+                )
+                .with_state(lib_context.clone()),
+        );
+
+    let listener = tokio::net::TcpListener::bind(&settings.address)
+        .await
+        .context(format!("Failed to bind to address: {}", settings.address))?;
+
+    println!(
+        "Server running at http://{}/cocoindex",
+        listener.local_addr()?
+    );
+    let serve_fut = async { axum::serve(listener, app).await.unwrap() };
+    Ok(serve_fut.boxed())
+}

cocoindex-0.1.31/src/server.rs

@@ -1,80 +0,0 @@
-use crate::prelude::*;
-
-use crate::{lib_context::LibContext, service};
-use axum::{routing, Router};
-use tower::ServiceBuilder;
-use tower_http::{
-    cors::{AllowOrigin, CorsLayer},
-    trace::TraceLayer,
-};
-
-#[derive(Deserialize, Debug)]
-pub struct ServerSettings {
-    pub address: String,
-    #[serde(default)]
-    pub cors_origins: Vec<String>,
-}
-
-/// Initialize the server and return a future that will actually handle requests.
-pub async fn init_server(
-    lib_context: Arc<LibContext>,
-    settings: ServerSettings,
-) -> Result<BoxFuture<'static, ()>> {
-    let mut cors = CorsLayer::default();
-    if !settings.cors_origins.is_empty() {
-        let origins: Vec<_> = settings
-            .cors_origins
-            .iter()
-            .map(|origin| origin.parse())
-            .collect::<Result<_, _>>()?;
-        cors = cors
-            .allow_origin(AllowOrigin::list(origins))
-            .allow_methods([
-                axum::http::Method::GET,
-                axum::http::Method::POST,
-                axum::http::Method::DELETE,
-            ])
-            .allow_headers([axum::http::header::CONTENT_TYPE]);
-    }
-    let app = Router::new()
-        .route("/api/flows", routing::get(service::flows::list_flows))
-        .route(
-            "/api/flows/:flowInstName",
-            routing::get(service::flows::get_flow_spec),
-        )
-        .route(
-            "/api/flows/:flowInstName/schema",
-            routing::get(service::flows::get_flow_schema),
-        )
-        .route(
-            "/api/flows/:flowInstName/keys",
-            routing::get(service::flows::get_keys),
-        )
-        .route(
-            "/api/flows/:flowInstName/data",
-            routing::get(service::flows::evaluate_data),
-        )
-        .route(
-            "/api/flows/:flowInstName/update",
-            routing::post(service::flows::update),
-        )
-        .route(
-            "/api/flows/:flowInstName/search",
-            routing::get(service::search::search),
-        )
-        .layer(
-            ServiceBuilder::new()
-                .layer(TraceLayer::new_for_http())
-                .layer(cors),
-        )
-        .with_state(lib_context.clone());
-
-    // run our app with hyper, listening globally on port 3000
-    let listener = tokio::net::TcpListener::bind(&settings.address)
-        .await
-        .unwrap();
-
-    println!("Server running at http://{}/", settings.address);
-    let serve_fut = async { axum::serve(listener, app).await.unwrap() };
-    Ok(serve_fut.boxed())
-}