mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-17 07:04:36 +00:00
cleanup
This commit is contained in:
1 parent
be32ab6794
commit
42fca1c9b4
3 files changed
+22
-36
No files matched your search
+5
-1
@@ -25,11 +25,15 @@ pub async fn run_pipeline_v1(
|
||||
user_token: &tokens::tokens::users::UserToken,
|
||||
media_file_hydration_map: &Option<HashMap<MediaFileToken, Url>>,
|
||||
) -> Result<PipelineResult, AdvancedCommonWebError> {
|
||||
let kinovi_character_ids = resolve_kinovi_character_ids(
|
||||
let kinovi_character_id_map = resolve_kinovi_character_ids(
|
||||
request.reference_character_tokens.as_deref(),
|
||||
mysql_connection,
|
||||
).await?;
|
||||
|
||||
// v1 execute_generation expects a flat Vec<String> of kinovi IDs
|
||||
let kinovi_character_ids: Option<Vec<String>> = kinovi_character_id_map
|
||||
.map(|map| map.into_values().collect());
|
||||
|
||||
let execution_provider = match request.model {
|
||||
Some(CommonVideoModel::Seedance2p0) => Provider::Seedance2Pro,
|
||||
Some(CommonVideoModel::Seedance2p0Fast) => Provider::Seedance2Pro,
|
||||
|
||||
+6
-28
@@ -6,7 +6,6 @@ use url::Url;
|
||||
use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
|
||||
use artcraft_router::api::provider::Provider;
|
||||
use artcraft_router::generate::generate_video::generate_video_response::GenerateVideoResponse;
|
||||
use tokens::tokens::characters::CharacterToken;
|
||||
use tokens::tokens::media_files::MediaFileToken;
|
||||
|
||||
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
|
||||
@@ -14,6 +13,7 @@ use crate::http_server::endpoints::omni_gen::generate::video::helpers::bill_wall
|
||||
use crate::http_server::endpoints::omni_gen::generate::video::pipeline_result::PipelineResult;
|
||||
use crate::http_server::endpoints::omni_gen::generate::video::hydrate_router_request::hydrate_to_router_request;
|
||||
use crate::http_server::endpoints::omni_gen::generate::video::pipeline_v2::execute::execute_pipeline_v2;
|
||||
use crate::http_server::endpoints::omni_gen::generate::video::request_helper::resolve_kinovi_character_ids::resolve_kinovi_character_ids;
|
||||
use crate::state::server_state::ServerState;
|
||||
|
||||
pub async fn run_pipeline_v2(
|
||||
@@ -60,12 +60,12 @@ pub async fn run_pipeline_v2(
|
||||
map.iter().map(|(k, v)| (k.clone(), v.to_string())).collect()
|
||||
});
|
||||
|
||||
let kinovi_character_id_map: Option<HashMap<CharacterToken, String>> =
|
||||
resolve_kinovi_character_id_map(
|
||||
request.reference_character_tokens.as_deref(), mysql_connection,
|
||||
).await?;
|
||||
let kinovi_character_id_map = resolve_kinovi_character_ids(
|
||||
request.reference_character_tokens.as_deref(),
|
||||
mysql_connection,
|
||||
).await?;
|
||||
|
||||
// 5. Execute: finalize draft -> send
|
||||
// 5. Execute: finalize draft → send
|
||||
let response = execute_pipeline_v2(
|
||||
draft_or_request, server_state,
|
||||
media_file_urls_as_strings.as_ref(), kinovi_character_id_map.as_ref(),
|
||||
@@ -74,25 +74,3 @@ pub async fn run_pipeline_v2(
|
||||
|
||||
Ok(PipelineResult { billing, response })
|
||||
}
|
||||
|
||||
async fn resolve_kinovi_character_id_map(
|
||||
maybe_tokens: Option<&[CharacterToken]>,
|
||||
connection: &mut sqlx::pool::PoolConnection<sqlx::MySql>,
|
||||
) -> Result<Option<HashMap<CharacterToken, String>>, AdvancedCommonWebError> {
|
||||
use mysql_queries::queries::characters::batch_lookup_characters_by_token_for_prompting::batch_lookup_characters_by_token_for_prompting;
|
||||
|
||||
let tokens = match maybe_tokens {
|
||||
None => return Ok(None),
|
||||
Some(tokens) if tokens.is_empty() => return Ok(None),
|
||||
Some(tokens) => tokens,
|
||||
};
|
||||
|
||||
let characters = batch_lookup_characters_by_token_for_prompting(tokens, connection).await?;
|
||||
|
||||
let map: HashMap<CharacterToken, String> = characters.iter()
|
||||
.filter(|c| c.is_active)
|
||||
.filter_map(|c| c.kinovi_character_id.as_ref().map(|kid| (c.token.clone(), kid.clone())))
|
||||
.collect();
|
||||
|
||||
if map.is_empty() { Ok(None) } else { Ok(Some(map)) }
|
||||
}
|
||||
+11
-7
@@ -1,5 +1,7 @@
|
||||
//! Resolve character tokens to Kinovi character IDs for prompting.
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use log::warn;
|
||||
use sqlx::MySql;
|
||||
|
||||
@@ -8,14 +10,14 @@ use tokens::tokens::characters::CharacterToken;
|
||||
|
||||
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
|
||||
|
||||
/// Resolve character tokens to Kinovi character IDs for prompting.
|
||||
/// Resolve character tokens to a map of CharacterToken → Kinovi character ID.
|
||||
///
|
||||
/// Looks up the characters, filters to active ones with kinovi IDs, and warns about
|
||||
/// any that are missing or inactive (but doesn't fail the request).
|
||||
pub async fn resolve_kinovi_character_ids(
|
||||
maybe_tokens: Option<&[CharacterToken]>,
|
||||
connection: &mut sqlx::pool::PoolConnection<MySql>,
|
||||
) -> Result<Option<Vec<String>>, AdvancedCommonWebError> {
|
||||
) -> Result<Option<HashMap<CharacterToken, String>>, AdvancedCommonWebError> {
|
||||
let tokens = match maybe_tokens {
|
||||
None => return Ok(None),
|
||||
Some(tokens) if tokens.is_empty() => return Ok(None),
|
||||
@@ -38,10 +40,12 @@ pub async fn resolve_kinovi_character_ids(
|
||||
}
|
||||
}
|
||||
|
||||
let ids: Vec<String> = characters.iter()
|
||||
.filter(|c| c.is_active)
|
||||
.filter_map(|c| c.kinovi_character_id.clone())
|
||||
.collect();
|
||||
let map: HashMap<CharacterToken, String> = characters.iter()
|
||||
.filter(|c| c.is_active)
|
||||
.filter_map(|c| {
|
||||
c.kinovi_character_id.as_ref().map(|kid| (c.token.clone(), kid.clone()))
|
||||
})
|
||||
.collect();
|
||||
|
||||
if ids.is_empty() { Ok(None) } else { Ok(Some(ids)) }
|
||||
if map.is_empty() { Ok(None) } else { Ok(Some(map)) }
|
||||
}
|
||||
Reference in new issue
Block a user