From 177d3809b7c81ff378c74bfa1bf5ca002db7bb20 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 10 Mar 2026 20:24:32 -0400 Subject: [PATCH] add new fields to query --- ...f71d89eb35461e2113e43cd9d221bfa91c9a.json} | 22 ++++++++++++++----- .../src/queries/list_tasks_for_frontend.rs | 11 ++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) rename .sqlx/{query-47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767.json => query-2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a.json} (81%) diff --git a/.sqlx/query-47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767.json b/.sqlx/query-2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a.json similarity index 81% rename from .sqlx/query-47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767.json rename to .sqlx/query-2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a.json index 38a55aff4a..923d83d541 100644 --- a/.sqlx/query-47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767.json +++ b/.sqlx/query-2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a.json @@ -1,6 +1,6 @@ { "db_name": "SQLite", - "query": "\n SELECT\n id,\n task_status,\n task_type,\n model_type,\n provider,\n provider_job_id,\n frontend_caller,\n frontend_subscriber_id,\n frontend_subscriber_payload,\n on_complete_primary_media_file_token,\n on_complete_primary_media_file_class,\n on_complete_batch_token,\n on_complete_primary_media_file_cdn_url,\n on_complete_primary_media_file_thumbnail_url_template,\n created_at as \"created_at: DateTime\",\n updated_at as \"updated_at: DateTime\",\n completed_at as \"completed_at: DateTime\"\n FROM tasks\n WHERE is_dismissed_by_user == 0\n ", + "query": "\n SELECT\n id,\n task_status,\n task_type,\n model_type,\n provider,\n provider_job_id,\n frontend_caller,\n frontend_subscriber_id,\n frontend_subscriber_payload,\n on_complete_primary_media_file_token,\n on_complete_primary_media_file_class,\n on_complete_batch_token,\n on_complete_primary_media_file_cdn_url,\n on_complete_primary_media_file_thumbnail_url_template,\n on_failure_type,\n on_failure_message,\n created_at as \"created_at: DateTime\",\n updated_at as \"updated_at: DateTime\",\n completed_at as \"completed_at: DateTime\"\n FROM tasks\n WHERE is_dismissed_by_user == 0\n ", "describe": { "columns": [ { @@ -74,18 +74,28 @@ "type_info": "Text" }, { - "name": "created_at: DateTime", + "name": "on_failure_type", "ordinal": 14, + "type_info": "Text" + }, + { + "name": "on_failure_message", + "ordinal": 15, + "type_info": "Text" + }, + { + "name": "created_at: DateTime", + "ordinal": 16, "type_info": "Int64" }, { "name": "updated_at: DateTime", - "ordinal": 15, + "ordinal": 17, "type_info": "Int64" }, { "name": "completed_at: DateTime", - "ordinal": 16, + "ordinal": 18, "type_info": "Int64" } ], @@ -107,10 +117,12 @@ true, true, true, + true, + true, false, false, true ] }, - "hash": "47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767" + "hash": "2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a" } diff --git a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs index 049e79d576..6156218347 100644 --- a/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs +++ b/crates/schema/database/sqlite_tasks/src/queries/list_tasks_for_frontend.rs @@ -2,6 +2,7 @@ use crate::connection::TaskDbConnection; use crate::error::SqliteTasksError; use chrono::{DateTime, Utc}; use enums::common::generation_provider::GenerationProvider; +use enums::tauri::tasks::task_failure_type::TaskFailureType; use enums::tauri::tasks::task_media_file_class::TaskMediaFileClass; use enums::tauri::tasks::task_model_type::TaskModelType; use enums::tauri::tasks::task_status::TaskStatus; @@ -30,6 +31,8 @@ pub struct TaskItem { pub on_complete_batch_token: Option, pub on_complete_primary_media_file_cdn_url: Option, pub on_complete_primary_media_file_thumbnail_url_template: Option, + pub on_failure_type: Option, + pub on_failure_message: Option, pub created_at: DateTime, pub updated_at: DateTime, pub completed_at: Option>, @@ -56,6 +59,8 @@ pub async fn list_tasks_for_frontend( on_complete_batch_token, on_complete_primary_media_file_cdn_url, on_complete_primary_media_file_thumbnail_url_template, + on_failure_type, + on_failure_message, created_at as "created_at: DateTime", updated_at as "updated_at: DateTime", completed_at as "completed_at: DateTime" @@ -92,6 +97,10 @@ pub async fn list_tasks_for_frontend( on_complete_batch_token: raw.on_complete_batch_token.map(|t| BatchGenerationToken::new_from_str(&t)), on_complete_primary_media_file_cdn_url: raw.on_complete_primary_media_file_cdn_url, on_complete_primary_media_file_thumbnail_url_template: raw.on_complete_primary_media_file_thumbnail_url_template, + on_failure_type: raw.on_failure_type + .map(|t| TaskFailureType::from_str(&t)) + .transpose()?, + on_failure_message: raw.on_failure_message, created_at: raw.created_at, updated_at: raw.updated_at, completed_at: raw.completed_at, @@ -118,6 +127,8 @@ struct TaskItemRaw { on_complete_batch_token: Option, on_complete_primary_media_file_cdn_url: Option, on_complete_primary_media_file_thumbnail_url_template: Option, + on_failure_type: Option, + on_failure_message: Option, created_at: DateTime, updated_at: DateTime, completed_at: Option>,