diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs index 2089bda8df..b08135219a 100644 --- a/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs +++ b/crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs @@ -5,6 +5,7 @@ use sqlx::MySqlPool; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums::common::job_status_plus::JobStatusPlus; use errors::AnyhowResult; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -14,7 +15,7 @@ use crate::helpers::boolean_converters::i8_to_bool; pub struct GenericInferenceJobStatus { pub job_token: InferenceJobToken, - pub status: String, + pub status: JobStatusPlus, pub attempt_count: u16, pub maybe_assigned_worker: Option, @@ -79,7 +80,7 @@ pub async fn get_inference_job_status(job_token: &InferenceJobToken, mysql_pool: SELECT jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`, - jobs.status, + jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`, jobs.attempt_count, jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`, @@ -210,7 +211,7 @@ WHERE jobs.token = ? struct RawGenericInferenceJobStatus { pub job_token: InferenceJobToken, - pub status: String, + pub status: JobStatusPlus, pub attempt_count: u16, pub inference_category: InferenceCategory, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs index 8f0ca0decf..6ad6b9e63d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs @@ -6,13 +6,14 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use chrono::{DateTime, Utc}; -use log::{error, log}; +use log::error; use r2d2_redis::redis::{Commands, RedisResult}; use buckets::public::media_files::original_file::MediaFileBucketPath; use buckets::public::voice_conversion_results::original_file::VoiceConversionResultOriginalFilePath; use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; +use enums::common::job_status_plus::JobStatusPlus; use mysql_queries::queries::generic_inference::web::get_inference_job_status::get_inference_job_status; use redis_common::redis_keys::RedisKeys; use tokens::tokens::generic_inference_jobs::InferenceJobToken; @@ -65,7 +66,7 @@ pub struct RequestDetailsResponse { #[derive(Serialize)] pub struct StatusDetailsResponse { /// Primary status from the database (a state machine). - pub status: String, + pub status: JobStatusPlus, /// Extra, temporary status from Redis. /// This can denote inference progress, and the Python code can write to it.