From 2ba1c8caccbf13565d640c330c13ce787b92c058 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 22 Jun 2026 10:09:44 -0400 Subject: [PATCH] populate field --- ...cb927bd2b3a6f67c8ceb37883b744237ba34c.json | 190 ------------------ ...442df706a183362fa7e5c331f5a4bf1a74a00.json | 12 -- .../src/prompts/batch_get_prompts.rs | 4 + .../src/prompts/get_prompt.rs | 4 + .../src/queries/prompts/batch_get_prompts.rs | 5 + .../src/queries/prompts/get_prompt.rs | 5 + .../src/queries/prompts/insert_prompt.rs | 4 + .../sd/process_job_inference.rs | 1 + .../steps/validate_and_save_results.rs | 1 + .../flux_2_lora_edit_image_angle_handler.rs | 1 + ...qwen_edit_2511_edit_image_angle_handler.rs | 1 + ...flux_pro_kontext_max_edit_image_handler.rs | 1 + .../gemini_25_flash_edit_image_handler.rs | 1 + .../edit/gpt_image_1_edit_image_handler.rs | 1 + .../image/edit/qwen_edit_image_handler.rs | 1 + .../edit/seededit_3_edit_image_handler.rs | 1 + .../flux_dev_juggernaut_inpaint_handler.rs | 1 + .../inpaint/flux_pro_1_inpaint_handler.rs | 1 + ...5_lite_multi_function_image_gen_handler.rs | 1 + ...eam_v4_multi_function_image_gen_handler.rs | 1 + ...m_v4p5_multi_function_image_gen_handler.rs | 1 + ...ge_1p5_multi_function_image_gen_handler.rs | 1 + ...nana_2_multi_function_image_gen_handler.rs | 1 + ...banana_multi_function_image_gen_handler.rs | 1 + ...na_pro_multi_function_image_gen_handler.rs | 1 + ...nerate_flux_1_dev_text_to_image_handler.rs | 2 + ...te_flux_1_schnell_text_to_image_handler.rs | 1 + ...erate_flux_pro_11_text_to_image_handler.rs | 1 + ...flux_pro_11_ultra_text_to_image_handler.rs | 1 + ...erate_gpt_image_1_text_to_image_handler.rs | 1 + ...enerate_hunyuan_2_0_image_to_3d_handler.rs | 1 + ...enerate_hunyuan_2_1_image_to_3d_handler.rs | 1 + ...yuan3d_v3_multi_function_object_handler.rs | 1 + ...worldlabs_marble_0p1_mini_splat_handler.rs | 1 + ...worldlabs_marble_0p1_plus_splat_handler.rs | 1 + .../beeble_switchx_edit_video_gen_handler.rs | 1 + .../generate_kling_1_6_pro_video_handler.rs | 1 + ...generate_kling_2_1_master_video_handler.rs | 1 + .../generate_kling_2_1_pro_video_handler.rs | 1 + ...eedance_1_0_lite_image_to_video_handler.rs | 1 + ...seedance_1_0_pro_image_to_video_handler.rs | 1 + .../generate_veo_2_image_to_video_handler.rs | 1 + ...erate_veo_3_fast_image_to_video_handler.rs | 1 + .../generate_veo_3_image_to_video_handler.rs | 1 + ...bo_pro_multi_function_video_gen_handler.rs | 1 + ...p6_pro_multi_function_video_gen_handler.rs | 1 + ...p0_pro_multi_function_video_gen_handler.rs | 1 + ...andard_multi_function_video_gen_handler.rs | 1 + ...p5_pro_multi_function_video_gen_handler.rs | 1 + ...ce_2p0_multi_function_video_gen_handler.rs | 1 + ...sora_2_multi_function_video_gen_handler.rs | 1 + ..._2_pro_multi_function_video_gen_handler.rs | 1 + ...1_fast_multi_function_video_gen_handler.rs | 1 + ...eo_3p1_multi_function_video_gen_handler.rs | 1 + .../image/omni_api_image_generate_handler.rs | 1 + .../video/omni_api_video_generate_handler.rs | 1 + .../image/omni_gen_image_generate_handler.rs | 1 + .../video/omni_gen_video_generate_handler.rs | 1 + .../prompts/batch_get_prompts_handler.rs | 1 + .../prompts/create_prompt_handler.rs | 1 + .../endpoints/prompts/get_prompt_handler.rs | 1 + 61 files changed, 77 insertions(+), 202 deletions(-) delete mode 100644 .sqlx/query-4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c.json delete mode 100644 .sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.json diff --git a/.sqlx/query-4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c.json b/.sqlx/query-4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c.json deleted file mode 100644 index 6202e1380c..0000000000 --- a/.sqlx/query-4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c.json +++ /dev/null @@ -1,190 +0,0 @@ -{ - "db_name": "MySQL", - "query": "\nSELECT\n p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n p.maybe_model_type as `maybe_model_type: enums::common::generation::common_model_type::CommonModelType`,\n p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n p.maybe_positive_prompt,\n p.maybe_negative_prompt,\n\n p.maybe_generation_mode as `maybe_generation_mode: enums::common::generation::common_generation_mode::CommonGenerationMode`,\n p.maybe_aspect_ratio as `maybe_aspect_ratio: enums::common::generation::common_aspect_ratio::CommonAspectRatio`,\n p.maybe_resolution as `maybe_resolution: enums::common::generation::common_resolution::CommonResolution`,\n p.maybe_batch_count as `maybe_batch_count: u8`,\n p.maybe_generate_audio as `maybe_generate_audio: bool`,\n p.maybe_duration_seconds as `maybe_duration_seconds: u32`,\n\n p.maybe_other_args,\n\n p.creator_ip_address,\n p.created_at\n\nFROM prompts as p\nWHERE\n p.token = ?\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "token: tokens::tokens::prompts::PromptToken", - "type_info": { - "type": "VarString", - "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", - "char_set": 224, - "max_size": 128 - } - }, - { - "ordinal": 1, - "name": "prompt_type: enums::by_table::prompts::prompt_type::PromptType", - "type_info": { - "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", - "char_set": 224, - "max_size": 64 - } - }, - { - "ordinal": 2, - "name": "maybe_model_type: enums::common::generation::common_model_type::CommonModelType", - "type_info": { - "type": "VarString", - "flags": "BINARY", - "char_set": 224, - "max_size": 128 - } - }, - { - "ordinal": 3, - "name": "maybe_generation_provider: enums::common::generation_provider::GenerationProvider", - "type_info": { - "type": "VarString", - "flags": "BINARY", - "char_set": 224, - "max_size": 64 - } - }, - { - "ordinal": 4, - "name": "maybe_creator_user_token: tokens::tokens::users::UserToken", - "type_info": { - "type": "VarString", - "flags": "MULTIPLE_KEY | BINARY", - "char_set": 224, - "max_size": 128 - } - }, - { - "ordinal": 5, - "name": "maybe_positive_prompt", - "type_info": { - "type": "Blob", - "flags": "BLOB | BINARY", - "char_set": 224, - "max_size": 262140 - } - }, - { - "ordinal": 6, - "name": "maybe_negative_prompt", - "type_info": { - "type": "Blob", - "flags": "BLOB | BINARY", - "char_set": 224, - "max_size": 262140 - } - }, - { - "ordinal": 7, - "name": "maybe_generation_mode: enums::common::generation::common_generation_mode::CommonGenerationMode", - "type_info": { - "type": "VarString", - "flags": "BINARY", - "char_set": 224, - "max_size": 96 - } - }, - { - "ordinal": 8, - "name": "maybe_aspect_ratio: enums::common::generation::common_aspect_ratio::CommonAspectRatio", - "type_info": { - "type": "VarString", - "flags": "BINARY", - "char_set": 224, - "max_size": 96 - } - }, - { - "ordinal": 9, - "name": "maybe_resolution: enums::common::generation::common_resolution::CommonResolution", - "type_info": { - "type": "VarString", - "flags": "BINARY", - "char_set": 224, - "max_size": 64 - } - }, - { - "ordinal": 10, - "name": "maybe_batch_count: u8", - "type_info": { - "type": "Tiny", - "flags": "UNSIGNED", - "char_set": 63, - "max_size": 3 - } - }, - { - "ordinal": 11, - "name": "maybe_generate_audio: bool", - "type_info": { - "type": "Tiny", - "flags": "", - "char_set": 63, - "max_size": 1 - } - }, - { - "ordinal": 12, - "name": "maybe_duration_seconds: u32", - "type_info": { - "type": "Long", - "flags": "UNSIGNED", - "char_set": 63, - "max_size": 10 - } - }, - { - "ordinal": 13, - "name": "maybe_other_args", - "type_info": { - "type": "Blob", - "flags": "BLOB | BINARY", - "char_set": 224, - "max_size": 262140 - } - }, - { - "ordinal": 14, - "name": "creator_ip_address", - "type_info": { - "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", - "char_set": 224, - "max_size": 160 - } - }, - { - "ordinal": 15, - "name": "created_at", - "type_info": { - "type": "Timestamp", - "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP", - "char_set": 63, - "max_size": 19 - } - } - ], - "parameters": { - "Right": 1 - }, - "nullable": [ - false, - false, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - true, - false, - false - ] - }, - "hash": "4a50b7bf06061f05e769a41e547cb927bd2b3a6f67c8ceb37883b744237ba34c" -} diff --git a/.sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.json b/.sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.json deleted file mode 100644 index c4f101dd57..0000000000 --- a/.sqlx/query-ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "db_name": "MySQL", - "query": "\nINSERT INTO prompts\nSET\n token = ?,\n prompt_type = ?,\n\n maybe_creator_user_token = ?,\n \n maybe_model_type = ?,\n maybe_generation_provider = ?,\n\n maybe_positive_prompt = ?,\n maybe_negative_prompt = ?,\n\n maybe_generation_mode = ?,\n maybe_aspect_ratio = ?,\n maybe_resolution = ?,\n maybe_batch_count = ?,\n maybe_generate_audio = ?,\n maybe_duration_seconds = ?,\n\n maybe_other_args = ?,\n\n creator_ip_address = ?\n ", - "describe": { - "columns": [], - "parameters": { - "Right": 15 - }, - "nullable": [] - }, - "hash": "ccf92ebe0328d3019ac6b01be4b442df706a183362fa7e5c331f5a4bf1a74a00" -} diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/batch_get_prompts.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/batch_get_prompts.rs index 707ef7b702..ba409f5a7d 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/batch_get_prompts.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/batch_get_prompts.rs @@ -2,6 +2,7 @@ use crate::prompts::get_prompt::GetPromptImageContextItem; use chrono::{DateTime, Utc}; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums::common::generation::common_bitrate::CommonBitrate; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_model_class::CommonModelClass; use enums::common::generation::common_model_type::CommonModelType; @@ -55,6 +56,9 @@ pub struct BatchPromptInfo { /// OPTIONAL. The resolution (eg. one_k, two_k, four_k, etc.) pub maybe_resolution: Option, + /// OPTIONAL. The output bitrate (eg. normal, high). + pub maybe_bitrate: Option, + /// OPTIONAL. The number of outputs to generate (0-255). pub maybe_batch_count: Option, diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs index 77369ec369..ec096842c6 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs @@ -3,6 +3,7 @@ use chrono::{DateTime, Utc}; use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums::common::generation::common_bitrate::CommonBitrate; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_model_type::CommonModelType; use enums::common::generation::common_resolution::CommonResolution; @@ -59,6 +60,9 @@ pub struct PromptInfo { /// OPTIONAL. The resolution (eg. one_k, two_k, four_k, etc.) pub maybe_resolution: Option, + /// OPTIONAL. The output bitrate (eg. normal, high). + pub maybe_bitrate: Option, + /// OPTIONAL. The number of outputs to generate (0-255). pub maybe_batch_count: Option, diff --git a/crates/schema/database/mysql_queries/src/queries/prompts/batch_get_prompts.rs b/crates/schema/database/mysql_queries/src/queries/prompts/batch_get_prompts.rs index d0e2bc7590..f2b9b71655 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompts/batch_get_prompts.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompts/batch_get_prompts.rs @@ -5,6 +5,7 @@ use sqlx::{FromRow, MySql, QueryBuilder, Row}; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums::common::generation::common_bitrate::CommonBitrate; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_model_type::CommonModelType; use enums::common::generation::common_resolution::CommonResolution; @@ -23,6 +24,7 @@ pub struct BatchPromptResult { pub maybe_generation_mode: Option, pub maybe_aspect_ratio: Option, pub maybe_resolution: Option, + pub maybe_bitrate: Option, pub maybe_batch_count: Option, pub maybe_generate_audio: Option, pub maybe_duration_seconds: Option, @@ -46,6 +48,8 @@ impl FromRow<'_, MySqlRow> for BatchPromptResult { .and_then(|s| CommonAspectRatio::from_str(&s).ok()), maybe_resolution: row.try_get::, _>("maybe_resolution")? .and_then(|s| CommonResolution::from_str(&s).ok()), + maybe_bitrate: row.try_get::, _>("maybe_bitrate")? + .and_then(|s| CommonBitrate::from_str(&s).ok()), maybe_batch_count: row.try_get("maybe_batch_count")?, maybe_generate_audio: row.try_get("maybe_generate_audio")?, maybe_duration_seconds: row.try_get("maybe_duration_seconds")?, @@ -73,6 +77,7 @@ SELECT p.maybe_generation_mode, p.maybe_aspect_ratio, p.maybe_resolution, + p.maybe_bitrate, p.maybe_batch_count, p.maybe_generate_audio, p.maybe_duration_seconds, diff --git a/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs b/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs index f25c8893d4..437647d740 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs @@ -8,6 +8,7 @@ use chrono::{DateTime, Utc}; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation_provider::GenerationProvider; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums::common::generation::common_bitrate::CommonBitrate; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_model_type::CommonModelType; use enums::common::generation::common_resolution::CommonResolution; @@ -38,6 +39,7 @@ pub struct Prompt { pub maybe_generation_mode: Option, pub maybe_aspect_ratio: Option, pub maybe_resolution: Option, + pub maybe_bitrate: Option, pub maybe_batch_count: Option, pub maybe_generate_audio: Option, pub maybe_duration_seconds: Option, @@ -67,6 +69,7 @@ pub struct PromptRaw { pub maybe_generation_mode: Option, pub maybe_aspect_ratio: Option, pub maybe_resolution: Option, + pub maybe_bitrate: Option, pub maybe_batch_count: Option, pub maybe_generate_audio: Option, pub maybe_duration_seconds: Option, @@ -114,6 +117,7 @@ pub async fn get_prompt_from_connection( maybe_generation_mode: record.maybe_generation_mode, maybe_aspect_ratio: record.maybe_aspect_ratio, maybe_resolution: record.maybe_resolution, + maybe_bitrate: record.maybe_bitrate, maybe_batch_count: record.maybe_batch_count, maybe_generate_audio: record.maybe_generate_audio, maybe_duration_seconds: record.maybe_duration_seconds, @@ -149,6 +153,7 @@ SELECT p.maybe_generation_mode as `maybe_generation_mode: enums::common::generation::common_generation_mode::CommonGenerationMode`, p.maybe_aspect_ratio as `maybe_aspect_ratio: enums::common::generation::common_aspect_ratio::CommonAspectRatio`, p.maybe_resolution as `maybe_resolution: enums::common::generation::common_resolution::CommonResolution`, + p.maybe_bitrate as `maybe_bitrate: enums::common::generation::common_bitrate::CommonBitrate`, p.maybe_batch_count as `maybe_batch_count: u8`, p.maybe_generate_audio as `maybe_generate_audio: bool`, p.maybe_duration_seconds as `maybe_duration_seconds: u32`, diff --git a/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs b/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs index a1cec5b011..5a463126c3 100644 --- a/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs +++ b/crates/schema/database/mysql_queries/src/queries/prompts/insert_prompt.rs @@ -7,6 +7,7 @@ use sqlx::{Executor, MySql}; use enums::by_table::prompts::prompt_type::PromptType; use enums::common::generation::common_aspect_ratio::CommonAspectRatio; +use enums::common::generation::common_bitrate::CommonBitrate; use enums::common::generation::common_generation_mode::CommonGenerationMode; use enums::common::generation::common_model_type::CommonModelType; use enums::common::generation::common_resolution::CommonResolution; @@ -36,6 +37,7 @@ pub struct InsertPromptArgs<'e, 'c, E> pub maybe_generation_mode: Option, pub maybe_aspect_ratio: Option, pub maybe_resolution: Option, + pub maybe_bitrate: Option, pub maybe_batch_count: Option, pub maybe_generate_audio: Option, pub maybe_duration_seconds: Option, @@ -89,6 +91,7 @@ SET maybe_generation_mode = ?, maybe_aspect_ratio = ?, maybe_resolution = ?, + maybe_bitrate = ?, maybe_batch_count = ?, maybe_generate_audio = ?, maybe_duration_seconds = ?, @@ -107,6 +110,7 @@ SET args.maybe_generation_mode.map(|m| m.to_str()), args.maybe_aspect_ratio.map(|a| a.to_str()), args.maybe_resolution.map(|r| r.to_str()), + args.maybe_bitrate.map(|b| b.to_str()), args.maybe_batch_count, args.maybe_generate_audio, args.maybe_duration_seconds, diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs index 55f8d266fd..50733c06fb 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_inference.rs @@ -332,6 +332,7 @@ pub async fn process_job_inference( // NB: Don't fail the job if the query fails. let prompt_result = insert_prompt(InsertPromptArgs { + maybe_bitrate: None, maybe_apriori_prompt_token: Some(&prompt_token), prompt_type: PromptType::StableDiffusion, maybe_creator_user_token: job.maybe_creator_user_token_typed.as_ref(), diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs index b08c40de50..267b1262bc 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/validate_and_save_results.rs @@ -287,6 +287,7 @@ pub async fn validate_and_save_results(args: SaveResultsArgs<'_>) -> Result