Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions crates/openplotva-app/src/dialog_jobs/queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ impl DialogJobWorkerQueue for InMemoryTaskQueue {
);
Ok(item.map(|item| {
let schedule = self
.records()
.into_iter()
.find(|record| record.id == item.id)
.record(item.id)
.map(|record| (record.source_update_ids, record.latest_update_id))
.unwrap_or_default();
dialog_work_item_from_taskman(item, schedule.0, schedule.1)
Expand Down
36 changes: 36 additions & 0 deletions crates/openplotva-app/src/dialog_jobs/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,42 @@ fn activity_pulse(
)
}

#[tokio::test]
async fn dialog_dequeue_preserves_claim_and_causation_with_terminal_history()
-> Result<(), Box<dyn Error>> {
let queue = InMemoryTaskQueue::new();
let now = OffsetDateTime::now_utc();
let old_id = queue.assign(
DIALOG_AIFARM_QUEUE_NAME,
new_dialog_job_at(dialog_params("old"), now),
);
queue.complete(old_id, now)?;
let expected = queue.assign_with_schedule(
DIALOG_AIFARM_QUEUE_NAME,
new_dialog_job_at(dialog_params("current"), now),
openplotva_taskman::TaskQueueSchedule {
source_update_ids: vec![71, 72],
latest_update_id: Some(72),
..Default::default()
},
);
let item = queue
.dequeue_dialog_job(DIALOG_AIFARM_QUEUE_NAME)
.await?
.expect("current dialog");
assert_eq!(item.id, expected);
assert_eq!(item.source_update_ids, vec![71, 72]);
assert_eq!(item.latest_update_id, Some(72));
let record = queue.record(expected).expect("claimed record");
assert_eq!(record.status, JobStatus::Processing);
assert_eq!(record.started_at, Some(item.claim_started_at));
assert_eq!(
queue.record(old_id).expect("terminal history").status,
JobStatus::Completed
);
Ok(())
}

#[tokio::test]
async fn dialog_worker_runs_provider_sends_answer_and_completes_job() -> Result<(), Box<dyn Error>>
{
Expand Down
2 changes: 1 addition & 1 deletion crates/openplotva-app/src/runtime_taskman.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ pub(crate) struct RuntimeTaskmanInspectorHandle {

impl RuntimeTaskmanInspectorHandle {
pub(crate) fn is_configured(&self) -> bool {
self.records().is_some()
self.shared_queue().is_ok()
}

pub(crate) fn set_shared_queue(
Expand Down
2 changes: 1 addition & 1 deletion crates/openplotva-app/src/task_queue.rs
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ impl SharedTaskQueueRuntime {
journal.flush_dirty().await?;
}
let report = SharedTaskQueueRestoreReport {
restored: queue.records().len().max(restored_before_requeue),
restored: restored_before_requeue,
requeued,
};
Ok((
Expand Down
Loading