server/artcraft
1
0
Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-10-20 17:02:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

characters API and schema (#1290)

Browse Source
This commit is contained in:
Brandon Thomas
2026-04-03 00:17:03 -04:00
committed by GitHub
parent 79a7443baa
commit 72d680411f
55 changed files with 2385 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.sqlx/query-2a19cc533815aa3325b940eafe56b9f014fedb3b360b954935d6ec13ff14302d.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "MySQL",
"query": "\nINSERT INTO characters\nSET\n token = ?,\n character_type = ?,\n is_active = false,\n character_name = ?,\n maybe_description = ?,\n maybe_avatar_media_token = NULL,\n maybe_full_image_media_token = NULL,\n maybe_original_upload_media_token = ?,\n maybe_creator_user_token = ?,\n creator_ip_address = ?,\n kinovi_character_id = ?,\n kinovi_character_name = ?,\n maybe_kinovi_asset_id = NULL,\n maybe_generic_inference_job_token = ?\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 10
},
"nullable": []
},
"hash": "2a19cc533815aa3325b940eafe56b9f014fedb3b360b954935d6ec13ff14302d"
}
.sqlx/query-8c130ebd0d192355844863b3ebd44952aa8715eebe96375fb28f9f12baf7f9b1.json
Generated
+157
View File
@@ -0,0 +1,157 @@
{
"db_name": "MySQL",
"query": "\nSELECT\n id as `id: u64`,\n token as `token: tokens::tokens::characters::CharacterToken`,\n character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,\n is_active as `is_active: bool`,\n character_name,\n maybe_description,\n maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n kinovi_character_id,\n kinovi_character_name,\n maybe_kinovi_asset_id\nFROM characters\nWHERE maybe_creator_user_token = ?\n AND is_active = true\n AND deleted_at IS NULL\n AND id < ?\nORDER BY id DESC\nLIMIT ?\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "id: u64",
"type_info": {
"type": "LongLong",
"flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
"char_set": 63,
"max_size": 20
}
},
{
"ordinal": 1,
"name": "token: tokens::tokens::characters::CharacterToken",
"type_info": {
"type": "VarString",
"flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 2,
"name": "character_type: enums::by_table::characters::character_type::CharacterType",
"type_info": {
"type": "VarString",
"flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
"char_set": 224,
"max_size": 96
}
},
{
"ordinal": 3,
"name": "is_active: bool",
"type_info": {
"type": "Tiny",
"flags": "NOT_NULL | MULTIPLE_KEY",
"char_set": 63,
"max_size": 1
}
},
{
"ordinal": 4,
"name": "character_name",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 1020
}
},
{
"ordinal": 5,
"name": "maybe_description",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 2048
}
},
{
"ordinal": 6,
"name": "maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 7,
"name": "maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 8,
"name": "maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 9,
"name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
"type_info": {
"type": "VarString",
"flags": "MULTIPLE_KEY | BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 10,
"name": "kinovi_character_id",
"type_info": {
"type": "VarString",
"flags": "MULTIPLE_KEY | BINARY",
"char_set": 224,
"max_size": 256
}
},
{
"ordinal": 11,
"name": "kinovi_character_name",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 1020
}
},
{
"ordinal": 12,
"name": "maybe_kinovi_asset_id",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 256
}
}
],
"parameters": {
"Right": 3
},
"nullable": [
false,
false,
false,
false,
true,
true,
true,
true,
true,
true,
true,
true,
true
]
},
"hash": "8c130ebd0d192355844863b3ebd44952aa8715eebe96375fb28f9f12baf7f9b1"
}
.sqlx/query-b0ba0fe63908df3d66b4820ca47cbb773786e480464c84a278fe63b1fa8913b4.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "MySQL",
"query": "\nINSERT INTO generic_inference_jobs\nSET\n token = ?,\n uuid_idempotency_token = ?,\n\n job_type = ?,\n\n maybe_external_third_party = ?,\n maybe_external_third_party_id = ?,\n\n product_category = ?,\n inference_category = ?,\n\n maybe_model_type = NULL,\n maybe_model_token = NULL,\n\n maybe_input_source_token = NULL,\n maybe_input_source_token_type = NULL,\n\n maybe_download_url = NULL,\n maybe_cover_image_media_file_token = NULL,\n\n maybe_prompt_token = NULL,\n\n maybe_wallet_ledger_entry_token = NULL,\n\n maybe_raw_inference_text = NULL,\n\n maybe_inference_args = NULL,\n\n maybe_creator_user_token = ?,\n maybe_creator_anonymous_visitor_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n\n priority_level = 0,\n is_keepalive_required = FALSE,\n max_duration_seconds = 0,\n\n is_debug_request = FALSE,\n maybe_routing_tag = NULL,\n\n status = ?\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 12
},
"nullable": []
},
"hash": "b0ba0fe63908df3d66b4820ca47cbb773786e480464c84a278fe63b1fa8913b4"
}
.sqlx/query-e9078c593087df3da20dbd193cdad102d6bb3ae83ee81c8c4ad75fe184e03c92.json
Generated
+146
View File
@@ -0,0 +1,146 @@
{
"db_name": "MySQL",
"query": "\nSELECT\n token as `token: tokens::tokens::characters::CharacterToken`,\n character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,\n is_active as `is_active: bool`,\n character_name,\n maybe_description,\n maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,\n maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n kinovi_character_id,\n kinovi_character_name,\n maybe_kinovi_asset_id\nFROM characters\nWHERE token = ?\n AND deleted_at IS NULL\n ",
"describe": {
"columns": [
{
"ordinal": 0,
"name": "token: tokens::tokens::characters::CharacterToken",
"type_info": {
"type": "VarString",
"flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 1,
"name": "character_type: enums::by_table::characters::character_type::CharacterType",
"type_info": {
"type": "VarString",
"flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
"char_set": 224,
"max_size": 96
}
},
{
"ordinal": 2,
"name": "is_active: bool",
"type_info": {
"type": "Tiny",
"flags": "NOT_NULL | MULTIPLE_KEY",
"char_set": 63,
"max_size": 1
}
},
{
"ordinal": 3,
"name": "character_name",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 1020
}
},
{
"ordinal": 4,
"name": "maybe_description",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 2048
}
},
{
"ordinal": 5,
"name": "maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 6,
"name": "maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 7,
"name": "maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 8,
"name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
"type_info": {
"type": "VarString",
"flags": "MULTIPLE_KEY | BINARY",
"char_set": 224,
"max_size": 128
}
},
{
"ordinal": 9,
"name": "kinovi_character_id",
"type_info": {
"type": "VarString",
"flags": "MULTIPLE_KEY | BINARY",
"char_set": 224,
"max_size": 256
}
},
{
"ordinal": 10,
"name": "kinovi_character_name",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 1020
}
},
{
"ordinal": 11,
"name": "maybe_kinovi_asset_id",
"type_info": {
"type": "VarString",
"flags": "BINARY",
"char_set": 224,
"max_size": 256
}
}
],
"parameters": {
"Right": 1
},
"nullable": [
false,
false,
false,
true,
true,
true,
true,
true,
true,
true,
true,
true
]
},
"hash": "e9078c593087df3da20dbd193cdad102d6bb3ae83ee81c8c4ad75fe184e03c92"
}
.sqlx/query-eae0b979383989f7a9af8ddd678ab0c0403952b8b98d9fcb078ae401ae7fa4e3.json
Generated
+12
View File
@@ -0,0 +1,12 @@
{
"db_name": "MySQL",
"query": "\nUPDATE characters\nSET\n character_name = ?,\n kinovi_character_name = ?,\n maybe_description = ?\nWHERE token = ?\n AND deleted_at IS NULL\n ",
"describe": {
"columns": [],
"parameters": {
"Right": 4
},
"nullable": []
},
"hash": "eae0b979383989f7a9af8ddd678ab0c0403952b8b98d9fcb078ae401ae7fa4e3"
}
_database/sql/migrations/2026-04-02-083548-0000_characters/down.sql
+5
View File
@@ -0,0 +1,5 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
DROP TABLE IF EXISTS characters;
_database/sql/migrations/2026-04-02-083548-0000_characters/up.sql
+101
View File
@@ -0,0 +1,101 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-- Characters are reusable entities that can be referenced in video/image generations.
-- A character is created from one or more reference images and registered with third-party
-- systems (e.g. Kinovi/Seedance) that support character-based generation.
CREATE TABLE characters (
-- Not used for anything except replication (private, not even used in queries)
id BIGINT(20) NOT NULL AUTO_INCREMENT,
-- Public-facing "primary key" (PUBLIC)
token VARCHAR(32) NOT NULL,
-- The type or "features" of the character.
character_type VARCHAR(24) NOT NULL,
-- Whether the character has been fully created and is available for use.
-- A character may exist in the database before its creation job completes.
is_active BOOLEAN NOT NULL DEFAULT false,
-- ========== CHARACTER DETAILS ==========
-- User's display name for the character.
character_name VARCHAR(255) DEFAULT NULL,
-- Optional user description of the character.
maybe_description VARCHAR(512) DEFAULT NULL,
-- ========== MEDIA ==========
-- Avatar image (cropped to face, ideally).
maybe_avatar_media_token VARCHAR(32) DEFAULT NULL,
-- Full-size reference image.
maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- WE'LL NEED TO BREAK THIS INTO ANOTHER TABLE IF WE WANT TO SUPPORT MULTIPLE IMAGES.
-- Image the character was originally created with.
maybe_original_upload_media_token VARCHAR(32) DEFAULT NULL,
-- ========== CREATOR ==========
-- The user who created this character.
maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
-- For abuse tracking.
creator_ip_address VARCHAR(40) NOT NULL,
-- ========== KINOVI (TEMPORARY) ==========
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- The identifier in the third-party system.
-- e.g. Kinovi's "char_1774752056469_2wlxoq"
kinovi_character_id VARCHAR(64) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- The name used by the third party.
-- Important for Kinovi since characters are referenced by name in prompts.
kinovi_character_name VARCHAR(255) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- This might be the upstream third party of kinovi.
-- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
maybe_kinovi_asset_id VARCHAR(64) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- Our job system token (if the character was created via a job).
maybe_generic_inference_job_token VARCHAR(32) DEFAULT NULL,
-- Maybe this doesn't exist
-- -- TEMPORARY FOR GOING FAST :
-- -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- -- Third party's job system token (if any).
-- maybe_kinovi_job_id VARCHAR(64) DEFAULT NULL,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
deleted_at TIMESTAMP DEFAULT NULL,
-- ========== INDICES ==========
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY index_character_type (character_type),
KEY index_maybe_creator_user_token (maybe_creator_user_token),
KEY index_maybe_creator_user_token_active (maybe_creator_user_token, is_active),
KEY index_is_active (is_active),
KEY index_kinovi_character_id (kinovi_character_id),
KEY index_maybe_generic_inference_job_token (maybe_generic_inference_job_token),
KEY index_created_at (created_at),
KEY index_deleted_at (deleted_at)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
_database/sql/migrations_squashed/characters/characters.sql
+46 -2
View File
@@ -15,6 +15,9 @@ CREATE TABLE characters (
-- Effective "primary key" (PUBLIC)
token VARCHAR(32) NOT NULL,
-- The type or "features" of the character.
character_type VARCHAR(24) NOT NULL,
-- Whether the character has been fully created and is available for use.
-- A character may exist in the database before its creation job completes.
is_active BOOLEAN NOT NULL DEFAULT false,
@@ -22,7 +25,7 @@ CREATE TABLE characters (
-- ========== CHARACTER DETAILS ==========
-- Display name for the character.
name VARCHAR(255) NOT NULL,
character_name VARCHAR(255) DEFAULT NULL,
-- Optional description of the character.
maybe_description VARCHAR(512) DEFAULT NULL,
@@ -35,6 +38,11 @@ CREATE TABLE characters (
-- Full-size reference image.
maybe_full_image_media_token VARCHAR(32) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- WE'LL NEED TO BREAK THIS INTO ANOTHER TABLE IF WE WANT TO SUPPORT MULTIPLE IMAGES.
-- Image the character was originally created with.
maybe_original_upload_media_token VARCHAR(32) DEFAULT NULL,
-- ========== CREATOR ==========
-- The user who created this character.
@@ -43,6 +51,37 @@ CREATE TABLE characters (
-- For abuse tracking.
creator_ip_address VARCHAR(40) NOT NULL,
-- ========== KINOVI (TEMPORARY) ==========
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- The identifier in the third-party system.
-- e.g. Kinovi's "char_1774752056469_2wlxoq"
kinovi_character_id VARCHAR(64) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- The name used by the third party.
-- Important for Kinovi since characters are referenced by name in prompts.
kinovi_character_name VARCHAR(255) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- This might be the upstream third party of kinovi.
-- e.g. Kinovi's assetId "asset-20260329104101-kk5kl"
maybe_kinovi_asset_id VARCHAR(64) DEFAULT NULL,
-- TEMPORARY FOR GOING FAST :
-- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- Our job system token (if the character was created via a job).
maybe_generic_inference_job_token VARCHAR(32) DEFAULT NULL,
-- Maybe this doesn't exist
-- -- TEMPORARY FOR GOING FAST :
-- -- IDEALLY WE MOVE THIS TO A SEPARATE TABLE.
-- -- Third party's job system token (if any).
-- maybe_kinovi_job_id VARCHAR(64) DEFAULT NULL,
-- ========== TIMESTAMPS ==========
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -53,8 +92,13 @@ CREATE TABLE characters (
PRIMARY KEY (id),
UNIQUE KEY (token),
KEY index_character_type (character_type),
KEY index_maybe_creator_user_token (maybe_creator_user_token),
KEY index_maybe_creator_user_token_active (maybe_creator_user_token, is_active),
KEY index_is_active (is_active),
KEY index_created_at (created_at)
KEY index_kinovi_character_id (kinovi_character_id),
KEY index_maybe_generic_inference_job_token (maybe_generic_inference_job_token),
KEY index_created_at (created_at),
KEY index_deleted_at (deleted_at)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
_tools/postman/collections/ArtCraft API/characters/.resources/definition.yaml
+3
View File
@@ -0,0 +1,3 @@
$kind: collection
name: characters
order: 4767
_tools/postman/collections/ArtCraft API/characters/Create Character.request.yaml
+16
View File
@@ -0,0 +1,16 @@
$kind: http-request
name: Create Character
url: "{{api_host}}/v1/character/create"
method: POST
body:
type: json
content: >-
{
"uuid_idempotency_token": "{{$randomUUID}}",
"model": "seedance_2p0",
//"image_media_token": "m_v2hjh936k72knmggmqqa2xfs9sge8k", // steampunk clown
//"image_media_token": "m_13m13fm33bw3cxvfrncyc6873z0dyy", // mochi on couch
"image_media_token": "m_cp20gcxsattt6j7699brs4ndqf803z", // t-rex
"character_name": "T-rex"
}
order: 1775175681198
_tools/postman/collections/ArtCraft API/characters/Delete Character.request.yaml
+5
View File
@@ -0,0 +1,5 @@
$kind: http-request
name: Delete Character
url: "{{api_host}}/v1/character/character_c40dzeq9pa1qtfy19q9f1w"
method: DELETE
order: 76446840865701
_tools/postman/collections/ArtCraft API/characters/Edit Character.request.yaml
+18
View File
@@ -0,0 +1,18 @@
$kind: http-request
name: Edit Character
url: "{{api_host}}/v1/character/edit"
method: POST
body:
type: json
content: |-
{
/// The character to edit.
"token": "character_4aj66rcqsbjmv3jp5ek4fc",
/// Updated name (if changing).
"updated_name": "Mochi",
/// Updated description (if changing).
"updated_description": "New Description"
}
order: 487436956121943
_tools/postman/collections/ArtCraft API/generate/video/multi_function/Seedance 2.0 (character ref to video).request.yaml
+23
View File
@@ -0,0 +1,23 @@
$kind: http-request
name: Seedance 2.0 (character ref to video)
url: "{{api_host}}/v1/generate/video/multi_function/seedance_2p0"
method: POST
headers:
- key: Accept
value: application/json
- key: Session
value: ""
disabled: true
- key: Session
value: ""
disabled: true
body:
type: json
content: >
{
"uuid_idempotency_token": "{{$randomUUID}}",
"prompt": "@Mochi is riding on the shoulder of @Steampunk Clown while they're walking through a crowded shopping mall in the sci-fi future. Retro 80's aesthetics while simultaneously futuristic and steam punk. @Mochi licks her lips and barks.",
"duration_seconds": 5,
"reference_character_tokens": ["character_beph3xd1z2m4kkbedra24f", "character_4aj66rcqsbjmv3jp5ek4fc"]
}
order: 3802
_tools/postman/collections/ArtCraft API/users/Google Account Create.request.yaml
+1 -1
View File
@@ -8,6 +8,6 @@ body:
type: json
content: |-
{
"google_credential": "eyJhbGciOiJSUzI1NiIsImtpZCI6ImIyN...[redacted]"
"google_credential": "...[redacted]"
}
order: 4000
crates/api_clients/artcraft/artcraft_api_defs/src/characters/create_character.rs
+6
View File
@@ -16,6 +16,12 @@ pub struct CreateCharacterRequest {
/// The reference image media file token.
pub image_media_token: MediaFileToken,
/// Name of the character.
pub character_name: String,
/// Description of the character.
pub character_description: Option<String>,
}
/// Response body for creating a character.
crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/multi_function/seedance_2p0_multi_function_video_gen.rs
+5
View File
@@ -1,4 +1,5 @@
use serde::{Deserialize, Serialize};
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::media_files::MediaFileToken;
use utoipa::ToSchema;
@@ -29,6 +30,10 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
/// Optional reference audio files.
pub reference_audio_media_tokens: Option<Vec<MediaFileToken>>,
/// Optional character tokens to reference in the prompt.
/// Characters are referenced in prompts as @CharacterName.
pub reference_character_tokens: Option<Vec<CharacterToken>>,
/// Video aspect ratio / resolution.
pub aspect_ratio: Option<Seedance2p0AspectRatio>,
crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs
+1
View File
@@ -34,6 +34,7 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/seedance2pro/estimate_video_cost_seedance2pro_seedance2p0.rs
+1
View File
@@ -22,6 +22,7 @@ pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0(
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/artcraft/generate_video_artcraft_seedance2p0.rs
+1
View File
@@ -23,6 +23,7 @@ pub async fn execute_artcraft_seedance2p0(
aspect_ratio: plan.aspect_ratio,
duration_seconds: plan.duration_seconds,
batch_count: Some(plan.batch_count),
reference_character_tokens: None,
};
let response = seedance_2p0_multi_function_video_gen(
crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/seedance2pro/execute_seedance2pro_seedance2p0.rs
+1
View File
@@ -44,6 +44,7 @@ pub async fn execute_seedance2pro_seedance2p0(
reference_image_urls,
reference_video_urls,
reference_audio_urls,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
crates/api_clients/seedance2pro_client/src/requests/generate_video/generate_video.rs
+149
View File
@@ -49,6 +49,10 @@ pub struct GenerateVideoArgs<'a> {
/// Sent in a separate `audioUrls` field (not in `uploadedUrls`).
pub reference_audio_urls: Option<Vec<String>>,
/// Optional Kinovi character IDs to reference in the prompt.
/// Characters are referenced in prompts as @CharacterName.
pub character_ids: Option<Vec<String>>,
/// Controls the `faceBlurMode` field: true sends "on", false sends "off", None omits it.
pub use_face_blur_hack: Option<bool>,
@@ -69,6 +73,7 @@ impl std::fmt::Debug for GenerateVideoArgs<'_> {
.field("reference_image_urls", &self.reference_image_urls)
.field("reference_video_urls", &self.reference_video_urls)
.field("reference_audio_urls", &self.reference_audio_urls)
.field("character_ids", &self.character_ids)
.field("use_face_blur_hack", &self.use_face_blur_hack)
.field("host_override", &self.host_override)
.finish()
@@ -261,6 +266,7 @@ pub async fn generate_video(args: GenerateVideoArgs<'_>) -> Result<GenerateVideo
duration,
mode: video_input_mode,
face_blur_mode,
character_ids: args.character_ids,
uploaded_urls,
audio_urls,
batch_count,
@@ -371,6 +377,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
}
@@ -495,6 +502,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -524,6 +532,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -555,6 +564,7 @@ mod tests {
]),
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -585,6 +595,7 @@ mod tests {
"https://static.seedance2-pro.com/materials/20260315/1773594284659-3a46d231.mp4".to_string(),
]),
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -617,6 +628,7 @@ mod tests {
"https://static.seedance2-pro.com/materials/20260315/1773594284659-3a46d231.mp4".to_string(),
]),
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -671,6 +683,7 @@ mod tests {
result.public_url,
]),
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -720,6 +733,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -771,6 +785,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -829,6 +844,7 @@ mod tests {
reference_image_urls: Some(uploaded_urls),
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -880,6 +896,7 @@ mod tests {
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: Some(vec![upload_result.public_url]),
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -891,5 +908,137 @@ mod tests {
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
mod character_tests {
use super::*;
const STEAMPUNK_CLOWN_ID: &str = "char_1775176566518_sik0te";
const MOCHI_ID: &str = "char_1775177718294_g2pitx";
#[tokio::test]
#[ignore] // manually test — requires real cookies, costs money
async fn test_text_prompt_with_character_pro() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let args = GenerateVideoArgs {
session: &session,
model_type: ModelType::Seedance2Pro,
prompt: "@Steampunk Clown is juggling flaming torches in a circus tent.".to_string(),
resolution: Resolution::Landscape16x9,
duration_seconds: 5,
batch_count: BatchCount::One,
start_frame_url: None,
end_frame_url: None,
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: Some(vec![STEAMPUNK_CLOWN_ID.to_string()]),
use_face_blur_hack: None,
host_override: None,
};
let result = generate_video(args).await?;
println!("Task ID: {}", result.task_id);
println!("Order ID: {}", result.order_id);
assert!(!result.task_id.is_empty());
assert!(!result.order_id.is_empty());
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
#[tokio::test]
#[ignore] // manually test — requires real cookies, costs money
async fn test_text_prompt_with_character_fast() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let args = GenerateVideoArgs {
session: &session,
model_type: ModelType::Seedance2Fast,
prompt: "@Mochi the female shiba inu is eating a cheese pizza while standing on the table".to_string(),
resolution: Resolution::Portrait9x16,
duration_seconds: 5,
batch_count: BatchCount::One,
start_frame_url: None,
end_frame_url: None,
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: Some(vec![MOCHI_ID.to_string()]),
use_face_blur_hack: None,
host_override: None,
};
let result = generate_video(args).await?;
println!("Task ID: {}", result.task_id);
println!("Order ID: {}", result.order_id);
assert!(!result.task_id.is_empty());
assert!(!result.order_id.is_empty());
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
#[tokio::test]
#[ignore] // manually test — requires real cookies, costs money
async fn test_character_with_image_ref_pro() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let args = GenerateVideoArgs {
session: &session,
model_type: ModelType::Seedance2Pro,
prompt: "@Steampunk Clown is walking up to pet a dog on the couch.".to_string(),
resolution: Resolution::Landscape16x9,
duration_seconds: 5,
batch_count: BatchCount::One,
start_frame_url: None,
end_frame_url: None,
reference_image_urls: Some(vec![
"https://static.seedance2-pro.com/materials/20260329/1774752385699-1ff44886.jpeg".to_string(),
]),
reference_video_urls: None,
reference_audio_urls: None,
character_ids: Some(vec![STEAMPUNK_CLOWN_ID.to_string()]),
use_face_blur_hack: None,
host_override: None,
};
let result = generate_video(args).await?;
println!("Task ID: {}", result.task_id);
println!("Order ID: {}", result.order_id);
assert!(!result.task_id.is_empty());
assert!(!result.order_id.is_empty());
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
#[tokio::test]
#[ignore] // manually test — requires real cookies, costs money
async fn test_two_characters_fast() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let args = GenerateVideoArgs {
session: &session,
model_type: ModelType::Seedance2Fast,
prompt: "@Steampunk Clown and @Mochi are playing fetch in a sunny park.".to_string(),
resolution: Resolution::Landscape16x9,
duration_seconds: 5,
batch_count: BatchCount::One,
start_frame_url: None,
end_frame_url: None,
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: Some(vec![
STEAMPUNK_CLOWN_ID.to_string(),
MOCHI_ID.to_string(),
]),
use_face_blur_hack: None,
host_override: None,
};
let result = generate_video(args).await?;
println!("Task ID: {}", result.task_id);
println!("Order ID: {}", result.order_id);
assert!(!result.task_id.is_empty());
assert!(!result.order_id.is_empty());
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
}
}
}
crates/api_clients/seedance2pro_client/src/requests/generate_video/request_types.rs
+2
View File
@@ -30,6 +30,8 @@ pub (super) struct ApiParams {
pub mode: &'static str,
#[serde(rename = "faceBlurMode", skip_serializing_if = "Option::is_none")]
pub face_blur_mode: Option<&'static str>,
#[serde(rename = "characterIds", skip_serializing_if = "Option::is_none")]
pub character_ids: Option<Vec<String>>,
#[serde(rename = "uploadedUrls", skip_serializing_if = "Option::is_none")]
pub uploaded_urls: Option<Vec<String>>,
#[serde(rename = "audioUrls", skip_serializing_if = "Option::is_none")]
crates/api_clients/seedance2pro_client/src/requests/mod.rs
+1
View File
@@ -4,4 +4,5 @@ pub mod kinovi_host;
pub mod poll_characters;
pub mod poll_orders;
pub mod prepare_file_upload;
pub mod update_character;
pub mod upload_file;
crates/api_clients/seedance2pro_client/src/requests/update_character/mod.rs
+2
View File
@@ -0,0 +1,2 @@
pub mod update_character;
pub(crate) mod request_types;
crates/api_clients/seedance2pro_client/src/requests/update_character/request_types.rs
+44
View File
@@ -0,0 +1,44 @@
use serde_derive::{Deserialize, Serialize};
// ======================== Request ========================
#[derive(Serialize, Debug)]
pub(super) struct BatchRequest {
#[serde(rename = "0")]
pub zero: BatchRequestInner,
}
#[derive(Serialize, Debug)]
pub(super) struct BatchRequestInner {
pub json: BatchRequestJson,
}
#[derive(Serialize, Debug)]
#[serde(rename_all = "camelCase")]
pub(super) struct BatchRequestJson {
pub character_id: String,
pub name: String,
pub description: String,
}
// ======================== Response ========================
#[derive(Deserialize, Debug)]
pub(super) struct BatchResponseItem {
pub result: BatchResponseResult,
}
#[derive(Deserialize, Debug)]
pub(super) struct BatchResponseResult {
pub data: BatchResponseData,
}
#[derive(Deserialize, Debug)]
pub(super) struct BatchResponseData {
pub json: UpdateCharacterResponseJson,
}
#[derive(Deserialize, Debug)]
pub(super) struct UpdateCharacterResponseJson {
pub success: bool,
}
crates/api_clients/seedance2pro_client/src/requests/update_character/update_character.rs
+203
View File
@@ -0,0 +1,203 @@
use crate::creds::seedance2pro_session::Seedance2ProSession;
use crate::error::seedance2pro_client_error::Seedance2ProClientError;
use crate::error::seedance2pro_error::Seedance2ProError;
use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
use crate::requests::update_character::request_types::*;
use crate::requests::kinovi_host::{KinoviHost, resolve_host};
use crate::utils::common_headers::FIREFOX_USER_AGENT;
use log::info;
use wreq::Client;
use wreq_util::Emulation;
// --- Public args ---
pub struct UpdateCharacterArgs<'a> {
pub session: &'a Seedance2ProSession,
/// The Kinovi character ID (e.g. "char_1775184656440_vsy3eu").
pub character_id: String,
/// The new name for the character.
pub name: String,
/// The new description (empty string clears it).
pub description: String,
/// Override the default host (kinovi.ai).
pub host_override: Option<KinoviHost>,
}
// --- Public response ---
#[derive(Debug)]
pub struct UpdateCharacterResponse {
pub success: bool,
}
// --- Implementation ---
pub async fn update_character(args: UpdateCharacterArgs<'_>) -> Result<UpdateCharacterResponse, Seedance2ProError> {
let host = resolve_host(args.host_override.as_ref());
let base_url = host.api_base_url();
let url = format!("{}/api/trpc/character.updateCharacter?batch=1", base_url);
info!("Updating character '{}' (name='{}', description='{}')", args.character_id, args.name, args.description);
let request_body = BatchRequest {
zero: BatchRequestInner {
json: BatchRequestJson {
character_id: args.character_id.clone(),
name: args.name,
description: args.description,
},
},
};
let cookie = args.session.cookies.as_str();
let referer = format!("{}/app/characters", base_url);
let client = Client::builder()
.emulation(Emulation::Firefox143)
.build()
.map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
let response = client.post(&url)
.header("User-Agent", FIREFOX_USER_AGENT)
.header("Accept", "*/*")
.header("Accept-Language", "en-US,en;q=0.9")
.header("Accept-Encoding", "gzip, deflate, br, zstd")
.header("Referer", &referer)
.header("Content-Type", "application/json")
.header("x-trpc-source", "client")
.header("Origin", base_url)
.header("Connection", "keep-alive")
.header("Cookie", cookie)
.header("Sec-Fetch-Dest", "empty")
.header("Sec-Fetch-Mode", "cors")
.header("Sec-Fetch-Site", "same-origin")
.header("Priority", "u=4")
.header("TE", "trailers")
.json(&request_body)
.send()
.await
.map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
let status = response.status();
let response_body = response.text()
.await
.map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
info!("Update character response: status={}, body={}", status, response_body);
if !status.is_success() {
return Err(Seedance2ProGenericApiError::UncategorizedBadResponseWithStatusAndBody {
status_code: status,
body: response_body,
}.into());
}
let batch_response: Vec<BatchResponseItem> = serde_json::from_str(&response_body)
.map_err(|err| Seedance2ProGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
let data = batch_response
.into_iter()
.next()
.ok_or_else(|| Seedance2ProGenericApiError::UncategorizedBadResponse(
"Empty batch response array".to_string()
))?
.result
.data
.json;
Ok(UpdateCharacterResponse {
success: data.success,
})
}
#[cfg(test)]
mod tests {
use super::*;
use crate::creds::seedance2pro_session::Seedance2ProSession;
use crate::test_utils::get_test_cookies::get_test_cookies;
use crate::test_utils::setup_test_logging::setup_test_logging;
use errors::AnyhowResult;
use log::LevelFilter;
fn test_session() -> AnyhowResult<Seedance2ProSession> {
let cookies = get_test_cookies()?;
Ok(Seedance2ProSession::from_cookies_string(cookies))
}
// Steampunk Clown character
const TEST_CHARACTER_ID: &str = "char_1775176566518_sik0te";
#[tokio::test]
#[ignore] // manually test — requires real cookies, modifies real data
async fn test_rename_character() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let result = update_character(UpdateCharacterArgs {
session: &session,
character_id: TEST_CHARACTER_ID.to_string(),
name: "Steampunk Clown (renamed)".to_string(),
description: "A steampunk clown character for testing".to_string(),
host_override: None,
}).await?;
println!("Success: {}", result.success);
assert!(result.success);
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
#[tokio::test]
#[ignore] // manually test — requires real cookies, modifies real data
async fn test_rename_character_clear_description() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
let result = update_character(UpdateCharacterArgs {
session: &session,
character_id: TEST_CHARACTER_ID.to_string(),
name: "Steampunk Clown".to_string(),
description: "".to_string(),
host_override: None,
}).await?;
println!("Success: {}", result.success);
assert!(result.success);
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
#[tokio::test]
#[ignore] // manually test — requires real cookies, modifies real data
async fn test_rename_and_restore() -> AnyhowResult<()> {
setup_test_logging(LevelFilter::Trace);
let session = test_session()?;
// Rename
let result = update_character(UpdateCharacterArgs {
session: &session,
character_id: TEST_CHARACTER_ID.to_string(),
name: "Temporary Name".to_string(),
description: "Temporary description".to_string(),
host_override: None,
}).await?;
assert!(result.success);
// Restore
let result = update_character(UpdateCharacterArgs {
session: &session,
character_id: TEST_CHARACTER_ID.to_string(),
name: "Steampunk Clown".to_string(),
description: "A steampunk clown".to_string(),
host_override: None,
}).await?;
assert!(result.success);
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
Ok(())
}
}
crates/schema/database/mysql_queries/src/queries/characters/batch_lookup_characters_by_token_for_prompting.rs
+54
View File
@@ -0,0 +1,54 @@
use sqlx::pool::PoolConnection;
use sqlx::{FromRow, MySql, QueryBuilder};
use tokens::tokens::characters::CharacterToken;
/// Character data needed for constructing prompts with character references.
#[derive(Debug, FromRow)]
pub struct CharacterPromptData {
pub token: CharacterToken,
pub is_active: bool,
pub character_name: Option<String>,
pub kinovi_character_id: Option<String>,
pub kinovi_character_name: Option<String>,
}
/// Look up multiple characters by their tokens, returning the data needed for prompting.
///
/// Characters that are not found (or soft-deleted) are silently omitted from the results.
pub async fn batch_lookup_characters_by_token_for_prompting(
tokens: &[CharacterToken],
connection: &mut PoolConnection<MySql>,
) -> Result<Vec<CharacterPromptData>, sqlx::Error> {
if tokens.is_empty() {
return Ok(Vec::new());
}
let mut query_builder: QueryBuilder<MySql> = QueryBuilder::new(
r#"
SELECT
token,
is_active,
character_name,
kinovi_character_id,
kinovi_character_name
FROM characters
WHERE deleted_at IS NULL
AND token IN (
"#,
);
let mut separated = query_builder.separated(", ");
for token in tokens {
separated.push_bind(token.as_str().to_string());
}
query_builder.push(")");
let results: Vec<CharacterPromptData> = query_builder
.build_query_as::<CharacterPromptData>()
.fetch_all(&mut **connection)
.await?;
Ok(results)
}
crates/schema/database/mysql_queries/src/queries/characters/create_pending_character.rs
+94
View File
@@ -0,0 +1,94 @@
use log::info;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
use enums::by_table::characters::character_type::CharacterType;
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
/// Arguments for inserting a new pending character record.
pub struct CreatePendingCharacterArgs<'e, 'c, E>
where E: 'e + Executor<'c, Database = MySql>
{
/// The type of character (e.g. KinoviSeedance).
pub character_type: CharacterType,
/// User's display name for the character (truncated to 255 chars by caller).
pub character_name: &'e str,
/// Optional user description (truncated to 512 chars by caller).
pub maybe_description: Option<&'e str>,
/// The media file token of the original uploaded image.
pub maybe_original_upload_media_token: Option<&'e MediaFileToken>,
/// The user who created this character.
pub maybe_creator_user_token: Option<&'e UserToken>,
/// IP address for abuse tracking.
pub creator_ip_address: &'e str,
/// The Kinovi character ID (e.g. "char_1774752056469_2wlxoq").
pub kinovi_character_id: &'e str,
/// The name Kinovi assigned to the character.
pub kinovi_character_name: &'e str,
/// Our inference job token for tracking the character creation.
pub maybe_generic_inference_job_token: Option<&'e InferenceJobToken>,
pub mysql_executor: E,
pub phantom: PhantomData<&'c E>,
}
/// Insert a new pending character record. Returns the generated CharacterToken.
///
/// The character is created with `is_active = false`. It will be activated
/// once the async creation job completes.
pub async fn create_pending_character<'e, 'c: 'e, E>(
args: CreatePendingCharacterArgs<'e, 'c, E>,
) -> Result<CharacterToken, sqlx::Error>
where E: 'e + Executor<'c, Database = MySql>
{
let token = CharacterToken::generate();
let query = sqlx::query!(
r#"
INSERT INTO characters
SET
token = ?,
character_type = ?,
is_active = false,
character_name = ?,
maybe_description = ?,
maybe_avatar_media_token = NULL,
maybe_full_image_media_token = NULL,
maybe_original_upload_media_token = ?,
maybe_creator_user_token = ?,
creator_ip_address = ?,
kinovi_character_id = ?,
kinovi_character_name = ?,
maybe_kinovi_asset_id = NULL,
maybe_generic_inference_job_token = ?
"#,
token.as_str(),
args.character_type.to_str(),
args.character_name,
args.maybe_description,
args.maybe_original_upload_media_token.map(|t| t.as_str()),
args.maybe_creator_user_token.map(|t| t.as_str()),
args.creator_ip_address,
args.kinovi_character_id,
args.kinovi_character_name,
args.maybe_generic_inference_job_token.map(|t| t.as_str()),
);
let result = query.execute(args.mysql_executor)
.await?;
info!("Created pending character {} (record ID {})", token, result.last_insert_id());
Ok(token)
}
crates/schema/database/mysql_queries/src/queries/characters/delete_character.rs
+26
View File
@@ -0,0 +1,26 @@
use sqlx::pool::PoolConnection;
use sqlx::MySql;
use tokens::tokens::characters::CharacterToken;
/// Soft-delete a character by setting deleted_at to NOW().
///
/// This is idempotent — calling it on an already-deleted character is a no-op.
pub async fn delete_character(
character_token: &CharacterToken,
connection: &mut PoolConnection<MySql>,
) -> Result<(), sqlx::Error> {
sqlx::query(
r#"
UPDATE characters
SET deleted_at = NOW()
WHERE token = ?
AND deleted_at IS NULL
"#,
)
.bind(character_token.as_str())
.execute(&mut **connection)
.await?;
Ok(())
}
crates/schema/database/mysql_queries/src/queries/characters/get_character_by_token.rs
+54
View File
@@ -0,0 +1,54 @@
use sqlx::pool::PoolConnection;
use sqlx::MySql;
use enums::by_table::characters::character_type::CharacterType;
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
/// Full character record for the GET endpoint.
pub struct CharacterRecord {
pub token: CharacterToken,
pub character_type: CharacterType,
pub is_active: bool,
pub character_name: Option<String>,
pub maybe_description: Option<String>,
pub maybe_avatar_media_token: Option<MediaFileToken>,
pub maybe_full_image_media_token: Option<MediaFileToken>,
pub maybe_original_upload_media_token: Option<MediaFileToken>,
pub maybe_creator_user_token: Option<UserToken>,
pub kinovi_character_id: Option<String>,
pub kinovi_character_name: Option<String>,
pub maybe_kinovi_asset_id: Option<String>,
}
/// Look up a character by token (excluding soft-deleted).
pub async fn get_character_by_token(
character_token: &CharacterToken,
connection: &mut PoolConnection<MySql>,
) -> Result<Option<CharacterRecord>, sqlx::Error> {
sqlx::query_as!(
CharacterRecord,
r#"
SELECT
token as `token: tokens::tokens::characters::CharacterToken`,
character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,
is_active as `is_active: bool`,
character_name,
maybe_description,
maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
kinovi_character_id,
kinovi_character_name,
maybe_kinovi_asset_id
FROM characters
WHERE token = ?
AND deleted_at IS NULL
"#,
character_token.as_str(),
)
.fetch_optional(&mut **connection)
.await
}
crates/schema/database/mysql_queries/src/queries/characters/get_character_by_token_including_deleted.rs
+39
View File
@@ -0,0 +1,39 @@
use sqlx::pool::PoolConnection;
use sqlx::{FromRow, MySql};
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::users::UserToken;
/// Minimal character record for ownership and deletion checks.
#[derive(Debug, FromRow)]
pub struct CharacterOwnershipRecord {
pub token: CharacterToken,
pub maybe_creator_user_token: Option<UserToken>,
pub is_active: bool,
pub is_deleted: bool,
}
/// Look up a character by token, including soft-deleted records.
///
/// Returns `None` if the character does not exist at all.
pub async fn get_character_by_token_including_deleted(
character_token: &CharacterToken,
connection: &mut PoolConnection<MySql>,
) -> Result<Option<CharacterOwnershipRecord>, sqlx::Error> {
let result = sqlx::query_as::<_, CharacterOwnershipRecord>(
r#"
SELECT
token,
maybe_creator_user_token,
is_active,
(deleted_at IS NOT NULL) as is_deleted
FROM characters
WHERE token = ?
"#,
)
.bind(character_token.as_str())
.fetch_optional(&mut **connection)
.await?;
Ok(result)
}
crates/schema/database/mysql_queries/src/queries/characters/list_active_characters_for_user.rs
+86
View File
@@ -0,0 +1,86 @@
use sqlx::pool::PoolConnection;
use sqlx::MySql;
use enums::by_table::characters::character_type::CharacterType;
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
const DEFAULT_PAGE_SIZE: u32 = 50;
/// A character row for the list endpoint.
pub struct CharacterListRow {
pub id: u64,
pub token: CharacterToken,
pub character_type: CharacterType,
pub is_active: bool,
pub character_name: Option<String>,
pub maybe_description: Option<String>,
pub maybe_avatar_media_token: Option<MediaFileToken>,
pub maybe_full_image_media_token: Option<MediaFileToken>,
pub maybe_original_upload_media_token: Option<MediaFileToken>,
pub maybe_creator_user_token: Option<UserToken>,
pub kinovi_character_id: Option<String>,
pub kinovi_character_name: Option<String>,
pub maybe_kinovi_asset_id: Option<String>,
}
pub struct ListActiveCharactersResult {
pub characters: Vec<CharacterListRow>,
pub next_cursor: Option<u64>,
}
/// List active, non-deleted characters for a user, paginated by descending id.
pub async fn list_active_characters_for_user(
user_token: &UserToken,
maybe_cursor: Option<u64>,
connection: &mut PoolConnection<MySql>,
) -> Result<ListActiveCharactersResult, sqlx::Error> {
let fetch_limit = (DEFAULT_PAGE_SIZE + 1) as i64;
let id_cursor = maybe_cursor.map(|c| c as i64).unwrap_or(i64::MAX);
let rows = sqlx::query_as!(
CharacterListRow,
r#"
SELECT
id as `id: u64`,
token as `token: tokens::tokens::characters::CharacterToken`,
character_type as `character_type: enums::by_table::characters::character_type::CharacterType`,
is_active as `is_active: bool`,
character_name,
maybe_description,
maybe_avatar_media_token as `maybe_avatar_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_full_image_media_token as `maybe_full_image_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_original_upload_media_token as `maybe_original_upload_media_token: tokens::tokens::media_files::MediaFileToken`,
maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
kinovi_character_id,
kinovi_character_name,
maybe_kinovi_asset_id
FROM characters
WHERE maybe_creator_user_token = ?
AND is_active = true
AND deleted_at IS NULL
AND id < ?
ORDER BY id DESC
LIMIT ?
"#,
user_token.as_str(),
id_cursor,
fetch_limit,
)
.fetch_all(&mut **connection)
.await?;
let has_next = rows.len() as u32 >= DEFAULT_PAGE_SIZE;
let characters: Vec<CharacterListRow> = rows.into_iter().take(DEFAULT_PAGE_SIZE as usize).collect();
let next_cursor = if has_next {
characters.last().map(|c| c.id)
} else {
None
};
Ok(ListActiveCharactersResult {
characters,
next_cursor,
})
}
crates/schema/database/mysql_queries/src/queries/characters/mod.rs
+7
View File
@@ -0,0 +1,7 @@
pub mod batch_lookup_characters_by_token_for_prompting;
pub mod create_pending_character;
pub mod delete_character;
pub mod get_character_by_token;
pub mod get_character_by_token_including_deleted;
pub mod list_active_characters_for_user;
pub mod update_character_name_and_description;
crates/schema/database/mysql_queries/src/queries/characters/update_character_name_and_description.rs
+36
View File
@@ -0,0 +1,36 @@
use sqlx::pool::PoolConnection;
use sqlx::MySql;
use tokens::tokens::characters::CharacterToken;
/// Update a character's name, kinovi name, and/or description.
///
/// All fields are always SET in the query — the caller should pass the
/// existing values for fields that should not change.
pub async fn update_character_name_and_description(
character_token: &CharacterToken,
character_name: &str,
kinovi_character_name: &str,
maybe_description: Option<&str>,
connection: &mut PoolConnection<MySql>,
) -> Result<(), sqlx::Error> {
sqlx::query!(
r#"
UPDATE characters
SET
character_name = ?,
kinovi_character_name = ?,
maybe_description = ?
WHERE token = ?
AND deleted_at IS NULL
"#,
character_name,
kinovi_character_name,
maybe_description,
character_token.as_str(),
)
.execute(&mut **connection)
.await?;
Ok(())
}
crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token.rs
+125
View File
@@ -0,0 +1,125 @@
use anyhow::anyhow;
use log::info;
use sqlx::{Executor, MySql};
use std::marker::PhantomData;
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty;
use enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory;
use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
use enums::common::job_status_plus::JobStatusPlus;
use enums::common::visibility::Visibility;
use tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::users::UserToken;
use crate::errors::database_query_error::DatabaseQueryError;
pub struct InsertGenericInferenceForSeedance2ProCharacterWithAprioriJobTokenArgs<'e, 'c, E>
where E: 'e + Executor<'c, Database = MySql>
{
pub uuid_idempotency_token: &'e str,
/// Pre-generated job token.
pub apriori_job_token: &'e InferenceJobToken,
/// The Kinovi character_id returned by generate_character().
pub kinovi_character_id: &'e str,
pub maybe_creator_user_token: Option<&'e UserToken>,
pub maybe_avt_token: Option<&'e AnonymousVisitorTrackingToken>,
pub creator_ip_address: &'e str,
pub creator_set_visibility: Visibility,
pub mysql_executor: E,
pub phantom: PhantomData<&'c E>,
}
pub async fn insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token<'e, 'c : 'e, E>(
args: InsertGenericInferenceForSeedance2ProCharacterWithAprioriJobTokenArgs<'e, 'c, E>
) -> Result<InferenceJobToken, DatabaseQueryError>
where E: 'e + Executor<'c, Database = MySql>
{
const JOB_TYPE: InferenceJobType = InferenceJobType::Seedance2ProCharacter;
const INFERENCE_CATEGORY: InferenceCategory = InferenceCategory::CharacterGeneration;
const PRODUCT_CATEGORY: InferenceJobProductCategory = InferenceJobProductCategory::Seedance2ProCharacter;
const EXTERNAL_THIRD_PARTY: InferenceJobExternalThirdParty = InferenceJobExternalThirdParty::Seedance2Pro;
const STATUS: JobStatusPlus = JobStatusPlus::Pending;
let query = sqlx::query!(
r#"
INSERT INTO generic_inference_jobs
SET
token = ?,
uuid_idempotency_token = ?,
job_type = ?,
maybe_external_third_party = ?,
maybe_external_third_party_id = ?,
product_category = ?,
inference_category = ?,
maybe_model_type = NULL,
maybe_model_token = NULL,
maybe_input_source_token = NULL,
maybe_input_source_token_type = NULL,
maybe_download_url = NULL,
maybe_cover_image_media_file_token = NULL,
maybe_prompt_token = NULL,
maybe_wallet_ledger_entry_token = NULL,
maybe_raw_inference_text = NULL,
maybe_inference_args = NULL,
maybe_creator_user_token = ?,
maybe_creator_anonymous_visitor_token = ?,
creator_ip_address = ?,
creator_set_visibility = ?,
priority_level = 0,
is_keepalive_required = FALSE,
max_duration_seconds = 0,
is_debug_request = FALSE,
maybe_routing_tag = NULL,
status = ?
"#,
args.apriori_job_token.as_str(),
args.uuid_idempotency_token,
JOB_TYPE.to_str(),
EXTERNAL_THIRD_PARTY.to_str(),
args.kinovi_character_id,
PRODUCT_CATEGORY.to_str(),
INFERENCE_CATEGORY.to_str(),
args.maybe_creator_user_token.map(|t| t.to_string()),
args.maybe_avt_token.map(|t| t.to_string()),
args.creator_ip_address,
args.creator_set_visibility.to_str(),
STATUS.to_str(),
);
let query_result = query.execute(args.mysql_executor)
.await;
let record_id = match query_result {
Err(err) => return Err(DatabaseQueryError::from(err)),
Ok(res) => res.last_insert_id(),
};
info!("Insert generic inference job for Seedance2Pro character: {} with record ID {}", args.apriori_job_token, record_id);
Ok(args.apriori_job_token.clone())
}
crates/schema/database/mysql_queries/src/queries/generic_inference/seedance2pro/mod.rs
+1
View File
@@ -1,2 +1,3 @@
pub mod insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token;
pub mod insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token;
pub mod list_pending_seedance2pro_jobs;
crates/schema/database/mysql_queries/src/queries/generic_inference/web/batch_get_inference_job_status.rs
+2
View File
@@ -187,6 +187,7 @@ fn raw_records_to_public_result(records: Vec<RawGenericInferenceJobStatus>) -> V
InferenceCategory::SeedVc => Some("Seed VC"),
InferenceCategory::ConvertBvhToWorkflow => Some("BVH to Workflow"),
InferenceCategory::SplatGeneration => Some("Splat Generation"),
InferenceCategory::CharacterGeneration => Some("Character Generation"),
InferenceCategory::DeprecatedField => Some("Job"), // TODO(bt,2024-07-16): Fix
};
}
@@ -210,6 +211,7 @@ fn raw_records_to_public_result(records: Vec<RawGenericInferenceJobStatus>) -> V
InferenceCategory::LivePortrait => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::ConvertBvhToWorkflow => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::SplatGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::CharacterGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::DeprecatedField => (true, None), // TODO(bt,2024-07-16): We'll need to read another field!
};
crates/schema/database/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs
+2
View File
@@ -162,6 +162,7 @@ fn raw_record_to_public_result(record: RawGenericInferenceJobStatus) -> GenericI
InferenceCategory::SeedVc => Some("Seed VC"),
InferenceCategory::ConvertBvhToWorkflow => Some("BVH to Workflow"),
InferenceCategory::SplatGeneration => Some("Splat Generation"),
InferenceCategory::CharacterGeneration => Some("Character Generation"),
InferenceCategory::DeprecatedField => Some("Job"), // TODO(bt,2024-07-16): Fix
};
}
@@ -185,6 +186,7 @@ fn raw_record_to_public_result(record: RawGenericInferenceJobStatus) -> GenericI
InferenceCategory::SeedVc => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::ConvertBvhToWorkflow => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::SplatGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::CharacterGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::DeprecatedField => (true, None), // TODO(bt,2024-07-16): We'll need to read another field!
};
crates/schema/database/mysql_queries/src/queries/generic_inference/web/list_session_jobs.rs
+2
View File
@@ -253,6 +253,7 @@ fn raw_records_to_public_result(records: Vec<RawGenericInferenceJobStatus>) -> V
InferenceCategory::LivePortrait => Some("Live Portrait"),
InferenceCategory::SeedVc => Some("Seed VC"),
InferenceCategory::SplatGeneration => Some("Splat Generation"),
InferenceCategory::CharacterGeneration => Some("Character Generation"),
InferenceCategory::DeprecatedField => Some("Job"), // TODO(bt,2024-07-16): Fix
};
}
@@ -276,6 +277,7 @@ fn raw_records_to_public_result(records: Vec<RawGenericInferenceJobStatus>) -> V
InferenceCategory::SeedVc => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::ConvertBvhToWorkflow => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::SplatGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::CharacterGeneration => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::DeprecatedField => (true, None), // TODO(bt,2024-07-16): We'll need to read another field!
};
crates/schema/database/mysql_queries/src/queries/mod.rs
+1
View File
@@ -6,6 +6,7 @@ pub mod batch_generations;
pub mod beta_keys;
pub mod billing;
pub mod browser_session_logs;
pub mod characters;
pub mod comments;
pub mod database_time;
pub mod email_sender_jobs;
crates/schema/public/enums/src/by_table/characters/character_type.rs
+108
View File
@@ -0,0 +1,108 @@
use std::collections::BTreeSet;
#[cfg(test)]
use strum::EnumCount;
#[cfg(test)]
use strum::EnumIter;
/// Used in the `characters` table in `VARCHAR(24)` field `character_type`.
///
/// Identifies the type/backend used to create the character.
///
/// YOU CAN ADD NEW VALUES, BUT DO NOT CHANGE EXISTING VALUES WITHOUT A MIGRATION STRATEGY.
#[cfg_attr(test, derive(EnumIter, EnumCount))]
#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
pub enum CharacterType {
/// Character created via Kinovi / Seedance2Pro.
#[serde(rename = "kinovi_seedance")]
KinoviSeedance,
}
impl_enum_display_and_debug_using_to_str!(CharacterType);
impl_mysql_enum_coders!(CharacterType);
impl CharacterType {
pub fn to_str(&self) -> &'static str {
match self {
Self::KinoviSeedance => "kinovi_seedance",
}
}
pub fn from_str(value: &str) -> Result<Self, String> {
match value {
"kinovi_seedance" => Ok(Self::KinoviSeedance),
_ => Err(format!("invalid value: {:?}", value)),
}
}
pub fn all_variants() -> BTreeSet<Self> {
BTreeSet::from([
Self::KinoviSeedance,
])
}
}
#[cfg(test)]
mod tests {
use crate::by_table::characters::character_type::CharacterType;
use crate::test_helpers::assert_serialization;
mod explicit_checks {
use super::*;
#[test]
fn test_serialization() {
assert_serialization(CharacterType::KinoviSeedance, "kinovi_seedance");
}
#[test]
fn to_str() {
assert_eq!(CharacterType::KinoviSeedance.to_str(), "kinovi_seedance");
}
#[test]
fn from_str() {
assert_eq!(CharacterType::from_str("kinovi_seedance").unwrap(), CharacterType::KinoviSeedance);
assert!(CharacterType::from_str("invalid").is_err());
}
#[test]
fn all_variants() {
const EXPECTED_COUNT: usize = 1;
assert_eq!(CharacterType::all_variants().len(), EXPECTED_COUNT);
use strum::IntoEnumIterator;
assert_eq!(CharacterType::all_variants().len(), CharacterType::iter().len());
}
}
mod mechanical_checks {
use super::*;
#[test]
fn variant_length() {
use strum::IntoEnumIterator;
assert_eq!(CharacterType::all_variants().len(), CharacterType::iter().len());
}
#[test]
fn round_trip() {
for variant in CharacterType::all_variants() {
assert_eq!(variant, CharacterType::from_str(variant.to_str()).unwrap());
assert_eq!(variant, CharacterType::from_str(&format!("{}", variant)).unwrap());
assert_eq!(variant, CharacterType::from_str(&format!("{:?}", variant)).unwrap());
}
}
#[test]
fn serialized_length_ok_for_database() {
const MAX_LENGTH: usize = 24;
for variant in CharacterType::all_variants() {
let serialized = variant.to_str();
assert!(!serialized.is_empty(), "variant {:?} is too short", variant);
assert!(serialized.len() <= MAX_LENGTH, "variant {:?} is too long for VARCHAR({})", variant, MAX_LENGTH);
}
}
}
}
crates/schema/public/enums/src/by_table/characters/mod.rs
+1
View File
@@ -0,0 +1 @@
pub mod character_type;
crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_category.rs
+11 -1
View File
@@ -52,6 +52,10 @@ pub enum InferenceCategory {
#[serde(rename = "splat_generation")]
SplatGeneration,
/// Character generation (eg. Kinovi/Seedance2Pro characters)
#[serde(rename = "character_generation")]
CharacterGeneration,
/// FAL-powered image background removal
#[serde(rename = "background_removal")]
BackgroundRemoval,
@@ -109,6 +113,7 @@ impl InferenceCategory {
Self::VideoGeneration => "video_generation",
Self::ObjectGeneration => "object_generation",
Self::SplatGeneration => "splat_generation",
Self::CharacterGeneration => "character_generation",
Self::BackgroundRemoval => "background_removal",
Self::Mocap => "mocap",
Self::Workflow => "workflow",
@@ -131,6 +136,7 @@ impl InferenceCategory {
"video_generation" => Ok(Self::VideoGeneration),
"object_generation" => Ok(Self::ObjectGeneration),
"splat_generation" => Ok(Self::SplatGeneration),
"character_generation" => Ok(Self::CharacterGeneration),
"background_removal" => Ok(Self::BackgroundRemoval),
"f5_tts" => Ok(Self::F5TTS),
"mocap" => Ok(Self::Mocap),
@@ -155,6 +161,7 @@ impl InferenceCategory {
Self::ImageGeneration,
Self::ObjectGeneration,
Self::SplatGeneration,
Self::CharacterGeneration,
Self::VideoGeneration,
Self::BackgroundRemoval,
Self::Mocap,
@@ -187,6 +194,7 @@ mod tests {
assert_serialization(InferenceCategory::VideoGeneration, "video_generation");
assert_serialization(InferenceCategory::ObjectGeneration, "object_generation");
assert_serialization(InferenceCategory::SplatGeneration, "splat_generation");
assert_serialization(InferenceCategory::CharacterGeneration, "character_generation");
assert_serialization(InferenceCategory::BackgroundRemoval, "background_removal");
assert_serialization(InferenceCategory::Mocap, "mocap");
assert_serialization(InferenceCategory::F5TTS, "f5_tts");
@@ -208,6 +216,7 @@ mod tests {
assert_eq!(InferenceCategory::VideoGeneration.to_str(), "video_generation");
assert_eq!(InferenceCategory::ObjectGeneration.to_str(), "object_generation");
assert_eq!(InferenceCategory::SplatGeneration.to_str(), "splat_generation");
assert_eq!(InferenceCategory::CharacterGeneration.to_str(), "character_generation");
assert_eq!(InferenceCategory::BackgroundRemoval.to_str(), "background_removal");
assert_eq!(InferenceCategory::F5TTS.to_str(), "f5_tts");
assert_eq!(InferenceCategory::SeedVc.to_str(), "seed_vc");
@@ -229,6 +238,7 @@ mod tests {
assert_eq!(InferenceCategory::from_str("video_generation").unwrap(), InferenceCategory::VideoGeneration);
assert_eq!(InferenceCategory::from_str("object_generation").unwrap(), InferenceCategory::ObjectGeneration);
assert_eq!(InferenceCategory::from_str("splat_generation").unwrap(), InferenceCategory::SplatGeneration);
assert_eq!(InferenceCategory::from_str("character_generation").unwrap(), InferenceCategory::CharacterGeneration);
assert_eq!(InferenceCategory::from_str("background_removal").unwrap(), InferenceCategory::BackgroundRemoval);
assert_eq!(InferenceCategory::from_str("f5_tts").unwrap(), InferenceCategory::F5TTS);
assert_eq!(InferenceCategory::from_str("seed_vc").unwrap(), InferenceCategory::SeedVc);
@@ -243,7 +253,7 @@ mod tests {
#[test]
fn all_variants() {
// Static check
const EXPECTED_COUNT : usize = 17;
const EXPECTED_COUNT : usize = 18;
assert_eq!(InferenceCategory::all_variants().len(), EXPECTED_COUNT);
assert_eq!(InferenceCategory::iter().len(), EXPECTED_COUNT);
crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_job_product_category.rs
+10 -1
View File
@@ -35,6 +35,9 @@ pub enum InferenceJobProductCategory {
#[serde(rename = "seedance2pro_video")]
Seedance2ProVideo,
#[serde(rename = "seedance2pro_character")]
Seedance2ProCharacter,
// =============== WORLD LABS ===============
/// World Labs: Gaussian Splat Generation
@@ -137,6 +140,7 @@ impl InferenceJobProductCategory {
Self::FalObject => "fal_object",
Self::FalBgRemoval => "fal_bg_removal",
Self::Seedance2ProVideo => "seedance2pro_video",
Self::Seedance2ProCharacter => "seedance2pro_character",
Self::WorldlabsSplat => "worldlabs_splat",
Self::TtsGptSoVits => "tts_gpt_so_vits",
Self::TtsStyleTts2 => "tts_style_tts2",
@@ -171,6 +175,7 @@ impl InferenceJobProductCategory {
"fal_object" => Ok(Self::FalObject),
"fal_bg_removal" => Ok(Self::FalBgRemoval),
"seedance2pro_video" => Ok(Self::Seedance2ProVideo),
"seedance2pro_character" => Ok(Self::Seedance2ProCharacter),
"worldlabs_splat" => Ok(Self::WorldlabsSplat),
"tts_gpt_so_vits" => Ok(Self::TtsGptSoVits),
"tts_style_tts2" => Ok(Self::TtsStyleTts2),
@@ -208,6 +213,7 @@ impl InferenceJobProductCategory {
Self::FalObject,
Self::FalBgRemoval,
Self::Seedance2ProVideo,
Self::Seedance2ProCharacter,
Self::WorldlabsSplat,
Self::TtsGptSoVits,
Self::TtsStyleTts2,
@@ -251,6 +257,7 @@ mod tests {
assert_serialization(InferenceJobProductCategory::FalObject, "fal_object");
assert_serialization(InferenceJobProductCategory::FalBgRemoval, "fal_bg_removal");
assert_serialization(InferenceJobProductCategory::Seedance2ProVideo, "seedance2pro_video");
assert_serialization(InferenceJobProductCategory::Seedance2ProCharacter, "seedance2pro_character");
assert_serialization(InferenceJobProductCategory::WorldlabsSplat, "worldlabs_splat");
assert_serialization(InferenceJobProductCategory::TtsGptSoVits, "tts_gpt_so_vits");
assert_serialization(InferenceJobProductCategory::TtsStyleTts2, "tts_style_tts2");
@@ -284,6 +291,7 @@ mod tests {
assert_eq!(InferenceJobProductCategory::FalObject.to_str(), "fal_object");
assert_eq!(InferenceJobProductCategory::FalBgRemoval.to_str(), "fal_bg_removal");
assert_eq!(InferenceJobProductCategory::Seedance2ProVideo.to_str(), "seedance2pro_video");
assert_eq!(InferenceJobProductCategory::Seedance2ProCharacter.to_str(), "seedance2pro_character");
assert_eq!(InferenceJobProductCategory::WorldlabsSplat.to_str(), "worldlabs_splat");
assert_eq!(InferenceJobProductCategory::TtsGptSoVits.to_str(), "tts_gpt_so_vits");
assert_eq!(InferenceJobProductCategory::TtsStyleTts2.to_str(), "tts_style_tts2");
@@ -316,6 +324,7 @@ mod tests {
assert_eq!(InferenceJobProductCategory::from_str("fal_object").unwrap(), InferenceJobProductCategory::FalObject);
assert_eq!(InferenceJobProductCategory::from_str("fal_bg_removal").unwrap(), InferenceJobProductCategory::FalBgRemoval);
assert_eq!(InferenceJobProductCategory::from_str("seedance2pro_video").unwrap(), InferenceJobProductCategory::Seedance2ProVideo);
assert_eq!(InferenceJobProductCategory::from_str("seedance2pro_character").unwrap(), InferenceJobProductCategory::Seedance2ProCharacter);
assert_eq!(InferenceJobProductCategory::from_str("worldlabs_splat").unwrap(), InferenceJobProductCategory::WorldlabsSplat);
assert_eq!(InferenceJobProductCategory::from_str("tts_gpt_so_vits").unwrap(), InferenceJobProductCategory::TtsGptSoVits);
assert_eq!(InferenceJobProductCategory::from_str("tts_style_tts2").unwrap(), InferenceJobProductCategory::TtsStyleTts2);
@@ -343,7 +352,7 @@ mod tests {
#[test]
fn all_variants() {
// Static check
const EXPECTED_COUNT : usize = 29;
const EXPECTED_COUNT : usize = 30;
assert_eq!(InferenceJobProductCategory::all_variants().len(), EXPECTED_COUNT);
assert_eq!(InferenceJobProductCategory::iter().len(), EXPECTED_COUNT);
crates/schema/public/enums/src/by_table/generic_inference_jobs/inference_job_type.rs
+11 -1
View File
@@ -23,6 +23,10 @@ pub enum InferenceJobType {
#[serde(rename = "seedance2pro_queue")]
Seedance2ProQueue,
/// Seedance 2 Pro character creation. We poll for results.
#[serde(rename = "seedance2pro_character")]
Seedance2ProCharacter,
/// World Labs jobs. We poll for results.
#[serde(rename = "worldlabs_queue")]
WorldlabsQueue,
@@ -119,6 +123,7 @@ impl InferenceJobType {
match self {
Self::FalQueue => "fal_queue",
Self::Seedance2ProQueue => "seedance2pro_queue",
Self::Seedance2ProCharacter => "seedance2pro_character",
Self::WorldlabsQueue => "worldlabs_queue",
Self::VideoRender => "video_render",
Self::LivePortrait => "live_portrait",
@@ -147,6 +152,7 @@ impl InferenceJobType {
match value {
"fal_queue" => Ok(Self::FalQueue),
"seedance2pro_queue" => Ok(Self::Seedance2ProQueue),
"seedance2pro_character" => Ok(Self::Seedance2ProCharacter),
"worldlabs_queue" => Ok(Self::WorldlabsQueue),
"video_render" => Ok(Self::VideoRender),
"live_portrait" => Ok(Self::LivePortrait),
@@ -178,6 +184,7 @@ impl InferenceJobType {
BTreeSet::from([
Self::FalQueue,
Self::Seedance2ProQueue,
Self::Seedance2ProCharacter,
Self::WorldlabsQueue,
Self::VideoRender,
Self::LivePortrait,
@@ -220,6 +227,7 @@ mod tests {
fn test_serialization() {
assert_serialization(InferenceJobType::FalQueue, "fal_queue");
assert_serialization(InferenceJobType::Seedance2ProQueue, "seedance2pro_queue");
assert_serialization(InferenceJobType::Seedance2ProCharacter, "seedance2pro_character");
assert_serialization(InferenceJobType::WorldlabsQueue, "worldlabs_queue");
assert_serialization(InferenceJobType::VideoRender, "video_render");
assert_serialization(InferenceJobType::LivePortrait, "live_portrait");
@@ -247,6 +255,7 @@ mod tests {
fn to_str() {
assert_eq!(InferenceJobType::FalQueue.to_str(), "fal_queue");
assert_eq!(InferenceJobType::Seedance2ProQueue.to_str(), "seedance2pro_queue");
assert_eq!(InferenceJobType::Seedance2ProCharacter.to_str(), "seedance2pro_character");
assert_eq!(InferenceJobType::WorldlabsQueue.to_str(), "worldlabs_queue");
assert_eq!(InferenceJobType::VideoRender.to_str(), "video_render");
assert_eq!(InferenceJobType::LivePortrait.to_str(), "live_portrait");
@@ -274,6 +283,7 @@ mod tests {
fn from_str() {
assert_eq!(InferenceJobType::from_str("fal_queue").unwrap(), InferenceJobType::FalQueue);
assert_eq!(InferenceJobType::from_str("seedance2pro_queue").unwrap(), InferenceJobType::Seedance2ProQueue);
assert_eq!(InferenceJobType::from_str("seedance2pro_character").unwrap(), InferenceJobType::Seedance2ProCharacter);
assert_eq!(InferenceJobType::from_str("worldlabs_queue").unwrap(), InferenceJobType::WorldlabsQueue);
assert_eq!(InferenceJobType::from_str("video_render").unwrap(), InferenceJobType::VideoRender);
assert_eq!(InferenceJobType::from_str("live_portrait").unwrap(), InferenceJobType::LivePortrait);
@@ -300,7 +310,7 @@ mod tests {
#[test]
fn all_variants() {
// Static check
const EXPECTED_COUNT : usize = 23;
const EXPECTED_COUNT : usize = 24;
assert_eq!(InferenceJobType::all_variants().len(), EXPECTED_COUNT);
assert_eq!(InferenceJobType::iter().len(), EXPECTED_COUNT);
crates/schema/public/enums/src/by_table/mod.rs
+1
View File
@@ -1,6 +1,7 @@
// ===== MySql =====
pub mod audit_logs;
pub mod batch_generations;
pub mod characters;
pub mod beta_keys;
pub mod comments;
pub mod email_sender_jobs;
crates/schema/public/enums_public/src/by_table/generic_inference_jobs/public_inference_job_type.rs
+6
View File
@@ -105,6 +105,10 @@ pub enum PublicInferenceJobType {
#[serde(rename = "seedance2pro_queue")]
Seedance2ProQueue,
/// Seedance 2 Pro character generation jobs. We poll for results.
#[serde(rename = "seedance2pro_character")]
Seedance2ProCharacter,
/// World Labs splat generation jobs. We poll for results.
#[serde(rename = "worldlabs_queue")]
WorldlabsQueue,
@@ -139,6 +143,7 @@ impl PublicInferenceJobType {
InferenceJobType::RerenderAVideo => Self::RerenderAVideo,
InferenceJobType::ImageGenApi => Self::ImageGenApi,
InferenceJobType::Seedance2ProQueue => Self::Seedance2ProQueue,
InferenceJobType::Seedance2ProCharacter => Self::Seedance2ProCharacter,
InferenceJobType::WorldlabsQueue => Self::WorldlabsQueue,
}
}
@@ -164,6 +169,7 @@ impl PublicInferenceJobType {
Self::StableDiffusion => InferenceJobType::StableDiffusion,
Self::ImageGenApi => InferenceJobType::ImageGenApi,
Self::Seedance2ProQueue => InferenceJobType::Seedance2ProQueue,
Self::Seedance2ProCharacter => InferenceJobType::Seedance2ProCharacter,
Self::WorldlabsQueue => InferenceJobType::WorldlabsQueue,
Self::StyleTTS2 => InferenceJobType::StyleTTS2,
Self::Tacotron2 => InferenceJobType::Tacotron2,
crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs
+244 -7
View File
@@ -1,12 +1,36 @@
use std::marker::PhantomData;
use std::sync::Arc;
use actix_web::web::Json;
use actix_web::{web, HttpRequest};
use log::{error, info, warn};
use sqlx::Acquire;
use artcraft_api_defs::characters::create_character::{CreateCharacterRequest, CreateCharacterResponse};
use enums::by_table::characters::character_type::CharacterType;
use enums::common::visibility::Visibility;
use http_server_common::request::get_request_ip::get_request_ip;
use mysql_queries::queries::characters::create_pending_character::{create_pending_character, CreatePendingCharacterArgs};
use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token::{
insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token,
InsertGenericInferenceForSeedance2ProCharacterWithAprioriJobTokenArgs,
};
use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
use seedance2pro_client::requests::generate_character::generate_character::{generate_character, GenerateCharacterArgs};
use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{prepare_file_upload, PrepareFileUploadArgs};
use seedance2pro_client::requests::upload_file::upload_file::{upload_file, UploadFileArgs};
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use url_utils::extension::extract_extension_from_url::{extract_extension_from_url, ExtractExtensions};
use crate::http_server::common_responses::common_web_error::CommonWebError;
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
use crate::state::server_state::ServerState;
use crate::util::http_download_url_to_bytes::http_download_url_to_bytes;
use crate::util::lookup::lookup_media_file_urls_as_map::lookup_media_file_urls_as_map;
const MAX_NAME_LENGTH: usize = 255;
const MAX_DESCRIPTION_LENGTH: usize = 512;
/// Create a new character.
#[utoipa::path(
@@ -18,14 +42,227 @@ use crate::state::server_state::ServerState;
(status = 200, description = "Success", body = CreateCharacterResponse),
(status = 400, description = "Bad input"),
(status = 401, description = "Unauthorized"),
(status = 402, description = "Payment required"),
(status = 500, description = "Server error"),
),
)]
pub async fn create_character_handler(
_http_request: HttpRequest,
_request: Json<CreateCharacterRequest>,
_server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<CreateCharacterResponse>, CommonWebError> {
todo!()
http_request: HttpRequest,
request: Json<CreateCharacterRequest>,
server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<CreateCharacterResponse>, AdvancedCommonWebError> {
// --- Auth ---
let mut mysql_connection = server_state.mysql_pool
.acquire()
.await?;
let maybe_user_session = server_state
.session_checker
.maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
.await
.map_err(|e| {
warn!("Session checker error: {:?}", e);
AdvancedCommonWebError::from_anyhow_error(e)
})?;
let user_session = match maybe_user_session {
Some(session) => session,
None => return Err(AdvancedCommonWebError::NotAuthorized),
};
let user_token = &user_session.user_token;
let ip_address = get_request_ip(&http_request);
// --- Validate input ---
if let Err(reason) = validate_idempotency_token_format(&request.uuid_idempotency_token) {
return Err(AdvancedCommonWebError::BadInputWithSimpleMessage(reason));
}
// For now we use the model name as the character name and description.
let character_name = request.character_name.clone();
let character_name = truncate_string(&character_name, MAX_NAME_LENGTH);
let character_description = request.character_description.as_deref()
.map(|desc| desc.trim());
// --- Look up the image media file ---
let file_urls_by_token = lookup_media_file_urls_as_map(
&http_request,
&mut mysql_connection,
server_state.server_environment,
&[request.image_media_token.clone()],
).await?;
let image_cdn_url = file_urls_by_token
.get(&request.image_media_token)
.ok_or_else(|| {
warn!("Image media token not found: {:?}", request.image_media_token);
AdvancedCommonWebError::BadInputWithSimpleMessage("Image media file not found.".to_string())
})?;
// --- Insert idempotency token ---
insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
.await
.map_err(|err| {
error!("Error inserting idempotency token: {:?}", err);
AdvancedCommonWebError::BadInputWithSimpleMessage("repeated idempotency token".to_string())
})?;
// --- Upload image to Kinovi CDN ---
let seedance_image_url = upload_to_kinovi(
&server_state.seedance2pro.cookies,
image_cdn_url,
).await?;
info!("Uploaded image to Kinovi: {}", seedance_image_url);
// --- Call Kinovi generate_character ---
let session = Seedance2ProSession::from_cookies_string(
server_state.seedance2pro.cookies.clone()
);
let gen_result = generate_character(GenerateCharacterArgs {
session: &session,
name: character_name.clone(),
description: character_description
.map(|d| d.to_string())
.unwrap_or_else(|| "".to_string()),
reference_image_url: seedance_image_url,
is_public: false,
host_override: None,
})
.await
.map_err(|err| {
error!("Error calling Kinovi generate_character: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
info!(
"Kinovi character created: id={}, character_id={}, name={}",
gen_result.id, gen_result.character_id, gen_result.name,
);
// --- Generate apriori job token ---
let apriori_job_token = InferenceJobToken::generate();
// --- Insert records in a transaction ---
let mut transaction = mysql_connection
.begin()
.await
.map_err(|err| {
error!("Error starting MySQL transaction: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
let character_token = create_pending_character(CreatePendingCharacterArgs {
character_type: CharacterType::KinoviSeedance,
character_name: &character_name,
maybe_description: character_description,
maybe_original_upload_media_token: Some(&request.image_media_token),
maybe_creator_user_token: Some(user_token),
creator_ip_address: &ip_address,
kinovi_character_id: &gen_result.character_id,
kinovi_character_name: &gen_result.name,
maybe_generic_inference_job_token: Some(&apriori_job_token),
mysql_executor: &mut *transaction,
phantom: PhantomData,
})
.await?;
info!("Created pending character: {}", character_token);
insert_generic_inference_job_for_seedance2pro_character_with_apriori_job_token(
InsertGenericInferenceForSeedance2ProCharacterWithAprioriJobTokenArgs {
uuid_idempotency_token: &request.uuid_idempotency_token,
apriori_job_token: &apriori_job_token,
kinovi_character_id: &gen_result.character_id,
maybe_creator_user_token: Some(user_token),
maybe_avt_token: None,
creator_ip_address: &ip_address,
creator_set_visibility: Visibility::Hidden,
mysql_executor: &mut *transaction,
phantom: PhantomData,
}
)
.await
.map_err(|err| {
error!("Error inserting inference job: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
info!("Created inference job: {}", apriori_job_token);
transaction
.commit()
.await
.map_err(|err| {
error!("Error committing transaction: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
Ok(Json(CreateCharacterResponse {
success: true,
inference_job_token: apriori_job_token,
}))
}
// =============== Private helpers ===============
/// Upload an image from our CDN to Kinovi's CDN via prepare + upload.
async fn upload_to_kinovi(
cookies: &str,
our_cdn_url: &url::Url,
) -> Result<String, AdvancedCommonWebError> {
let extension = extract_extension_from_url(our_cdn_url, &ExtractExtensions::All)
.map(|ext| ext.without_period().to_string())
.unwrap_or_else(|| "png".to_string());
let session = Seedance2ProSession::from_cookies_string(cookies.to_string());
let file_bytes = http_download_url_to_bytes(our_cdn_url.as_str())
.await
.map_err(|err| {
warn!("Error downloading media file from CDN: {:?}", err);
AdvancedCommonWebError::from_anyhow_error(err)
})?
.to_vec();
let prepare_result = prepare_file_upload(PrepareFileUploadArgs {
session: &session,
extension,
host_override: None,
})
.await
.map_err(|err| {
warn!("Error preparing Kinovi file upload: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
let upload_result = upload_file(UploadFileArgs {
upload_url: prepare_result.upload_url,
file_bytes,
host_override: None,
})
.await
.map_err(|err| {
warn!("Error uploading file to Kinovi: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
Ok(upload_result.public_url)
}
fn truncate_string(s: &str, max_len: usize) -> String {
if s.len() <= max_len {
s.to_string()
} else {
s[..max_len].to_string()
}
}
crates/service/web/storyteller_web/src/http_server/endpoints/characters/delete_character_handler.rs
+62 -6
View File
@@ -2,11 +2,15 @@ use std::sync::Arc;
use actix_web::web::{Json, Path};
use actix_web::{web, HttpRequest};
use log::{info, warn};
use artcraft_api_defs::characters::delete_character::{DeleteCharacterPathInfo, DeleteCharacterResponse};
use tokens::tokens::characters::CharacterToken;
use mysql_queries::queries::characters::delete_character::delete_character;
use mysql_queries::queries::characters::get_character_by_token_including_deleted::get_character_by_token_including_deleted;
use crate::http_server::common_responses::common_web_error::CommonWebError;
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection;
use crate::state::server_state::ServerState;
/// Delete a character.
@@ -25,9 +29,61 @@ use crate::state::server_state::ServerState;
)
)]
pub async fn delete_character_handler(
_http_request: HttpRequest,
_path: Path<DeleteCharacterPathInfo>,
_server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<DeleteCharacterResponse>, CommonWebError> {
todo!()
http_request: HttpRequest,
path: Path<DeleteCharacterPathInfo>,
server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<DeleteCharacterResponse>, AdvancedCommonWebError> {
let character_token = &path.character_token;
// --- Auth ---
let mut mysql_connection = server_state.mysql_pool.acquire().await?;
let user_session = require_user_session_using_connection(
&http_request,
&server_state.session_checker,
&mut mysql_connection,
).await?;
let user_token = &user_session.user_token;
let is_mod = user_session.is_mod();
// --- Look up the character (including deleted) ---
let character = get_character_by_token_including_deleted(character_token, &mut mysql_connection)
.await?
.ok_or_else(|| {
warn!("Character not found: {}", character_token);
AdvancedCommonWebError::NotFound
})?;
// Already deleted — return success idempotently.
if character.is_deleted {
info!("Character {} is already deleted", character_token);
return Ok(Json(DeleteCharacterResponse { success: true }));
}
// --- Ownership check ---
let is_owner = character.maybe_creator_user_token
.as_ref()
.map(|owner| owner == user_token)
.unwrap_or(false);
if !is_owner && !is_mod {
warn!(
"User {} attempted to delete character {} owned by {:?}",
user_token, character_token, character.maybe_creator_user_token,
);
return Err(AdvancedCommonWebError::NotAuthorized);
}
// --- Soft delete ---
delete_character(character_token, &mut mysql_connection).await?;
info!("Character {} deleted by user {}", character_token, user_token);
Ok(Json(DeleteCharacterResponse { success: true }))
}
crates/service/web/storyteller_web/src/http_server/endpoints/characters/edit_character_handler.rs
+154 -6
View File
@@ -2,10 +2,16 @@ use std::sync::Arc;
use actix_web::web::Json;
use actix_web::{web, HttpRequest};
use log::{error, info, warn};
use artcraft_api_defs::characters::edit_character::{EditCharacterRequest, EditCharacterResponse};
use mysql_queries::queries::characters::get_character_by_token::get_character_by_token;
use mysql_queries::queries::characters::update_character_name_and_description::update_character_name_and_description;
use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
use seedance2pro_client::requests::update_character::update_character::{update_character, UpdateCharacterArgs};
use crate::http_server::common_responses::common_web_error::CommonWebError;
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection;
use crate::state::server_state::ServerState;
/// Edit a character's name or description.
@@ -23,9 +29,151 @@ use crate::state::server_state::ServerState;
),
)]
pub async fn edit_character_handler(
_http_request: HttpRequest,
_request: Json<EditCharacterRequest>,
_server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<EditCharacterResponse>, CommonWebError> {
todo!()
http_request: HttpRequest,
request: Json<EditCharacterRequest>,
server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<EditCharacterResponse>, AdvancedCommonWebError> {
// --- Auth ---
let mut mysql_connection = server_state.mysql_pool.acquire().await?;
let user_session = require_user_session_using_connection(
&http_request,
&server_state.session_checker,
&mut mysql_connection,
).await?;
let user_token = &user_session.user_token;
let is_mod = user_session.is_mod();
// --- Look up character ---
let character = get_character_by_token(&request.token, &mut mysql_connection)
.await?
.ok_or_else(|| {
warn!("Character not found: {}", request.token);
AdvancedCommonWebError::NotFound
})?;
// --- Ownership check ---
let is_owner = character.maybe_creator_user_token
.as_ref()
.map(|owner| owner == user_token)
.unwrap_or(false);
if !is_owner && !is_mod {
warn!("User {} tried to edit character {} they don't own", user_token, request.token);
return Err(AdvancedCommonWebError::NotFound);
}
// --- Determine what to update ---
let new_name = resolve_name_update(&request.updated_name);
let description_update = resolve_description_update(&request.updated_description);
let has_name_change = new_name.is_some();
let has_description_change = !matches!(description_update, DescriptionUpdateType::NoUpdate);
if !has_name_change && !has_description_change {
return Ok(Json(EditCharacterResponse { success: true }));
}
// --- Compute final values ---
let final_name = new_name.unwrap_or_else(|| character.character_name.clone().unwrap_or_default());
let final_kinovi_name = if has_name_change { final_name.clone() } else {
character.kinovi_character_name.clone()
.or_else(|| character.character_name.clone())
.unwrap_or_default()
};
let final_description = match &description_update {
DescriptionUpdateType::NoUpdate => character.maybe_description.clone(),
DescriptionUpdateType::Nullify => None,
DescriptionUpdateType::Update(text) => Some(text.clone()),
};
// --- If renaming, update Kinovi first ---
if has_name_change {
if let Some(ref kinovi_id) = character.kinovi_character_id {
let session = Seedance2ProSession::from_cookies_string(
server_state.seedance2pro.cookies.clone()
);
update_character(UpdateCharacterArgs {
session: &session,
character_id: kinovi_id.clone(),
name: final_name.clone(),
description: final_description.clone().unwrap_or_default(),
host_override: None,
})
.await
.map_err(|err| {
error!("Error updating character on Kinovi: {:?}", err);
AdvancedCommonWebError::from_error(err)
})?;
info!("Updated character {} on Kinovi (name='{}')", kinovi_id, final_name);
}
}
// --- Update database ---
update_character_name_and_description(
&request.token,
&final_name,
&final_kinovi_name,
final_description.as_deref(),
&mut mysql_connection,
).await?;
info!("Updated character {} in database", request.token);
Ok(Json(EditCharacterResponse { success: true }))
}
// =============== Private helpers ===============
const MAX_NAME_LENGTH: usize = 50;
const MAX_DESCRIPTION_LENGTH: usize = 500;
enum DescriptionUpdateType {
NoUpdate,
Nullify,
Update(String),
}
/// Determine the new name, if any.
/// Returns None if the name should not be updated.
fn resolve_name_update(updated_name: &Option<String>) -> Option<String> {
let name = updated_name.as_ref()?;
let trimmed = name.trim();
if trimmed.is_empty() {
None
} else {
Some(truncate(trimmed, MAX_NAME_LENGTH))
}
}
/// Determine the description update type.
fn resolve_description_update(updated_description: &Option<String>) -> DescriptionUpdateType {
let desc = match updated_description.as_ref() {
None => return DescriptionUpdateType::NoUpdate,
Some(d) => d,
};
let trimmed = desc.trim();
if trimmed.is_empty() {
DescriptionUpdateType::Nullify
} else {
DescriptionUpdateType::Update(truncate(trimmed, MAX_DESCRIPTION_LENGTH))
}
}
fn truncate(s: &str, max_len: usize) -> String {
if s.len() <= max_len { s.to_string() } else { s[..max_len].to_string() }
}
crates/service/web/storyteller_web/src/http_server/endpoints/characters/get_character_handler.rs
+59 -31
View File
@@ -5,14 +5,17 @@ use actix_web::{web, HttpRequest};
use log::warn;
use artcraft_api_defs::characters::get_character::{GetCharacterDetails, GetCharacterPathInfo, GetCharacterResponse};
use artcraft_api_defs::common::responses::media_links::MediaLinks;
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use enums::common::generation::common_model_type::CommonModelType;
use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
use mysql_queries::queries::characters::get_character_by_token::get_character_by_token;
use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaFilesByTokensRecord};
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::media_files::MediaFileToken;
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder;
use crate::http_server::common_responses::common_web_error::CommonWebError;
use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
use crate::state::server_state::ServerState;
@@ -34,42 +37,67 @@ pub async fn get_character_handler(
http_request: HttpRequest,
path: Path<GetCharacterPathInfo>,
server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<GetCharacterResponse>, CommonWebError> {
// TODO: Replace with real character query. This is test data using a real media file (Ernest).
) -> Result<Json<GetCharacterResponse>, AdvancedCommonWebError> {
let mut mysql_connection = server_state.mysql_pool.acquire().await?;
let character = get_character_by_token(&path.character_token, &mut mysql_connection)
.await?
.ok_or_else(|| {
warn!("Character not found: {}", path.character_token);
AdvancedCommonWebError::NotFound
})?;
// --- Resolve media links ---
let media_domain = get_media_domain(&http_request);
let ernest_media_token = MediaFileToken::new_from_str("m_1997908e4tcbaj34wa0s5bvr4y4szt");
let maybe_links = match get_media_file(&ernest_media_token, false, &server_state.mysql_pool).await {
Ok(Some(record)) => {
let path = MediaFileBucketPath::from_object_hash(
&record.public_bucket_directory_hash,
record.maybe_public_bucket_prefix.as_deref(),
record.maybe_public_bucket_extension.as_deref(),
);
Some(MediaLinksBuilder::from_media_path_and_env(media_domain, server_state.server_environment, &path))
}
Ok(None) => {
warn!("Ernest media file not found in database");
None
}
Err(err) => {
warn!("Failed to look up Ernest media file: {:?}", err);
None
}
let mut media_tokens_to_lookup: Vec<MediaFileToken> = Vec::new();
if let Some(ref t) = character.maybe_avatar_media_token { media_tokens_to_lookup.push(t.clone()); }
if let Some(ref t) = character.maybe_full_image_media_token { media_tokens_to_lookup.push(t.clone()); }
if let Some(ref t) = character.maybe_original_upload_media_token { media_tokens_to_lookup.push(t.clone()); }
let media_records = if media_tokens_to_lookup.is_empty() {
vec![]
} else {
batch_get_media_files_by_tokens_with_connection(&mut mysql_connection, &media_tokens_to_lookup, true)
.await
.unwrap_or_else(|err| {
warn!("Failed to look up media files for character: {:?}", err);
vec![]
})
};
let character = GetCharacterDetails {
token: path.character_token.clone(),
models: vec![CommonModelType::Seedance2p0],
name: "Ernest".to_string(),
maybe_description: Some("Ernest P. Worrell".to_string()),
maybe_avatar: maybe_links.clone(),
maybe_full_image: maybe_links,
};
let maybe_avatar = resolve_media_links(&media_records, &character.maybe_avatar_media_token, media_domain, server_state.server_environment);
let maybe_full_image = resolve_media_links(&media_records, &character.maybe_full_image_media_token, media_domain, server_state.server_environment);
Ok(Json(GetCharacterResponse {
success: true,
character,
character: GetCharacterDetails {
token: character.token,
models: vec![CommonModelType::Seedance2p0],
name: character.character_name.unwrap_or_default(),
maybe_description: character.maybe_description,
maybe_avatar,
maybe_full_image,
},
}))
}
// =============== Private helpers ===============
fn resolve_media_links(
media_records: &[MediaFilesByTokensRecord],
maybe_token: &Option<MediaFileToken>,
media_domain: MediaDomain,
server_environment: server_environment::ServerEnvironment,
) -> Option<MediaLinks> {
let token = maybe_token.as_ref()?;
let record = media_records.iter().find(|r| &r.token == token)?;
let path = MediaFileBucketPath::from_object_hash(
&record.public_bucket_directory_hash,
record.maybe_public_bucket_prefix.as_deref(),
record.maybe_public_bucket_extension.as_deref(),
);
Some(MediaLinksBuilder::from_media_path_and_env(media_domain, server_environment, &path))
}
crates/service/web/storyteller_web/src/http_server/endpoints/characters/list_characters_handler.rs
+76 -43
View File
@@ -5,15 +5,18 @@ use actix_web::{web, HttpRequest};
use log::warn;
use artcraft_api_defs::characters::list_characters::{ListCharactersEntry, ListCharactersQuery, ListCharactersResponse};
use artcraft_api_defs::common::responses::media_links::MediaLinks;
use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
use enums::common::generation::common_model_type::CommonModelType;
use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens;
use tokens::tokens::characters::CharacterToken;
use mysql_queries::queries::characters::list_active_characters_for_user::list_active_characters_for_user;
use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaFilesByTokensRecord};
use tokens::tokens::media_files::MediaFileToken;
use crate::http_server::common_responses::advanced_common_web_error::AdvancedCommonWebError;
use crate::http_server::common_responses::media::media_domain::MediaDomain;
use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder;
use crate::http_server::common_responses::common_web_error::CommonWebError;
use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
use crate::http_server::web_utils::user_session::require_user_session_using_connection::require_user_session_using_connection;
use crate::state::server_state::ServerState;
/// List characters for the current session.
@@ -30,62 +33,92 @@ use crate::state::server_state::ServerState;
)]
pub async fn list_characters_handler(
http_request: HttpRequest,
_query: Query<ListCharactersQuery>,
query: Query<ListCharactersQuery>,
server_state: web::Data<Arc<ServerState>>,
) -> Result<Json<ListCharactersResponse>, CommonWebError> {
// TODO: Replace with real character queries. This is test data using real media files.
) -> Result<Json<ListCharactersResponse>, AdvancedCommonWebError> {
let mut mysql_connection = server_state.mysql_pool.acquire().await?;
let user_session = require_user_session_using_connection(
&http_request,
&server_state.session_checker,
&mut mysql_connection,
).await?;
let user_token = &user_session.user_token;
// --- Query characters ---
let result = list_active_characters_for_user(user_token, query.cursor, &mut mysql_connection)
.await?;
if result.characters.is_empty() {
return Ok(Json(ListCharactersResponse {
success: true,
characters: vec![],
next_cursor: None,
}));
}
// --- Resolve media links ---
let media_domain = get_media_domain(&http_request);
struct TestCharacter {
token: &'static str,
name: &'static str,
description: &'static str,
media_token: &'static str,
let mut media_tokens_to_lookup: Vec<MediaFileToken> = Vec::new();
for character in &result.characters {
if let Some(ref t) = character.maybe_avatar_media_token { media_tokens_to_lookup.push(t.clone()); }
if let Some(ref t) = character.maybe_full_image_media_token { media_tokens_to_lookup.push(t.clone()); }
if let Some(ref t) = character.maybe_original_upload_media_token { media_tokens_to_lookup.push(t.clone()); }
}
let test_characters = vec![
TestCharacter { token: "character_mock_ernest_001", name: "Ernest", description: "Ernest P. Worrell", media_token: "m_1997908e4tcbaj34wa0s5bvr4y4szt" },
TestCharacter { token: "character_mock_juno_002", name: "Juno", description: "Juno the corgi", media_token: "m_m1bz02z1kkzanxy6rb4vk1kvq9de9g" },
TestCharacter { token: "character_mock_mochi_003", name: "Mochi", description: "Mochi with glasses", media_token: "m_5y81rcnpnrbey55da6cc2s9z4d2f45" },
];
let media_records = if media_tokens_to_lookup.is_empty() {
vec![]
} else {
batch_get_media_files_by_tokens_with_connection(&mut mysql_connection, &media_tokens_to_lookup, false)
.await
.unwrap_or_else(|err| {
warn!("Failed to look up media files for characters: {:?}", err);
vec![]
})
};
let media_tokens: Vec<MediaFileToken> = test_characters.iter()
.map(|c| MediaFileToken::new_from_str(c.media_token))
.collect();
// --- Build response ---
let media_records = batch_get_media_files_by_tokens(&server_state.mysql_pool, &media_tokens, false)
.await
.unwrap_or_else(|err| {
warn!("Failed to look up media files for test characters: {:?}", err);
vec![]
});
let characters = test_characters.iter().map(|tc| {
let maybe_links = media_records.iter()
.find(|r| r.token.as_str() == tc.media_token)
.map(|r| {
let path = MediaFileBucketPath::from_object_hash(
&r.public_bucket_directory_hash,
r.maybe_public_bucket_prefix.as_deref(),
r.maybe_public_bucket_extension.as_deref(),
);
MediaLinksBuilder::from_media_path_and_env(media_domain, server_state.server_environment, &path)
});
let characters = result.characters.iter().map(|c| {
let maybe_avatar = resolve_media_links(&media_records, &c.maybe_avatar_media_token, media_domain, server_state.server_environment);
let maybe_full_image = resolve_media_links(&media_records, &c.maybe_full_image_media_token, media_domain, server_state.server_environment);
ListCharactersEntry {
token: CharacterToken::new_from_str(tc.token),
token: c.token.clone(),
models: vec![CommonModelType::Seedance2p0],
name: tc.name.to_string(),
maybe_description: Some(tc.description.to_string()),
maybe_avatar: maybe_links.clone(),
maybe_full_image: maybe_links,
name: c.character_name.clone().unwrap_or_default(),
maybe_description: c.maybe_description.clone(),
maybe_avatar,
maybe_full_image,
}
}).collect();
Ok(Json(ListCharactersResponse {
success: true,
characters,
next_cursor: None,
next_cursor: result.next_cursor,
}))
}
// =============== Private helpers ===============
fn resolve_media_links(
media_records: &[MediaFilesByTokensRecord],
maybe_token: &Option<MediaFileToken>,
media_domain: MediaDomain,
server_environment: server_environment::ServerEnvironment,
) -> Option<MediaLinks> {
let token = maybe_token.as_ref()?;
let record = media_records.iter().find(|r| &r.token == token)?;
let path = MediaFileBucketPath::from_object_hash(
&record.public_bucket_directory_hash,
record.maybe_public_bucket_prefix.as_deref(),
record.maybe_public_bucket_extension.as_deref(),
);
Some(MediaLinksBuilder::from_media_path_and_env(media_domain, server_environment, &path))
}
crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs
+54
View File
@@ -25,6 +25,7 @@ use enums::common::generation_provider::GenerationProvider;
use enums::common::visibility::Visibility;
use http_server_common::request::get_request_ip::get_request_ip;
use log::{error, info, warn};
use mysql_queries::queries::characters::batch_lookup_characters_by_token_for_prompting::batch_lookup_characters_by_token_for_prompting;
use mysql_queries::queries::generic_inference::seedance2pro::insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token::{
insert_generic_inference_job_for_seedance2pro_queue_with_apriori_job_token,
InsertGenericInferenceForSeedance2ProWithAprioriJobTokenArgs,
@@ -45,6 +46,8 @@ use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{
};
use seedance2pro_client::requests::upload_file::upload_file::{upload_file, UploadFileArgs};
use sqlx::Acquire;
use sqlx::MySql;
use tokens::tokens::characters::CharacterToken;
use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use tokens::tokens::media_files::MediaFileToken;
use url::Url;
@@ -142,6 +145,13 @@ pub async fn seedance_2p0_multi_function_video_gen_handler(
).await?
};
// --- Look up character tokens (if any) ---
let kinovi_character_ids = resolve_kinovi_character_ids(
request.reference_character_tokens.as_deref(),
&mut mysql_connection,
).await?;
// --- Insert idempotency token ---
insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
@@ -191,6 +201,7 @@ pub async fn seedance_2p0_multi_function_video_gen_handler(
resolution,
batch_count,
duration_seconds,
kinovi_character_ids.clone(),
).await;
match result {
@@ -212,6 +223,7 @@ pub async fn seedance_2p0_multi_function_video_gen_handler(
resolution,
batch_count,
duration_seconds,
kinovi_character_ids.clone(),
).await;
match result {
@@ -248,6 +260,7 @@ pub async fn seedance_2p0_multi_function_video_gen_handler(
resolution,
batch_count,
duration_seconds,
kinovi_character_ids,
).await;
match result {
@@ -480,6 +493,7 @@ fn estimate_cost_upfront(resolution: Resolution, batch_count: BatchCount, durati
reference_image_urls: None,
reference_video_urls: None,
reference_audio_urls: None,
character_ids: None,
use_face_blur_hack: None,
host_override: None,
};
@@ -495,6 +509,7 @@ async fn upload_and_generate(
resolution: Resolution,
batch_count: BatchCount,
duration_seconds: u8,
kinovi_character_ids: Option<Vec<String>>,
) -> Result<SeedanceGenerationResult, AdvancedCommonWebError> {
// --- Upload files to seedance2pro CDN ---
@@ -569,6 +584,7 @@ async fn upload_and_generate(
reference_image_urls,
reference_video_urls,
reference_audio_urls,
character_ids: kinovi_character_ids,
use_face_blur_hack: None,
host_override: None,
};
@@ -585,6 +601,44 @@ async fn upload_and_generate(
})
}
/// Resolve character tokens to Kinovi character IDs for prompting.
///
/// 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).
async fn resolve_kinovi_character_ids(
maybe_tokens: Option<&[CharacterToken]>,
connection: &mut sqlx::pool::PoolConnection<MySql>,
) -> Result<Option<Vec<String>>, AdvancedCommonWebError> {
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?;
if characters.len() != tokens.len() {
warn!(
"Not all character tokens were found: requested {}, found {}",
tokens.len(), characters.len(),
);
}
for character in &characters {
if !character.is_active {
warn!("Character {} is not yet active, skipping", character.token);
}
}
let ids: Vec<String> = characters.iter()
.filter(|c| c.is_active)
.filter_map(|c| c.kinovi_character_id.clone())
.collect();
if ids.is_empty() { Ok(None) } else { Ok(Some(ids)) }
}
/// Uploads a list of reference media tokens to seedance2pro, returning the resulting URLs.
/// Returns `None` if the token list is absent or empty.
async fn upload_reference_tokens_to_seedance2pro(
crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/utils/estimates/estimate_job_progress.rs
+1
View File
@@ -85,6 +85,7 @@ pub fn estimate_job_progress(job: &GenericInferenceJobStatus, maybe_args: Option
InferenceCategory::Mocap => 0,
InferenceCategory::VideoFilter => 0,
InferenceCategory::ConvertBvhToWorkflow => 0,
InferenceCategory::CharacterGeneration => percent(duration_seconds, 60*2),
InferenceCategory::SplatGeneration => percent(duration_seconds, 60*5),
InferenceCategory::DeprecatedField => 0, // TODO(bt,2024-07-16): Read job type instead.
};
frontend/package-lock.json
Generated
+85 -215
View File
File diff suppressed because it is too large Load Diff