From 6701da597d1c4f4a34b2ef799efc74e992f59c00 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 22 Apr 2024 21:33:31 -0400 Subject: [PATCH] refactor --- crates/service/web/storyteller_web/src/api_doc.rs | 8 ++++---- ...tatus.rs => batch_get_inference_job_status_handler.rs} | 0 ..._job_status.rs => get_inference_job_status_handler.rs} | 2 +- ...ount.rs => get_pending_inference_job_count_handler.rs} | 0 ...l_inference_jobs.rs => kill_inference_jobs_handler.rs} | 0 .../src/http_server/endpoints/inference_job/mod.rs | 8 ++++---- .../service/web/storyteller_web/src/routes/add_routes.rs | 4 ++-- .../service/web/storyteller_web/src/routes/job_routes.rs | 6 +++--- .../web/storyteller_web/src/routes/moderation_routes.rs | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/{batch_get_inference_job_status.rs => batch_get_inference_job_status_handler.rs} (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/{get_inference_job_status.rs => get_inference_job_status_handler.rs} (99%) rename crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/{get_pending_inference_job_count.rs => get_pending_inference_job_count_handler.rs} (100%) rename crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/{kill_inference_jobs.rs => kill_inference_jobs_handler.rs} (100%) diff --git a/crates/service/web/storyteller_web/src/api_doc.rs b/crates/service/web/storyteller_web/src/api_doc.rs index e662a2e4d4..620a049e28 100644 --- a/crates/service/web/storyteller_web/src/api_doc.rs +++ b/crates/service/web/storyteller_web/src/api_doc.rs @@ -37,8 +37,8 @@ use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats use crate::http_server::common_responses::weights_cover_image_details::*; use crate::http_server::endpoints::conversion::enqueue_fbx_to_gltf_handler::*; use crate::http_server::endpoints::engine::create_scene_handler::*; -use crate::http_server::endpoints::inference_job::batch_get_inference_job_status::*; -use crate::http_server::endpoints::inference_job::get_inference_job_status::*; +use crate::http_server::endpoints::inference_job::batch_get_inference_job_status_handler::*; +use crate::http_server::endpoints::inference_job::get_inference_job_status_handler::*; use crate::http_server::endpoints::inference_job::terminate_inference_job_handler::*; use crate::http_server::endpoints::media_files::delete::delete_media_file_handler::*; use crate::http_server::endpoints::media_files::edit::change_media_file_visibility_handler::*; @@ -87,8 +87,8 @@ use crate::http_server::web_utils::response_success_helpers::*; paths( crate::http_server::endpoints::conversion::enqueue_fbx_to_gltf_handler::enqueue_fbx_to_gltf_handler, crate::http_server::endpoints::engine::create_scene_handler::create_scene_handler, - crate::http_server::endpoints::inference_job::batch_get_inference_job_status::batch_get_inference_job_status_handler, - crate::http_server::endpoints::inference_job::get_inference_job_status::get_inference_job_status_handler, + crate::http_server::endpoints::inference_job::batch_get_inference_job_status_handler::batch_get_inference_job_status_handler, + crate::http_server::endpoints::inference_job::get_inference_job_status_handler::get_inference_job_status_handler, crate::http_server::endpoints::inference_job::terminate_inference_job_handler::terminate_inference_job_handler, crate::http_server::endpoints::media_files::delete::delete_media_file_handler::delete_media_file_handler, crate::http_server::endpoints::media_files::edit::change_media_file_visibility_handler::change_media_file_visibility_handler, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/batch_get_inference_job_status.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/batch_get_inference_job_status_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/batch_get_inference_job_status.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/batch_get_inference_job_status_handler.rs 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_handler.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status_handler.rs index 19b22bec81..718cf7ca8c 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_handler.rs @@ -362,7 +362,7 @@ mod tests { use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType; use mysql_queries::queries::generic_inference::web::get_inference_job_status::{GenericInferenceJobStatus, RequestDetails, ResultDetails}; - use crate::http_server::endpoints::inference_job::get_inference_job_status::record_to_payload; + use crate::http_server::endpoints::inference_job::get_inference_job_status_handler::record_to_payload; #[test] fn text_to_speech_as_media_file() { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_pending_inference_job_count_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/kill_inference_jobs.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/kill_inference_jobs_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/kill_inference_jobs.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/kill_inference_jobs_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/mod.rs index 0bb2f8a054..3dd6b67517 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/mod.rs @@ -1,5 +1,5 @@ -pub mod batch_get_inference_job_status; -pub mod get_inference_job_status; -pub mod get_pending_inference_job_count; -pub mod kill_inference_jobs; +pub mod batch_get_inference_job_status_handler; +pub mod get_inference_job_status_handler; +pub mod get_pending_inference_job_count_handler; +pub mod kill_inference_jobs_handler; pub mod terminate_inference_job_handler; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/routes/add_routes.rs b/crates/service/web/storyteller_web/src/routes/add_routes.rs index 917693580f..1b7b4eb339 100644 --- a/crates/service/web/storyteller_web/src/routes/add_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/add_routes.rs @@ -38,8 +38,8 @@ use crate::http_server::endpoints::events::list_events::list_events_handler; use crate::http_server::endpoints::flags::design_refresh_flag::disable_design_refresh_flag_handler::disable_design_refresh_flag_handler; use crate::http_server::endpoints::flags::design_refresh_flag::enable_design_refresh_flag_handler::enable_design_refresh_flag_handler; use crate::http_server::endpoints::image_gen::enqueue_image_generation::enqueue_image_generation_request; -use crate::http_server::endpoints::inference_job::get_inference_job_status::get_inference_job_status_handler; -use crate::http_server::endpoints::inference_job::get_pending_inference_job_count::get_pending_inference_job_count_handler; +use crate::http_server::endpoints::inference_job::get_inference_job_status_handler::get_inference_job_status_handler; +use crate::http_server::endpoints::inference_job::get_pending_inference_job_count_handler::get_pending_inference_job_count_handler; use crate::http_server::endpoints::inference_job::terminate_inference_job_handler::terminate_inference_job_handler; use crate::http_server::endpoints::investor_demo::disable_demo_mode_handler::disable_demo_mode_handler; use crate::http_server::endpoints::investor_demo::enable_demo_mode_handler::enable_demo_mode_handler; diff --git a/crates/service/web/storyteller_web/src/routes/job_routes.rs b/crates/service/web/storyteller_web/src/routes/job_routes.rs index f0bf42cbf8..d6ddb242a6 100644 --- a/crates/service/web/storyteller_web/src/routes/job_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/job_routes.rs @@ -3,9 +3,9 @@ use actix_service::ServiceFactory; use actix_web::{App, Error}; use actix_web::dev::{ServiceRequest, ServiceResponse}; use actix_helpers::route_builder::RouteBuilder; -use crate::http_server::endpoints::inference_job::batch_get_inference_job_status::batch_get_inference_job_status_handler; -use crate::http_server::endpoints::inference_job::get_inference_job_status::get_inference_job_status_handler; -use crate::http_server::endpoints::inference_job::get_pending_inference_job_count::get_pending_inference_job_count_handler; +use crate::http_server::endpoints::inference_job::batch_get_inference_job_status_handler::batch_get_inference_job_status_handler; +use crate::http_server::endpoints::inference_job::get_inference_job_status_handler::get_inference_job_status_handler; +use crate::http_server::endpoints::inference_job::get_pending_inference_job_count_handler::get_pending_inference_job_count_handler; use crate::http_server::endpoints::inference_job::terminate_inference_job_handler::terminate_inference_job_handler; pub fn add_job_routes (app: App) -> App diff --git a/crates/service/web/storyteller_web/src/routes/moderation_routes.rs b/crates/service/web/storyteller_web/src/routes/moderation_routes.rs index 7f483d4483..0a6efd0ce9 100644 --- a/crates/service/web/storyteller_web/src/routes/moderation_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/moderation_routes.rs @@ -3,7 +3,7 @@ use actix_service::ServiceFactory; use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; -use crate::http_server::endpoints::inference_job::kill_inference_jobs::kill_generic_inference_jobs_handler; +use crate::http_server::endpoints::inference_job::kill_inference_jobs_handler::kill_generic_inference_jobs_handler; use crate::http_server::endpoints::moderation::approval::pending_w2l_templates::get_pending_w2l_templates_handler; use crate::http_server::endpoints::moderation::categories::delete_category::delete_category_handler; use crate::http_server::endpoints::moderation::categories::edit_category::edit_category_handler;