tauri wip

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::kling_2_5_turbo_multi_function_video_gen::{Kling2p5TurboProMultiFunctionVideoGenRequest, Kling2p5TurboProMultiFunctionVideoGenResponse, KLING_2P5_TURBO_PRO_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn kling_2p5_turbo_pro_multi_function_image_gen(
+pub async fn kling_2p5_turbo_pro_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Kling2p5TurboProMultiFunctionVideoGenRequest,

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::kling_2_6_multi_function_video_gen::{Kling2p6ProMultiFunctionVideoGenRequest, Kling2p6ProMultiFunctionVideoGenResponse, KLING_2P6_PRO_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn kling_2p6_pro_multi_function_image_gen(
+pub async fn kling_2p6_pro_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Kling2p6ProMultiFunctionVideoGenRequest,

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::sora_2_multi_function_video_gen::{Sora2MultiFunctionVideoGenRequest, Sora2MultiFunctionVideoGenResponse, SORA_2_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn sora_2_multi_function_image_gen(
+pub async fn sora_2_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Sora2MultiFunctionVideoGenRequest,

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::sora_2_pro_multi_function_video_gen::{Sora2ProMultiFunctionVideoGenRequest, Sora2ProMultiFunctionVideoGenResponse, SORA_2_PRO_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn sora_2_fast_multi_function_image_gen(
+pub async fn sora_2_pro_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Sora2ProMultiFunctionVideoGenRequest,

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::veo_3p1_fast_multi_function_video_gen::{Veo3p1FastMultiFunctionVideoGenRequest, Veo3p1FastMultiFunctionVideoGenResponse, VEO_3P1_FAST_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn veo_3p1_fast_multi_function_image_gen(
+pub async fn veo_3p1_fast_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Veo3p1FastMultiFunctionVideoGenRequest,

crates/api_clients/artcraft/storyteller_client/src/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen.rs

@@ -4,7 +4,7 @@ use crate::utils::api_host::ApiHost;
 use crate::utils::basic_json_post_request::basic_json_post_request;
 use artcraft_api_defs::generate::video::multi_function::veo_3p1_multi_function_video_gen::{Veo3p1MultiFunctionVideoGenRequest, Veo3p1MultiFunctionVideoGenResponse, VEO_3P1_MULTI_FUNCTION_VIDEO_VIDEO_PATH};
 
-pub async fn veo_3p1_multi_function_image_gen(
+pub async fn veo_3p1_multi_function_video_gen(
   api_host: &ApiHost,
   maybe_creds: Option<&StorytellerCredentialSet>,
   request: Veo3p1MultiFunctionVideoGenRequest,

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

@@ -0,0 +1,27 @@
+use crate::core::commands::enqueue::generate_error::GenerateError;
+use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
+use crate::core::events::generation_events::common::GenerationAction;
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use log::error;
+use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use tauri::AppHandle;
+
+pub (super) fn get_storyteller_creds_or_error(
+  app: &AppHandle,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> Result<StorytellerCredentialSet, GenerateError> {
+
+  match storyteller_creds_manager.get_credentials()? {
+    Some(creds) => Ok(creds),
+    None => {
+      error!("No Artcraft credentials are set. Can't perform action.");
+      let event =
+          GenerationEnqueueFailureEvent::no_artcraft_credentials(GenerationAction::GenerateVideo);
+
+      event.send_infallible(app);
+
+      Err(GenerateError::needs_storyteller_credentials())
+    },
+  }
+}

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/artcraft/handle_artcraft_sora2.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::sora_2_multi_function_video_gen::{Sora2MultiFunctionVideoGenAspectRatio, Sora2MultiFunctionVideoGenDuration, Sora2MultiFunctionVideoGenRequest, Sora2MultiFunctionVideoGenResolution};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew;
+use openai_sora_client::recipes::list_sora2_drafts::list_sora2_drafts_with_session_auto_renew::list_sora2_drafts_with_session_auto_renew;
+use openai_sora_client::requests::generate_sora2_video::generate_sora2_video::{GenerateSora2VideoArgs, Orientation};
+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::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_sora2(
+  request: &EnqueueImageToVideoRequest,
+  app_env_configs: &AppEnvConfigs,
+  creds: &StorytellerCredentialSet,
+) -> Result<TaskEnqueueSuccess, GenerateError> {
+
+  let uuid_idempotency_token = generate_random_uuid();
+
+  let aspect_ratio = match request.sora_orientation {
+    Some(SoraOrientation::Portrait) => Sora2MultiFunctionVideoGenAspectRatio::NineBySixteen,
+    Some(SoraOrientation::Landscape) => Sora2MultiFunctionVideoGenAspectRatio::SixteenByNine,
+    None => Sora2MultiFunctionVideoGenAspectRatio::SixteenByNine,
+  };
+  
+  let request = Sora2MultiFunctionVideoGenRequest {
+    uuid_idempotency_token,
+    prompt: request.prompt.clone(),
+    image_media_token: request.image_media_token.clone(),
+    aspect_ratio: Some(aspect_ratio),
+    resolution: Some(Sora2MultiFunctionVideoGenResolution::SevenTwentyP), // TODO: Parameterize
+    duration: Some(Sora2MultiFunctionVideoGenDuration::TwelveSeconds), // TODO: Parameterize
+  };
+  
+  let result = sora_2_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::Sora2),
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
+}

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

@@ -0,0 +1,75 @@
+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::sora_2_pro_multi_function_video_gen::{Sora2ProMultiFunctionVideoGenAspectRatio, Sora2ProMultiFunctionVideoGenDuration, Sora2ProMultiFunctionVideoGenRequest, Sora2ProMultiFunctionVideoGenResolution};
+use enums::common::generation_provider::GenerationProvider;
+use enums::tauri::tasks::task_type::TaskType;
+use idempotency::uuid::generate_random_uuid;
+use log::{error, info};
+use openai_sora_client::recipes::generate_sora2_video::generate_sora2_video_with_session_auto_renew::generate_sora2_video_with_session_auto_renew;
+use openai_sora_client::recipes::list_sora2_drafts::list_sora2_drafts_with_session_auto_renew::list_sora2_drafts_with_session_auto_renew;
+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::sora_2_multi_function_video_gen::sora_2_multi_function_video_gen;
+use storyteller_client::endpoints::generate::video::multi_function::sora_2_pro_multi_function_video_gen::sora_2_pro_multi_function_video_gen;
+use tauri::AppHandle;
+use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use tokens::tokens::media_files::MediaFileToken;
+
+pub (super) async fn handle_artcraft_sora2_pro(
+  request: &EnqueueImageToVideoRequest,
+  app_env_configs: &AppEnvConfigs,
+  creds: &StorytellerCredentialSet,
+) -> Result<TaskEnqueueSuccess, GenerateError> {
+
+  let uuid_idempotency_token = generate_random_uuid();
+
+  let aspect_ratio = match request.sora_orientation {
+    Some(SoraOrientation::Portrait) => Sora2ProMultiFunctionVideoGenAspectRatio::NineBySixteen,
+    Some(SoraOrientation::Landscape) => Sora2ProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+    None => Sora2ProMultiFunctionVideoGenAspectRatio::SixteenByNine,
+  };
+  
+  let request = Sora2ProMultiFunctionVideoGenRequest {
+    uuid_idempotency_token,
+    prompt: request.prompt.clone(),
+    image_media_token: request.image_media_token.clone(),
+    aspect_ratio: Some(aspect_ratio),
+    resolution: Some(Sora2ProMultiFunctionVideoGenResolution::TenEightyP), // TODO: Parameterize
+    duration: Some(Sora2ProMultiFunctionVideoGenDuration::TwelveSeconds), // TODO: Parameterize
+  };
+  
+  let result = sora_2_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::Sora2Pro),
+    provider: GenerationProvider::Artcraft,
+    provider_job_id: Some(job_token.to_string()),
+  })
+}

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

@@ -0,0 +1,32 @@
+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::artcraft::handle_artcraft_sora2::handle_artcraft_sora2;
+use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_sora2_pro::handle_artcraft_sora2_pro;
+use crate::core::commands::enqueue::image_to_video::enqueue_image_to_video_command::{EnqueueImageToVideoRequest, VideoModel};
+use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
+use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use tauri::AppHandle;
+
+pub async fn handle_video_artcraft(
+  request: &EnqueueImageToVideoRequest,
+  app: &AppHandle,
+  app_env_configs: &AppEnvConfigs,
+  storyteller_creds_manager: &StorytellerCredentialManager,
+) -> Result<TaskEnqueueSuccess, GenerateError> {
+
+  let creds = get_storyteller_creds_or_error(app, storyteller_creds_manager)?;
+  
+  match request.model {
+    None => {
+      Err(GenerateError::no_model_specified())
+    },
+    Some(VideoModel::Sora2) => handle_artcraft_sora2(request, app_env_configs, &creds).await,
+    Some(VideoModel::Sora2Pro) => handle_artcraft_sora2_pro(request, app_env_configs, &creds).await,
+    Some(_) => {
+      Err(GenerateError::AnyhowError(
+        anyhow!("wrong logic: another branch should handle this: {:?}", request.model)))
+    },
+  }
+}

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

@@ -0,0 +1,4 @@
+mod get_storyteller_creds_or_error;
+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

@@ -9,22 +9,22 @@ use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::functional_events::credits_balance_changed_event::CreditsBalanceChangedEvent;
+use crate::core::events::generation_events::common::GenerationAction;
+use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 use crate::core::state::task_database::TaskDatabase;
+use crate::services::grok::state::grok_credential_manager::GrokCredentialManager;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use enums::tauri::ux::tauri_command_caller::TauriCommandCaller;
 use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
 use tauri::{AppHandle, State};
-use enums::tauri::ux::tauri_command_caller::TauriCommandCaller;
 use tokens::tokens::media_files::MediaFileToken;
-use crate::core::events::generation_events::common::GenerationAction;
-use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::services::grok::state::grok_credential_manager::GrokCredentialManager;
 
 /// This is used in the Tauri command bridge.
 /// Don't change the serializations without coordinating with the frontend.
@@ -48,6 +48,9 @@ pub enum VideoModel {
 
   #[serde(rename = "sora_2")]
   Sora2,
+  
+  #[serde(rename = "sora_2_pro")]
+  Sora2Pro,
 
   #[serde(rename = "veo_2")]
   Veo2,

crates/desktop/artcraft/src/core/commands/enqueue/image_to_video/generic/handle_video_artcraft.rs

@@ -62,7 +62,6 @@ pub async fn handle_video_artcraft(
 
   info!("Calling Artcraft image to video...");
 
-
   let uuid_idempotency_token = generate_random_uuid();
   
   let mut selected_model = None;

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

@@ -1,4 +1,5 @@
 pub mod enqueue_image_to_video_command;
 mod generic;
 pub mod sora2;
-mod grok;
+mod grok;
+mod artcraft;

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

@@ -76,6 +76,8 @@ pub enum GenerationModel {
   Sora,
   #[serde(rename = "sora_2")]
   Sora2,
+  #[serde(rename = "sora_2_pro")]
+  Sora2Pro,
   #[serde(rename = "seedance_1.0_lite")]
   Seedance10Lite,
   #[serde(rename = "veo_2")]