From f767fc96382434c8cc73dec65cfa50ad261ae9a7 Mon Sep 17 00:00:00 2001 From: hanashi Date: Sat, 8 Aug 2026 22:33:46 -0400 Subject: [PATCH] cleanup (#1872) --- .../src/api/router_video_model.rs | 2 -- .../providers/artcraft/seedance_2p5_u/build.rs | 2 -- .../providers/artcraft/seedance_2p5_u/cost.rs | 9 ++++----- .../providers/artcraft/seedance_common.rs | 6 ++---- .../inference_model_type.rs | 1 - .../src/common/generation/common_model_type.rs | 1 - .../src/common/generation/common_video_model.rs | 2 -- .../video/pipeline_v2/run_pipeline_v2.rs | 17 ++++++++++------- .../cost/video/omni_gen_video_cost_handler.rs | 3 +-- .../video/pipeline_v2/run_pipeline_v2.rs | 17 ++++++++++------- 10 files changed, 27 insertions(+), 33 deletions(-) diff --git a/crates/api_clients/artcraft/artcraft_router/src/api/router_video_model.rs b/crates/api_clients/artcraft/artcraft_router/src/api/router_video_model.rs index 9b6b543708..c5259f86d1 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/api/router_video_model.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/api/router_video_model.rs @@ -95,8 +95,6 @@ pub enum RouterVideoModel { #[serde(rename = "seedance_2p5")] Seedance2p5, - /// Seedance 2.5 as routed via the BytePlus Ultra kinovi account. - /// Fulfilled by Seedance 2.5; billed at its own (higher) rate. #[serde(rename = "seedance_2p5_u")] Seedance2p5Ultra, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs index f0b5865dd6..a03eacbe3e 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs @@ -11,8 +11,6 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p5_u::reques use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest; use crate::generate::generate_video::video_generation_request::VideoGenerationRequest; -/// Seedance 2.5 Ultra: the same model surface as Seedance 2.5, billed at its -/// own (higher) rate and fulfilled via the BytePlus Ultra kinovi account. pub fn build_artcraft_seedance_2p5_u(mut builder: GenerateVideoRequestBuilder) -> Result { let strategy = builder.request_mismatch_mitigation_strategy; diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs index 318120b08b..1f568ab283 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs @@ -5,11 +5,10 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenera use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p5_ultra_usd_cents; use crate::generate::generate_video::providers::artcraft::seedance_2p5_u::request::ArtcraftSeedance2p5UltraRequestState; -/// Seedance 2.5 Ultra pricing has the same structure as Seedance 2.5 (at -/// higher rates): it depends on the resolution, the output duration, and — -/// when reference videos are attached — the total seconds of reference video -/// input, which are billed on top of the output duration (at a lower -/// per-second rate). Input seconds are clamped to +/// Seedance 2.5 Ultra pricing depends on the resolution, the output +/// duration, and — when reference videos are attached — the total seconds of +/// reference video input, which are billed on top of the output duration (at +/// a lower per-second rate). Input seconds are clamped to /// [`MAX_BILLED_INPUT_SECONDS`] — the model accepts at most 30 seconds of /// video. No batching. pub struct ArtcraftSeedance2p5UltraCostState { diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs index d8a755d92e..5d8f37a2df 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs @@ -190,11 +190,9 @@ const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_480P: f64 = 8.55967078 /// Seedance 2.5 Ultra — 720p price with video references, USD cents per second. const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_720P: f64 = 18.72427984; -/// ArtCraft's price (USD cents) for Seedance 2.5 Ultra (the BytePlus Ultra -/// kinovi account routing of Seedance 2.5). +/// ArtCraft's price (USD cents) for Seedance 2.5 Ultra. /// -/// Same billing structure as [`seedance_2p5_usd_cents`], at higher rates: -/// only 480p and 720p are offered; any other resolution prices at 720p. +/// Only 480p and 720p are offered; any other resolution prices at 720p. /// Without video references, billed seconds = output duration. With video /// references, the per-second rate drops but the billed seconds are the /// output duration PLUS the total seconds of reference video input. The diff --git a/crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_model_type.rs b/crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_model_type.rs index 44149d1853..93671a657f 100644 --- a/crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_model_type.rs +++ b/crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_model_type.rs @@ -222,7 +222,6 @@ pub enum InferenceModelType { Seedance2p5Preview, #[serde(rename = "seedance_2p5")] Seedance2p5, - /// Seedance 2.5 as routed via the BytePlus Ultra kinovi account #[serde(rename = "seedance_2p5_u")] Seedance2p5Ultra, #[serde(rename = "sora_2")] diff --git a/crates/schema/public/enums/src/common/generation/common_model_type.rs b/crates/schema/public/enums/src/common/generation/common_model_type.rs index 4d4ccf1b36..b3e817c339 100644 --- a/crates/schema/public/enums/src/common/generation/common_model_type.rs +++ b/crates/schema/public/enums/src/common/generation/common_model_type.rs @@ -193,7 +193,6 @@ pub enum CommonModelType { Seedance2p5Preview, #[serde(rename = "seedance_2p5")] Seedance2p5, - /// Seedance 2.5 as routed via the BytePlus Ultra kinovi account #[serde(rename = "seedance_2p5_u")] Seedance2p5Ultra, #[serde(rename = "sora_2")] diff --git a/crates/schema/public/enums/src/common/generation/common_video_model.rs b/crates/schema/public/enums/src/common/generation/common_video_model.rs index 65acf96ea5..28de79f2f1 100644 --- a/crates/schema/public/enums/src/common/generation/common_video_model.rs +++ b/crates/schema/public/enums/src/common/generation/common_video_model.rs @@ -101,8 +101,6 @@ pub enum CommonVideoModel { #[serde(rename = "seedance_2p5")] Seedance2p5, - /// Seedance 2.5 as routed via the BytePlus Ultra kinovi account. - /// Fulfilled by Seedance 2.5; billed at its own (higher) rate. #[serde(rename = "seedance_2p5_u")] Seedance2p5Ultra, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/pipeline_v2/run_pipeline_v2.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/pipeline_v2/run_pipeline_v2.rs index 6aba5ba807..504f2550c1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/pipeline_v2/run_pipeline_v2.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/video/pipeline_v2/run_pipeline_v2.rs @@ -93,13 +93,16 @@ pub async fn run_pipeline_v2(args: RunPipelineV2Args<'_>) -> Result) -> Result