mirror of
https://github.com/outbackdingo/optimclaw.git
synced 2026-08-26 15:40:18 +00:00
Routines created via Telegram (or any WASM channel) were invisible in the web UI because the routines list endpoint filtered by GATEWAY_USER_ID, which didn't match the Telegram user's ID stored on the routine. Add list_all_routines() to the RoutineStore trait (both libSQL and PostgreSQL backends) and use it in the web dashboard handlers so all routines are visible regardless of which channel created them. Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
427 lines
14 KiB
Rust
427 lines
14 KiB
Rust
//! Routine-related RoutineStore implementation for LibSqlBackend.
|
|
|
|
use async_trait::async_trait;
|
|
use chrono::{DateTime, Utc};
|
|
use libsql::params;
|
|
use uuid::Uuid;
|
|
|
|
use super::{
|
|
LibSqlBackend, ROUTINE_COLUMNS, ROUTINE_RUN_COLUMNS, fmt_opt_ts, fmt_ts, get_i64, opt_text,
|
|
opt_text_owned, row_to_routine_libsql, row_to_routine_run_libsql,
|
|
};
|
|
use crate::agent::routine::{Routine, RoutineRun, RunStatus};
|
|
use crate::db::RoutineStore;
|
|
use crate::error::DatabaseError;
|
|
|
|
#[async_trait]
|
|
impl RoutineStore for LibSqlBackend {
|
|
async fn create_routine(&self, routine: &Routine) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let trigger_type = routine.trigger.type_tag();
|
|
let trigger_config = routine.trigger.to_config_json();
|
|
let action_type = routine.action.type_tag();
|
|
let action_config = routine.action.to_config_json();
|
|
let cooldown_secs = routine.guardrails.cooldown.as_secs() as i64;
|
|
let max_concurrent = routine.guardrails.max_concurrent as i64;
|
|
let dedup_window_secs = routine.guardrails.dedup_window.map(|d| d.as_secs() as i64);
|
|
|
|
conn.execute(
|
|
r#"
|
|
INSERT INTO routines (
|
|
id, name, description, user_id, enabled,
|
|
trigger_type, trigger_config, action_type, action_config,
|
|
cooldown_secs, max_concurrent, dedup_window_secs,
|
|
notify_channel, notify_user, notify_on_success, notify_on_failure, notify_on_attention,
|
|
state, next_fire_at, created_at, updated_at
|
|
) VALUES (
|
|
?1, ?2, ?3, ?4, ?5,
|
|
?6, ?7, ?8, ?9,
|
|
?10, ?11, ?12,
|
|
?13, ?14, ?15, ?16, ?17,
|
|
?18, ?19, ?20, ?21
|
|
)
|
|
"#,
|
|
params![
|
|
routine.id.to_string(),
|
|
routine.name.as_str(),
|
|
routine.description.as_str(),
|
|
routine.user_id.as_str(),
|
|
routine.enabled as i64,
|
|
trigger_type,
|
|
trigger_config.to_string(),
|
|
action_type,
|
|
action_config.to_string(),
|
|
cooldown_secs,
|
|
max_concurrent,
|
|
dedup_window_secs,
|
|
opt_text(routine.notify.channel.as_deref()),
|
|
routine.notify.user.as_str(),
|
|
routine.notify.on_success as i64,
|
|
routine.notify.on_failure as i64,
|
|
routine.notify.on_attention as i64,
|
|
routine.state.to_string(),
|
|
fmt_opt_ts(&routine.next_fire_at),
|
|
fmt_ts(&routine.created_at),
|
|
fmt_ts(&routine.updated_at),
|
|
],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn get_routine(&self, id: Uuid) -> Result<Option<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!("SELECT {} FROM routines WHERE id = ?1", ROUTINE_COLUMNS),
|
|
params![id.to_string()],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
match rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
Some(row) => Ok(Some(row_to_routine_libsql(&row)?)),
|
|
None => Ok(None),
|
|
}
|
|
}
|
|
|
|
async fn get_routine_by_name(
|
|
&self,
|
|
user_id: &str,
|
|
name: &str,
|
|
) -> Result<Option<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!(
|
|
"SELECT {} FROM routines WHERE user_id = ?1 AND name = ?2",
|
|
ROUTINE_COLUMNS
|
|
),
|
|
params![user_id, name],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
match rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
Some(row) => Ok(Some(row_to_routine_libsql(&row)?)),
|
|
None => Ok(None),
|
|
}
|
|
}
|
|
|
|
async fn list_routines(&self, user_id: &str) -> Result<Vec<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!(
|
|
"SELECT {} FROM routines WHERE user_id = ?1 ORDER BY name",
|
|
ROUTINE_COLUMNS
|
|
),
|
|
params![user_id],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
let mut routines = Vec::new();
|
|
while let Some(row) = rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
routines.push(row_to_routine_libsql(&row)?);
|
|
}
|
|
Ok(routines)
|
|
}
|
|
|
|
async fn list_all_routines(&self) -> Result<Vec<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!("SELECT {} FROM routines ORDER BY name", ROUTINE_COLUMNS),
|
|
(),
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
let mut routines = Vec::new();
|
|
while let Some(row) = rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
routines.push(row_to_routine_libsql(&row)?);
|
|
}
|
|
Ok(routines)
|
|
}
|
|
|
|
async fn list_event_routines(&self) -> Result<Vec<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!(
|
|
"SELECT {} FROM routines WHERE enabled = 1 AND trigger_type = 'event'",
|
|
ROUTINE_COLUMNS
|
|
),
|
|
(),
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
let mut routines = Vec::new();
|
|
while let Some(row) = rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
routines.push(row_to_routine_libsql(&row)?);
|
|
}
|
|
Ok(routines)
|
|
}
|
|
|
|
async fn list_due_cron_routines(&self) -> Result<Vec<Routine>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let now = fmt_ts(&Utc::now());
|
|
let mut rows = conn
|
|
.query(
|
|
&format!(
|
|
"SELECT {} FROM routines WHERE enabled = 1 AND trigger_type = 'cron' AND next_fire_at IS NOT NULL AND next_fire_at <= ?1",
|
|
ROUTINE_COLUMNS
|
|
),
|
|
params![now],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
let mut routines = Vec::new();
|
|
while let Some(row) = rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
routines.push(row_to_routine_libsql(&row)?);
|
|
}
|
|
Ok(routines)
|
|
}
|
|
|
|
async fn update_routine(&self, routine: &Routine) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let trigger_type = routine.trigger.type_tag();
|
|
let trigger_config = routine.trigger.to_config_json();
|
|
let action_type = routine.action.type_tag();
|
|
let action_config = routine.action.to_config_json();
|
|
let cooldown_secs = routine.guardrails.cooldown.as_secs() as i64;
|
|
let max_concurrent = routine.guardrails.max_concurrent as i64;
|
|
let dedup_window_secs = routine.guardrails.dedup_window.map(|d| d.as_secs() as i64);
|
|
let now = fmt_ts(&Utc::now());
|
|
|
|
conn.execute(
|
|
r#"
|
|
UPDATE routines SET
|
|
name = ?2, description = ?3, enabled = ?4,
|
|
trigger_type = ?5, trigger_config = ?6,
|
|
action_type = ?7, action_config = ?8,
|
|
cooldown_secs = ?9, max_concurrent = ?10, dedup_window_secs = ?11,
|
|
notify_channel = ?12, notify_user = ?13,
|
|
notify_on_success = ?14, notify_on_failure = ?15, notify_on_attention = ?16,
|
|
state = ?17, next_fire_at = ?18,
|
|
updated_at = ?19
|
|
WHERE id = ?1
|
|
"#,
|
|
params![
|
|
routine.id.to_string(),
|
|
routine.name.as_str(),
|
|
routine.description.as_str(),
|
|
routine.enabled as i64,
|
|
trigger_type,
|
|
trigger_config.to_string(),
|
|
action_type,
|
|
action_config.to_string(),
|
|
cooldown_secs,
|
|
max_concurrent,
|
|
dedup_window_secs,
|
|
opt_text(routine.notify.channel.as_deref()),
|
|
routine.notify.user.as_str(),
|
|
routine.notify.on_success as i64,
|
|
routine.notify.on_failure as i64,
|
|
routine.notify.on_attention as i64,
|
|
routine.state.to_string(),
|
|
fmt_opt_ts(&routine.next_fire_at),
|
|
now,
|
|
],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn update_routine_runtime(
|
|
&self,
|
|
id: Uuid,
|
|
last_run_at: DateTime<Utc>,
|
|
next_fire_at: Option<DateTime<Utc>>,
|
|
run_count: u64,
|
|
consecutive_failures: u32,
|
|
state: &serde_json::Value,
|
|
) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let now = fmt_ts(&Utc::now());
|
|
conn.execute(
|
|
r#"
|
|
UPDATE routines SET
|
|
last_run_at = ?2, next_fire_at = ?3,
|
|
run_count = ?4, consecutive_failures = ?5,
|
|
state = ?6, updated_at = ?7
|
|
WHERE id = ?1
|
|
"#,
|
|
params![
|
|
id.to_string(),
|
|
fmt_ts(&last_run_at),
|
|
fmt_opt_ts(&next_fire_at),
|
|
run_count as i64,
|
|
consecutive_failures as i64,
|
|
state.to_string(),
|
|
now,
|
|
],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn delete_routine(&self, id: Uuid) -> Result<bool, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let count = conn
|
|
.execute(
|
|
"DELETE FROM routines WHERE id = ?1",
|
|
params![id.to_string()],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(count > 0)
|
|
}
|
|
|
|
async fn create_routine_run(&self, run: &RoutineRun) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
conn.execute(
|
|
r#"
|
|
INSERT INTO routine_runs (
|
|
id, routine_id, trigger_type, trigger_detail,
|
|
started_at, status, job_id
|
|
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
|
|
"#,
|
|
params![
|
|
run.id.to_string(),
|
|
run.routine_id.to_string(),
|
|
run.trigger_type.as_str(),
|
|
opt_text(run.trigger_detail.as_deref()),
|
|
fmt_ts(&run.started_at),
|
|
run.status.to_string(),
|
|
opt_text_owned(run.job_id.map(|id| id.to_string())),
|
|
],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn complete_routine_run(
|
|
&self,
|
|
id: Uuid,
|
|
status: RunStatus,
|
|
result_summary: Option<&str>,
|
|
tokens_used: Option<i32>,
|
|
) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let now = fmt_ts(&Utc::now());
|
|
conn.execute(
|
|
r#"
|
|
UPDATE routine_runs SET
|
|
completed_at = ?5, status = ?2,
|
|
result_summary = ?3, tokens_used = ?4
|
|
WHERE id = ?1
|
|
"#,
|
|
params![
|
|
id.to_string(),
|
|
status.to_string(),
|
|
opt_text(result_summary),
|
|
tokens_used.map(|t| t as i64),
|
|
now,
|
|
],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
|
|
async fn list_routine_runs(
|
|
&self,
|
|
routine_id: Uuid,
|
|
limit: i64,
|
|
) -> Result<Vec<RoutineRun>, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
&format!(
|
|
"SELECT {} FROM routine_runs WHERE routine_id = ?1 ORDER BY started_at DESC LIMIT ?2",
|
|
ROUTINE_RUN_COLUMNS
|
|
),
|
|
params![routine_id.to_string(), limit],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
let mut runs = Vec::new();
|
|
while let Some(row) = rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
runs.push(row_to_routine_run_libsql(&row)?);
|
|
}
|
|
Ok(runs)
|
|
}
|
|
|
|
async fn count_running_routine_runs(&self, routine_id: Uuid) -> Result<i64, DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
let mut rows = conn
|
|
.query(
|
|
"SELECT COUNT(*) as cnt FROM routine_runs WHERE routine_id = ?1 AND status = 'running'",
|
|
params![routine_id.to_string()],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
|
|
match rows
|
|
.next()
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?
|
|
{
|
|
Some(row) => Ok(get_i64(&row, 0)),
|
|
None => Ok(0),
|
|
}
|
|
}
|
|
|
|
async fn link_routine_run_to_job(
|
|
&self,
|
|
run_id: Uuid,
|
|
job_id: Uuid,
|
|
) -> Result<(), DatabaseError> {
|
|
let conn = self.connect().await?;
|
|
conn.execute(
|
|
"UPDATE routine_runs SET job_id = ?1 WHERE id = ?2",
|
|
params![job_id.to_string(), run_id.to_string()],
|
|
)
|
|
.await
|
|
.map_err(|e| DatabaseError::Query(e.to_string()))?;
|
|
Ok(())
|
|
}
|
|
}
|