mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-04 09:28:11 +00:00
populate provider and model
This commit is contained in:
1 parent
fb68554f85
commit
ff360f83b1
5 files changed
+28
No files matched your search
@@ -6,6 +6,8 @@ use sqlx;
|
||||
use sqlx::{Executor, MySql};
|
||||
|
||||
use enums::by_table::prompts::prompt_type::PromptType;
|
||||
use enums::common::generation_provider::GenerationProvider;
|
||||
use enums::common::model_type::ModelType;
|
||||
use errors::AnyhowResult;
|
||||
use tokens::tokens::prompts::PromptToken;
|
||||
use tokens::tokens::users::UserToken;
|
||||
@@ -21,6 +23,10 @@ pub struct InsertPromptArgs<'e, 'c, E>
|
||||
pub prompt_type: PromptType,
|
||||
|
||||
pub maybe_creator_user_token: Option<&'e UserToken>,
|
||||
|
||||
pub maybe_model_type: Option<ModelType>,
|
||||
|
||||
pub maybe_generation_provider: Option<GenerationProvider>,
|
||||
|
||||
pub maybe_positive_prompt: Option<&'e str>,
|
||||
|
||||
@@ -65,9 +71,13 @@ SET
|
||||
prompt_type = ?,
|
||||
|
||||
maybe_creator_user_token = ?,
|
||||
|
||||
maybe_model_type = ?,
|
||||
maybe_generation_provider = ?,
|
||||
|
||||
maybe_positive_prompt = ?,
|
||||
maybe_negative_prompt = ?,
|
||||
|
||||
maybe_other_args = ?,
|
||||
|
||||
creator_ip_address = ?
|
||||
@@ -75,6 +85,8 @@ SET
|
||||
prompt_token.as_str(),
|
||||
args.prompt_type.to_str(),
|
||||
args.maybe_creator_user_token.map(|t| t.as_str()),
|
||||
args.maybe_model_type.map(|m| m.to_str()),
|
||||
args.maybe_generation_provider.map(|g| g.to_str()),
|
||||
args.maybe_positive_prompt,
|
||||
args.maybe_negative_prompt,
|
||||
maybe_other_args,
|
||||
|
||||
+4
@@ -15,6 +15,8 @@ use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginM
|
||||
use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
|
||||
use enums::by_table::media_files::media_file_type::MediaFileType;
|
||||
use enums::by_table::prompts::prompt_type::PromptType;
|
||||
use enums::common::generation_provider::GenerationProvider;
|
||||
use enums::common::model_type::ModelType;
|
||||
use filesys::path_to_string::path_to_string;
|
||||
use mysql_queries::payloads::media_file_extra_info::inner_payloads::stable_diffusion_extra_info::StableDiffusionExtraInfo;
|
||||
use mysql_queries::payloads::media_file_extra_info::media_file_extra_info::MediaFileExtraInfo;
|
||||
@@ -328,6 +330,8 @@ pub async fn process_job_inference(
|
||||
maybe_apriori_prompt_token: Some(&prompt_token),
|
||||
prompt_type: PromptType::StableDiffusion,
|
||||
maybe_creator_user_token: job.maybe_creator_user_token_typed.as_ref(),
|
||||
maybe_model_type: None,
|
||||
maybe_generation_provider: None,
|
||||
maybe_positive_prompt: Some(&positive_prompt),
|
||||
maybe_negative_prompt: maybe_negative_prompt.as_deref(),
|
||||
maybe_other_args: None, // TODO(bt,2024-02-22): Support other arguments
|
||||
|
||||
+4
@@ -8,6 +8,8 @@ use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path:
|
||||
use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
|
||||
use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
|
||||
use enums::by_table::prompts::prompt_type::PromptType;
|
||||
use enums::common::generation_provider::GenerationProvider;
|
||||
use enums::common::model_type::ModelType;
|
||||
use filesys::file_size::file_size;
|
||||
use filesys::path_to_string::path_to_string;
|
||||
use hashing::sha256::sha256_hash_file::sha256_hash_file;
|
||||
@@ -290,6 +292,8 @@ pub async fn validate_and_save_results(args: SaveResultsArgs<'_>) -> Result<Medi
|
||||
maybe_apriori_prompt_token: Some(&prompt_token),
|
||||
prompt_type: PromptType::ComfyUi,
|
||||
maybe_creator_user_token: args.job.maybe_creator_user_token_typed.as_ref(),
|
||||
maybe_model_type: None,
|
||||
maybe_generation_provider: None,
|
||||
maybe_positive_prompt: args.comfy_args.positive_prompt.as_deref(),
|
||||
maybe_negative_prompt: args.comfy_args.negative_prompt.as_deref(),
|
||||
maybe_other_args: maybe_other_args.as_ref(),
|
||||
|
||||
+4
@@ -10,6 +10,8 @@ use actix_web::{web, HttpRequest};
|
||||
use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest, GptImage1EditImageResponse};
|
||||
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
|
||||
use enums::by_table::prompts::prompt_type::PromptType;
|
||||
use enums::common::generation_provider::GenerationProvider;
|
||||
use enums::common::model_type::ModelType;
|
||||
use enums::common::visibility::Visibility;
|
||||
use fal_client::creds::open_ai_api_key::OpenAiApiKey;
|
||||
use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::enqueue_gpt_image_1_edit_image_webhook;
|
||||
@@ -206,6 +208,8 @@ pub async fn gpt_image_1_edit_image_handler(
|
||||
maybe_creator_user_token: maybe_user_session
|
||||
.as_ref()
|
||||
.map(|s| &s.user_token),
|
||||
maybe_model_type: Some(ModelType::GptImage1),
|
||||
maybe_generation_provider: Some(GenerationProvider::Artcraft),
|
||||
maybe_positive_prompt: request.prompt.as_deref(),
|
||||
maybe_negative_prompt: None,
|
||||
maybe_other_args: None,
|
||||
|
||||
+4
@@ -15,6 +15,8 @@ use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateV
|
||||
use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::GenerateVeo2ImageToVideoResponse;
|
||||
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
|
||||
use enums::by_table::prompts::prompt_type::PromptType;
|
||||
use enums::common::generation_provider::GenerationProvider;
|
||||
use enums::common::model_type::ModelType;
|
||||
use enums::common::visibility::Visibility;
|
||||
use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::enqueue_veo_2_image_to_video_webhook;
|
||||
use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::Veo2Args;
|
||||
@@ -198,6 +200,8 @@ pub async fn generate_veo_2_image_to_video_handler(
|
||||
maybe_creator_user_token: maybe_user_session
|
||||
.as_ref()
|
||||
.map(|s| &s.user_token),
|
||||
maybe_model_type: Some(ModelType::Veo2),
|
||||
maybe_generation_provider: Some(GenerationProvider::Artcraft),
|
||||
maybe_positive_prompt: Some(prompt),
|
||||
maybe_negative_prompt: None,
|
||||
maybe_other_args: None,
|
||||
|
||||
Reference in new issue
Block a user