mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-15 22:32:13 +00:00
fix
This commit is contained in:
1 parent
43b5a79efe
commit
e8b0cfa8dc
43 files changed
+231
-296
No files matched your search
@@ -5,7 +5,6 @@ pub mod request_mismatch_mitigation_strategy;
|
||||
pub mod router_artcraft_client;
|
||||
pub mod router_client;
|
||||
pub mod router_fal_client;
|
||||
pub mod router_fal_webhook_optional_client;
|
||||
pub mod router_gmicloud_client;
|
||||
pub mod router_grok_api_client;
|
||||
pub mod router_seedance2pro_client;
|
||||
@@ -1,6 +1,5 @@
|
||||
use crate::client::router_artcraft_client::RouterArtcraftClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_gmicloud_client::RouterGmiCloudClient;
|
||||
use crate::client::router_grok_api_client::RouterGrokApiClient;
|
||||
use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
|
||||
@@ -9,7 +8,6 @@ use crate::errors::client_error::{ClientError, ClientType};
|
||||
pub struct MultiRouterClient {
|
||||
pub(crate) artcraft_client: Option<RouterArtcraftClient>,
|
||||
pub(crate) fal_client: Option<RouterFalClient>,
|
||||
pub(crate) fal_webhook_optional_client: Option<RouterFalWebhookOptionalClient>,
|
||||
pub(crate) gmicloud_client: Option<RouterGmiCloudClient>,
|
||||
pub(crate) grok_api_client: Option<RouterGrokApiClient>,
|
||||
pub(crate) seedance2pro_client: Option<RouterSeedance2ProClient>,
|
||||
@@ -26,11 +24,6 @@ impl MultiRouterClient {
|
||||
.ok_or(ClientError::ClientNotConfigured(ClientType::Fal))
|
||||
}
|
||||
|
||||
pub fn get_fal_webhook_optional_client_ref(&self) -> Result<&RouterFalWebhookOptionalClient, ClientError> {
|
||||
self.fal_webhook_optional_client.as_ref()
|
||||
.ok_or(ClientError::ClientNotConfigured(ClientType::FalWebhookOptional))
|
||||
}
|
||||
|
||||
pub fn get_gmicloud_client_ref(&self) -> Result<&RouterGmiCloudClient, ClientError> {
|
||||
self.gmicloud_client.as_ref()
|
||||
.ok_or(ClientError::ClientNotConfigured(ClientType::GmiCloud))
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
use crate::client::multi_router_client::MultiRouterClient;
|
||||
use crate::client::router_artcraft_client::RouterArtcraftClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_gmicloud_client::RouterGmiCloudClient;
|
||||
use crate::client::router_grok_api_client::RouterGrokApiClient;
|
||||
use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
|
||||
@@ -9,7 +8,6 @@ use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
|
||||
pub struct MultiRouterClientBuilder {
|
||||
artcraft_client: Option<RouterArtcraftClient>,
|
||||
fal_client: Option<RouterFalClient>,
|
||||
fal_webhook_optional_client: Option<RouterFalWebhookOptionalClient>,
|
||||
gmicloud_client: Option<RouterGmiCloudClient>,
|
||||
grok_api_client: Option<RouterGrokApiClient>,
|
||||
seedance2pro_client: Option<RouterSeedance2ProClient>,
|
||||
@@ -20,7 +18,6 @@ impl MultiRouterClientBuilder {
|
||||
Self {
|
||||
artcraft_client: None,
|
||||
fal_client: None,
|
||||
fal_webhook_optional_client: None,
|
||||
gmicloud_client: None,
|
||||
grok_api_client: None,
|
||||
seedance2pro_client: None,
|
||||
@@ -37,11 +34,6 @@ impl MultiRouterClientBuilder {
|
||||
self
|
||||
}
|
||||
|
||||
pub fn set_fal_webhook_optional_client(mut self, client: RouterFalWebhookOptionalClient) -> Self {
|
||||
self.fal_webhook_optional_client = Some(client);
|
||||
self
|
||||
}
|
||||
|
||||
pub fn set_gmicloud_client(mut self, client: RouterGmiCloudClient) -> Self {
|
||||
self.gmicloud_client = Some(client);
|
||||
self
|
||||
@@ -61,7 +53,6 @@ impl MultiRouterClientBuilder {
|
||||
MultiRouterClient {
|
||||
artcraft_client: self.artcraft_client,
|
||||
fal_client: self.fal_client,
|
||||
fal_webhook_optional_client: self.fal_webhook_optional_client,
|
||||
gmicloud_client: self.gmicloud_client,
|
||||
grok_api_client: self.grok_api_client,
|
||||
seedance2pro_client: self.seedance2pro_client,
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
use crate::client::multi_router_client::MultiRouterClient;
|
||||
use crate::client::router_artcraft_client::RouterArtcraftClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_gmicloud_client::RouterGmiCloudClient;
|
||||
use crate::client::router_grok_api_client::RouterGrokApiClient;
|
||||
use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
|
||||
@@ -11,7 +10,6 @@ pub enum RouterClient {
|
||||
Multi(MultiRouterClient),
|
||||
Artcraft(RouterArtcraftClient),
|
||||
Fal(RouterFalClient),
|
||||
FalWebhookOptional(RouterFalWebhookOptionalClient),
|
||||
GmiCloud(RouterGmiCloudClient),
|
||||
GrokApi(RouterGrokApiClient),
|
||||
Seedance2Pro(RouterSeedance2ProClient),
|
||||
@@ -34,14 +32,6 @@ impl RouterClient {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_fal_webhook_optional_client_ref(&self) -> Result<&RouterFalWebhookOptionalClient, ClientError> {
|
||||
match self {
|
||||
RouterClient::FalWebhookOptional(client) => Ok(client),
|
||||
RouterClient::Multi(multi) => multi.get_fal_webhook_optional_client_ref(),
|
||||
_ => Err(ClientError::ClientNotConfigured(ClientType::Fal)),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_gmicloud_client_ref(&self) -> Result<&RouterGmiCloudClient, ClientError> {
|
||||
match self {
|
||||
RouterClient::GmiCloud(client) => Ok(client),
|
||||
|
||||
@@ -1,19 +1,30 @@
|
||||
use fal_client::creds::fal_api_key::FalApiKey;
|
||||
|
||||
/// A unified Fal client. The caller picks the dispatch mode:
|
||||
///
|
||||
/// - `Some(webhook_url)` → endpoints will use Fal's webhook flow.
|
||||
/// - `None` → endpoints will use the queue/polling flow (where available).
|
||||
///
|
||||
/// Some endpoints are webhook-only (their fal_client wrapper lives under the
|
||||
/// `requests::webhook::*` namespace and has no `api::` queue variant). Those
|
||||
/// will return `ClientError::WebhookUrlRequired` when constructed with `None`.
|
||||
pub struct RouterFalClient {
|
||||
pub(crate) api_key: FalApiKey,
|
||||
pub(crate) webhook_url: String,
|
||||
pub(crate) webhook_url: Option<String>,
|
||||
}
|
||||
|
||||
impl RouterFalClient {
|
||||
pub fn new(api_key: FalApiKey, webhook_url: String) -> Self {
|
||||
Self { api_key, webhook_url }
|
||||
/// Build a client for webhook dispatch.
|
||||
pub fn new_with_webhook(api_key: FalApiKey, webhook_url: String) -> Self {
|
||||
Self { api_key, webhook_url: Some(webhook_url) }
|
||||
}
|
||||
|
||||
pub fn new_from_raw_key(api_key: &str, webhook_url: String) -> Self {
|
||||
Self {
|
||||
api_key: FalApiKey::from_str(api_key),
|
||||
webhook_url,
|
||||
}
|
||||
/// Build a client for queue/polling dispatch (no webhook URL).
|
||||
pub fn new_polling_only(api_key: FalApiKey) -> Self {
|
||||
Self { api_key, webhook_url: None }
|
||||
}
|
||||
|
||||
pub fn new_polling_only_from_raw_key(api_key: &str) -> Self {
|
||||
Self::new_polling_only(FalApiKey::from_str(api_key))
|
||||
}
|
||||
}
|
||||
-22
@@ -1,22 +0,0 @@
|
||||
use fal_client::creds::fal_api_key::FalApiKey;
|
||||
|
||||
pub struct RouterFalWebhookOptionalClient {
|
||||
pub(crate) api_key: FalApiKey,
|
||||
pub(crate) webhook_url: Option<String>,
|
||||
}
|
||||
|
||||
impl RouterFalWebhookOptionalClient {
|
||||
pub fn new(api_key: FalApiKey) -> Self {
|
||||
Self { api_key, webhook_url: None }
|
||||
}
|
||||
pub fn from_str(api_key: &str) -> Self {
|
||||
Self::new(FalApiKey::from_str(api_key))
|
||||
}
|
||||
|
||||
pub fn new_with_webhook(api_key: FalApiKey, webhook_url: String) -> Self {
|
||||
Self {
|
||||
api_key,
|
||||
webhook_url: Some(webhook_url)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,7 +7,6 @@ use tokens::tokens::media_files::MediaFileToken;
|
||||
pub enum ClientType {
|
||||
Artcraft,
|
||||
Fal,
|
||||
FalWebhookOptional,
|
||||
GmiCloud,
|
||||
GrokApi,
|
||||
Seedance2Pro,
|
||||
@@ -18,7 +17,6 @@ impl Display for ClientType {
|
||||
match self {
|
||||
Self::Artcraft => write!(f, "Artcraft"),
|
||||
Self::Fal => write!(f, "Fal"),
|
||||
Self::FalWebhookOptional => write!(f, "FalWebhookOptional"),
|
||||
Self::GmiCloud => write!(f, "GmiCloud"),
|
||||
Self::GrokApi => write!(f, "GrokApi"),
|
||||
Self::Seedance2Pro => write!(f, "Seedance2Pro"),
|
||||
@@ -49,6 +47,11 @@ pub enum ClientError {
|
||||
|
||||
/// Seedance2Pro only accepts URLs for media inputs, not media tokens.
|
||||
Seedance2ProOnlySupportsUrls,
|
||||
|
||||
/// The Fal endpoint requires a webhook URL but the caller built the client
|
||||
/// in polling/queue mode (no webhook URL). Returned by webhook-only
|
||||
/// endpoints (those whose fal_client wrapper has no `api::` queue variant).
|
||||
WebhookUrlRequired,
|
||||
|
||||
/// The pre-dispatch context of media file token to URL map was not supplied.
|
||||
MediaFileToUrlMapNotProvided,
|
||||
@@ -89,6 +92,9 @@ impl Display for ClientError {
|
||||
Self::Seedance2ProOnlySupportsUrls => {
|
||||
write!(f, "Seedance2Pro only supports URLs for media inputs; resolve media tokens to URLs before calling this provider")
|
||||
}
|
||||
Self::WebhookUrlRequired => {
|
||||
write!(f, "This Fal endpoint only supports webhook dispatch; the caller built RouterFalClient in polling-only mode (no webhook URL)")
|
||||
}
|
||||
Self::MediaFileToUrlMapNotProvided => {
|
||||
write!(f, "Media file to URL map was not provided")
|
||||
}
|
||||
|
||||
+7
-7
@@ -272,11 +272,11 @@ impl ImageGenerationRequest {
|
||||
|
||||
// ── Fal ──
|
||||
Self::FalFlux1Dev(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalFlux1Schnell(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalFluxPro1p1(request) => {
|
||||
@@ -289,15 +289,15 @@ impl ImageGenerationRequest {
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalGptImage1(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalGptImage1p5(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalGptImage2(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalNanoBanana(request) => {
|
||||
@@ -306,11 +306,11 @@ impl ImageGenerationRequest {
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalNanoBanana2(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalNanoBananaPro(request) => {
|
||||
let fal_client = client.get_fal_webhook_optional_client_ref()?;
|
||||
let fal_client = client.get_fal_client_ref()?;
|
||||
request.send(fal_client).await
|
||||
}
|
||||
Self::FalSeedream4(request) => {
|
||||
|
||||
+7
-36
@@ -5,9 +5,8 @@ use fal_client::requests::api::image::edit::flux_1_dev_edit_image::api::Flux1Dev
|
||||
use fal_client::requests::api::image::text::flux_1_dev_text_to_image::api::Flux1DevTextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
};
|
||||
@@ -19,7 +18,7 @@ pub enum FalFlux1DevRequestState {
|
||||
}
|
||||
|
||||
impl FalFlux1DevRequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
@@ -58,12 +57,10 @@ struct FalResponseIds {
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request
|
||||
.send_webhook_request(&client.api_key, webhook_url)
|
||||
.await?;
|
||||
let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
|
||||
Ok(FalResponseIds {
|
||||
request_id: response.request_id,
|
||||
gateway_request_id: response.gateway_request_id,
|
||||
@@ -71,9 +68,7 @@ async fn send_fal_request<T: FalEndpoint>(
|
||||
response_url: None,
|
||||
})
|
||||
} else {
|
||||
let response = request
|
||||
.send_queue_request(&client.api_key)
|
||||
.await?;
|
||||
let response = request.send_queue_request(&client.api_key).await?;
|
||||
Ok(FalResponseIds {
|
||||
request_id: Some(response.request_id),
|
||||
gateway_request_id: None,
|
||||
@@ -99,17 +94,13 @@ mod tests {
|
||||
FalApiKey::from_str(secret.trim())
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new_with_webhook(
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new(read_fal_api_key())
|
||||
}
|
||||
|
||||
// ── Text-to-image ──
|
||||
|
||||
mod text_to_image {
|
||||
@@ -134,16 +125,6 @@ mod tests {
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = t2i_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue t2i — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
|
||||
// ── Edit image ──
|
||||
@@ -170,15 +151,5 @@ mod tests {
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = edit_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue edit — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
}
|
||||
+7
-36
@@ -5,9 +5,8 @@ use fal_client::requests::api::image::edit::flux_1_schnell_edit_image::api::Flux
|
||||
use fal_client::requests::api::image::text::flux_1_schnell_text_to_image::api::Flux1SchnellTextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
};
|
||||
@@ -19,7 +18,7 @@ pub enum FalFlux1SchnellRequestState {
|
||||
}
|
||||
|
||||
impl FalFlux1SchnellRequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
@@ -58,12 +57,10 @@ struct FalResponseIds {
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request
|
||||
.send_webhook_request(&client.api_key, webhook_url)
|
||||
.await?;
|
||||
let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
|
||||
Ok(FalResponseIds {
|
||||
request_id: response.request_id,
|
||||
gateway_request_id: response.gateway_request_id,
|
||||
@@ -71,9 +68,7 @@ async fn send_fal_request<T: FalEndpoint>(
|
||||
response_url: None,
|
||||
})
|
||||
} else {
|
||||
let response = request
|
||||
.send_queue_request(&client.api_key)
|
||||
.await?;
|
||||
let response = request.send_queue_request(&client.api_key).await?;
|
||||
Ok(FalResponseIds {
|
||||
request_id: Some(response.request_id),
|
||||
gateway_request_id: None,
|
||||
@@ -99,17 +94,13 @@ mod tests {
|
||||
FalApiKey::from_str(secret.trim())
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new_with_webhook(
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new(read_fal_api_key())
|
||||
}
|
||||
|
||||
// ── Text-to-image ──
|
||||
|
||||
mod text_to_image {
|
||||
@@ -132,16 +123,6 @@ mod tests {
|
||||
println!("Webhook t2i — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let response = t2i_request().send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue t2i — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
|
||||
// ── Edit image ──
|
||||
@@ -166,15 +147,5 @@ mod tests {
|
||||
println!("Webhook edit — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let response = edit_request().send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue edit — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-2
@@ -8,6 +8,7 @@ use fal_client::requests::webhook::image::angle::enqueue_flux_2_lora_edit_image_
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -20,10 +21,12 @@ pub struct FalFlux2LoraAnglesRequestState {
|
||||
|
||||
impl FalFlux2LoraAnglesRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
let args = EnqueueFlux2LoraEditImageAngleArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
let webhook_response = enqueue_flux_2_lora_edit_image_angle_webhook(args)
|
||||
@@ -55,7 +58,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+5
-2
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_imag
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -19,10 +20,12 @@ pub struct FalFluxPro1p1RequestState {
|
||||
|
||||
impl FalFluxPro1p1RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
let args = FluxPro11Args {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
let webhook_response = enqueue_flux_pro_11_text_to_image_webhook(args)
|
||||
@@ -54,7 +57,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+5
-2
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_t
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -19,10 +20,12 @@ pub struct FalFluxPro1p1UltraRequestState {
|
||||
|
||||
impl FalFluxPro1p1UltraRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
let args = FluxPro11UltraArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
let webhook_response = enqueue_flux_pro_11_ultra_text_to_image_webhook(args)
|
||||
@@ -54,7 +57,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+15
-12
@@ -5,7 +5,7 @@ use fal_client::requests::api::image::edit::gpt_image_1_edit_image::api::GptImag
|
||||
use fal_client::requests::api::image::text::gpt_image_1_text_to_image::api::GptImage1TextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::generate::generate_image::generate_image_response::{FalImageResponsePayload, GenerateImageResponse};
|
||||
|
||||
@@ -16,7 +16,7 @@ pub enum FalGptImage1RequestState {
|
||||
}
|
||||
|
||||
impl FalGptImage1RequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => send_request(request, client).await,
|
||||
Self::EditImage(request) => send_request(request, client).await,
|
||||
@@ -31,7 +31,7 @@ struct FalResponseIds {
|
||||
response_url: Option<String>,
|
||||
}
|
||||
|
||||
async fn send_request<T>(request: &T, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
async fn send_request<T>(request: &T, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
where
|
||||
T: FalEndpoint + Clone + Debug + Send + Sync + 'static,
|
||||
{
|
||||
@@ -48,7 +48,7 @@ where
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
|
||||
@@ -82,15 +82,18 @@ mod tests {
|
||||
};
|
||||
use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
|
||||
.expect("Failed to read fal_api_key.txt");
|
||||
RouterFalWebhookOptionalClient::new(FalApiKey::from_str(secret.trim()))
|
||||
RouterFalClient::new_with_webhook(
|
||||
FalApiKey::from_str(secret.trim()),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_text_to_image_queue() {
|
||||
async fn send_text_to_image_webhook() {
|
||||
let request = FalGptImage1RequestState::TextToImage(GptImage1TextToImageRequest {
|
||||
prompt: "a small ceramic robot reading by a window".to_string(),
|
||||
num_images: GptImage1TextToImageNumImages::One,
|
||||
@@ -99,14 +102,14 @@ mod tests {
|
||||
background: None,
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_edit_image_queue() {
|
||||
async fn send_edit_image_webhook() {
|
||||
let request = FalGptImage1RequestState::EditImage(GptImage1EditImageRequest {
|
||||
prompt: "make the image feel like a quiet watercolor study".to_string(),
|
||||
image_urls: vec![JUNO_AT_LAKE_IMAGE_URL.to_string()],
|
||||
@@ -118,8 +121,8 @@ mod tests {
|
||||
background: None,
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
}
|
||||
+15
-12
@@ -5,7 +5,7 @@ use fal_client::requests::api::image::edit::gpt_image_1p5_edit_image::api::GptIm
|
||||
use fal_client::requests::api::image::text::gpt_image_1p5_text_to_image::api::GptImage1p5TextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::generate::generate_image::generate_image_response::{FalImageResponsePayload, GenerateImageResponse};
|
||||
|
||||
@@ -16,7 +16,7 @@ pub enum FalGptImage1p5RequestState {
|
||||
}
|
||||
|
||||
impl FalGptImage1p5RequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => send_request(request, client).await,
|
||||
Self::EditImage(request) => send_request(request, client).await,
|
||||
@@ -31,7 +31,7 @@ struct FalResponseIds {
|
||||
response_url: Option<String>,
|
||||
}
|
||||
|
||||
async fn send_request<T>(request: &T, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
async fn send_request<T>(request: &T, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
where
|
||||
T: FalEndpoint + Clone + Debug + Send + Sync + 'static,
|
||||
{
|
||||
@@ -48,7 +48,7 @@ where
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
|
||||
@@ -83,15 +83,18 @@ mod tests {
|
||||
};
|
||||
use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
|
||||
.expect("Failed to read fal_api_key.txt");
|
||||
RouterFalWebhookOptionalClient::new(FalApiKey::from_str(secret.trim()))
|
||||
RouterFalClient::new_with_webhook(
|
||||
FalApiKey::from_str(secret.trim()),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_text_to_image_queue() {
|
||||
async fn send_text_to_image_webhook() {
|
||||
let request = FalGptImage1p5RequestState::TextToImage(GptImage1p5TextToImageRequest {
|
||||
prompt: "a tiny brass observatory in a snowy field".to_string(),
|
||||
num_images: GptImage1p5TextToImageNumImages::One,
|
||||
@@ -100,14 +103,14 @@ mod tests {
|
||||
quality: Some(GptImage1p5TextToImageQuality::Low),
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_edit_image_queue() {
|
||||
async fn send_edit_image_webhook() {
|
||||
let request = FalGptImage1p5RequestState::EditImage(GptImage1p5EditImageRequest {
|
||||
prompt: "turn this into a softly lit editorial photograph".to_string(),
|
||||
image_urls: vec![JUNO_AT_LAKE_IMAGE_URL.to_string()],
|
||||
@@ -119,8 +122,8 @@ mod tests {
|
||||
input_fidelity: None,
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
}
|
||||
+15
-12
@@ -5,7 +5,7 @@ use fal_client::requests::api::image::edit::gpt_image_2_edit_image::api::GptImag
|
||||
use fal_client::requests::api::image::text::gpt_image_2_text_to_image::api::GptImage2TextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::generate::generate_image::generate_image_response::{FalImageResponsePayload, GenerateImageResponse};
|
||||
|
||||
@@ -16,7 +16,7 @@ pub enum FalGptImage2RequestState {
|
||||
}
|
||||
|
||||
impl FalGptImage2RequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => send_request(request, client).await,
|
||||
Self::EditImage(request) => send_request(request, client).await,
|
||||
@@ -31,7 +31,7 @@ struct FalResponseIds {
|
||||
response_url: Option<String>,
|
||||
}
|
||||
|
||||
async fn send_request<T>(request: &T, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
async fn send_request<T>(request: &T, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError>
|
||||
where
|
||||
T: FalEndpoint + Clone + Debug + Send + Sync + 'static,
|
||||
{
|
||||
@@ -48,7 +48,7 @@ where
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
|
||||
@@ -83,15 +83,18 @@ mod tests {
|
||||
};
|
||||
use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
|
||||
.expect("Failed to read fal_api_key.txt");
|
||||
RouterFalWebhookOptionalClient::new(FalApiKey::from_str(secret.trim()))
|
||||
RouterFalClient::new_with_webhook(
|
||||
FalApiKey::from_str(secret.trim()),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_text_to_image_queue() {
|
||||
async fn send_text_to_image_webhook() {
|
||||
let request = FalGptImage2RequestState::TextToImage(GptImage2TextToImageRequest {
|
||||
prompt: "a polished product photo of a glass compass".to_string(),
|
||||
num_images: GptImage2TextToImageNumImages::One,
|
||||
@@ -100,14 +103,14 @@ mod tests {
|
||||
quality: Some(GptImage2TextToImageQuality::Low),
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_edit_image_queue() {
|
||||
async fn send_edit_image_webhook() {
|
||||
let request = FalGptImage2RequestState::EditImage(GptImage2EditImageRequest {
|
||||
prompt: "make this look like an elegant magazine cover image".to_string(),
|
||||
image_urls: vec![JUNO_AT_LAKE_IMAGE_URL.to_string()],
|
||||
@@ -118,8 +121,8 @@ mod tests {
|
||||
quality: Some(GptImage2EditImageQuality::Low),
|
||||
output_format: None,
|
||||
});
|
||||
let response = request.send(&client_without_webhook()).await.expect("send should succeed");
|
||||
let response = request.send(&client_with_webhook()).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
assert!(payload.request_id.is_some());
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
}
|
||||
+6
-3
@@ -11,6 +11,7 @@ use fal_client::requests::webhook::image::text::enqueue_gemini_25_flash_text_to_
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -24,12 +25,14 @@ pub enum FalNanoBananaRequestState {
|
||||
|
||||
impl FalNanoBananaRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound): (_, Arc<dyn Debug + Send + Sync>) = match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = Gemini25FlashTextToImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_gemini_25_flash_text_to_image_webhook(args).await, outbound)
|
||||
@@ -38,7 +41,7 @@ impl FalNanoBananaRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = Gemini25FlashEditArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_gemini_25_flash_edit_webhook(args).await, outbound)
|
||||
@@ -75,7 +78,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+5
-32
@@ -5,9 +5,8 @@ use fal_client::requests::api::image::edit::nano_banana_2_edit_image::api::NanoB
|
||||
use fal_client::requests::api::image::text::nano_banana_2_text_to_image::api::NanoBanana2TextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
};
|
||||
@@ -19,7 +18,7 @@ pub enum FalNanoBanana2RequestState {
|
||||
}
|
||||
|
||||
impl FalNanoBanana2RequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
@@ -58,7 +57,7 @@ struct FalResponseIds {
|
||||
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request
|
||||
@@ -103,17 +102,13 @@ mod tests {
|
||||
FalApiKey::from_str(secret.trim())
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new_with_webhook(
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new(read_fal_api_key())
|
||||
}
|
||||
|
||||
// ── Text-to-image ──
|
||||
|
||||
mod text_to_image {
|
||||
@@ -138,17 +133,6 @@ mod tests {
|
||||
println!("Webhook t2i — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = t2i_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue t2i — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
|
||||
// ── Edit image ──
|
||||
@@ -180,16 +164,5 @@ mod tests {
|
||||
println!("Webhook edit — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = edit_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue edit — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-33
@@ -5,9 +5,8 @@ use fal_client::requests::api::image::edit::nano_banana_pro_edit_image::api::Nan
|
||||
use fal_client::requests::api::image::text::nano_banana_pro_text_to_image::api::NanoBananaProTextToImageRequest;
|
||||
use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
|
||||
|
||||
use crate::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
};
|
||||
@@ -19,7 +18,7 @@ pub enum FalNanoBananaProRequestState {
|
||||
}
|
||||
|
||||
impl FalNanoBananaProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalWebhookOptionalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
@@ -56,10 +55,9 @@ struct FalResponseIds {
|
||||
response_url: Option<String>,
|
||||
}
|
||||
|
||||
/// Send a FAL request via webhook (if URL present) or queue (if not).
|
||||
async fn send_fal_request<T: FalEndpoint>(
|
||||
request: &T,
|
||||
client: &RouterFalWebhookOptionalClient,
|
||||
client: &RouterFalClient,
|
||||
) -> Result<FalResponseIds, ArtcraftRouterError> {
|
||||
if let Some(webhook_url) = &client.webhook_url {
|
||||
let response = request
|
||||
@@ -104,17 +102,13 @@ mod tests {
|
||||
FalApiKey::from_str(secret.trim())
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new_with_webhook(
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
}
|
||||
|
||||
fn client_without_webhook() -> RouterFalWebhookOptionalClient {
|
||||
RouterFalWebhookOptionalClient::new(read_fal_api_key())
|
||||
}
|
||||
|
||||
// ── Text-to-image ──
|
||||
|
||||
mod text_to_image {
|
||||
@@ -139,17 +133,6 @@ mod tests {
|
||||
println!("Webhook t2i — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = t2i_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue t2i — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
|
||||
// ── Edit image ──
|
||||
@@ -181,16 +164,5 @@ mod tests {
|
||||
println!("Webhook edit — request_id: {:?}, gateway_request_id: {:?}", payload.request_id, payload.gateway_request_id);
|
||||
assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore] // requires real API key, incurs cost
|
||||
async fn send_via_queue() {
|
||||
let client = client_without_webhook();
|
||||
let state = edit_request();
|
||||
let response = state.send(&client).await.expect("send should succeed");
|
||||
let payload = response.get_fal_payload().expect("expected Fal payload");
|
||||
println!("Queue edit — request_id: {:?}", payload.request_id);
|
||||
assert!(payload.request_id.is_some());
|
||||
}
|
||||
}
|
||||
}
|
||||
+5
-2
@@ -8,6 +8,7 @@ use fal_client::requests::webhook::image::angle::enqueue_qwen_edit_2511_edit_ima
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -20,10 +21,12 @@ pub struct FalQwenEdit2511AnglesRequestState {
|
||||
|
||||
impl FalQwenEdit2511AnglesRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
let args = EnqueueQwenEdit2511EditImageAngleArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
let webhook_response = enqueue_qwen_edit_2511_edit_image_angle_webhook(args)
|
||||
@@ -55,7 +58,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+6
-3
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_te
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -25,12 +26,14 @@ pub enum FalSeedream4RequestState {
|
||||
|
||||
impl FalSeedream4RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound): (_, Arc<dyn Debug + Send + Sync>) = match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV4TextToImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v4_text_to_image_webhook(args).await, outbound)
|
||||
@@ -39,7 +42,7 @@ impl FalSeedream4RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV4EditImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v4_edit_image_webhook(args).await, outbound)
|
||||
@@ -74,7 +77,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+6
-3
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -25,12 +26,14 @@ pub enum FalSeedream4p5RequestState {
|
||||
|
||||
impl FalSeedream4p5RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound): (_, Arc<dyn Debug + Send + Sync>) = match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV4p5TextToImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v4p5_text_to_image_webhook(args).await, outbound)
|
||||
@@ -39,7 +42,7 @@ impl FalSeedream4p5RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV4p5EditImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v4p5_edit_image_webhook(args).await, outbound)
|
||||
@@ -72,7 +75,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+6
-3
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_li
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_image::generate_image_response::{
|
||||
FalImageResponsePayload, GenerateImageResponse,
|
||||
@@ -25,12 +26,14 @@ pub enum FalSeedream5LiteRequestState {
|
||||
|
||||
impl FalSeedream5LiteRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateImageResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound): (_, Arc<dyn Debug + Send + Sync>) = match self {
|
||||
Self::TextToImage(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV5LiteTextToImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v5_lite_text_to_image_webhook(args).await, outbound)
|
||||
@@ -39,7 +42,7 @@ impl FalSeedream5LiteRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_bytedance_seedream_v5_lite_edit_image_webhook(args).await, outbound)
|
||||
@@ -72,7 +75,7 @@ mod tests {
|
||||
}
|
||||
|
||||
fn client_with_webhook() -> RouterFalClient {
|
||||
RouterFalClient::new(
|
||||
RouterFalClient::new_with_webhook(
|
||||
read_fal_api_key(),
|
||||
"https://example.com/fal-webhook-test".to_string(),
|
||||
)
|
||||
|
||||
+4
-1
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v1p6_pro_image_to
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -19,11 +20,13 @@ pub struct FalKling16ProRequestState {
|
||||
|
||||
impl FalKling16ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
|
||||
let args = Kling1p6ProArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
|
||||
|
||||
+4
-1
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_master_image
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -19,11 +20,13 @@ pub struct FalKling21MasterRequestState {
|
||||
|
||||
impl FalKling21MasterRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
|
||||
let args = Kling2p1MasterArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
|
||||
|
||||
+4
-1
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_pro_image_to
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -19,11 +20,13 @@ pub struct FalKling21ProRequestState {
|
||||
|
||||
impl FalKling21ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
|
||||
let args = Kling2p1ProArgs {
|
||||
request: self.request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::video::text::enqueue_kling_v2p5_turbo_pro_tex
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -30,12 +31,14 @@ pub struct FalKling2p5TurboProRequestState {
|
||||
|
||||
impl FalKling2p5TurboProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalKling2p5TurboProMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKlingV2p5TurboProTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_v2p5_turbo_pro_text_to_video_webhook(args).await, outbound)
|
||||
@@ -44,7 +47,7 @@ impl FalKling2p5TurboProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKlingV2p5TurboProImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_v2p5_turbo_pro_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::video::text::enqueue_kling_v2p6_pro_text_to_v
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -30,12 +31,14 @@ pub struct FalKling2p6ProRequestState {
|
||||
|
||||
impl FalKling2p6ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalKling2p6ProMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKlingV2p6ProTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_v2p6_pro_text_to_video_webhook(args).await, outbound)
|
||||
@@ -44,7 +47,7 @@ impl FalKling2p6ProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKlingV2p6ProImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_v2p6_pro_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::video::text::enqueue_kling_3p0_pro_text_to_vi
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -30,12 +31,14 @@ pub struct FalKling3p0ProRequestState {
|
||||
|
||||
impl FalKling3p0ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalKling3p0ProMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKling3p0ProTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_3p0_pro_text_to_video_webhook(args).await, outbound)
|
||||
@@ -44,7 +47,7 @@ impl FalKling3p0ProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKling3p0ProImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_3p0_pro_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::video::text::enqueue_kling_3p0_standard_text_
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -30,12 +31,14 @@ pub struct FalKling3p0StandardRequestState {
|
||||
|
||||
impl FalKling3p0StandardRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalKling3p0StandardMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKling3p0StandardTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_3p0_standard_text_to_video_webhook(args).await, outbound)
|
||||
@@ -44,7 +47,7 @@ impl FalKling3p0StandardRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueKling3p0StandardImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_kling_3p0_standard_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+4
-1
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_t
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -19,12 +20,14 @@ pub struct FalSeedance10LiteRequestState {
|
||||
|
||||
impl FalSeedance10LiteRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
|
||||
let args = Seedance1LiteArgs {
|
||||
request: self.request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
|
||||
let webhook_response = enqueue_seedance_1_lite_image_to_video_webhook(args)
|
||||
|
||||
+5
-2
@@ -12,6 +12,7 @@ use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -30,12 +31,14 @@ pub struct FalSeedance1p5ProRequestState {
|
||||
|
||||
impl FalSeedance1p5ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalSeedance1p5ProMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSeedance1p5ProTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_seedance_1p5_pro_text_to_video_webhook(args).await, outbound)
|
||||
@@ -44,7 +47,7 @@ impl FalSeedance1p5ProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSeedance1p5ProImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_seedance_1p5_pro_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -14,6 +14,7 @@ use fal_client::requests::webhook::video::text::enqueue_sora_2_text_to_video_web
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -60,6 +61,8 @@ pub struct FalSora2RequestState {
|
||||
|
||||
impl FalSora2RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalSora2Mode::TextToVideo => {
|
||||
// Text-to-video does not support Auto aspect ratio or Auto resolution.
|
||||
@@ -72,7 +75,7 @@ impl FalSora2RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSora2TextToVideoArgs {
|
||||
request,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_sora_2_text_to_video_webhook(args).await, outbound)
|
||||
@@ -88,7 +91,7 @@ impl FalSora2RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSora2ImageToVideoArgs {
|
||||
request,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_sora_2_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -14,6 +14,7 @@ use fal_client::requests::webhook::video::text::enqueue_sora_2_pro_text_to_video
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -57,6 +58,8 @@ pub struct FalSora2ProRequestState {
|
||||
|
||||
impl FalSora2ProRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalSora2ProMode::TextToVideo => {
|
||||
// Text-to-video does not support Auto aspect ratio or Auto resolution.
|
||||
@@ -69,7 +72,7 @@ impl FalSora2ProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSora2ProTextToVideoArgs {
|
||||
request,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_sora_2_pro_text_to_video_webhook(args).await, outbound)
|
||||
@@ -85,7 +88,7 @@ impl FalSora2ProRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueSora2ProImageToVideoArgs {
|
||||
request,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_sora_2_pro_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+5
-2
@@ -10,6 +10,7 @@ use fal_client::requests::webhook::video::text::enqueue_veo_2_text_to_video_webh
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -28,13 +29,15 @@ pub struct FalVeo2RequestState {
|
||||
|
||||
impl FalVeo2RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalVeo2Mode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = Veo2TextToVideoArgs {
|
||||
request: request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
(enqueue_veo_2_text_to_video_webhook(args).await, outbound)
|
||||
}
|
||||
@@ -43,7 +46,7 @@ impl FalVeo2RequestState {
|
||||
let args = Veo2Args {
|
||||
request: request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
(enqueue_veo_2_image_to_video_webhook(args).await, outbound)
|
||||
}
|
||||
|
||||
+5
-2
@@ -10,6 +10,7 @@ use fal_client::requests::webhook::video::text::enqueue_veo_3_text_to_video_webh
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -28,13 +29,15 @@ pub struct FalVeo3RequestState {
|
||||
|
||||
impl FalVeo3RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalVeo3Mode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = Veo3TextToVideoArgs {
|
||||
request: request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
(enqueue_veo_3_text_to_video_webhook(args).await, outbound)
|
||||
}
|
||||
@@ -43,7 +46,7 @@ impl FalVeo3RequestState {
|
||||
let args = Veo3Args {
|
||||
request: request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
(enqueue_veo_3_image_to_video_webhook(args).await, outbound)
|
||||
}
|
||||
|
||||
+4
-1
@@ -7,6 +7,7 @@ use fal_client::requests::webhook::video::image::enqueue_veo_3_fast_image_to_vid
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -19,12 +20,14 @@ pub struct FalVeo3FastRequestState {
|
||||
|
||||
impl FalVeo3FastRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(self.request.clone());
|
||||
|
||||
let args = Veo3FastArgs {
|
||||
request: self.request.clone(),
|
||||
api_key: &client.api_key,
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
};
|
||||
|
||||
let webhook_response = enqueue_veo_3_fast_image_to_video_webhook(args)
|
||||
|
||||
+6
-3
@@ -14,6 +14,7 @@ use fal_client::requests::webhook::video::text::enqueue_veo_3p1_text_to_video_we
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -33,12 +34,14 @@ pub struct FalVeo3p1RequestState {
|
||||
|
||||
impl FalVeo3p1RequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalVeo3p1Mode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1TextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_text_to_video_webhook(args).await, outbound)
|
||||
@@ -47,7 +50,7 @@ impl FalVeo3p1RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1ImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_image_to_video_webhook(args).await, outbound)
|
||||
@@ -56,7 +59,7 @@ impl FalVeo3p1RequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1FirstLastFrameImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_first_last_frame_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
+6
-3
@@ -17,6 +17,7 @@ use fal_client::requests::webhook::video::text::enqueue_veo_3p1_fast_text_to_vid
|
||||
|
||||
use crate::client::router_fal_client::RouterFalClient;
|
||||
use crate::errors::artcraft_router_error::ArtcraftRouterError;
|
||||
use crate::errors::client_error::ClientError;
|
||||
use crate::errors::provider_error::ProviderError;
|
||||
use crate::generate::generate_video::generate_video_response::{
|
||||
FalVideoResponsePayload, GenerateVideoResponse,
|
||||
@@ -36,12 +37,14 @@ pub struct FalVeo3p1FastRequestState {
|
||||
|
||||
impl FalVeo3p1FastRequestState {
|
||||
pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
|
||||
let webhook_url = client.webhook_url.as_deref()
|
||||
.ok_or(ArtcraftRouterError::Client(ClientError::WebhookUrlRequired))?;
|
||||
let (webhook_response, outbound_request): (_, Arc<dyn Debug + Send + Sync>) = match &self.mode {
|
||||
FalVeo3p1FastMode::TextToVideo(request) => {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1FastTextToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_fast_text_to_video_webhook(args).await, outbound)
|
||||
@@ -50,7 +53,7 @@ impl FalVeo3p1FastRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1FastImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_fast_image_to_video_webhook(args).await, outbound)
|
||||
@@ -59,7 +62,7 @@ impl FalVeo3p1FastRequestState {
|
||||
let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
|
||||
let args = EnqueueVeo3p1FastFirstLastFrameImageToVideoArgs {
|
||||
request: request.clone(),
|
||||
webhook_url: client.webhook_url.as_str(),
|
||||
webhook_url,
|
||||
api_key: &client.api_key,
|
||||
};
|
||||
(enqueue_veo_3p1_fast_first_last_frame_image_to_video_webhook(args).await, outbound)
|
||||
|
||||
@@ -49,7 +49,7 @@ pub fn get_fal_client() -> RouterClient {
|
||||
.expect("Failed to read /Users/bt/Artcraft/credentials/fal_api_key.txt");
|
||||
let api_key = FalApiKey::from_str(secret.trim());
|
||||
let webhook_url = "https://example.com/fal-webhook-test".to_string();
|
||||
RouterClient::Fal(RouterFalClient::new(api_key, webhook_url))
|
||||
RouterClient::Fal(RouterFalClient::new_with_webhook(api_key, webhook_url))
|
||||
}
|
||||
|
||||
pub fn base_fal_image_request() -> GenerateImageRequestBuilder {
|
||||
|
||||
+2
-3
@@ -6,7 +6,6 @@ use artcraft_router::client::generation_mode_mismatch_strategy::GenerationModeMi
|
||||
use artcraft_router::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
|
||||
use artcraft_router::client::router_client::RouterClient;
|
||||
use artcraft_router::client::router_fal_client::RouterFalClient;
|
||||
use artcraft_router::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
|
||||
use artcraft_router::generate::generate_image::generate_image_response::GenerateImageResponse;
|
||||
use artcraft_router::generate::generate_image_v2::image_generation_draft_or_request::ImageGenerationDraftOrRequest;
|
||||
@@ -91,8 +90,8 @@ async fn handle_fal(
|
||||
storyteller_creds_manager,
|
||||
).await;
|
||||
|
||||
let fal_client = RouterFalWebhookOptionalClient::from_str(api_key);
|
||||
let client = RouterClient::FalWebhookOptional(fal_client);
|
||||
let fal_client = RouterFalClient::new_polling_only_from_raw_key(api_key);
|
||||
let client = RouterClient::Fal(fal_client);
|
||||
|
||||
info!("Building FAL image generation plan: model={:?}", router_model);
|
||||
|
||||
|
||||
+3
-3
@@ -3,7 +3,7 @@ use log::{info, warn};
|
||||
use artcraft_router::api::image_list_ref::ImageListRef;
|
||||
use artcraft_router::api::provider::Provider;
|
||||
use artcraft_router::client::router_client::RouterClient;
|
||||
use artcraft_router::client::router_fal_webhook_optional_client::RouterFalWebhookOptionalClient;
|
||||
use artcraft_router::client::router_fal_client::RouterFalClient;
|
||||
use artcraft_router::generate::generate_image::generate_image_request_builder::GenerateImageRequestBuilder;
|
||||
use artcraft_router::generate::generate_image::generate_image_response::GenerateImageResponse;
|
||||
use artcraft_router::generate::generate_image_v2::image_generation_draft_context::ImageGenerationDraftContext;
|
||||
@@ -155,11 +155,11 @@ fn build_router_client(
|
||||
) -> Result<RouterClient, CommonWebError> {
|
||||
match provider {
|
||||
Provider::Fal => {
|
||||
let fal_client = RouterFalWebhookOptionalClient::new_with_webhook(
|
||||
let fal_client = RouterFalClient::new_with_webhook(
|
||||
server_state.fal.api_key.clone(),
|
||||
server_state.fal.webhook_url.clone(),
|
||||
);
|
||||
Ok(RouterClient::FalWebhookOptional(fal_client))
|
||||
Ok(RouterClient::Fal(fal_client))
|
||||
},
|
||||
other => {
|
||||
Err(CommonWebError::server_error_with_message(
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ pub fn build_router_client(
|
||||
kinovi_provider(server_state, use_alternate_kinovi)
|
||||
}
|
||||
Provider::Fal => {
|
||||
let fal_client = RouterFalClient::new(
|
||||
let fal_client = RouterFalClient::new_with_webhook(
|
||||
server_state.fal.api_key.clone(),
|
||||
server_state.fal.webhook_url.clone(),
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user