New features: - Add ConfigWatcher for hot-reloading config.csv from ~/data - Add LocalFileMonitor for watching ~/data/*.gbai directories - Add GLM LLM provider implementation - Add tool context for LLM tool calling Bug fixes: - Fix model routing to respect session → bot → default hierarchy - Fix ConfigWatcher to handle local embedded (llm-server=true) - Skip DriveMonitor for default bot (managed via ConfigWatcher) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
308 lines
12 KiB
Rust
308 lines
12 KiB
Rust
use crate::shared::models::UserSession;
|
|
use crate::shared::state::AppState;
|
|
use diesel::prelude::*;
|
|
use log::{error, info, trace, warn};
|
|
use rhai::{Dynamic, Engine};
|
|
use std::path::Path;
|
|
use std::sync::Arc;
|
|
use uuid::Uuid;
|
|
pub fn use_tool_keyword(state: Arc<AppState>, user: UserSession, engine: &mut Engine) {
|
|
let state_clone = Arc::clone(&state);
|
|
let user_clone = user.clone();
|
|
|
|
engine
|
|
.register_custom_syntax(["USE", "TOOL", "$expr$"], false, move |context, inputs| {
|
|
let tool_path = context.eval_expression_tree(&inputs[0])?;
|
|
let tool_path_str = tool_path.to_string().trim_matches('"').to_string();
|
|
trace!(
|
|
"USE TOOL command executed: {} for session: {}",
|
|
tool_path_str,
|
|
user_clone.id
|
|
);
|
|
let tool_name = tool_path_str
|
|
.strip_prefix(".gbdialog/")
|
|
.unwrap_or(&tool_path_str)
|
|
.strip_suffix(".bas")
|
|
.unwrap_or(&tool_path_str)
|
|
.to_string();
|
|
if tool_name.is_empty() {
|
|
return Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
|
|
"Invalid tool name".into(),
|
|
rhai::Position::NONE,
|
|
)));
|
|
}
|
|
let state_for_task = Arc::clone(&state_clone);
|
|
let user_for_task = user_clone.clone();
|
|
let tool_name_for_task = tool_name;
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
std::thread::spawn(move || {
|
|
let rt = tokio::runtime::Builder::new_multi_thread()
|
|
.worker_threads(2)
|
|
.enable_all()
|
|
.build();
|
|
let send_err = if let Ok(_rt) = rt {
|
|
let result = associate_tool_with_session(
|
|
&state_for_task,
|
|
&user_for_task,
|
|
&tool_name_for_task,
|
|
);
|
|
tx.send(result).err()
|
|
} else {
|
|
tx.send(Err("Failed to build tokio runtime".to_string()))
|
|
.err()
|
|
};
|
|
if send_err.is_some() {
|
|
error!("Failed to send result from thread");
|
|
}
|
|
});
|
|
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
|
|
Ok(Ok(message)) => Ok(Dynamic::from(message)),
|
|
Ok(Err(e)) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
|
|
e.into(),
|
|
rhai::Position::NONE,
|
|
))),
|
|
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
|
|
Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
|
|
"USE TOOL timed out".into(),
|
|
rhai::Position::NONE,
|
|
)))
|
|
}
|
|
Err(e) => Err(Box::new(rhai::EvalAltResult::ErrorRuntime(
|
|
format!("USE TOOL failed: {}", e).into(),
|
|
rhai::Position::NONE,
|
|
))),
|
|
}
|
|
})
|
|
.expect("valid syntax registration");
|
|
|
|
// Register use_tool(tool_name) function for preprocessor compatibility
|
|
let state_clone2 = Arc::clone(&state);
|
|
let user_clone2 = user.clone();
|
|
|
|
engine.register_fn("use_tool", move |tool_path: &str| -> Dynamic {
|
|
let tool_path_str = tool_path.to_string();
|
|
trace!(
|
|
"use_tool function called: {} for session: {}",
|
|
tool_path_str,
|
|
user_clone2.id
|
|
);
|
|
let tool_name = tool_path_str
|
|
.strip_prefix(".gbdialog/")
|
|
.unwrap_or(&tool_path_str)
|
|
.strip_suffix(".bas")
|
|
.unwrap_or(&tool_path_str)
|
|
.to_string();
|
|
if tool_name.is_empty() {
|
|
return Dynamic::from("ERROR: Invalid tool name");
|
|
}
|
|
let state_for_task = Arc::clone(&state_clone2);
|
|
let user_for_task = user_clone2.clone();
|
|
let tool_name_for_task = tool_name;
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
std::thread::spawn(move || {
|
|
let rt = tokio::runtime::Builder::new_multi_thread()
|
|
.worker_threads(2)
|
|
.enable_all()
|
|
.build();
|
|
let send_err = if let Ok(_rt) = rt {
|
|
let result = associate_tool_with_session(
|
|
&state_for_task,
|
|
&user_for_task,
|
|
&tool_name_for_task,
|
|
);
|
|
tx.send(result).err()
|
|
} else {
|
|
tx.send(Err("Failed to build tokio runtime".to_string()))
|
|
.err()
|
|
};
|
|
if send_err.is_some() {
|
|
error!("Failed to send result from thread");
|
|
}
|
|
});
|
|
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
|
|
Ok(Ok(message)) => Dynamic::from(message),
|
|
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
|
|
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
|
|
Dynamic::from("ERROR: use_tool timed out")
|
|
}
|
|
Err(e) => Dynamic::from(format!("ERROR: use_tool failed: {}", e)),
|
|
}
|
|
});
|
|
|
|
// Register USE_TOOL(tool_name) function (uppercase variant)
|
|
let state_clone3 = Arc::clone(&state);
|
|
let user_clone3 = user;
|
|
|
|
engine.register_fn("USE_TOOL", move |tool_path: &str| -> Dynamic {
|
|
let tool_path_str = tool_path.to_string();
|
|
trace!(
|
|
"USE_TOOL function called: {} for session: {}",
|
|
tool_path_str,
|
|
user_clone3.id
|
|
);
|
|
let tool_name = tool_path_str
|
|
.strip_prefix(".gbdialog/")
|
|
.unwrap_or(&tool_path_str)
|
|
.strip_suffix(".bas")
|
|
.unwrap_or(&tool_path_str)
|
|
.to_string();
|
|
if tool_name.is_empty() {
|
|
return Dynamic::from("ERROR: Invalid tool name");
|
|
}
|
|
let state_for_task = Arc::clone(&state_clone3);
|
|
let user_for_task = user_clone3.clone();
|
|
let tool_name_for_task = tool_name;
|
|
let (tx, rx) = std::sync::mpsc::channel();
|
|
std::thread::spawn(move || {
|
|
let rt = tokio::runtime::Builder::new_multi_thread()
|
|
.worker_threads(2)
|
|
.enable_all()
|
|
.build();
|
|
let send_err = if let Ok(_rt) = rt {
|
|
let result = associate_tool_with_session(
|
|
&state_for_task,
|
|
&user_for_task,
|
|
&tool_name_for_task,
|
|
);
|
|
tx.send(result).err()
|
|
} else {
|
|
tx.send(Err("Failed to build tokio runtime".to_string()))
|
|
.err()
|
|
};
|
|
if send_err.is_some() {
|
|
error!("Failed to send result from thread");
|
|
}
|
|
});
|
|
match rx.recv_timeout(std::time::Duration::from_secs(10)) {
|
|
Ok(Ok(message)) => Dynamic::from(message),
|
|
Ok(Err(e)) => Dynamic::from(format!("ERROR: {}", e)),
|
|
Err(std::sync::mpsc::RecvTimeoutError::Timeout) => {
|
|
Dynamic::from("ERROR: USE_TOOL timed out")
|
|
}
|
|
Err(e) => Dynamic::from(format!("ERROR: USE_TOOL failed: {}", e)),
|
|
}
|
|
});
|
|
}
|
|
fn associate_tool_with_session(
|
|
state: &AppState,
|
|
user: &UserSession,
|
|
tool_name: &str,
|
|
) -> Result<String, String> {
|
|
use crate::shared::models::schema::session_tool_associations;
|
|
|
|
// Check if tool's .mcp.json file exists in work directory
|
|
let home_dir = std::env::var("HOME").unwrap_or_else(|_| ".".to_string());
|
|
let gb_dir = format!("{}/gb", home_dir);
|
|
|
|
// Get bot name to construct the path
|
|
let bot_name = get_bot_name_from_id(state, &user.bot_id)?;
|
|
let work_path = Path::new(&gb_dir)
|
|
.join("work")
|
|
.join(format!("{}.gbai/{}.gbdialog", bot_name, bot_name));
|
|
let mcp_path = work_path.join(format!("{}.mcp.json", tool_name));
|
|
|
|
trace!("Checking for tool .mcp.json at: {:?}", mcp_path);
|
|
|
|
if !mcp_path.exists() {
|
|
warn!(
|
|
"Tool '{}' .mcp.json file not found at {:?}",
|
|
tool_name, mcp_path
|
|
);
|
|
return Err(format!(
|
|
"Tool '{}' is not available. .mcp.json file not found.",
|
|
tool_name
|
|
));
|
|
}
|
|
|
|
info!(
|
|
"Tool '{}' .mcp.json found, proceeding with session association",
|
|
tool_name
|
|
);
|
|
|
|
let mut conn = state.conn.get().map_err(|e| format!("DB error: {}", e))?;
|
|
let association_id = Uuid::new_v4().to_string();
|
|
let session_id_str = user.id.to_string();
|
|
let added_at = chrono::Utc::now().to_rfc3339();
|
|
let insert_result: Result<usize, diesel::result::Error> =
|
|
diesel::insert_into(session_tool_associations::table)
|
|
.values((
|
|
session_tool_associations::id.eq(&association_id),
|
|
session_tool_associations::session_id.eq(&session_id_str),
|
|
session_tool_associations::tool_name.eq(tool_name),
|
|
session_tool_associations::added_at.eq(&added_at),
|
|
))
|
|
.on_conflict((
|
|
session_tool_associations::session_id,
|
|
session_tool_associations::tool_name,
|
|
))
|
|
.do_nothing()
|
|
.execute(&mut *conn);
|
|
match insert_result {
|
|
Ok(rows_affected) => {
|
|
if rows_affected > 0 {
|
|
trace!(
|
|
"Tool '{}' newly associated with session '{}' (user: {}, bot: {})",
|
|
tool_name,
|
|
user.id,
|
|
user.user_id,
|
|
user.bot_id
|
|
);
|
|
Ok(format!(
|
|
"Tool '{}' is now available in this conversation",
|
|
tool_name
|
|
))
|
|
} else {
|
|
trace!(
|
|
"Tool '{}' was already associated with session '{}'",
|
|
tool_name,
|
|
user.id
|
|
);
|
|
Ok(format!(
|
|
"Tool '{}' is already available in this conversation",
|
|
tool_name
|
|
))
|
|
}
|
|
}
|
|
Err(e) => {
|
|
error!(
|
|
"Failed to associate tool '{}' with session '{}': {}",
|
|
tool_name, user.id, e
|
|
);
|
|
Err(format!("Failed to add tool to session: {}", e))
|
|
}
|
|
}
|
|
}
|
|
pub fn get_session_tools(
|
|
conn: &mut PgConnection,
|
|
session_id: &Uuid,
|
|
) -> Result<Vec<String>, diesel::result::Error> {
|
|
use crate::shared::models::schema::session_tool_associations;
|
|
let session_id_str = session_id.to_string();
|
|
session_tool_associations::table
|
|
.filter(session_tool_associations::session_id.eq(&session_id_str))
|
|
.select(session_tool_associations::tool_name)
|
|
.load::<String>(conn)
|
|
}
|
|
pub fn clear_session_tools(
|
|
conn: &mut PgConnection,
|
|
session_id: &Uuid,
|
|
) -> Result<usize, diesel::result::Error> {
|
|
use crate::shared::models::schema::session_tool_associations;
|
|
let session_id_str = session_id.to_string();
|
|
diesel::delete(
|
|
session_tool_associations::table
|
|
.filter(session_tool_associations::session_id.eq(&session_id_str)),
|
|
)
|
|
.execute(conn)
|
|
}
|
|
|
|
fn get_bot_name_from_id(state: &AppState, bot_id: &uuid::Uuid) -> Result<String, String> {
|
|
use crate::shared::models::schema::bots;
|
|
let mut conn = state.conn.get().map_err(|e| format!("DB error: {}", e))?;
|
|
let bot_name: String = bots::table
|
|
.filter(bots::id.eq(bot_id))
|
|
.select(bots::name)
|
|
.first(&mut *conn)
|
|
.map_err(|e| format!("Failed to get bot name for id {}: {}", bot_id, e))?;
|
|
Ok(bot_name)
|
|
}
|