module refactor

This commit is contained in:
Brandon Thomas committed 2024-09-19 01:15:43 -04:00
1 parent 0ee2d9548a
commit bc4cf3617c
21 files changed
+23 -23

No files matched your search

@@ -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;
@@ -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;
@@ -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;
@@ -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::*;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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};
@@ -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;
@@ -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;
@@ -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;
@@ -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 {
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;