daniel543x/artcraft
1
0 Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-11-05 09:48:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

module refactor

Browse Source
This commit is contained in:
Brandon Thomas committed 2024-09-19 01:50:34 -04:00
1 parent bc4cf3617c
commit ac899f2b56
11 files changed
+62 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

crates/service/web/storyteller_web/src/http_server/common_responses/media/cover_image_links.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks};
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
use url::Url;
use utoipa::ToSchema;
crates/service/web/storyteller_web/src/http_server/common_responses/media/media_domain.rs
+35
View File
@@ -0,0 +1,35 @@
use once_cell::sync::Lazy;
use url::Url;
//const FAKEYOU_CDN_STR: &str = "https://storage.googleapis.com/dev-vocodes-public";
const FAKEYOU_CDN_STR: &str = "https://cdn.fakeyou.com";
const STORYTELLER_CDN_STR: &str = "https://cdn.storyteller.ai";
const FAKEYOU_CDN: Lazy<Url> = Lazy::new(|| Url::parse(FAKEYOU_CDN_STR)
.expect("should never fail"));
const STORYTELLER_CDN: Lazy<Url> = Lazy::new(|| Url::parse(STORYTELLER_CDN_STR)
.expect("should never fail"));
/// Which domain to generate CDN, etc. links for.
#[derive(Copy, Clone, Debug)]
pub enum MediaDomain {
FakeYou,
Storyteller,
}
impl MediaDomain {
pub fn new_cdn_url(&self) -> Url {
match self {
MediaDomain::FakeYou => FAKEYOU_CDN.clone(),
MediaDomain::Storyteller => STORYTELLER_CDN.clone(),
}
}
pub fn cdn_url_str(&self) -> &'static str {
match self {
MediaDomain::FakeYou => FAKEYOU_CDN_STR,
MediaDomain::Storyteller => STORYTELLER_CDN_STR,
}
}
}
crates/service/web/storyteller_web/src/http_server/common_responses/media/media_file_cover_image_details.rs
+1 -1
View File
@@ -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::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::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;
crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs
+2 -34
View File
@@ -1,44 +1,12 @@
use once_cell::sync::Lazy;
use url::Url;
use utoipa::ToSchema;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
//const FAKEYOU_CDN_STR: &str = "https://storage.googleapis.com/dev-vocodes-public";
const FAKEYOU_CDN_STR: &str = "https://cdn.fakeyou.com";
const STORYTELLER_CDN_STR: &str = "https://cdn.storyteller.ai";
const FAKEYOU_CDN: Lazy<Url> = Lazy::new(|| Url::parse(FAKEYOU_CDN_STR)
.expect("should never fail"));
const STORYTELLER_CDN: Lazy<Url> = Lazy::new(|| Url::parse(STORYTELLER_CDN_STR)
.expect("should never fail"));
// TODO(bt,2024-09-05): Worth reducing the quality at all?
const QUALITY : u8 = 95;
/// Which domain to generate CDN, etc. links for.
#[derive(Copy, Clone, Debug)]
pub enum MediaDomain {
FakeYou,
Storyteller,
}
impl MediaDomain {
pub fn new_cdn_url(&self) -> Url {
match self {
MediaDomain::FakeYou => FAKEYOU_CDN.clone(),
MediaDomain::Storyteller => STORYTELLER_CDN.clone(),
}
}
pub fn cdn_url_str(&self) -> &'static str {
match self {
MediaDomain::FakeYou => FAKEYOU_CDN_STR,
MediaDomain::Storyteller => STORYTELLER_CDN_STR,
}
}
}
/// Links to media file locations (bucket, CDN, etc.)
#[derive(Serialize, ToSchema, Debug, Clone, Eq, PartialEq)]
@@ -155,7 +123,7 @@ 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::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links::MediaLinks;
mod fakeyou {
crates/service/web/storyteller_web/src/http_server/common_responses/media/mod.rs
+1
View File
@@ -1,4 +1,5 @@
pub mod cover_image_links;
pub mod media_domain;
pub mod media_file_cover_image_details;
pub mod media_links;
pub mod weights_cover_image_details;
crates/service/web/storyteller_web/src/http_server/common_responses/media/weights_cover_image_details.rs
+2 -2
View File
@@ -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::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::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::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::weights_cover_image_details::WeightsCoverImageDetails;
use tokens::tokens::model_weights::ModelWeightToken;
use url::Url;
crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/batch_get_inference_job_status_handler.rs
+2 -1
View File
@@ -12,7 +12,8 @@ use log::error;
use r2d2_redis::redis::{Commands, RedisResult};
use utoipa::{IntoParams, ToSchema};
use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks};
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links::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;
crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get/get_inference_job_status_handler.rs
+3 -2
View File
@@ -10,7 +10,8 @@ use log::error;
use r2d2_redis::redis::{Commands, RedisResult};
use utoipa::ToSchema;
use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks};
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links::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 +412,7 @@ fn record_to_payload(
#[cfg(test)]
mod tests {
use crate::http_server::common_responses::media::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::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};
crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/list/list_session_jobs_handler.rs
+2 -1
View File
@@ -12,7 +12,8 @@ use log::{error, warn};
use r2d2_redis::redis::{Commands, RedisResult};
use utoipa::{IntoParams, ToSchema};
use crate::http_server::common_responses::media::media_links::{MediaDomain, MediaLinks};
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links::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;
crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs
+12 -12
View File
@@ -1,15 +1,26 @@
use std::fmt;
use std::sync::Arc;
use actix_web::{HttpMessage, HttpRequest, HttpResponse, web};
use actix_web::error::ResponseError;
use actix_web::http::{StatusCode, Uri};
use actix_web::web::{Json, Path};
use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
use chrono::{DateTime, Utc};
use log::warn;
use url::Url;
use utoipa::ToSchema;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_file_cover_image_details::{MediaFileCoverImageDetails, MediaFileDefaultCover};
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;
use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path;
use crate::http_server::web_utils::bucket_urls::bucket_url_from_str_path::bucket_url_from_str_path;
use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
use crate::state::server_state::ServerState;
use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
@@ -28,17 +39,6 @@ use tokens::tokens::media_files::MediaFileToken;
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::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;
use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
use crate::http_server::web_utils::bucket_urls::bucket_url_from_media_path::bucket_url_from_media_path;
use crate::http_server::web_utils::bucket_urls::bucket_url_from_str_path::bucket_url_from_str_path;
use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
use crate::state::server_state::ServerState;
/// For the URL PathInfo
#[derive(Deserialize, ToSchema)]
pub struct GetMediaFilePathInfo {
crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_media_domain.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use actix_web::HttpRequest;
use crate::http_server::common_responses::media::media_links::MediaDomain;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::requests::get_request_domain_branding::{DomainBranding, get_request_domain_branding};
pub fn get_media_domain(http_request: &HttpRequest) -> MediaDomain {