diff --git a/crates/service/web/storyteller_web/src/docs/api_doc.rs b/crates/service/web/storyteller_web/src/docs/api_doc.rs index 7199ca4819..b30e0be485 100644 --- a/crates/service/web/storyteller_web/src/docs/api_doc.rs +++ b/crates/service/web/storyteller_web/src/docs/api_doc.rs @@ -46,7 +46,7 @@ use crate::http_server::common_responses::media::media_file_cover_image_details: use crate::http_server::common_responses::media::weights_cover_image_details::*; use crate::http_server::common_responses::media_file_origin_details::*; use crate::http_server::common_responses::media_file_social_meta_lite::MediaFileSocialMetaLight; -use crate::http_server::common_responses::media_links::*; +use crate::http_server::common_responses::media::media_links::*; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media/cover_image_links.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/cover_image_links.rs index 685317fa67..e1a4ef190e 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media/cover_image_links.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/cover_image_links.rs @@ -1,4 +1,4 @@ -use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks}; +use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks}; use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; use url::Url; use utoipa::ToSchema; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs index ad51dc47e2..e701c8ffcb 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs @@ -4,7 +4,7 @@ use url::Url; use utoipa::ToSchema; use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks; -use crate::http_server::common_responses::media_links::MediaDomain; +use crate::http_server::common_responses::media::media_links::MediaDomain; use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path; use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; use tokens::tokens::media_files::MediaFileToken; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media_links.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/common_responses/media_links.rs rename to crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs index f5f6c466ea..b7af4c4b40 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media_links.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs @@ -155,8 +155,8 @@ fn video_preview_thumbnail_template(media_domain: MediaDomain, rooted_path: &str mod tests { use buckets::public::media_files::bucket_file_path::MediaFileBucketPath; - use crate::http_server::common_responses::media_links::MediaDomain; - use crate::http_server::common_responses::media_links::MediaLinks; + use crate::http_server::common_responses::media::media_links::MediaDomain; + use crate::http_server::common_responses::media::media_links::MediaLinks; mod fakeyou { use super::*; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs index b7c9e8dead..52f17cbd73 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs @@ -1,3 +1,4 @@ pub mod cover_image_links; pub mod media_file_cover_image_details; +pub mod media_links; pub mod weights_cover_image_details; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs index fd0b09db43..e66e44f3c0 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs @@ -2,7 +2,7 @@ use url::Url; use utoipa::ToSchema; use crate::http_server::common_responses::media::cover_image_links::CoverImageLinks; -use crate::http_server::common_responses::media_links::MediaDomain; +use crate::http_server::common_responses::media::media_links::MediaDomain; use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path; use crate::util::placeholder_images::cover_images::default_cover_image_color_from_token::default_cover_image_color_from_token; use crate::util::placeholder_images::cover_images::default_cover_image_from_token::default_cover_image_from_token; @@ -94,7 +94,7 @@ impl WeightsDefaultCoverInfo { #[cfg(test)] mod tests { - use crate::http_server::common_responses::media_links::MediaDomain; + use crate::http_server::common_responses::media::media_links::MediaDomain; use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails; use tokens::tokens::model_weights::ModelWeightToken; use url::Url; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/mod.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/mod.rs index f9f8487e8f..d3b009bd43 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/mod.rs @@ -1,7 +1,6 @@ pub mod media; pub mod media_file_origin_details; pub mod media_file_social_meta_lite; -pub mod media_links; pub mod pagination_cursors; pub mod pagination_page; pub mod simple_entity_stats; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs index 838bce96cf..1eaff06560 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs @@ -12,7 +12,7 @@ use log::error; use r2d2_redis::redis::{Commands, RedisResult}; use utoipa::{IntoParams, ToSchema}; -use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks}; +use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks}; use crate::http_server::endpoints::inference_job::common_responses::lipsync::JobDetailsLipsyncRequest; use crate::http_server::endpoints::inference_job::common_responses::live_portrait::JobDetailsLivePortraitRequest; use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs index c7f06289f7..5c6be2e58d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs @@ -10,7 +10,7 @@ use log::error; use r2d2_redis::redis::{Commands, RedisResult}; use utoipa::ToSchema; -use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks}; +use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks}; use crate::http_server::endpoints::inference_job::common_responses::lipsync::JobDetailsLipsyncRequest; use crate::http_server::endpoints::inference_job::common_responses::live_portrait::JobDetailsLivePortraitRequest; use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress; @@ -411,7 +411,7 @@ fn record_to_payload( #[cfg(test)] mod tests { - use crate::http_server::common_responses::media_links::MediaDomain; + use crate::http_server::common_responses::media::media_links::MediaDomain; use crate::http_server::endpoints::inference_job::get::get_inference_job_status_handler::record_to_payload; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use mysql_queries::queries::generic_inference::web::job_status::{GenericInferenceJobStatus, RequestDetails, ResultDetails}; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs index 70425e45d9..aaf3e0b94e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs @@ -12,7 +12,7 @@ use log::{error, warn}; use r2d2_redis::redis::{Commands, RedisResult}; use utoipa::{IntoParams, ToSchema}; -use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks}; +use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks}; use crate::http_server::endpoints::inference_job::common_responses::lipsync::JobDetailsLipsyncRequest; use crate::http_server::endpoints::inference_job::common_responses::live_portrait::JobDetailsLivePortraitRequest; use crate::http_server::endpoints::inference_job::utils::estimates::estimate_job_progress::estimate_job_progress; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs index 7171a315fa..ac07dfe69c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs @@ -32,7 +32,7 @@ use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::endpoints::media_files::common_responses::live_portrait::MediaFileLivePortraitDetails; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs index f3c27d0a7b..50ee2abb48 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs @@ -29,7 +29,7 @@ use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::prompts::PromptToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; -use crate::http_server::common_responses::media_links::{MediaDomain, MediaLinks}; +use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks}; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::endpoints::media_files::common_responses::live_portrait::MediaFileLivePortraitDetails; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs index ce3d593bec..156a0f7dea 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs @@ -1,6 +1,6 @@ use actix_web::HttpRequest; -use crate::http_server::common_responses::media_links::MediaDomain; +use crate::http_server::common_responses::media::media_links::MediaDomain; use crate::http_server::requests::get_request_domain_branding::{DomainBranding, get_request_domain_branding}; pub fn get_media_domain(http_request: &HttpRequest) -> MediaDomain { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs index e611e5e42a..41ed05d9ec 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_featured_media_files_handler.rs @@ -28,7 +28,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs index 9f349edaaf..dbf4c61c0a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs @@ -26,7 +26,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs index 424a480e3a..1d40b294b6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_for_user_handler.rs @@ -25,7 +25,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs index a3e8548b9c..f60622bb55 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_handler.rs @@ -24,7 +24,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs index 712d4f8657..4d8af14bc6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs @@ -22,7 +22,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs index ef74737f93..91d5af31fb 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_featured_media_files_handler.rs @@ -21,7 +21,7 @@ use tokens::tokens::media_files::MediaFileToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs index 756d4fd934..debceb3eea 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/search/search_session_media_files_handler.rs @@ -23,7 +23,7 @@ use tokens::tokens::users::UserToken; use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover}; use crate::http_server::common_responses::media_file_origin_details::MediaFileOriginDetails; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_cursors::PaginationCursors; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs index a3ddb032c9..776dad792f 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs @@ -14,7 +14,7 @@ use chrono::{DateTime, Utc}; use log::warn; use utoipa::{IntoParams, ToSchema}; -use crate::http_server::common_responses::media_links::MediaLinks; +use crate::http_server::common_responses::media::media_links::MediaLinks; use crate::http_server::common_responses::pagination_page::PaginationPage; use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats; use crate::http_server::common_responses::user_details_lite::UserDetailsLight;