nidx-binding 6.6.1.post413__tar.gz → 6.6.1.post415__tar.gz

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.6.1.post413
+Version: 6.6.1.post415
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/nidx_protos/pyproject.toml

@@ -10,10 +10,10 @@ build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.6.1.post413"
+version = "6.6.1.post415"
 license = "AGPL-3.0-or-later"
 description = "Protobuf definitions for nucliadb/nidx"
-authors = [ { name = "Nuclia", email = "nucliadb@nuclia.com" }]
+authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]
 classifiers = [
     "Development Status :: 4 - Beta",
     "Programming Language :: Python",

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-version = "6.6.1.post413"
+version = "6.6.1.post415"
 
 [project.urls]
 Homepage = "https://nuclia.com"

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/src/control.rs

@@ -62,6 +62,7 @@ enum ControlResponse {
         alive: Alive,
         searcher_sync_delay: Option<f64>,
         searcher_initally_synced: Option<bool>,
+        nats_connected: Option<bool>,
     },
 }
 
@@ -75,15 +76,17 @@ impl From<anyhow::Result<()>> for ControlResponse {
 }
 
 pub struct ControlServer {
-    pub meta: NidxMetadata,
-    pub searcher_synced: Option<bool>,
+    meta: NidxMetadata,
+    searcher_synced: Option<bool>,
+    nats_client: Option<async_nats::Client>,
 }
 
 impl ControlServer {
-    pub fn new(meta: NidxMetadata, has_searcher: bool) -> Self {
+    pub fn new(meta: NidxMetadata, has_searcher: bool, nats_client: Option<async_nats::Client>) -> Self {
         Self {
             meta,
             searcher_synced: has_searcher.then_some(false),
+            nats_client,
         }
     }
 
@@ -141,6 +144,10 @@ impl ControlServer {
             alive: self.alive().await,
             searcher_sync_delay,
             searcher_initally_synced: self.searcher_synced,
+            nats_connected: self
+                .nats_client
+                .as_ref()
+                .map(|c| c.connection_state() == async_nats::connection::State::Connected),
         }
     }
 }
@@ -162,11 +169,12 @@ pub fn control_client(settings: &EnvSettings, request: ControlRequest) -> anyhow
         }
     } else if let ControlResponse::Ready {
         alive,
-        searcher_sync_delay: _,
         searcher_initally_synced,
+        nats_connected,
+        ..
     } = response
     {
-        if !(alive.all_ok() && searcher_initally_synced.unwrap_or(true)) {
+        if !(alive.all_ok() && searcher_initally_synced.unwrap_or(true) && nats_connected.unwrap_or(true)) {
             return Err(anyhow!("Not ready"));
         }
     }

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/src/indexer.rs

@@ -50,10 +50,14 @@ use crate::{Settings, metadata::*};
 #[cfg(feature = "telemetry")]
 use crate::telemetry;
 
-pub async fn run(settings: Settings, shutdown: CancellationToken) -> anyhow::Result<()> {
-    let indexer_settings = settings.indexer.as_ref().ok_or(anyhow!("Indexer settings required"))?;
-    if indexer_settings.nats_server.is_some() {
-        run_nats(settings, shutdown).await
+pub async fn run(
+    settings: Settings,
+    shutdown: CancellationToken,
+    nats_client: Option<async_nats::Client>,
+) -> anyhow::Result<()> {
+    settings.indexer.as_ref().ok_or(anyhow!("Indexer settings required"))?;
+    if let Some(nats_client) = nats_client {
+        run_nats(settings, shutdown, nats_client).await
     } else {
         let service = IndexerServer::new(settings)?.into_service();
         let server = GrpcServer::new("0.0.0.0:10002").await?;
@@ -118,7 +122,11 @@ impl NidxIndexer for IndexerServer {
     }
 }
 
-pub async fn run_nats(settings: Settings, shutdown: CancellationToken) -> anyhow::Result<()> {
+pub async fn run_nats(
+    settings: Settings,
+    shutdown: CancellationToken,
+    nats_client: async_nats::Client,
+) -> anyhow::Result<()> {
     let meta = settings.metadata.clone();
 
     let indexer_settings = settings.indexer.as_ref().ok_or(anyhow!("Indexer settings required"))?;
@@ -127,7 +135,6 @@ pub async fn run_nats(settings: Settings, shutdown: CancellationToken) -> anyhow
     let storage_settings = settings.storage.as_ref().ok_or(anyhow!("Storage settings required"))?;
     let segment_storage = &storage_settings.object_store;
 
-    let nats_client = async_nats::connect(&indexer_settings.nats_server.as_ref().unwrap()).await?;
     let jetstream = async_nats::jetstream::new(nats_client);
     let consumer: PullConsumer = jetstream.get_consumer_from_stream("nidx", "nidx").await?;
     let message_ttl = consumer.cached_info().config.ack_wait;

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/src/main.rs

@@ -23,7 +23,7 @@ use nidx::{
     Settings, api,
     control::{ControlRequest, ControlServer, control_client},
     indexer, metrics, scheduler, searcher,
-    settings::EnvSettings,
+    settings::{EnvSettings, IndexerSettings},
     telemetry,
     tool::{ToolCommand, run_tool},
     worker,
@@ -112,6 +112,23 @@ async fn do_main(env_settings: EnvSettings, components: Vec<Component>) -> anyho
 
     let shutdown = CancellationToken::new();
 
+    let needs_nats = components
+        .iter()
+        .any(|c| matches!(c, Component::Indexer | Component::Scheduler));
+    let nats_client = if needs_nats {
+        if let Some(IndexerSettings {
+            nats_server: Some(nats_server),
+            ..
+        }) = settings.indexer.as_ref()
+        {
+            Some(async_nats::connect(&nats_server).await?)
+        } else {
+            None
+        }
+    } else {
+        None
+    };
+
     let mut task_ids = HashMap::new();
     let mut tasks = JoinSet::new();
     let mut has_searcher = false;
@@ -119,7 +136,7 @@ async fn do_main(env_settings: EnvSettings, components: Vec<Component>) -> anyho
         let task = match component {
             Component::Indexer => {
                 metrics::indexer::register(&mut metrics);
-                tasks.spawn(indexer::run(settings.clone(), shutdown.clone()))
+                tasks.spawn(indexer::run(settings.clone(), shutdown.clone(), nats_client.clone()))
             }
             Component::Worker => {
                 metrics::worker::register(&mut metrics);
@@ -127,7 +144,7 @@ async fn do_main(env_settings: EnvSettings, components: Vec<Component>) -> anyho
             }
             Component::Scheduler => {
                 metrics::scheduler::register(&mut metrics);
-                tasks.spawn(scheduler::run(settings.clone(), shutdown.clone()))
+                tasks.spawn(scheduler::run(settings.clone(), shutdown.clone(), nats_client.clone()))
             }
             Component::Searcher => {
                 has_searcher = true;
@@ -144,7 +161,7 @@ async fn do_main(env_settings: EnvSettings, components: Vec<Component>) -> anyho
     tokio::spawn(metrics_server(metrics));
     if let Some(control_socket) = &settings.control_socket {
         let control_socket = control_socket.clone();
-        let mut control = ControlServer::new(settings.metadata.clone(), has_searcher);
+        let mut control = ControlServer::new(settings.metadata.clone(), has_searcher, nats_client);
         tokio::spawn(async move { control.run(&control_socket).await });
     }
 

{nidx_binding-6.6.1.post413 → nidx_binding-6.6.1.post415}/src/scheduler.rs

@@ -43,14 +43,16 @@ use tokio::{task::JoinSet, time::sleep};
 use tokio_util::sync::CancellationToken;
 use tracing::*;
 
-pub async fn run(settings: Settings, shutdown: CancellationToken) -> anyhow::Result<()> {
-    let indexer_settings = settings.indexer.as_ref().unwrap();
+pub async fn run(
+    settings: Settings,
+    shutdown: CancellationToken,
+    nats_client: Option<async_nats::Client>,
+) -> anyhow::Result<()> {
     let storage_settings = settings.storage.as_ref().unwrap();
     let meta = settings.metadata.clone();
 
-    if let Some(nats_server) = &indexer_settings.nats_server {
-        let client = async_nats::connect(nats_server).await?;
-        let jetstream = async_nats::jetstream::new(client);
+    if let Some(nats_client) = nats_client {
+        let jetstream = async_nats::jetstream::new(nats_client);
         let consumer: PullConsumer = jetstream.get_consumer_from_stream("nidx", "nidx").await?;
         tokio::select! {
             _ = run_tasks(meta, storage_settings.object_store.clone(), settings, NatsAckFloor(consumer)) => {},