save ip adapter image with prompt

This commit is contained in:
Brandon Thomas committed 2024-06-26 18:32:41 -04:00
1 parent 3a3e85abd0
commit a87e19b402
2 files changed
+24 -4

No files matched your search

@@ -1,6 +1,7 @@
use chrono::Duration;
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use crate::payloads::prompt_args::encoded_style_transfer_name::EncodedStyleTransferName;
@@ -65,6 +66,12 @@ pub struct PromptInnerPayload {
#[serde(alias = "use_cinematic")]
#[serde(skip_serializing_if = "Option::is_none")]
pub use_cinematic: Option<bool>,
/// Global IP Adapter image token, if set.
#[serde(rename = "gi")] // NB: DO NOT CHANGE: IT WILL BREAK MYSQL RECORDS. Renamed to consume fewer bytes.
#[serde(alias = "global_ipa_token")]
#[serde(skip_serializing_if = "Option::is_none")]
pub global_ipa_token: Option<MediaFileToken>,
}
pub struct PromptInnerPayloadBuilder {
@@ -79,6 +86,7 @@ pub struct PromptInnerPayloadBuilder {
pub main_ipa_workflow: Option<String>,
pub face_detailer_workflow: Option<String>,
pub upscaler_workflow: Option<String>,
pub global_ipa_token: Option<MediaFileToken>,
}
impl PromptInnerPayloadBuilder {
@@ -95,6 +103,7 @@ impl PromptInnerPayloadBuilder {
main_ipa_workflow: None,
face_detailer_workflow: None,
upscaler_workflow: None,
global_ipa_token: None,
}
}
@@ -110,6 +119,7 @@ impl PromptInnerPayloadBuilder {
&& self.main_ipa_workflow.is_none()
&& self.face_detailer_workflow.is_none()
&& self.upscaler_workflow.is_none()
&& self.global_ipa_token.is_none()
{
return None;
}
@@ -129,6 +139,7 @@ impl PromptInnerPayloadBuilder {
main_ipa_workflow: self.main_ipa_workflow,
face_detailer_workflow: self.face_detailer_workflow,
upscaler_workflow: self.upscaler_workflow,
global_ipa_token: self.global_ipa_token,
})
}
@@ -195,6 +206,10 @@ impl PromptInnerPayloadBuilder {
pub fn set_upscaler_workflow(&mut self, workflow: Option<String>) {
self.upscaler_workflow = workflow;
}
pub fn set_global_ipa_token(&mut self, token: Option<MediaFileToken>) {
self.global_ipa_token = token;
}
}
impl PromptInnerPayload{
@@ -233,14 +233,15 @@ pub async fn validate_and_save_results(args: SaveResultsArgs<'_>) -> Result<Medi
})?;
let should_insert_prompt_record =
args.comfy_args.positive_prompt.is_some()
|| args.comfy_args.negative_prompt.is_some()
args.comfy_args.disable_lcm.is_some()
|| args.comfy_args.global_ip_adapter_token.is_some()
|| args.comfy_args.lipsync_enabled.is_some()
|| args.comfy_args.negative_prompt.is_some()
|| args.comfy_args.positive_prompt.is_some()
|| args.comfy_args.strength.is_some()
|| args.comfy_args.style_name.is_some()
|| args.comfy_args.use_face_detailer.is_some()
|| args.comfy_args.disable_lcm.is_some()
|| args.comfy_args.use_cinematic.is_some()
|| args.comfy_args.use_face_detailer.is_some()
|| args.comfy_args.use_upscaler.is_some();
if should_insert_prompt_record {
@@ -284,6 +285,10 @@ pub async fn validate_and_save_results(args: SaveResultsArgs<'_>) -> Result<Medi
other_args_builder.set_inference_duration(Some(duration));
}
if args.comfy_args.global_ip_adapter_token.is_some() {
other_args_builder.set_global_ipa_token(args.comfy_args.global_ip_adapter_token.clone());
}
let maybe_other_args = other_args_builder.build();
info!("maybe other prompt args: {:?}", maybe_other_args);