mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-19 08:05:20 +00:00
get rid of inpaint error
This commit is contained in:
1 parent
def1d6afda
commit
b7ce347f14
15 files changed
+146
-220
No files matched your search
@@ -29,10 +29,22 @@ pub enum GenerateError {
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum BadInputReason {
|
||||
NoModelSpecified,
|
||||
/// An image was required but not provided.
|
||||
NoImageSpecified,
|
||||
Base64DecodeError,
|
||||
BothImageMaskMediaTokenAndBytesSupplied,
|
||||
CannotDetermineImageMimeType,
|
||||
InvalidNumberOfInputImages {
|
||||
provided: u32,
|
||||
min: u32,
|
||||
max: u32,
|
||||
},
|
||||
InvalidNumberOfRequestedImages {
|
||||
requested: u32,
|
||||
min: u32,
|
||||
max: u32,
|
||||
},
|
||||
NoModelSpecified,
|
||||
RequiredSourceImageMaskNotProvided,
|
||||
RequiredSourceImageNotProvided,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
@@ -69,23 +81,31 @@ pub enum ProviderFailureReason {
|
||||
}
|
||||
|
||||
impl GenerateError {
|
||||
|
||||
|
||||
//
|
||||
// Bad input
|
||||
//
|
||||
|
||||
pub fn no_image_specified() -> Self {
|
||||
Self::BadInput(BadInputReason::NoImageSpecified)
|
||||
//
|
||||
|
||||
pub fn both_image_mask_media_token_and_bytes_supplied() -> Self {
|
||||
Self::BadInput(BadInputReason::BothImageMaskMediaTokenAndBytesSupplied)
|
||||
}
|
||||
|
||||
|
||||
pub fn no_model_specified() -> Self {
|
||||
Self::BadInput(BadInputReason::NoModelSpecified)
|
||||
}
|
||||
|
||||
|
||||
pub fn required_source_image_mask_not_provided() -> Self {
|
||||
Self::BadInput(BadInputReason::RequiredSourceImageMaskNotProvided)
|
||||
}
|
||||
|
||||
pub fn required_source_image_not_provided() -> Self {
|
||||
Self::BadInput(BadInputReason::RequiredSourceImageNotProvided)
|
||||
}
|
||||
|
||||
//
|
||||
// Missing credentials
|
||||
//
|
||||
|
||||
|
||||
pub fn needs_fal_api_key() -> Self {
|
||||
Self::MissingCredentials(MissingCredentialsReason::NeedsFalApiKey)
|
||||
}
|
||||
|
||||
+1
-1
@@ -208,7 +208,7 @@ fn error_to_tauri_response(error: GenerateError) -> CommandErrorResponseWrapper<
|
||||
error_type = EnqueueImageBgRemovalErrorType::NoProviderAvailable;
|
||||
error_message = "No configured provider available for background removal".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::NoImageSpecified) => {
|
||||
GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueImageBgRemovalErrorType::MissingImage;
|
||||
error_message = "No image provided for background removal".to_string();
|
||||
|
||||
+1
-1
@@ -113,7 +113,7 @@ async fn upload_image_from_base64_bytes(
|
||||
GenerateError::BadInput(BadInputReason::Base64DecodeError)
|
||||
})?;
|
||||
} else {
|
||||
return Err(GenerateError::BadInput(BadInputReason::NoImageSpecified));
|
||||
return Err(GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided));
|
||||
};
|
||||
|
||||
info!("Uploading image media file from temp file: {:?}", temp_file.path());
|
||||
|
||||
+61
-3
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit::handle_gpt_image_1_edit;
|
||||
use crate::core::commands::enqueue::image_inpaint::errors::InternalImageInpaintError;
|
||||
@@ -197,7 +198,7 @@ pub async fn enqueue_image_inpaint_command(
|
||||
error!("Failed to emit event: {:?}", err); // Fail open.
|
||||
}
|
||||
|
||||
Err(err.to_tauri_response())
|
||||
Err(error_to_tauri_response(err))
|
||||
}
|
||||
Ok(event) => {
|
||||
let event = GenerationEnqueueSuccessEvent {
|
||||
@@ -227,10 +228,10 @@ pub async fn handle_request(
|
||||
fal_task_queue: &FalTaskQueue,
|
||||
sora_creds_manager: &SoraCredentialManager,
|
||||
sora_task_queue: &SoraTaskQueue,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
let success_event= match request.model {
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NoModelSpecified)
|
||||
return Err(GenerateError::no_model_specified())
|
||||
}
|
||||
Some(ImageInpaintModel::FluxDevJuggernaut) => {
|
||||
handle_flux_dev_juggernaut_inpaint(
|
||||
@@ -308,3 +309,60 @@ pub async fn handle_request(
|
||||
|
||||
Ok(success_event)
|
||||
}
|
||||
|
||||
pub fn error_to_tauri_response(error: GenerateError) -> CommandErrorResponseWrapper<EnqueueInpaintImageErrorType, ()> {
|
||||
let mut status = CommandErrorStatus::ServerError;
|
||||
let mut error_type = EnqueueInpaintImageErrorType::ServerError;
|
||||
let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
|
||||
|
||||
match error {
|
||||
GenerateError::BadInput(BadInputReason::NoModelSpecified) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::ModelNotSpecified;
|
||||
error_message = "No model specified for image generation".to_string();
|
||||
}
|
||||
GenerateError::NoProviderAvailable => {
|
||||
status = CommandErrorStatus::ServerError;
|
||||
error_type = EnqueueInpaintImageErrorType::NoProviderAvailable;
|
||||
error_message = "No configured provider available for image generation".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::NoSourceImageSpecified;
|
||||
error_message = "No source image was provided".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::RequiredSourceImageMaskNotProvided) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::NoMaskImageSpecified;
|
||||
error_message = "No mask image was provided".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::BothImageMaskMediaTokenAndBytesSupplied) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::MultipleMaskImagesSpecified;
|
||||
error_message = "multiple mask images provided".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::CannotDetermineImageMimeType) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadMaskImage;
|
||||
error_message = "bad mask image (mime)".to_string();
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages { min, max, requested }) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadRequest;
|
||||
error_message = format!("Invalid number of images requested ({}). Must be between {} and {}", requested, min, max);
|
||||
}
|
||||
GenerateError::BadInput(BadInputReason::InvalidNumberOfInputImages{ min, max, provided }) => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadRequest;
|
||||
error_message = format!("Invalid number of input images ({}). Must be between {} and {}", provided, min, max);
|
||||
}
|
||||
_ => {}, // Other cases fall through.
|
||||
}
|
||||
|
||||
CommandErrorResponseWrapper {
|
||||
status,
|
||||
error_message: Some(error_message.to_string()),
|
||||
error_type: Some(error_type),
|
||||
error_details: None,
|
||||
}
|
||||
}
|
||||
@@ -61,68 +61,4 @@ impl From<StorytellerError> for InternalImageInpaintError {
|
||||
}
|
||||
|
||||
impl InternalImageInpaintError {
|
||||
pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueInpaintImageErrorType, E> {
|
||||
let mut status = CommandErrorStatus::ServerError;
|
||||
let mut error_type = EnqueueInpaintImageErrorType::ServerError;
|
||||
let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
|
||||
|
||||
match self {
|
||||
InternalImageInpaintError::NoModelSpecified => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::ModelNotSpecified;
|
||||
error_message = "No model specified for image generation".to_string();
|
||||
}
|
||||
InternalImageInpaintError::NoProviderAvailable => {
|
||||
status = CommandErrorStatus::ServerError;
|
||||
error_type = EnqueueInpaintImageErrorType::NoProviderAvailable;
|
||||
error_message = "No configured provider available for image generation".to_string();
|
||||
}
|
||||
InternalImageInpaintError::NoSourceImageSpecified => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::NoSourceImageSpecified;
|
||||
error_message = "No source image was provided".to_string();
|
||||
}
|
||||
InternalImageInpaintError::NoMaskImageSpecified => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::NoMaskImageSpecified;
|
||||
error_message = "No mask image was provided".to_string();
|
||||
}
|
||||
InternalImageInpaintError::MaskMediaTokenAndBytesSupplied => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::MultipleMaskImagesSpecified;
|
||||
error_message = "multiple mask images provided".to_string();
|
||||
}
|
||||
InternalImageInpaintError::CouldNotDetermineMaskMimeType => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadMaskImage;
|
||||
error_message = "bad mask image (mime)".to_string();
|
||||
}
|
||||
InternalImageInpaintError::CouldNotEncodeMask => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadMaskImage;
|
||||
error_message = "bad mask image (encode)".to_string();
|
||||
}
|
||||
InternalImageInpaintError::InvalidNumberOfRequestedImages { min, max, requested } => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadRequest;
|
||||
error_message = format!("Invalid number of images requested ({}). Must be between {} and {}", requested, min, max);
|
||||
|
||||
}
|
||||
InternalImageInpaintError::InvalidNumberOfInputImages { min, max, requested } => {
|
||||
status = CommandErrorStatus::BadRequest;
|
||||
error_type = EnqueueInpaintImageErrorType::BadRequest;
|
||||
error_message = format!("Invalid number of input images ({}). Must be between {} and {}", requested, min, max);
|
||||
}
|
||||
InternalImageInpaintError::AnyhowError(_) => {}
|
||||
InternalImageInpaintError::StorytellerError(_) => {}
|
||||
InternalImageInpaintError::NeedsStorytellerCredentials => {}
|
||||
}
|
||||
|
||||
CommandErrorResponseWrapper {
|
||||
status,
|
||||
error_message: Some(error_message.to_string()),
|
||||
error_type: Some(error_type),
|
||||
error_details: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::GenerateError;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
|
||||
@@ -28,7 +29,7 @@ pub async fn handle_flux_dev_juggernaut_inpaint(
|
||||
fal_task_queue: &FalTaskQueue,
|
||||
sora_creds_manager: &SoraCredentialManager,
|
||||
sora_task_queue: &SoraTaskQueue,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let priority = provider_priority_store.get_priority()?;
|
||||
|
||||
@@ -57,5 +58,5 @@ pub async fn handle_flux_dev_juggernaut_inpaint(
|
||||
}
|
||||
}
|
||||
|
||||
Err(InternalImageInpaintError::NoProviderAvailable)
|
||||
Err(GenerateError::NoProviderAvailable)
|
||||
}
|
||||
+12
-19
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
|
||||
use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
|
||||
use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand;
|
||||
@@ -51,30 +52,22 @@ pub async fn handle_flux_dev_juggernaut_inpaint_artcraft(
|
||||
app_data_root: &AppDataRoot,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let creds = match storyteller_creds_manager.get_credentials()? {
|
||||
Some(creds) => creds,
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NeedsStorytellerCredentials);
|
||||
return Err(GenerateError::needs_storyteller_credentials());
|
||||
},
|
||||
};
|
||||
|
||||
let image_media_token = match &request.image_media_token {
|
||||
Some(token) => token.clone(),
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NoSourceImageSpecified);
|
||||
return Err(GenerateError::required_source_image_not_provided());
|
||||
},
|
||||
};
|
||||
|
||||
//let image_media_file = get_media_file(
|
||||
// &app_env_configs.storyteller_host,
|
||||
// &image_media_token,
|
||||
//).await.map_err(|err| {
|
||||
// error!("Failed to get media file for image: {:?}", err);
|
||||
// InternalImageInpaintError::StorytellerError(err)
|
||||
//})?;
|
||||
|
||||
let mask_media_token = get_mask(
|
||||
request,
|
||||
app_env_configs,
|
||||
@@ -92,11 +85,11 @@ pub async fn handle_flux_dev_juggernaut_inpaint_artcraft(
|
||||
Some(3) => Some(FluxDevJuggernautInpaintImageNumImages::Three),
|
||||
Some(4) => Some(FluxDevJuggernautInpaintImageNumImages::Four),
|
||||
Some(other) => {
|
||||
return Err(InternalImageInpaintError::InvalidNumberOfRequestedImages {
|
||||
return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
|
||||
min: 1,
|
||||
max: 4,
|
||||
requested: other,
|
||||
});
|
||||
}));
|
||||
},
|
||||
};
|
||||
|
||||
@@ -123,7 +116,7 @@ pub async fn handle_flux_dev_juggernaut_inpaint_artcraft(
|
||||
}
|
||||
Err(err) => {
|
||||
error!("Failed to use Artcraft flux dev juggernaut inpaint: {:?}", err);
|
||||
return Err(InternalImageInpaintError::StorytellerError(err));
|
||||
return Err(GenerateError::from(err));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -139,10 +132,10 @@ async fn get_mask(
|
||||
request: &EnqueueInpaintImageCommand,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds: &StorytellerCredentialSet,
|
||||
) -> Result<MediaFileToken, InternalImageInpaintError> {
|
||||
) -> Result<MediaFileToken, GenerateError> {
|
||||
|
||||
if request.mask_image_media_token.is_some() && request.mask_image_raw_bytes.is_some() {
|
||||
return Err(InternalImageInpaintError::MaskMediaTokenAndBytesSupplied);
|
||||
return Err(GenerateError::both_image_mask_media_token_and_bytes_supplied());
|
||||
}
|
||||
|
||||
if let Some(token) = request.mask_image_media_token.as_ref() {
|
||||
@@ -150,12 +143,12 @@ async fn get_mask(
|
||||
};
|
||||
|
||||
let image_bytes = request.mask_image_raw_bytes.as_ref()
|
||||
.ok_or(InternalImageInpaintError::NoMaskImageSpecified)?;
|
||||
.ok_or(GenerateError::required_source_image_mask_not_provided())?;
|
||||
|
||||
let image_bytes = normalize_image_bytes_to_flux_mask(image_bytes)
|
||||
.map_err(|err| {
|
||||
error!("Failed to convert image bytes to png: {:?}", err);
|
||||
InternalImageInpaintError::CouldNotEncodeMask
|
||||
GenerateError::AnyhowError(anyhow!("Failed to convert image bytes to png mask"))
|
||||
})?;
|
||||
|
||||
info!("Uploading image media file from bytes...");
|
||||
@@ -169,7 +162,7 @@ async fn get_mask(
|
||||
}).await
|
||||
.map_err(|err| {
|
||||
error!("Failed to upload image media file: {:?}", err);
|
||||
InternalImageInpaintError::StorytellerError(err)
|
||||
GenerateError::from(err)
|
||||
})?;
|
||||
|
||||
Ok(result.media_file_token)
|
||||
|
||||
+3
-2
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::GenerateError;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_edit_artcraft::handle_gpt_image_1_edit_artcraft;
|
||||
@@ -28,7 +29,7 @@ pub async fn handle_flux_pro_1_inpaint(
|
||||
fal_task_queue: &FalTaskQueue,
|
||||
sora_creds_manager: &SoraCredentialManager,
|
||||
sora_task_queue: &SoraTaskQueue,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let priority = provider_priority_store.get_priority()?;
|
||||
|
||||
@@ -57,5 +58,5 @@ pub async fn handle_flux_pro_1_inpaint(
|
||||
}
|
||||
}
|
||||
|
||||
Err(InternalImageInpaintError::NoProviderAvailable)
|
||||
Err(GenerateError::NoProviderAvailable)
|
||||
}
|
||||
+12
-19
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
|
||||
use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
|
||||
use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand;
|
||||
@@ -50,30 +51,22 @@ pub async fn handle_flux_pro_1_inpaint_artcraft(
|
||||
app_data_root: &AppDataRoot,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let creds = match storyteller_creds_manager.get_credentials()? {
|
||||
Some(creds) => creds,
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NeedsStorytellerCredentials);
|
||||
return Err(GenerateError::needs_storyteller_credentials());
|
||||
},
|
||||
};
|
||||
|
||||
let image_media_token = match &request.image_media_token {
|
||||
Some(token) => token.clone(),
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NoSourceImageSpecified);
|
||||
return Err(GenerateError::required_source_image_not_provided());
|
||||
},
|
||||
};
|
||||
|
||||
//let image_media_file = get_media_file(
|
||||
// &app_env_configs.storyteller_host,
|
||||
// &image_media_token,
|
||||
//).await.map_err(|err| {
|
||||
// error!("Failed to get media file for image: {:?}", err);
|
||||
// InternalImageInpaintError::StorytellerError(err)
|
||||
//})?;
|
||||
|
||||
let mask_media_token = get_mask(
|
||||
request,
|
||||
app_env_configs,
|
||||
@@ -91,11 +84,11 @@ pub async fn handle_flux_pro_1_inpaint_artcraft(
|
||||
Some(3) => Some(FluxPro1InpaintImageNumImages::Three),
|
||||
Some(4) => Some(FluxPro1InpaintImageNumImages::Four),
|
||||
Some(other) => {
|
||||
return Err(InternalImageInpaintError::InvalidNumberOfRequestedImages {
|
||||
return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
|
||||
min: 1,
|
||||
max: 4,
|
||||
requested: other,
|
||||
});
|
||||
}));
|
||||
},
|
||||
};
|
||||
|
||||
@@ -122,7 +115,7 @@ pub async fn handle_flux_pro_1_inpaint_artcraft(
|
||||
}
|
||||
Err(err) => {
|
||||
error!("Failed to use Artcraft flux pro 1 inpaint: {:?}", err);
|
||||
return Err(InternalImageInpaintError::StorytellerError(err));
|
||||
return Err(GenerateError::from(err));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -138,10 +131,10 @@ async fn get_mask(
|
||||
request: &EnqueueInpaintImageCommand,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds: &StorytellerCredentialSet,
|
||||
) -> Result<MediaFileToken, InternalImageInpaintError> {
|
||||
) -> Result<MediaFileToken, GenerateError> {
|
||||
|
||||
if request.mask_image_media_token.is_some() && request.mask_image_raw_bytes.is_some() {
|
||||
return Err(InternalImageInpaintError::MaskMediaTokenAndBytesSupplied);
|
||||
return Err(GenerateError::both_image_mask_media_token_and_bytes_supplied());
|
||||
}
|
||||
|
||||
if let Some(token) = request.mask_image_media_token.as_ref() {
|
||||
@@ -149,12 +142,12 @@ async fn get_mask(
|
||||
};
|
||||
|
||||
let image_bytes = request.mask_image_raw_bytes.as_ref()
|
||||
.ok_or(InternalImageInpaintError::NoMaskImageSpecified)?;
|
||||
.ok_or(GenerateError::required_source_image_mask_not_provided())?;
|
||||
|
||||
let image_bytes = normalize_image_bytes_to_flux_mask(image_bytes)
|
||||
.map_err(|err| {
|
||||
error!("Failed to convert image bytes to png: {:?}", err);
|
||||
InternalImageInpaintError::CouldNotEncodeMask
|
||||
GenerateError::AnyhowError(anyhow!("could not encode image mask to png"))
|
||||
})?;
|
||||
|
||||
info!("Uploading image media file from bytes...");
|
||||
@@ -168,7 +161,7 @@ async fn get_mask(
|
||||
}).await
|
||||
.map_err(|err| {
|
||||
error!("Failed to upload image media file: {:?}", err);
|
||||
InternalImageInpaintError::StorytellerError(err)
|
||||
GenerateError::from(err)
|
||||
})?;
|
||||
|
||||
Ok(result.media_file_token)
|
||||
|
||||
+3
-2
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::GenerateError;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand;
|
||||
@@ -26,7 +27,7 @@ pub async fn handle_flux_pro_kontext_inpaint(
|
||||
fal_task_queue: &FalTaskQueue,
|
||||
sora_creds_manager: &SoraCredentialManager,
|
||||
sora_task_queue: &SoraTaskQueue,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let priority = provider_priority_store.get_priority()?;
|
||||
|
||||
@@ -55,5 +56,5 @@ pub async fn handle_flux_pro_kontext_inpaint(
|
||||
}
|
||||
}
|
||||
|
||||
Err(InternalImageInpaintError::NoProviderAvailable)
|
||||
Err(GenerateError::NoProviderAvailable)
|
||||
}
|
||||
+7
-46
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
|
||||
use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
@@ -53,19 +54,19 @@ pub async fn handle_flux_pro_kontext_inpaint_artcraft(
|
||||
app_data_root: &AppDataRoot,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let creds = match storyteller_creds_manager.get_credentials()? {
|
||||
Some(creds) => creds,
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NeedsStorytellerCredentials);
|
||||
return Err(GenerateError::needs_storyteller_credentials());
|
||||
},
|
||||
};
|
||||
|
||||
let image_media_token = match &request.image_media_token {
|
||||
Some(token) => token.clone(),
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NoSourceImageSpecified);
|
||||
return Err(GenerateError::required_source_image_not_provided());
|
||||
},
|
||||
};
|
||||
|
||||
@@ -96,11 +97,11 @@ pub async fn handle_flux_pro_kontext_inpaint_artcraft(
|
||||
Some(3) => Some(FluxProKontextMaxEditImageNumImages::Three),
|
||||
Some(4) => Some(FluxProKontextMaxEditImageNumImages::Four),
|
||||
Some(other) => {
|
||||
return Err(InternalImageInpaintError::InvalidNumberOfRequestedImages {
|
||||
return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
|
||||
min: 1,
|
||||
max: 4,
|
||||
requested: other,
|
||||
});
|
||||
}));
|
||||
},
|
||||
};
|
||||
|
||||
@@ -128,7 +129,7 @@ pub async fn handle_flux_pro_kontext_inpaint_artcraft(
|
||||
}
|
||||
Err(err) => {
|
||||
error!("Failed to use Artcraft flux pro kontext inpaint: {:?}", err);
|
||||
return Err(InternalImageInpaintError::StorytellerError(err));
|
||||
return Err(GenerateError::from(err));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -139,43 +140,3 @@ pub async fn handle_flux_pro_kontext_inpaint_artcraft(
|
||||
task_type: TaskType::ImageInpaintEdit,
|
||||
})
|
||||
}
|
||||
|
||||
// async fn get_mask(
|
||||
// request: &EnqueueInpaintImageCommand,
|
||||
// app_env_configs: &AppEnvConfigs,
|
||||
// storyteller_creds: &StorytellerCredentialSet,
|
||||
// ) -> Result<MediaFileToken, InternalImageInpaintError> {
|
||||
//
|
||||
// if request.mask_image_media_token.is_some() && request.mask_image_raw_bytes.is_some() {
|
||||
// return Err(InternalImageInpaintError::MaskMediaTokenAndBytesSupplied);
|
||||
// }
|
||||
//
|
||||
// if let Some(token) = request.mask_image_media_token.as_ref() {
|
||||
// return Ok(token.clone());
|
||||
// };
|
||||
//
|
||||
// let image_bytes = request.mask_image_raw_bytes.as_ref()
|
||||
// .ok_or(InternalImageInpaintError::NoMaskImageSpecified)?;
|
||||
//
|
||||
// let image_bytes = normalize_image_bytes_to_flux_mask(image_bytes)
|
||||
// .map_err(|err| {
|
||||
// error!("Failed to convert image bytes to png: {:?}", err);
|
||||
// InternalImageInpaintError::CouldNotEncodeMask
|
||||
// })?;
|
||||
//
|
||||
// info!("Uploading image media file from bytes...");
|
||||
//
|
||||
// let result = upload_image_media_file_from_bytes(UploadImageBytesArgs {
|
||||
// api_host: &app_env_configs.storyteller_host,
|
||||
// maybe_creds: Some(&storyteller_creds),
|
||||
// image_bytes: image_bytes.0,
|
||||
// image_type: ImageType::Png,
|
||||
// is_intermediate_system_file: true,
|
||||
// }).await
|
||||
// .map_err(|err| {
|
||||
// error!("Failed to upload image media file: {:?}", err);
|
||||
// InternalImageInpaintError::StorytellerError(err)
|
||||
// })?;
|
||||
//
|
||||
// Ok(result.media_file_token)
|
||||
// }
|
||||
+3
-2
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::GenerateError;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
use crate::core::commands::enqueue::image_inpaint::enqueue_image_inpaint_command::EnqueueInpaintImageCommand;
|
||||
@@ -27,7 +28,7 @@ pub async fn handle_gemini_25_flash_inpaint(
|
||||
fal_task_queue: &FalTaskQueue,
|
||||
sora_creds_manager: &SoraCredentialManager,
|
||||
sora_task_queue: &SoraTaskQueue,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let priority = provider_priority_store.get_priority()?;
|
||||
|
||||
@@ -56,5 +57,5 @@ pub async fn handle_gemini_25_flash_inpaint(
|
||||
}
|
||||
}
|
||||
|
||||
Err(InternalImageInpaintError::NoProviderAvailable)
|
||||
Err(GenerateError::NoProviderAvailable)
|
||||
}
|
||||
+7
-46
@@ -1,3 +1,4 @@
|
||||
use crate::core::commands::enqueue::generate_error::{BadInputReason, GenerateError};
|
||||
use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
|
||||
use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
|
||||
use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
|
||||
@@ -55,19 +56,19 @@ pub async fn handle_gemini_25_flash_inpaint_artcraft(
|
||||
app_data_root: &AppDataRoot,
|
||||
app_env_configs: &AppEnvConfigs,
|
||||
storyteller_creds_manager: &StorytellerCredentialManager,
|
||||
) -> Result<TaskEnqueueSuccess, InternalImageInpaintError> {
|
||||
) -> Result<TaskEnqueueSuccess, GenerateError> {
|
||||
|
||||
let creds = match storyteller_creds_manager.get_credentials()? {
|
||||
Some(creds) => creds,
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NeedsStorytellerCredentials);
|
||||
return Err(GenerateError::needs_storyteller_credentials());
|
||||
},
|
||||
};
|
||||
|
||||
let image_media_token = match &request.image_media_token {
|
||||
Some(token) => token.clone(),
|
||||
None => {
|
||||
return Err(InternalImageInpaintError::NoSourceImageSpecified);
|
||||
return Err(GenerateError::required_source_image_not_provided());
|
||||
},
|
||||
};
|
||||
|
||||
@@ -82,11 +83,11 @@ pub async fn handle_gemini_25_flash_inpaint_artcraft(
|
||||
Some(3) => Some(Gemini25FlashEditImageNumImages::Three),
|
||||
Some(4) => Some(Gemini25FlashEditImageNumImages::Four),
|
||||
Some(other) => {
|
||||
return Err(InternalImageInpaintError::InvalidNumberOfRequestedImages {
|
||||
return Err(GenerateError::BadInput(BadInputReason::InvalidNumberOfRequestedImages {
|
||||
min: 1,
|
||||
max: 4,
|
||||
requested: other,
|
||||
});
|
||||
}));
|
||||
},
|
||||
};
|
||||
|
||||
@@ -113,7 +114,7 @@ pub async fn handle_gemini_25_flash_inpaint_artcraft(
|
||||
}
|
||||
Err(err) => {
|
||||
error!("Failed to use Artcraft gemini 2.5 flash inpaint: {:?}", err);
|
||||
return Err(InternalImageInpaintError::StorytellerError(err));
|
||||
return Err(GenerateError::from(err));
|
||||
}
|
||||
};
|
||||
|
||||
@@ -124,43 +125,3 @@ pub async fn handle_gemini_25_flash_inpaint_artcraft(
|
||||
task_type: TaskType::ImageInpaintEdit,
|
||||
})
|
||||
}
|
||||
|
||||
// async fn get_mask(
|
||||
// request: &EnqueueInpaintImageCommand,
|
||||
// app_env_configs: &AppEnvConfigs,
|
||||
// storyteller_creds: &StorytellerCredentialSet,
|
||||
// ) -> Result<MediaFileToken, InternalImageInpaintError> {
|
||||
//
|
||||
// if request.mask_image_media_token.is_some() && request.mask_image_raw_bytes.is_some() {
|
||||
// return Err(InternalImageInpaintError::MaskMediaTokenAndBytesSupplied);
|
||||
// }
|
||||
//
|
||||
// if let Some(token) = request.mask_image_media_token.as_ref() {
|
||||
// return Ok(token.clone());
|
||||
// };
|
||||
//
|
||||
// let image_bytes = request.mask_image_raw_bytes.as_ref()
|
||||
// .ok_or(InternalImageInpaintError::NoMaskImageSpecified)?;
|
||||
//
|
||||
// let image_bytes = normalize_image_bytes_to_flux_mask(image_bytes)
|
||||
// .map_err(|err| {
|
||||
// error!("Failed to convert image bytes to png: {:?}", err);
|
||||
// InternalImageInpaintError::CouldNotEncodeMask
|
||||
// })?;
|
||||
//
|
||||
// info!("Uploading image media file from bytes...");
|
||||
//
|
||||
// let result = upload_image_media_file_from_bytes(UploadImageBytesArgs {
|
||||
// api_host: &app_env_configs.storyteller_host,
|
||||
// maybe_creds: Some(&storyteller_creds),
|
||||
// image_bytes: image_bytes.0,
|
||||
// image_type: ImageType::Png,
|
||||
// is_intermediate_system_file: true,
|
||||
// }).await
|
||||
// .map_err(|err| {
|
||||
// error!("Failed to upload image media file: {:?}", err);
|
||||
// InternalImageInpaintError::StorytellerError(err)
|
||||
// })?;
|
||||
//
|
||||
// Ok(result.media_file_token)
|
||||
// }
|
||||
+1
-1
@@ -57,7 +57,7 @@ pub async fn handle_object_fal(
|
||||
&media_token
|
||||
).await?;
|
||||
} else {
|
||||
return Err(GenerateError::no_image_specified());
|
||||
return Err(GenerateError::required_source_image_not_provided());
|
||||
}
|
||||
|
||||
info!("Calling FAL image to 3d ...");
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ pub async fn handle_video_fal(
|
||||
&media_token
|
||||
).await?;
|
||||
} else {
|
||||
return Err(GenerateError::BadInput(BadInputReason::NoImageSpecified));
|
||||
return Err(GenerateError::BadInput(BadInputReason::RequiredSourceImageNotProvided));
|
||||
}
|
||||
|
||||
let filename = temp_download.path().to_path_buf();
|
||||
|
||||
Reference in new issue
Block a user