diff --git a/crates/service/web/storyteller_web/src/api_doc.rs b/crates/service/web/storyteller_web/src/api_doc.rs index 37b48e6528..cd1cdc776f 100644 --- a/crates/service/web/storyteller_web/src/api_doc.rs +++ b/crates/service/web/storyteller_web/src/api_doc.rs @@ -69,13 +69,14 @@ use crate::http_server::endpoints::user_ratings::get_user_rating_handler::*; use crate::http_server::endpoints::user_ratings::set_user_rating_handler::*; use crate::http_server::endpoints::voice_designer::inference::enqueue_tts_request::*; use crate::http_server::endpoints::voice_designer::voice_datasets::list_datasets_by_user::*; -use crate::http_server::endpoints::weights::delete_weight::*; -use crate::http_server::endpoints::weights::get_weight::*; -use crate::http_server::endpoints::weights::list_available_weights::*; -use crate::http_server::endpoints::weights::list_weights_by_user::*; +use crate::http_server::endpoints::weights::delete_weight_handler::*; +use crate::http_server::endpoints::weights::get_weight_handler::*; +use crate::http_server::endpoints::weights::list_available_weights_handler::*; +use crate::http_server::endpoints::weights::list_featured_weights_handler::*; +use crate::http_server::endpoints::weights::list_weights_by_user_handler::*; use crate::http_server::endpoints::weights::search_model_weights_handler::*; -use crate::http_server::endpoints::weights::set_model_weight_cover_image::*; -use crate::http_server::endpoints::weights::update_weight::*; +use crate::http_server::endpoints::weights::set_model_weight_cover_image_handler::*; +use crate::http_server::endpoints::weights::update_weight_handler::*; use crate::http_server::endpoints::workflows::enqueue_video_style_transfer_handler::*; use crate::http_server::web_utils::response_success_helpers::*; @@ -114,13 +115,14 @@ use crate::http_server::web_utils::response_success_helpers::*; crate::http_server::endpoints::user_ratings::set_user_rating_handler::set_user_rating_handler, crate::http_server::endpoints::voice_designer::inference::enqueue_tts_request::enqueue_tts_request, crate::http_server::endpoints::voice_designer::voice_datasets::list_datasets_by_user::list_datasets_by_user_handler, - crate::http_server::endpoints::weights::delete_weight::delete_weight_handler, - crate::http_server::endpoints::weights::get_weight::get_weight_handler, - crate::http_server::endpoints::weights::list_available_weights::list_available_weights_handler, - crate::http_server::endpoints::weights::list_weights_by_user::list_weights_by_user_handler, + crate::http_server::endpoints::weights::delete_weight_handler::delete_weight_handler, + crate::http_server::endpoints::weights::get_weight_handler::get_weight_handler, + crate::http_server::endpoints::weights::list_available_weights_handler::list_available_weights_handler, + crate::http_server::endpoints::weights::list_featured_weights_handler::list_featured_weights_handler, + crate::http_server::endpoints::weights::list_weights_by_user_handler::list_weights_by_user_handler, crate::http_server::endpoints::weights::search_model_weights_handler::search_model_weights_handler, - crate::http_server::endpoints::weights::set_model_weight_cover_image::set_model_weight_cover_image_handler, - crate::http_server::endpoints::weights::update_weight::update_weight_handler, + crate::http_server::endpoints::weights::set_model_weight_cover_image_handler::set_model_weight_cover_image_handler, + crate::http_server::endpoints::weights::update_weight_handler::update_weight_handler, crate::http_server::endpoints::workflows::enqueue_video_style_transfer_handler::enqueue_video_style_transfer_handler, users_component::endpoints::get_profile_handler::get_profile_handler, users_component::endpoints::login_handler::login_handler, @@ -210,6 +212,7 @@ use crate::http_server::web_utils::response_success_helpers::*; EnqueueVideoStyleTransferRequest, EnqueueVideoStyleTransferSuccessResponse, FakeYouPlan, + FeaturedModelWeightForList, GetInferenceJobStatusError, GetInferenceJobStatusPathInfo, GetInferenceJobStatusSuccessResponse, @@ -226,11 +229,11 @@ use crate::http_server::web_utils::response_success_helpers::*; GetWeightError, GetWeightPathInfo, GetWeightResponse, + InferenceJobStatusResponsePayload, + InferenceJobTokenType, InferTtsError, InferTtsRequest, InferTtsSuccessResponse, - InferenceJobStatusResponsePayload, - InferenceJobTokenType, ListAvailableWeightsQuery, ListAvailableWeightsSuccessResponse, ListDatasetsByUserError, @@ -238,6 +241,8 @@ use crate::http_server::web_utils::response_success_helpers::*; ListDatasetsByUserSuccessResponse, ListFeaturedMediaFilesError, ListFeaturedMediaFilesSuccessResponse, + ListFeaturedWeightsError, + ListFeaturedWeightsSuccessResponse, ListMediaFilesByBatchError, ListMediaFilesByBatchPathInfo, ListMediaFilesByBatchSuccessResponse, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs index 64e67ddce5..26d49b039f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/edit/set_media_file_cover_image_handler.rs @@ -14,7 +14,7 @@ use http_server_common::response::serialize_as_json_error::serialize_as_json_err use mysql_queries::queries::media_files::edit::set_media_file_cover_image::{set_media_file_cover_image, UpdateArgs}; use mysql_queries::queries::media_files::get_media_file::get_media_file; use tokens::tokens::media_files::MediaFileToken; -use crate::http_server::endpoints::weights::set_model_weight_cover_image::SetModelWeightCoverImageError; +use crate::http_server::endpoints::weights::set_model_weight_cover_image_handler::SetModelWeightCoverImageError; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete_weight.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete_weight_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete_weight.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/delete_weight_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get_weight.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/get_weight_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/get_weight.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/get_weight_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights_handler.rs similarity index 97% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights_handler.rs index 3d0dfef727..3130d80d41 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_featured_weights_handler.rs @@ -24,11 +24,11 @@ use crate::server_state::ServerState; #[derive(Serialize, ToSchema)] pub struct ListFeaturedWeightsSuccessResponse { pub success: bool, - pub results: Vec, + pub results: Vec, } #[derive(Serialize, ToSchema)] -pub struct ModelWeightForList { +pub struct FeaturedModelWeightForList { pub weight_token: ModelWeightToken, pub weight_type: WeightsType, @@ -152,7 +152,7 @@ pub async fn list_featured_weights_handler( .to_string() }); - ModelWeightForList { + FeaturedModelWeightForList { weight_token: w.token, title: w.title, weight_type: w.weights_type, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_weights_by_user.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_weights_by_user_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_weights_by_user.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_weights_by_user_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/mod.rs index 696aee4fb2..3adcd06f68 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/mod.rs @@ -1,8 +1,8 @@ -pub mod delete_weight; -pub mod get_weight; -pub mod list_available_weights; -pub mod list_featured_weights; -pub mod list_weights_by_user; +pub mod delete_weight_handler; +pub mod get_weight_handler; +pub mod list_available_weights_handler; +pub mod list_featured_weights_handler; +pub mod list_weights_by_user_handler; pub mod search_model_weights_handler; -pub mod set_model_weight_cover_image; -pub mod update_weight; \ No newline at end of file +pub mod set_model_weight_cover_image_handler; +pub mod update_weight_handler; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/set_model_weight_cover_image.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/set_model_weight_cover_image_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/set_model_weight_cover_image.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/set_model_weight_cover_image_handler.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight_handler.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight_handler.rs diff --git a/crates/service/web/storyteller_web/src/routes/weights_routes.rs b/crates/service/web/storyteller_web/src/routes/weights_routes.rs index 96ef7b0d46..e290480159 100644 --- a/crates/service/web/storyteller_web/src/routes/weights_routes.rs +++ b/crates/service/web/storyteller_web/src/routes/weights_routes.rs @@ -3,14 +3,14 @@ use actix_service::ServiceFactory; use actix_web::{App, Error, HttpResponse, web}; use actix_web::dev::{ServiceRequest, ServiceResponse}; -use crate::http_server::endpoints::weights::delete_weight::delete_weight_handler; -use crate::http_server::endpoints::weights::get_weight::get_weight_handler; -use crate::http_server::endpoints::weights::list_available_weights::list_available_weights_handler; -use crate::http_server::endpoints::weights::list_featured_weights::list_featured_weights_handler; -use crate::http_server::endpoints::weights::list_weights_by_user::list_weights_by_user_handler; +use crate::http_server::endpoints::weights::delete_weight_handler::delete_weight_handler; +use crate::http_server::endpoints::weights::get_weight_handler::get_weight_handler; +use crate::http_server::endpoints::weights::list_available_weights_handler::list_available_weights_handler; +use crate::http_server::endpoints::weights::list_featured_weights_handler::list_featured_weights_handler; +use crate::http_server::endpoints::weights::list_weights_by_user_handler::list_weights_by_user_handler; use crate::http_server::endpoints::weights::search_model_weights_handler::search_model_weights_handler; -use crate::http_server::endpoints::weights::set_model_weight_cover_image::set_model_weight_cover_image_handler; -use crate::http_server::endpoints::weights::update_weight::update_weight_handler; +use crate::http_server::endpoints::weights::set_model_weight_cover_image_handler::set_model_weight_cover_image_handler; +use crate::http_server::endpoints::weights::update_weight_handler::update_weight_handler; pub fn add_weights_routes(app: App) -> App where