kling wip

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p5_turbo_pro.rs

@@ -0,0 +1,74 @@
+use crate::core::commands::enqueue::generate_error::GenerateError;
+use crate::core::commands::enqueue::image_to_video::artcraft::get_storyteller_creds_or_error::get_storyteller_creds_or_error;
+use crate::core::commands::enqueue::image_to_video::enqueue_image_to_video_command::{EnqueueImageToVideoRequest, SoraOrientation};
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult};
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use artcraft_api_defs::generate::video::multi_function::kling_2_5_turbo_multi_function_video_gen::{Kling2p5TurboProMultiFunctionVideoGenAspectRatio, Kling2p5TurboProMultiFunctionVideoGenDuration, Kling2p5TurboProMultiFunctionVideoGenRequest};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use storyteller_client::endpoints::generate::video::multi_function::kling_2p5_turbo_pro_multi_function_video_gen::kling_2p5_turbo_pro_multi_function_video_gen;
+use storyteller_client::endpoints::generate::video::multi_function::sora_2_multi_function_video_gen::sora_2_multi_function_video_gen;
+use tauri::AppHandle;
+use tokens::tokens::media_files::MediaFileToken;
+
+pub (super) async fn handle_artcraft_kling_2p5_turbo_pro(
+  request: &EnqueueImageToVideoRequest,
+  app_env_configs: &AppEnvConfigs,
+  creds: &StorytellerCredentialSet,
+) -> Result<TaskEnqueueSuccess, GenerateError> {
+
+  let uuid_idempotency_token = generate_random_uuid();
+
+  // TODO: Fix this parameter
+  let aspect_ratio = match request.sora_orientation {
+    Some(SoraOrientation::Portrait) => Kling2p5TurboProMultiFunctionVideoGenAspectRatio::NineBySixteen,
+    Some(SoraOrientation::Landscape) => Kling2p5TurboProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+    None => Kling2p5TurboProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+  };
+  
+  let request = Kling2p5TurboProMultiFunctionVideoGenRequest {
+    uuid_idempotency_token,
+    prompt: request.prompt.clone(),
+    negative_prompt: None, // TODO: Parameterize
+    start_frame_image_media_token: request.image_media_token.clone(),
+    end_frame_image_media_token: request.end_frame_image_media_token.clone(),
+    aspect_ratio: Some(aspect_ratio),
+    duration: Some(Kling2p5TurboProMultiFunctionVideoGenDuration::TenSeconds), // TODO: Parameterize
+  };
+  
+  let result = kling_2p5_turbo_pro_multi_function_video_gen(
+    &app_env_configs.storyteller_host,
+    Some(&creds),
+    request,
+  ).await;
+  
+  let job_token = match result {
+    Ok(enqueued) => {
+      info!("Successfully enqueued.");
+      enqueued.inference_job_token
+    }
+    Err(err) => {
+      error!("Failed to enqueue: {:?}", err);
+      return Err(GenerateError::from(err));
+    }
+  };
+
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::VideoGeneration,
+    model: Some(GenerationModel::Kling2p5TurboPro),
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_kling_2p6_pro.rs

@@ -0,0 +1,76 @@
+use crate::core::commands::enqueue::generate_error::GenerateError;
+use crate::core::commands::enqueue::image_to_video::artcraft::get_storyteller_creds_or_error::get_storyteller_creds_or_error;
+use crate::core::commands::enqueue::image_to_video::enqueue_image_to_video_command::{EnqueueImageToVideoRequest, SoraOrientation};
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::functional_events::show_provider_login_modal_event::ShowProviderLoginModalEvent;
+use crate::core::events::generation_events::common::{GenerationAction, GenerationModel};
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::sora::utils::upload_images_to_sora::{upload_images_to_sora, UploadImagesToSoraArgs, UploadImagesToSoraResult};
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest};
+use artcraft_api_defs::generate::video::multi_function::kling_2_6_multi_function_video_gen::{Kling2p6ProMultiFunctionVideoGenAspectRatio, Kling2p6ProMultiFunctionVideoGenDuration, Kling2p6ProMultiFunctionVideoGenRequest};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use storyteller_client::endpoints::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;
+use storyteller_client::endpoints::generate::video::multi_function::kling_2p6_pro_multi_function_video_gen::kling_2p6_pro_multi_function_video_gen;
+use storyteller_client::endpoints::generate::video::multi_function::sora_2_multi_function_video_gen::sora_2_multi_function_video_gen;
+use tauri::AppHandle;
+use tokens::tokens::media_files::MediaFileToken;
+
+pub (super) async fn handle_artcraft_kling_2p6_pro(
+  request: &EnqueueImageToVideoRequest,
+  app_env_configs: &AppEnvConfigs,
+  creds: &StorytellerCredentialSet,
+) -> Result<TaskEnqueueSuccess, GenerateError> {
+
+  let uuid_idempotency_token = generate_random_uuid();
+
+  // TODO: Fix this parameter
+  let aspect_ratio = match request.sora_orientation {
+    Some(SoraOrientation::Portrait) => Kling2p6ProMultiFunctionVideoGenAspectRatio::NineBySixteen,
+    Some(SoraOrientation::Landscape) => Kling2p6ProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+    None => Kling2p6ProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+  };
+  
+  let request = Kling2p6ProMultiFunctionVideoGenRequest {
+    uuid_idempotency_token,
+    prompt: request.prompt.clone(),
+    negative_prompt: None, // TODO: Parameterize
+    start_frame_image_media_token: request.image_media_token.clone(),
+    aspect_ratio: Some(aspect_ratio),
+    duration: Some(Kling2p6ProMultiFunctionVideoGenDuration::TenSeconds), // TODO: Parameterize
+    generate_audio: request.generate_audio,
+  };
+  
+  let result = kling_2p6_pro_multi_function_video_gen(
+    &app_env_configs.storyteller_host,
+    Some(&creds),
+    request,
+  ).await;
+  
+  let job_token = match result {
+    Ok(enqueued) => {
+      info!("Successfully enqueued.");
+      enqueued.inference_job_token
+    }
+    Err(err) => {
+      error!("Failed to enqueue: {:?}", err);
+      return Err(GenerateError::from(err));
+    }
+  };
+
+  Ok(TaskEnqueueSuccess {
+    task_type: TaskType::VideoGeneration,
+    model: Some(GenerationModel::Kling2p6Pro),
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/mod.rs

@@ -1,4 +1,6 @@
 mod get_storyteller_creds_or_error;
+mod handle_artcraft_kling_2p5_turbo_pro;
+mod handle_artcraft_kling_2p6_pro;
 mod handle_artcraft_sora2;
 mod handle_artcraft_sora2_pro;
 mod handle_artcraft_video;

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/enqueue_image_to_video_command.rs

@@ -42,6 +42,12 @@ pub enum VideoModel {
 
   #[serde(rename = "kling_2.1_master")]
   Kling21Master,
+  
+  #[serde(rename = "kling_2p5_turbo_pro")]
+  Kling2p5TurboPro,
+  
+  #[serde(rename = "kling_2p6_pro")]
+  Kling2p6Pro,
 
   #[serde(rename = "seedance_1.0_lite")]
   Seedance10Lite,

crates/desktop/artcraft/src/core/events/generation_events/common.rs

@@ -70,6 +70,10 @@ pub enum GenerationModel {
   Kling21Master,
   #[serde(rename = "kling_2.1_pro")]
   Kling21Pro,
+  #[serde(rename = "kling_2p5_turbo_pro")]
+  Kling2p5TurboPro,
+  #[serde(rename = "kling_2p6_pro")]
+  Kling2p6Pro,
   #[serde(rename = "recraft_3")]
   Recraft3,
   #[serde(rename = "sora")]