GeneralBots/botserver
2
1
Fork 0
Code Activity Actions

Fix embedding health check: behavior-based instead of URL whitelist
All checks were successful
BotServer CI/CD / build (push) Successful in 3m32s
Details

Browse source 
- Remove hardcoded URL list for remote API detection
- Try /health first, then probe with HEAD if 404/405
- Re-enable embedding server ready check in drive_monitor
- No more embedding_key hack that skipped health checks entirely
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2026-04-12 07:15:54 -03:00
parent 2bafd57046
commit cdab04e999
2 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/core/kb/embedding_generator.rs
View file

@ -327,54 +327,60 @@ impl KbEmbeddingGenerator {
}
pub async fn check_health(&self) -> bool {
// For HuggingFace and other remote APIs, skip health check and mark as ready
// These APIs don't have a /health endpoint and we verified they work during setup
if self.config.embedding_url.contains("huggingface.co") ||
self.config.embedding_url.contains("api.") ||
self.config.embedding_key.is_some() {
info!("Remote embedding API detected ({}), marking as ready", self.config.embedding_url);
set_embedding_server_ready(true);
return true;
}
// Strategy: try /health endpoint first.
// - 200 OK → local server with health endpoint, ready
// - 404/405 etc → server is reachable but has no /health (remote API or llama.cpp)
// - Connection refused/timeout → server truly unavailable
let health_url = format!("{}/health", self.config.embedding_url);
match tokio::time::timeout(
Duration::from_secs(5),
Duration::from_secs(self.config.connect_timeout_seconds),
self.client.get(&health_url).send()
).await {
Ok(Ok(response)) => {
let is_healthy = response.status().is_success();
if is_healthy {
let status = response.status();
if status.is_success() {
info!("Embedding server health check passed ({})", self.config.embedding_url);
set_embedding_server_ready(true);
true
} else if status.as_u16() == 404 || status.as_u16() == 405 {
// Server is reachable but has no /health endpoint (remote API, llama.cpp /embedding-only)
// Try a HEAD request to the embedding URL itself to confirm it's up
info!("No /health endpoint at {} (status {}), probing base URL", self.config.embedding_url, status);
match tokio::time::timeout(
Duration::from_secs(self.config.connect_timeout_seconds),
self.client.head(&self.config.embedding_url).send()
).await {
Ok(Ok(_)) => {
info!("Embedding server reachable at {}, marking as ready", self.config.embedding_url);
set_embedding_server_ready(true);
true
}
Ok(Err(e)) => {
warn!("Embedding server unreachable at {}: {}", self.config.embedding_url, e);
set_embedding_server_ready(false);
false
}
Err(_) => {
warn!("Embedding server probe timed out for {}", self.config.embedding_url);
set_embedding_server_ready(false);
false
}
}
} else {
warn!("Embedding server health check returned status {}", status);
set_embedding_server_ready(false);
false
}
is_healthy
}
Ok(Err(e)) => {
warn!("Health check failed for primary URL: {}", e);
let alt_url = &self.config.embedding_url;
match tokio::time::timeout(
Duration::from_secs(5),
self.client.get(alt_url).send()
).await {
Ok(Ok(response)) => {
let is_healthy = response.status().is_success();
if is_healthy {
set_embedding_server_ready(true);
}
is_healthy
}
Ok(Err(_)) => {
set_embedding_server_ready(false);
false
}
Err(_) => {
set_embedding_server_ready(false);
false
}
}
// Connection failed entirely — server not running or network issue
warn!("Embedding server connection failed for {}: {}", self.config.embedding_url, e);
set_embedding_server_ready(false);
false
}
Err(_) => {
warn!("Embedding server health check timed out for {}", self.config.embedding_url);
set_embedding_server_ready(false);
false
}

9
src/drive/drive_monitor/mod.rs
View file

@ -1269,11 +1269,10 @@ impl DriveMonitor {
#[cfg(any(feature = "research", feature = "llm"))]
{
// TEMP FIX: Skip embedding server check - embedding works but health check fails
// if !is_embedding_server_ready() {
// trace!("Embedding server not ready, deferring KB indexing for {}", kb_folder_path.display());
// continue;
// }
if !is_embedding_server_ready() {
trace!("Embedding server not ready, deferring KB indexing for {}", kb_folder_path.display());
continue;
}
// Create a unique key for this KB folder to track indexing state
let kb_key = format!("{}_{}", bot_name, kb_name);