mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-03 21:10:58 -05:00
Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2029524c77 | ||
|
|
0354b68f88 | ||
|
|
5b3327f919 | ||
|
|
34300089c8 | ||
|
|
9950dfebf0 | ||
|
|
2818831a66 | ||
|
|
8497a8c83a | ||
|
|
5fff16ee22 | ||
|
|
1c3810e5a5 | ||
|
|
5206a1d3e5 | ||
|
|
10f8297c1f | ||
|
|
edb771ccfb | ||
|
|
5979002f7e | ||
|
|
74e30c4ffb | ||
|
|
4061f00874 | ||
|
|
633003c43b | ||
|
|
957db2d07f | ||
|
|
b82a4e1599 | ||
|
|
bee790b952 | ||
|
|
a2d57e3685 | ||
|
|
9104faf806 | ||
|
|
b011319abd | ||
|
|
1c654bfafa | ||
|
|
a7c59f7c9b | ||
|
|
780bbbe9cf | ||
|
|
6e5cce20fb | ||
|
|
b12781056d |
+1
-1
@@ -120,7 +120,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -60,7 +60,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -70,7 +70,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -210,7 +210,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -220,7 +220,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+13
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `request_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `request_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
@@ -82,6 +82,16 @@
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 8,
|
||||
"name": "maybe_platform_type: enums::common::platform_type::PlatformType",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 64
|
||||
}
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
@@ -95,8 +105,9 @@
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
true
|
||||
]
|
||||
},
|
||||
"hash": "1ddb2207db50e2dbfb37d26c006bffe2d8f5fb011855d5a86d01f395c36df759"
|
||||
"hash": "1a0b60602debe525529f50566fc545f1cb4b77005f423a10464652be7fbfa839"
|
||||
}
|
||||
+1
-1
@@ -180,7 +180,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -50,7 +50,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -60,7 +60,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -210,7 +210,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -220,7 +220,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+14
-3
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n\n jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n\n jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
@@ -95,6 +95,16 @@
|
||||
},
|
||||
{
|
||||
"ordinal": 9,
|
||||
"name": "maybe_platform_type: enums::common::platform_type::PlatformType",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 64
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 10,
|
||||
"name": "created_at",
|
||||
"type_info": {
|
||||
"type": "Timestamp",
|
||||
@@ -104,7 +114,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 10,
|
||||
"ordinal": 11,
|
||||
"name": "updated_at",
|
||||
"type_info": {
|
||||
"type": "Timestamp",
|
||||
@@ -127,9 +137,10 @@
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
false,
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b"
|
||||
"hash": "38a1d7b676bb0987fc191bbc8bdeadf6174a19358dff40d9772b9d5824145bbc"
|
||||
}
|
||||
+14
-3
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n \n jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n \n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n \n jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n \n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`,\n\n jobs.created_at,\n jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
@@ -95,6 +95,16 @@
|
||||
},
|
||||
{
|
||||
"ordinal": 9,
|
||||
"name": "maybe_platform_type: enums::common::platform_type::PlatformType",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 64
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 10,
|
||||
"name": "created_at",
|
||||
"type_info": {
|
||||
"type": "Timestamp",
|
||||
@@ -104,7 +114,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 10,
|
||||
"ordinal": 11,
|
||||
"name": "updated_at",
|
||||
"type_info": {
|
||||
"type": "Timestamp",
|
||||
@@ -127,9 +137,10 @@
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
false,
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "2c98621c08055374fd09502c94ac40bb01d23fcea3f844cceea7446a5c0cb4dc"
|
||||
"hash": "3a846909a725eb776b4a4637dc64dcaf1ed70ad8891f9d012c7f3cdcb16a613e"
|
||||
}
|
||||
+2
-2
@@ -40,7 +40,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -50,7 +50,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+36
@@ -0,0 +1,36 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT DISTINCT\n subscription_namespace as `subscription_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n maybe_stripe_customer_id as `stripe_customer_id!`\n\nFROM user_subscriptions\n\nWHERE\n user_token = ?\n AND maybe_stripe_customer_id IS NOT NULL\n AND deleted_at IS NULL\nORDER BY subscription_namespace ASC, maybe_stripe_customer_id ASC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "subscription_namespace: enums::common::payments_namespace::PaymentsNamespace",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "stripe_customer_id!",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "MULTIPLE_KEY | BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 1020
|
||||
}
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Right": 1
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
true
|
||||
]
|
||||
},
|
||||
"hash": "516db34b6a642a2f7d7107f186905a79ad694c3c86f3078efc77bcaae7f39f3d"
|
||||
}
|
||||
+1
-1
@@ -180,7 +180,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
}
|
||||
],
|
||||
|
||||
+3
-3
@@ -1,12 +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 = ?,\n maybe_model_token = ?,\n\n maybe_input_source_token = ?,\n maybe_input_source_token_type = ?,\n\n maybe_download_url = ?,\n maybe_cover_image_media_file_token = ?,\n\n maybe_prompt_token = ?,\n maybe_wallet_ledger_entry_token = ?,\n\n maybe_raw_inference_text = ?,\n\n maybe_inference_args = ?,\n\n maybe_creator_user_token = ?,\n maybe_creator_anonymous_visitor_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n\n priority_level = ?,\n is_keepalive_required = ?,\n max_duration_seconds = ?,\n is_debug_request = ?,\n\n maybe_routing_tag = ?,\n\n maybe_debug_log_event_token = ?,\n\n frontend_failure_category = ?,\n failure_reason = ?,\n\n status = ?\n ",
|
||||
"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 = ?,\n maybe_model_token = ?,\n\n maybe_input_source_token = ?,\n maybe_input_source_token_type = ?,\n\n maybe_download_url = ?,\n maybe_cover_image_media_file_token = ?,\n\n maybe_prompt_token = ?,\n maybe_wallet_ledger_entry_token = ?,\n\n maybe_raw_inference_text = ?,\n\n maybe_inference_args = ?,\n\n maybe_creator_user_token = ?,\n maybe_creator_anonymous_visitor_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n\n platform_type = ?,\n\n maybe_external_third_party_cost_credits = ?,\n maybe_external_third_party_cost_usd_cents = ?,\n maybe_system_cost_credits = ?,\n maybe_system_cost_usd_cents = ?,\n\n priority_level = ?,\n is_keepalive_required = ?,\n max_duration_seconds = ?,\n is_debug_request = ?,\n\n maybe_routing_tag = ?,\n\n maybe_debug_log_event_token = ?,\n\n frontend_failure_category = ?,\n failure_reason = ?,\n\n status = ?\n ",
|
||||
"describe": {
|
||||
"columns": [],
|
||||
"parameters": {
|
||||
"Right": 30
|
||||
"Right": 35
|
||||
},
|
||||
"nullable": []
|
||||
},
|
||||
"hash": "161febbb30cf6c669a813fe036d405ef428422297440abd240482a6aae51f6f9"
|
||||
"hash": "5c67c3dd7f8bb6771c6b058a8cf6ffcc66b2be2bea41bd988070713173982dab"
|
||||
}
|
||||
+13
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `operation_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `operation_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
@@ -82,6 +82,16 @@
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 8,
|
||||
"name": "maybe_platform_type: enums::common::platform_type::PlatformType",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 64
|
||||
}
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
@@ -95,8 +105,9 @@
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
true
|
||||
]
|
||||
},
|
||||
"hash": "d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1"
|
||||
"hash": "5f24aeb12e5a78ffedd1c772c594b668188aaaf01f315a1c41c75610fdfc1b32"
|
||||
}
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -60,7 +60,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -70,7 +70,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -150,7 +150,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+7
-7
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n fmf.id as `membership_id: u64`,\n fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n mf.token as `media_file_token: MediaFileToken`,\n mf.media_class as `media_class: MediaFileClass`,\n mf.media_type as `media_type: MediaFileType`,\n\n mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n mf.public_bucket_directory_hash,\n mf.maybe_public_bucket_prefix,\n mf.maybe_public_bucket_extension,\n\n cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n mf.is_user_upload as `is_user_upload: bool`,\n mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n mf.maybe_title,\n mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n mf.maybe_origin_filename,\n\n mf.maybe_duration_millis,\n mf.maybe_frame_width,\n mf.maybe_frame_height,\n\n mf.created_at,\n mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n AND mf.user_deleted_at IS NULL\n AND mf.mod_deleted_at IS NULL\nORDER BY fmf.id DESC\nLIMIT ?\n ",
|
||||
"query": "\nSELECT\n mf.id as `media_file_id: u64`,\n fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n mf.token as `media_file_token: MediaFileToken`,\n mf.media_class as `media_class: MediaFileClass`,\n mf.media_type as `media_type: MediaFileType`,\n\n mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n mf.public_bucket_directory_hash,\n mf.maybe_public_bucket_prefix,\n mf.maybe_public_bucket_extension,\n\n cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n mf.is_user_upload as `is_user_upload: bool`,\n mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n mf.maybe_title,\n mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n mf.maybe_origin_filename,\n\n mf.maybe_duration_millis,\n mf.maybe_frame_width,\n mf.maybe_frame_height,\n\n mf.created_at,\n mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n AND mf.user_deleted_at IS NULL\n AND mf.mod_deleted_at IS NULL\nORDER BY mf.id DESC\nLIMIT ?\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "membership_id: u64",
|
||||
"name": "media_file_id: u64",
|
||||
"type_info": {
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL | UNIQUE_KEY | UNSIGNED | AUTO_INCREMENT",
|
||||
"flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
|
||||
"char_set": 63,
|
||||
"max_size": 20
|
||||
}
|
||||
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -200,7 +200,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 5
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -210,7 +210,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 5
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -263,5 +263,5 @@
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "88673127b54626dc38d28693e709dfaeced9a05300a26b3f3c52a17f28171c9a"
|
||||
"hash": "8aca9bc976b980ea1a3b3052bc8a45dd4d8db55c20fd1aede2a4415cc1395cf3"
|
||||
}
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -50,7 +50,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -60,7 +60,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -150,7 +150,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -30,7 +30,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -270,7 +270,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+3
-3
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\n INSERT INTO media_files\n SET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n is_user_upload = ?,\n is_intermediate_system_file = ?,\n\n origin_category = ?, \n origin_product_category = ?, \n maybe_origin_model_type = ?, \n maybe_origin_model_token = ?, \n maybe_origin_filename = ?,\n\n is_batch_generated = ?,\n maybe_batch_token = ?,\n\n maybe_mime_type = ?,\n file_size_bytes = ?,\n maybe_duration_millis = ?,\n maybe_audio_encoding = ?, \n maybe_video_encoding = ?, \n maybe_frame_width = ?, \n maybe_frame_height = ?,\n maybe_prompt_token = ?,\n checksum_sha2 = ?,\n \n maybe_engine_category = ?,\n\n maybe_title = ?,\n maybe_text_transcript = ?,\n\n maybe_scene_source_media_file_token = ?,\n\n public_bucket_directory_hash = ?, \n maybe_public_bucket_prefix = ?, \n maybe_public_bucket_extension = ?, \n\n maybe_creator_user_token = ?, \n maybe_creator_anonymous_visitor_token = ?, \n\n creator_ip_address = ?, \n creator_set_visibility = ?, \n\n maybe_creator_file_synthetic_id = ?, \n maybe_creator_category_synthetic_id = ?,\n\n extra_file_modification_info = ?,\n\n maybe_generation_provider = ?,\n\n maybe_cover_image_media_file_token = ?,\n\n maybe_mod_user_token = ?,\n is_generated_on_prem = ?,\n generated_by_worker = ?,\n generated_by_cluster = ?\n ",
|
||||
"query": "\n INSERT INTO media_files\n SET\n token = ?,\n\n media_class = ?,\n media_type = ?,\n\n is_user_upload = ?,\n is_intermediate_system_file = ?,\n\n origin_category = ?, \n origin_product_category = ?, \n maybe_origin_model_type = ?, \n maybe_origin_model_token = ?, \n maybe_origin_filename = ?,\n\n is_batch_generated = ?,\n maybe_batch_token = ?,\n\n maybe_mime_type = ?,\n file_size_bytes = ?,\n maybe_duration_millis = ?,\n maybe_audio_encoding = ?, \n maybe_video_encoding = ?, \n maybe_frame_width = ?, \n maybe_frame_height = ?,\n maybe_prompt_token = ?,\n checksum_sha2 = ?,\n \n maybe_engine_category = ?,\n\n maybe_title = ?,\n maybe_text_transcript = ?,\n\n maybe_scene_source_media_file_token = ?,\n\n public_bucket_directory_hash = ?, \n maybe_public_bucket_prefix = ?, \n maybe_public_bucket_extension = ?, \n\n maybe_creator_user_token = ?, \n maybe_creator_anonymous_visitor_token = ?, \n\n creator_ip_address = ?, \n creator_set_visibility = ?, \n\n maybe_creator_file_synthetic_id = ?, \n maybe_creator_category_synthetic_id = ?,\n\n extra_file_modification_info = ?,\n\n maybe_generation_provider = ?,\n\n platform_type = ?,\n\n maybe_cover_image_media_file_token = ?,\n\n maybe_mod_user_token = ?,\n is_generated_on_prem = ?,\n generated_by_worker = ?,\n generated_by_cluster = ?\n ",
|
||||
"describe": {
|
||||
"columns": [],
|
||||
"parameters": {
|
||||
"Right": 41
|
||||
"Right": 42
|
||||
},
|
||||
"nullable": []
|
||||
},
|
||||
"hash": "a4901f904aa1c00d9afc23faa7008816c6e1b653bd6ad9f0b6772e32000be544"
|
||||
"hash": "ad2ffbd9f48e52678a5c61817bec043bf1df4033463e5c5a18468c04af391e6a"
|
||||
}
|
||||
+1
-1
@@ -160,7 +160,7 @@
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 20
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+7
-7
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n fmf.id as `membership_id: u64`,\n fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n mf.token as `media_file_token: MediaFileToken`,\n mf.media_class as `media_class: MediaFileClass`,\n mf.media_type as `media_type: MediaFileType`,\n\n mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n mf.public_bucket_directory_hash,\n mf.maybe_public_bucket_prefix,\n mf.maybe_public_bucket_extension,\n\n cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n mf.is_user_upload as `is_user_upload: bool`,\n mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n mf.maybe_title,\n mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n mf.maybe_origin_filename,\n\n mf.maybe_duration_millis,\n mf.maybe_frame_width,\n mf.maybe_frame_height,\n\n mf.created_at,\n mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n AND mf.user_deleted_at IS NULL\n AND mf.mod_deleted_at IS NULL\n AND fmf.id < ?\nORDER BY fmf.id DESC\nLIMIT ?\n ",
|
||||
"query": "\nSELECT\n mf.id as `media_file_id: u64`,\n fmf.created_at as `added_to_folder_at: DateTime<Utc>`,\n\n mf.token as `media_file_token: MediaFileToken`,\n mf.media_class as `media_class: MediaFileClass`,\n mf.media_type as `media_type: MediaFileType`,\n\n mf.maybe_batch_token as `maybe_batch_token: BatchGenerationToken`,\n\n mf.public_bucket_directory_hash,\n mf.maybe_public_bucket_prefix,\n mf.maybe_public_bucket_extension,\n\n cover.public_bucket_directory_hash as `maybe_cover_public_bucket_directory_hash?`,\n cover.maybe_public_bucket_prefix as `maybe_cover_public_bucket_prefix?`,\n cover.maybe_public_bucket_extension as `maybe_cover_public_bucket_extension?`,\n\n mf.creator_set_visibility as `creator_set_visibility: Visibility`,\n mf.is_user_upload as `is_user_upload: bool`,\n mf.is_intermediate_system_file as `is_intermediate_system_file: bool`,\n\n mf.maybe_title,\n mf.maybe_prompt_token as `maybe_prompt_token: PromptToken`,\n mf.maybe_origin_filename,\n\n mf.maybe_duration_millis,\n mf.maybe_frame_width,\n mf.maybe_frame_height,\n\n mf.created_at,\n mf.updated_at\nFROM folder_media_files fmf\nJOIN media_files mf\n ON mf.token = fmf.media_file_token\nLEFT JOIN media_files cover\n ON cover.token = mf.maybe_cover_image_media_file_token\nWHERE fmf.folder_token = ?\n AND mf.user_deleted_at IS NULL\n AND mf.mod_deleted_at IS NULL\n AND mf.id < ?\nORDER BY mf.id DESC\nLIMIT ?\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "membership_id: u64",
|
||||
"name": "media_file_id: u64",
|
||||
"type_info": {
|
||||
"type": "LongLong",
|
||||
"flags": "NOT_NULL | UNIQUE_KEY | UNSIGNED | AUTO_INCREMENT",
|
||||
"flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
|
||||
"char_set": 63,
|
||||
"max_size": 20
|
||||
}
|
||||
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -200,7 +200,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 5
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -210,7 +210,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 5
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -263,5 +263,5 @@
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "d2a406bcf08f656fd602aa6ba1124a77d04ad874b15abafca300e8b381c7b211"
|
||||
"hash": "c0ba9f9aa3184b1cb3d714173b31e530e201a6c24afd29ad534cf7f3954c7316"
|
||||
}
|
||||
+1
-1
@@ -150,7 +150,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 3
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -180,7 +180,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+2
-2
@@ -180,7 +180,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "NOT_NULL",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+13
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `order_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.job_type = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"query": "\nSELECT\n jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n jobs.maybe_external_third_party_id as `order_id`,\n jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n jobs.creator_ip_address,\n jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`,\n jobs.platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n AND jobs.job_type = ?\n AND jobs.status NOT IN ('complete_success', 'complete_failure')\n AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
@@ -82,6 +82,16 @@
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 8,
|
||||
"name": "maybe_platform_type: enums::common::platform_type::PlatformType",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "BINARY",
|
||||
"char_set": 224,
|
||||
"max_size": 64
|
||||
}
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
@@ -95,8 +105,9 @@
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
true,
|
||||
true
|
||||
]
|
||||
},
|
||||
"hash": "a0002183d4d077b07bb0cd062ca95bf113d1564ce3195f0e62e531ce4297dd76"
|
||||
"hash": "ddbbd3886c00268edd3993508f635549fc8ddc877bb059fd58f14b8c07586fc9"
|
||||
}
|
||||
+1
-1
@@ -190,7 +190,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -140,7 +140,7 @@
|
||||
"type": "Long",
|
||||
"flags": "",
|
||||
"char_set": 63,
|
||||
"max_size": 10
|
||||
"max_size": 11
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
+47
@@ -0,0 +1,47 @@
|
||||
{
|
||||
"db_name": "MySQL",
|
||||
"query": "\nSELECT\n user_token as `user_token: tokens::tokens::users::UserToken`,\n payments_namespace as `payments_namespace: enums::common::payments_namespace::PaymentsNamespace`,\n stripe_customer_id\n\nFROM user_stripe_customer_links\n\nWHERE user_token = ?\nORDER BY id ASC\n ",
|
||||
"describe": {
|
||||
"columns": [
|
||||
{
|
||||
"ordinal": 0,
|
||||
"name": "user_token: tokens::tokens::users::UserToken",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 1,
|
||||
"name": "payments_namespace: enums::common::payments_namespace::PaymentsNamespace",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
|
||||
"char_set": 224,
|
||||
"max_size": 128
|
||||
}
|
||||
},
|
||||
{
|
||||
"ordinal": 2,
|
||||
"name": "stripe_customer_id",
|
||||
"type_info": {
|
||||
"type": "VarString",
|
||||
"flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
|
||||
"char_set": 224,
|
||||
"max_size": 1020
|
||||
}
|
||||
}
|
||||
],
|
||||
"parameters": {
|
||||
"Right": 1
|
||||
},
|
||||
"nullable": [
|
||||
false,
|
||||
false,
|
||||
false
|
||||
]
|
||||
},
|
||||
"hash": "ffb5717340f21f21693bfcade201bc055fb3fb8a26da8d0574e3de44b033586c"
|
||||
}
|
||||
Generated
+14
@@ -2377,6 +2377,20 @@ dependencies = [
|
||||
"tokio-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "comet_api_client"
|
||||
version = "0.0.1"
|
||||
dependencies = [
|
||||
"log",
|
||||
"reqwest 0.12.23",
|
||||
"serde",
|
||||
"serde_derive",
|
||||
"serde_json",
|
||||
"test_data",
|
||||
"tokio",
|
||||
"workspace-build-acceleration",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "compact_str"
|
||||
version = "0.7.1"
|
||||
|
||||
@@ -10,6 +10,7 @@ members = [
|
||||
"crates/api_clients/artcraft/artcraft_client",
|
||||
"crates/api_clients/artcraft/artcraft_router",
|
||||
"crates/api_clients/cloud_storage",
|
||||
"crates/api_clients/comet_api_client",
|
||||
"crates/api_clients/datadog_client",
|
||||
"crates/api_clients/fal_client",
|
||||
"crates/api_clients/google_drive_downloader",
|
||||
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
DROP COLUMN platform_type;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
ADD COLUMN platform_type VARCHAR(16) DEFAULT NULL;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE media_files
|
||||
DROP COLUMN platform_type;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE media_files
|
||||
ADD COLUMN platform_type VARCHAR(16) DEFAULT NULL;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
DROP COLUMN maybe_external_third_party_cost_credits;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
ADD COLUMN maybe_external_third_party_cost_credits INT(10) UNSIGNED DEFAULT NULL;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
DROP COLUMN maybe_external_third_party_cost_usd_cents;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
ADD COLUMN maybe_external_third_party_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
DROP COLUMN maybe_system_cost_credits;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
ADD COLUMN maybe_system_cost_credits INT(10) UNSIGNED DEFAULT NULL;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
DROP COLUMN maybe_system_cost_usd_cents;
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
-- noinspection SqlDialectInspectionForFile
|
||||
-- noinspection SqlNoDataSourceInspectionForFile
|
||||
-- noinspection SqlResolveForFile
|
||||
|
||||
ALTER TABLE generic_inference_jobs
|
||||
ADD COLUMN maybe_system_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL;
|
||||
@@ -56,6 +56,19 @@ CREATE TABLE generic_inference_jobs (
|
||||
-- service uses.
|
||||
maybe_external_third_party_id VARCHAR(64) DEFAULT NULL,
|
||||
|
||||
-- What the third-party service charges us for the job, in the service's
|
||||
-- own credit denomination (if it bills in credits).
|
||||
maybe_external_third_party_cost_credits INT(10) UNSIGNED DEFAULT NULL,
|
||||
|
||||
-- What the third-party service charges us for the job, in USD cents.
|
||||
maybe_external_third_party_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL,
|
||||
|
||||
-- What we charge the user for the job, in our own credits.
|
||||
maybe_system_cost_credits INT(10) UNSIGNED DEFAULT NULL,
|
||||
|
||||
-- What we charge the user for the job, in USD cents.
|
||||
maybe_system_cost_usd_cents INT(10) UNSIGNED DEFAULT NULL,
|
||||
|
||||
-- There is an index on this column.
|
||||
-- NB: See notes on inference_category. This is becoming a problematic field. We're using
|
||||
-- this to load the container spin-up arguments and dependencies, but the former is being
|
||||
@@ -208,6 +221,11 @@ CREATE TABLE generic_inference_jobs (
|
||||
-- Multiple debug_logs rows can share the same event token.
|
||||
maybe_debug_log_event_token VARCHAR(32) DEFAULT NULL,
|
||||
|
||||
-- The platform the enqueuing request came from ('web', 'desktop_app',
|
||||
-- 'curl', 'python_requests', 'postman'),
|
||||
-- inferred from the request's User-Agent header.
|
||||
platform_type VARCHAR(16) DEFAULT NULL,
|
||||
|
||||
-- ========== JOB SYSTEM DETAILS ==========
|
||||
|
||||
-- Jobs begin as "pending", then transition to other states.
|
||||
|
||||
@@ -65,6 +65,12 @@ CREATE TABLE media_files (
|
||||
-- What service provided the generation (if any).
|
||||
maybe_generation_provider VARCHAR(16) DEFAULT NULL,
|
||||
|
||||
-- The platform the creating request came from ('web', 'desktop_app',
|
||||
-- 'curl', 'python_requests', 'postman'),
|
||||
-- inferred from the request's User-Agent header. Copied from the originating
|
||||
-- generic_inference_jobs row for inference results.
|
||||
platform_type VARCHAR(16) DEFAULT NULL,
|
||||
|
||||
-- For inference that can be tied back to a model, the type of model.
|
||||
-- There are multiple indices on this column!
|
||||
-- DO NOT EXPOSE THIS TO USERS VIA THE API, as we may leak secrets in doing so.
|
||||
|
||||
@@ -64,6 +64,31 @@ pub struct FolderThumbnail {
|
||||
|
||||
/// Resizing template URL (with `{{width}}` / `{{height}}` placeholders)
|
||||
/// when the media class supports it. `None` for media classes without
|
||||
/// a thumbnail variant.
|
||||
/// a thumbnail variant. (Video media files instead have video previews,
|
||||
/// which, in turn, have their own thumbnail templates.)
|
||||
pub maybe_thumbnail_template: Option<String>,
|
||||
|
||||
/// Video preview images (still and animated gif) for mp4 video files.
|
||||
/// These are only set for video media files.
|
||||
pub maybe_video_previews: Option<FolderThumbnailVideoPreviews>,
|
||||
}
|
||||
|
||||
/// Video preview images for a video media file referenced by a folder.
|
||||
/// Mirrors the shape of `MediaLinks`' video previews, but is its own type
|
||||
/// so the folder wire shape can evolve independently.
|
||||
#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
|
||||
pub struct FolderThumbnailVideoPreviews {
|
||||
/// A static single frame preview image of the video.
|
||||
pub still: Url,
|
||||
|
||||
/// An animated gif preview of the video.
|
||||
pub animated: Url,
|
||||
|
||||
/// A template used to construct the still thumbnail URL.
|
||||
/// Replace the string `{WIDTH}` with the desired width.
|
||||
pub still_thumbnail_template: String,
|
||||
|
||||
/// A template used to construct the animated thumbnail URL.
|
||||
/// Replace the string `{WIDTH}` with the desired width.
|
||||
pub animated_thumbnail_template: String,
|
||||
}
|
||||
|
||||
@@ -2,5 +2,6 @@ pub mod alerts;
|
||||
pub mod jobs;
|
||||
pub mod user;
|
||||
pub mod user_referrals;
|
||||
pub mod user_stripe_data;
|
||||
pub mod wallet_ledger_entries;
|
||||
pub mod wallets;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
pub mod moderator_get_user_stripe_customer_ids;
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
use enums::common::payments_namespace::PaymentsNamespace;
|
||||
use serde_derive::{Deserialize, Serialize};
|
||||
use tokens::tokens::users::UserToken;
|
||||
use utoipa::ToSchema;
|
||||
|
||||
pub const MODERATOR_GET_USER_STRIPE_CUSTOMER_IDS_PATH: &str =
|
||||
"/v1/moderation/user_stripe_data/{user_token}/customer_ids";
|
||||
|
||||
#[derive(Deserialize, ToSchema)]
|
||||
pub struct ModeratorGetUserStripeCustomerIdsPathInfo {
|
||||
pub user_token: UserToken,
|
||||
}
|
||||
|
||||
#[derive(Serialize, ToSchema)]
|
||||
pub struct ModeratorGetUserStripeCustomerIdsResponse {
|
||||
pub success: bool,
|
||||
|
||||
/// All stripe customer ids we have on file for the user, across payments
|
||||
/// namespaces. A user may have zero or several: a customer link and/or
|
||||
/// subscriptions per namespace (eg. artcraft), plus legacy fakeyou
|
||||
/// subscriptions. The same customer id can appear once per source.
|
||||
pub customer_ids: Vec<ModeratorUserStripeCustomerIdEntry>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, ToSchema)]
|
||||
pub struct ModeratorUserStripeCustomerIdEntry {
|
||||
pub stripe_customer_id: String,
|
||||
pub payments_namespace: PaymentsNamespace,
|
||||
pub source: ModeratorStripeCustomerIdSource,
|
||||
|
||||
/// Link to the customer in the Stripe dashboard for the namespace's account.
|
||||
pub stripe_dashboard_url: String,
|
||||
}
|
||||
|
||||
/// Which table the customer id was found in.
|
||||
#[derive(Serialize, ToSchema)]
|
||||
#[serde(rename_all = "snake_case")]
|
||||
pub enum ModeratorStripeCustomerIdSource {
|
||||
/// From the `user_stripe_customer_links` table (1:1 per namespace).
|
||||
CustomerLink,
|
||||
/// From the user's rows in the `user_subscriptions` table.
|
||||
Subscription,
|
||||
}
|
||||
+27
-3
@@ -141,21 +141,45 @@ mod tests {
|
||||
fn batch_1_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::One }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(1);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 1: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_2_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::Two }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(2);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 2: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_4_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7CostState { batch_count: KinoviMidjourneyBatchCount::Four }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(4);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 4: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+27
-3
@@ -93,21 +93,45 @@ mod tests {
|
||||
fn batch_1_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::One }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(1);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 1: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_2_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Two }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(2);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 2: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_4_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Four }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(4);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 4: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+27
-3
@@ -93,21 +93,45 @@ mod tests {
|
||||
fn batch_1_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::One }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(1), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(1);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 1: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_2_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Two }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(2), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(2);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 2: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_4_matches_kinovi() {
|
||||
let kinovi = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Four }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost_cents(4), kinovi.cost_in_usd_cents.unwrap());
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost) while this artcraft user price rounds to
|
||||
// nearest — kinovi may exceed it by at most one cent.
|
||||
let artcraft_cents = cost_cents(4);
|
||||
let kinovi_cents = kinovi.cost_in_usd_cents.unwrap();
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"batch 4: artcraft={artcraft_cents}, kinovi={kinovi_cents}",
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+5
-4
@@ -37,8 +37,9 @@ impl KinoviMidjourney7CostState {
|
||||
reference_image_urls: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits() as u64;
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
ImageGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
@@ -93,13 +94,13 @@ mod tests {
|
||||
#[test]
|
||||
fn batch_one_is_six_cents() {
|
||||
// 12 / 193 × 100 = 6.21 → 6¢
|
||||
assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::One), 6);
|
||||
assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::One), 7); // rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn batch_two_is_twelve_cents() {
|
||||
// 24 / 193 × 100 = 12.44 → 12¢
|
||||
assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Two), 12);
|
||||
assert_eq!(usd_cents_for(KinoviMidjourneyBatchCount::Two), 13); // rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+5
-4
@@ -35,8 +35,9 @@ impl KinoviMidjourney7NijiCostState {
|
||||
reference_image_urls: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits() as u64;
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
ImageGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
@@ -59,7 +60,7 @@ mod tests {
|
||||
let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::One }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost.cost_in_credits, Some(12));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(6));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(7)); // 1200/193 = 6.22 -> rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -67,7 +68,7 @@ mod tests {
|
||||
let cost = KinoviMidjourney7NijiCostState { batch_count: KinoviMidjourneyBatchCount::Two }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost.cost_in_credits, Some(24));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(12));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(13)); // 2400/193 = 12.44 -> rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+5
-4
@@ -35,8 +35,9 @@ impl KinoviMidjourney8CostState {
|
||||
reference_image_urls: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits() as u64;
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
ImageGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
@@ -59,7 +60,7 @@ mod tests {
|
||||
let cost = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::One }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost.cost_in_credits, Some(12));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(6));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(7)); // 1200/193 = 6.22 -> rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -67,7 +68,7 @@ mod tests {
|
||||
let cost = KinoviMidjourney8CostState { batch_count: KinoviMidjourneyBatchCount::Two }
|
||||
.estimate_cost();
|
||||
assert_eq!(cost.cost_in_credits, Some(24));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(12));
|
||||
assert_eq!(cost.cost_in_usd_cents, Some(13)); // 2400/193 = 12.44 -> rounds UP
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+10
-4
@@ -234,10 +234,16 @@ mod tests {
|
||||
.estimate_cost()
|
||||
.expect("kinovi estimate_cost");
|
||||
|
||||
assert_eq!(
|
||||
artcraft_cost.cost_in_usd_cents, kinovi_cost.cost_in_usd_cents,
|
||||
"USD cents mismatch: res={:?} dur={}s batch={}",
|
||||
res, dur, batch,
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost), while the artcraft user-facing price
|
||||
// here rounds to nearest — so kinovi may exceed artcraft by at
|
||||
// most one cent.
|
||||
let artcraft_cents = artcraft_cost.cost_in_usd_cents.expect("artcraft cents");
|
||||
let kinovi_cents = kinovi_cost.cost_in_usd_cents.expect("kinovi cents");
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"USD cents mismatch: res={:?} dur={}s batch={} (artcraft={}, kinovi={})",
|
||||
res, dur, batch, artcraft_cents, kinovi_cents,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+10
-4
@@ -248,10 +248,16 @@ mod tests {
|
||||
.estimate_cost()
|
||||
.expect("kinovi estimate_cost");
|
||||
|
||||
assert_eq!(
|
||||
artcraft_cost.cost_in_usd_cents, kinovi_cost.cost_in_usd_cents,
|
||||
"USD cents mismatch: res={:?} dur={}s batch={}",
|
||||
res, dur, batch,
|
||||
// NB: The kinovi provider estimate rounds fractional cents UP
|
||||
// (KinoviGenerationCost), while the artcraft user-facing price
|
||||
// here rounds to nearest — so kinovi may exceed artcraft by at
|
||||
// most one cent.
|
||||
let artcraft_cents = artcraft_cost.cost_in_usd_cents.expect("artcraft cents");
|
||||
let kinovi_cents = kinovi_cost.cost_in_usd_cents.expect("kinovi cents");
|
||||
assert!(
|
||||
kinovi_cents == artcraft_cents || kinovi_cents == artcraft_cents + 1,
|
||||
"USD cents mismatch: res={:?} dur={}s batch={} (artcraft={}, kinovi={})",
|
||||
res, dur, batch, artcraft_cents, kinovi_cents,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-5
@@ -42,11 +42,12 @@ impl KinoviHappyHorse1p0CostState {
|
||||
start_frame_url: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits();
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
VideoGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits as u64),
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
cost_in_usd_cents: Some(cost_in_usd_cents),
|
||||
is_free: false,
|
||||
is_unlimited: false,
|
||||
@@ -98,9 +99,9 @@ mod tests {
|
||||
#[test]
|
||||
fn usd_cents_720p() {
|
||||
// 165 credits / 193 * 100 = 85.49 → 85¢
|
||||
assert_eq!(usd_cents(None, 5, None), 85);
|
||||
assert_eq!(usd_cents(None, 5, None), 86); // 16500/193 = 85.49 -> rounds UP
|
||||
// 495 credits / 193 * 100 = 256.48 → 256¢
|
||||
assert_eq!(usd_cents(None, 15, None), 256);
|
||||
assert_eq!(usd_cents(None, 15, None), 257); // 49500/193 = 256.48 -> rounds UP
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+34
-22
@@ -46,23 +46,31 @@ impl KinoviSeedance2p0CostState {
|
||||
duration_seconds: self.duration_seconds,
|
||||
batch_count: self.batch_count,
|
||||
|
||||
// PRESENCE of reference videos changes the price (per-second
|
||||
// surcharge); the URL contents don't.
|
||||
reference_video_urls: if self.has_video_reference {
|
||||
Some(vec!["pricing-placeholder".to_string()])
|
||||
} else {
|
||||
None
|
||||
},
|
||||
|
||||
// No impact on price
|
||||
prompt: String::new(),
|
||||
aspect_ratio: None,
|
||||
start_frame_url: None,
|
||||
end_frame_url: None,
|
||||
reference_image_urls: None,
|
||||
reference_video_urls: None,
|
||||
reference_audio_urls: None,
|
||||
character_ids: None,
|
||||
use_face_blur_hack: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits();
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
VideoGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits as u64),
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
cost_in_usd_cents: Some(cost_in_usd_cents),
|
||||
is_free: false,
|
||||
is_unlimited: false,
|
||||
@@ -97,16 +105,16 @@ mod tests {
|
||||
fn cost_720p_batch_1() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 83);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 104);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 6, KinoviBatchCount::One), 124);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 7, KinoviBatchCount::One), 145);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 207);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 6, KinoviBatchCount::One), 125);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 7, KinoviBatchCount::One), 146);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 208);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 311);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_720p_batch_2() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::Two), 166);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 207);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 208);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::Two), 622);
|
||||
}
|
||||
|
||||
@@ -125,7 +133,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn cost_480p_batch_1() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 31);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 32);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 39);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 78);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 117);
|
||||
@@ -138,7 +146,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn cost_480p_batch_4() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 155);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 156);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -150,14 +158,14 @@ mod tests {
|
||||
#[test]
|
||||
fn cost_1080p_batch_1() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 4, KinoviBatchCount::One), 187);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::One), 233);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 10, KinoviBatchCount::One), 466);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 15, KinoviBatchCount::One), 699);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::One), 234);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 10, KinoviBatchCount::One), 467);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 15, KinoviBatchCount::One), 700);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_1080p_batch_2() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Two), 466);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::TenEightyP, 5, KinoviBatchCount::Two), 467);
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -202,7 +210,7 @@ mod tests {
|
||||
// -- Video reference does NOT affect cost (yet) --
|
||||
|
||||
#[test]
|
||||
fn video_reference_does_not_affect_cost() {
|
||||
fn video_reference_adds_surcharge() {
|
||||
let base = KinoviSeedance2p0CostState {
|
||||
resolution: Some(KinoviOutputResolution::SevenTwentyP),
|
||||
duration_seconds: 5,
|
||||
@@ -211,8 +219,10 @@ mod tests {
|
||||
};
|
||||
let without = base.estimate_cost();
|
||||
let with = KinoviSeedance2p0CostState { has_video_reference: true, ..base }.estimate_cost();
|
||||
assert_eq!(without.cost_in_usd_cents, with.cost_in_usd_cents);
|
||||
assert_eq!(without.cost_in_credits, with.cost_in_credits);
|
||||
// 720p surcharge is +8 credits/s: 200 -> 240 credits (24000/193 = 124.35 -> 125 cents).
|
||||
assert_eq!(without.cost_in_credits, Some(200));
|
||||
assert_eq!(with.cost_in_credits, Some(240));
|
||||
assert_eq!(with.cost_in_usd_cents, Some(125));
|
||||
}
|
||||
|
||||
// ── from_request() tests ──
|
||||
@@ -250,7 +260,7 @@ mod tests {
|
||||
fn from_request_1080p_batch_2() {
|
||||
let req = make_request_state(Some(KinoviOutputResolution::TenEightyP), 5, KinoviBatchCount::Two, false);
|
||||
let cost = KinoviSeedance2p0CostState::from_request(&req);
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(466));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(467));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -258,8 +268,9 @@ mod tests {
|
||||
let req = make_request_state(Some(KinoviOutputResolution::SevenTwentyP), 5, KinoviBatchCount::One, true);
|
||||
let cost = KinoviSeedance2p0CostState::from_request(&req);
|
||||
assert!(cost.has_video_reference);
|
||||
// Video refs don't affect cost yet
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
|
||||
// Video refs add a +8 credits/s surcharge at 720p: 240 credits -> 125 cents.
|
||||
assert_eq!(cost.estimate_cost().cost_in_credits, Some(240));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(125));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -308,8 +319,9 @@ mod tests {
|
||||
let draft = make_draft(5, 1, None, true);
|
||||
let cost = KinoviSeedance2p0CostState::from_draft(&draft);
|
||||
assert!(cost.has_video_reference);
|
||||
// Video refs don't affect cost yet
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(104));
|
||||
// Video refs add a +8 credits/s surcharge at 720p: 240 credits -> 125 cents.
|
||||
assert_eq!(cost.estimate_cost().cost_in_credits, Some(240));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(125));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
+33
-21
@@ -46,23 +46,31 @@ impl KinoviSeedance2p0FastCostState {
|
||||
duration_seconds: self.duration_seconds,
|
||||
batch_count: self.batch_count,
|
||||
|
||||
// PRESENCE of reference videos changes the price (per-second
|
||||
// surcharge); the URL contents don't.
|
||||
reference_video_urls: if self.has_video_reference {
|
||||
Some(vec!["pricing-placeholder".to_string()])
|
||||
} else {
|
||||
None
|
||||
},
|
||||
|
||||
// No impact on price
|
||||
prompt: String::new(),
|
||||
aspect_ratio: None,
|
||||
start_frame_url: None,
|
||||
end_frame_url: None,
|
||||
reference_image_urls: None,
|
||||
reference_video_urls: None,
|
||||
reference_audio_urls: None,
|
||||
character_ids: None,
|
||||
use_face_blur_hack: None,
|
||||
};
|
||||
|
||||
let cost_in_credits = pricing_request.estimate_credits();
|
||||
let cost_in_usd_cents = pricing_request.estimate_cost_in_usd_cents();
|
||||
let costs = pricing_request.calculate_costs();
|
||||
let cost_in_credits = costs.kinovi_credits;
|
||||
let cost_in_usd_cents = costs.usd_cents_rounded_up;
|
||||
|
||||
VideoGenerationCostEstimate {
|
||||
cost_in_credits: Some(cost_in_credits as u64),
|
||||
cost_in_credits: Some(cost_in_credits),
|
||||
cost_in_usd_cents: Some(cost_in_usd_cents),
|
||||
is_free: false,
|
||||
is_unlimited: false,
|
||||
@@ -99,20 +107,20 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn cost_720p_batch_1() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 58);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 4, KinoviBatchCount::One), 59);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::One), 73);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 145);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 10, KinoviBatchCount::One), 146);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 15, KinoviBatchCount::One), 218);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_720p_batch_2() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 145);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Two), 146);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_720p_batch_4() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 290);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::SevenTwentyP, 5, KinoviBatchCount::Four), 291);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -123,8 +131,8 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn cost_480p_batch_1() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 29);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 36);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 4, KinoviBatchCount::One), 30);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::One), 37);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 10, KinoviBatchCount::One), 73);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 15, KinoviBatchCount::One), 109);
|
||||
}
|
||||
@@ -136,7 +144,7 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn cost_480p_batch_4() {
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 145);
|
||||
assert_eq!(usd_cents(KinoviOutputResolution::FourEightyP, 5, KinoviBatchCount::Four), 146);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -174,7 +182,7 @@ mod tests {
|
||||
// -- Video reference does NOT affect cost (yet) --
|
||||
|
||||
#[test]
|
||||
fn video_reference_does_not_affect_cost() {
|
||||
fn video_reference_adds_surcharge() {
|
||||
let base = KinoviSeedance2p0FastCostState {
|
||||
resolution: Some(KinoviOutputResolution::SevenTwentyP),
|
||||
duration_seconds: 5,
|
||||
@@ -183,8 +191,10 @@ mod tests {
|
||||
};
|
||||
let without = base.estimate_cost();
|
||||
let with = KinoviSeedance2p0FastCostState { has_video_reference: true, ..base }.estimate_cost();
|
||||
assert_eq!(without.cost_in_usd_cents, with.cost_in_usd_cents);
|
||||
assert_eq!(without.cost_in_credits, with.cost_in_credits);
|
||||
// Fast 720p surcharge is +6 credits/s: 140 -> 170 credits (17000/193 = 88.08 -> 89 cents).
|
||||
assert_eq!(without.cost_in_credits, Some(140));
|
||||
assert_eq!(with.cost_in_credits, Some(170));
|
||||
assert_eq!(with.cost_in_usd_cents, Some(89));
|
||||
}
|
||||
|
||||
// ── from_request() tests ──
|
||||
@@ -215,7 +225,7 @@ mod tests {
|
||||
fn from_request_480p() {
|
||||
let req = make_request_state(Some(KinoviOutputResolution::FourEightyP), 5, KinoviBatchCount::One, false);
|
||||
let cost = KinoviSeedance2p0FastCostState::from_request(&req);
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(36));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(37));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -223,8 +233,9 @@ mod tests {
|
||||
let req = make_request_state(Some(KinoviOutputResolution::SevenTwentyP), 5, KinoviBatchCount::One, true);
|
||||
let cost = KinoviSeedance2p0FastCostState::from_request(&req);
|
||||
assert!(cost.has_video_reference);
|
||||
// Video refs don't affect cost yet
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
|
||||
// Video refs add a +6 credits/s surcharge at 720p: 170 credits -> 89 cents.
|
||||
assert_eq!(cost.estimate_cost().cost_in_credits, Some(170));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(89));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -256,7 +267,7 @@ mod tests {
|
||||
let draft = make_draft(5, 1, Some(RouterResolution::FourEightyP), false);
|
||||
let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
|
||||
assert!(matches!(cost.resolution, Some(KinoviOutputResolution::FourEightyP)));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(36));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(37));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -264,8 +275,9 @@ mod tests {
|
||||
let draft = make_draft(5, 1, None, true);
|
||||
let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
|
||||
assert!(cost.has_video_reference);
|
||||
// Video refs don't affect cost yet
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(73));
|
||||
// Video refs add a +6 credits/s surcharge at 720p: 170 credits -> 89 cents.
|
||||
assert_eq!(cost.estimate_cost().cost_in_credits, Some(170));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(89));
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -281,7 +293,7 @@ mod tests {
|
||||
let cost = KinoviSeedance2p0FastCostState::from_draft(&draft);
|
||||
assert_eq!(cost.duration_seconds, 15);
|
||||
assert!(matches!(cost.batch_count, Some(KinoviBatchCount::Two)));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(435));
|
||||
assert_eq!(cost.estimate_cost().cost_in_usd_cents, Some(436));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
[package]
|
||||
name = "comet_api_client"
|
||||
edition = "2024"
|
||||
version = "0.0.1"
|
||||
publish = false
|
||||
|
||||
[package.metadata.cargo-udeps.ignore]
|
||||
normal = ["workspace-build-acceleration"]
|
||||
|
||||
[lib]
|
||||
name = "comet_api_client"
|
||||
path = "src/lib.rs"
|
||||
|
||||
[dependencies]
|
||||
# Workspace hack (faster compile times)
|
||||
workspace-build-acceleration.workspace = true
|
||||
|
||||
# External
|
||||
log.workspace = true
|
||||
# `multipart` is enabled on top of the workspace feature set because the
|
||||
# CometAPI video creation endpoint takes `multipart/form-data` (the
|
||||
# `input_reference` image fields are binary parts).
|
||||
reqwest = { workspace = true, features = ["multipart"] }
|
||||
serde.workspace = true
|
||||
serde_derive.workspace = true
|
||||
serde_json.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
test_data = { path = "../../testing/test_data" }
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
@@ -0,0 +1,17 @@
|
||||
/// A CometAPI key used for Bearer token authentication.
|
||||
#[derive(Clone)]
|
||||
pub struct CometApiKey(pub String);
|
||||
|
||||
impl CometApiKey {
|
||||
pub fn new(api_key: String) -> Self {
|
||||
Self(api_key.trim().to_string())
|
||||
}
|
||||
|
||||
pub fn from_str(api_key: &str) -> Self {
|
||||
Self(api_key.trim().to_string())
|
||||
}
|
||||
|
||||
pub fn as_str(&self) -> &str {
|
||||
&self.0
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
pub mod comet_api_key;
|
||||
@@ -0,0 +1,157 @@
|
||||
use reqwest::StatusCode;
|
||||
|
||||
use crate::error::comet_bad_request_api_error::CometBadRequestApiError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::error::comet_generic_api_error::CometGenericApiError;
|
||||
use crate::error::comet_specific_api_error::CometSpecificApiError;
|
||||
|
||||
/// Marker CometAPI returns from `GET /v1/videos/{id}` for unknown task ids.
|
||||
const TASK_NOT_EXIST_MARKER: &str = "task_not_exist";
|
||||
|
||||
/// Categorize a non-success response from the video creation endpoint
|
||||
/// (`POST /v1/videos`).
|
||||
///
|
||||
/// Per the docs, 400s from this endpoint mean the request itself was invalid
|
||||
/// (missing prompt, out-of-range duration, image input on an unsupported
|
||||
/// model) — the caller's fault, surfaced as [`CometBadRequestApiError`].
|
||||
pub fn categorize_create_video_error(
|
||||
status_code: StatusCode,
|
||||
body: String,
|
||||
) -> CometError {
|
||||
if status_code == StatusCode::UNAUTHORIZED {
|
||||
return CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body: body }.into();
|
||||
}
|
||||
|
||||
if status_code == StatusCode::BAD_REQUEST {
|
||||
return CometBadRequestApiError::InvalidRequestParameters { raw_body: body }.into();
|
||||
}
|
||||
|
||||
CometGenericApiError::UncategorizedBadResponseWithStatusAndBody {
|
||||
status_code,
|
||||
body,
|
||||
}.into()
|
||||
}
|
||||
|
||||
/// Categorize a non-success response from the poll endpoint
|
||||
/// (`GET /v1/videos/{id}`).
|
||||
///
|
||||
/// Unlike the creation endpoint, a 400 here means the task id is unknown
|
||||
/// ("task_not_exist") — a specific, well-known cause rather than a
|
||||
/// user-facing bad request.
|
||||
pub fn categorize_get_video_task_error(
|
||||
status_code: StatusCode,
|
||||
body: String,
|
||||
task_id: &str,
|
||||
) -> CometError {
|
||||
if status_code == StatusCode::UNAUTHORIZED {
|
||||
return CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body: body }.into();
|
||||
}
|
||||
|
||||
if status_code == StatusCode::BAD_REQUEST && body.contains(TASK_NOT_EXIST_MARKER) {
|
||||
return CometSpecificApiError::TaskNotFound {
|
||||
task_id: task_id.to_string(),
|
||||
raw_body: body,
|
||||
}.into();
|
||||
}
|
||||
|
||||
CometGenericApiError::UncategorizedBadResponseWithStatusAndBody {
|
||||
status_code,
|
||||
body,
|
||||
}.into()
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
mod create_video_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn bad_request_is_caller_fault() {
|
||||
let body = r#"{"error":{"message":"seconds must be between 4 and 15","type":"invalid_request_error"}}"#.to_string();
|
||||
|
||||
let error = categorize_create_video_error(StatusCode::BAD_REQUEST, body.clone());
|
||||
|
||||
match error {
|
||||
CometError::ApiBadRequest(CometBadRequestApiError::InvalidRequestParameters { raw_body }) => {
|
||||
assert_eq!(raw_body, body);
|
||||
}
|
||||
other => panic!("Expected InvalidRequestParameters, got: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unauthorized_is_specific() {
|
||||
let body = r#"{"error":{"message":"invalid token","type":"cometapi_error"}}"#.to_string();
|
||||
|
||||
let error = categorize_create_video_error(StatusCode::UNAUTHORIZED, body);
|
||||
|
||||
match error {
|
||||
CometError::ApiSpecific(CometSpecificApiError::UnauthorizedInvalidApiKey { raw_body }) => {
|
||||
assert!(raw_body.contains("invalid token"));
|
||||
}
|
||||
other => panic!("Expected UnauthorizedInvalidApiKey, got: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn server_errors_fall_back_to_uncategorized() {
|
||||
let error = categorize_create_video_error(
|
||||
StatusCode::BAD_GATEWAY,
|
||||
"upstream timeout".to_string(),
|
||||
);
|
||||
|
||||
match &error {
|
||||
CometError::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { status_code, .. }) => {
|
||||
assert_eq!(*status_code, StatusCode::BAD_GATEWAY);
|
||||
}
|
||||
other => panic!("Expected UncategorizedBadResponseWithStatusAndBody, got: {:?}", other),
|
||||
}
|
||||
assert!(error.is_having_downtime_issues());
|
||||
}
|
||||
}
|
||||
|
||||
mod get_video_task_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn task_not_exist_is_task_not_found() {
|
||||
let body = r#"{"error":{"message":"task_not_exist","type":"cometapi_error"}}"#.to_string();
|
||||
|
||||
let error = categorize_get_video_task_error(StatusCode::BAD_REQUEST, body, "task_abc123");
|
||||
|
||||
match error {
|
||||
CometError::ApiSpecific(CometSpecificApiError::TaskNotFound { task_id, raw_body }) => {
|
||||
assert_eq!(task_id, "task_abc123");
|
||||
assert!(raw_body.contains("task_not_exist"));
|
||||
}
|
||||
other => panic!("Expected TaskNotFound, got: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn other_bad_requests_fall_back_to_uncategorized() {
|
||||
let body = r#"{"error":{"message":"something else"}}"#.to_string();
|
||||
|
||||
let error = categorize_get_video_task_error(StatusCode::BAD_REQUEST, body, "task_abc123");
|
||||
|
||||
match error {
|
||||
CometError::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { .. }) => {}
|
||||
other => panic!("Expected UncategorizedBadResponseWithStatusAndBody, got: {:?}", other),
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unauthorized_is_specific() {
|
||||
let body = r#"{"error":{"message":"invalid token"}}"#.to_string();
|
||||
|
||||
let error = categorize_get_video_task_error(StatusCode::UNAUTHORIZED, body, "task_abc123");
|
||||
|
||||
match error {
|
||||
CometError::ApiSpecific(CometSpecificApiError::UnauthorizedInvalidApiKey { .. }) => {}
|
||||
other => panic!("Expected UnauthorizedInvalidApiKey, got: {:?}", other),
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
/// These represent known "400s" that are the fault of the client sending a
|
||||
/// bad request. They should surface to the end user as 400s.
|
||||
#[derive(Debug)]
|
||||
pub enum CometBadRequestApiError {
|
||||
/// The video creation request was rejected for invalid parameters (eg.
|
||||
/// missing prompt, out-of-range duration, an `input_reference` image on a
|
||||
/// model that doesn't support image input).
|
||||
InvalidRequestParameters { raw_body: String },
|
||||
}
|
||||
|
||||
impl Error for CometBadRequestApiError {}
|
||||
|
||||
impl Display for CometBadRequestApiError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::InvalidRequestParameters { raw_body } => write!(f, "Invalid request parameters: {}", raw_body),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum CometClientError {
|
||||
/// An error was encountered building the reqwest client or the request.
|
||||
ReqwestClientError(reqwest::Error),
|
||||
|
||||
/// A request field couldn't be validated or converted to the value
|
||||
/// expected on the wire. Carries the field name and the raw input the
|
||||
/// caller supplied.
|
||||
InvalidRequestField { field: &'static str, raw_value: String, reason: String },
|
||||
}
|
||||
|
||||
impl Error for CometClientError {}
|
||||
|
||||
impl Display for CometClientError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::ReqwestClientError(err) => write!(f, "Reqwest client error: {}", err),
|
||||
Self::InvalidRequestField { field, raw_value, reason } => {
|
||||
write!(f, "Invalid value for request field `{}`: {:?} ({})", field, raw_value, reason)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,71 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
use crate::error::comet_bad_request_api_error::CometBadRequestApiError;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_generic_api_error::CometGenericApiError;
|
||||
use crate::error::comet_specific_api_error::CometSpecificApiError;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum CometError {
|
||||
/// An error that happened client-side (before or while making the request).
|
||||
Client(CometClientError),
|
||||
|
||||
/// Known "400s" that are the fault of the client sending a bad request.
|
||||
/// These should surface to the end user as 400s.
|
||||
ApiBadRequest(CometBadRequestApiError),
|
||||
|
||||
/// Server-side errors with specific, well-known causes.
|
||||
ApiSpecific(CometSpecificApiError),
|
||||
|
||||
/// Server-side errors with unknown / grab-bag causes.
|
||||
ApiGeneric(CometGenericApiError),
|
||||
}
|
||||
|
||||
impl CometError {
|
||||
pub fn is_having_downtime_issues(&self) -> bool {
|
||||
match self {
|
||||
Self::ApiGeneric(CometGenericApiError::UncategorizedBadResponseWithStatusAndBody { status_code, body: _ }) => {
|
||||
matches!(status_code.as_u16(), 502 | 503 | 504 | 524)
|
||||
},
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Error for CometError {}
|
||||
|
||||
impl Display for CometError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::Client(e) => write!(f, "CometClientError: {:?}", e),
|
||||
Self::ApiBadRequest(e) => write!(f, "CometBadRequestApiError: {:?}", e),
|
||||
Self::ApiSpecific(e) => write!(f, "CometSpecificApiError: {:?}", e),
|
||||
Self::ApiGeneric(e) => write!(f, "CometGenericApiError: {:?}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CometClientError> for CometError {
|
||||
fn from(error: CometClientError) -> Self {
|
||||
Self::Client(error)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CometBadRequestApiError> for CometError {
|
||||
fn from(error: CometBadRequestApiError) -> Self {
|
||||
Self::ApiBadRequest(error)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CometSpecificApiError> for CometError {
|
||||
fn from(error: CometSpecificApiError) -> Self {
|
||||
Self::ApiSpecific(error)
|
||||
}
|
||||
}
|
||||
|
||||
impl From<CometGenericApiError> for CometError {
|
||||
fn from(error: CometGenericApiError) -> Self {
|
||||
Self::ApiGeneric(error)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
use reqwest::StatusCode;
|
||||
|
||||
/// Server-side errors with unknown / grab-bag causes.
|
||||
#[derive(Debug)]
|
||||
pub enum CometGenericApiError {
|
||||
/// serde_json::Error, likely from a JSON deserialization schema mismatch.
|
||||
/// Includes the original body.
|
||||
SerdeResponseParseErrorWithBody(serde_json::Error, String),
|
||||
|
||||
/// An uncategorized bad HTTP response with status code and body.
|
||||
UncategorizedBadResponseWithStatusAndBody {
|
||||
status_code: StatusCode,
|
||||
body: String,
|
||||
},
|
||||
|
||||
/// An uncaught error from the HTTP client (network failures, timeouts, etc.)
|
||||
ReqwestError(reqwest::Error),
|
||||
}
|
||||
|
||||
impl Error for CometGenericApiError {}
|
||||
|
||||
impl Display for CometGenericApiError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::SerdeResponseParseErrorWithBody(err, body) => write!(f, "Failed to parse response body: {:?}. Body: {}", err, body),
|
||||
Self::UncategorizedBadResponseWithStatusAndBody { status_code, body } => write!(f, "Uncategorized bad response: status code {}, body: {}", status_code, body),
|
||||
Self::ReqwestError(err) => write!(f, "Reqwest error: {}", err),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
/// Server-side errors with specific, well-known causes.
|
||||
#[derive(Debug)]
|
||||
pub enum CometSpecificApiError {
|
||||
/// 401: the API key is missing or invalid.
|
||||
UnauthorizedInvalidApiKey { raw_body: String },
|
||||
|
||||
/// The poll endpoint responded "task_not_exist" for the given task id.
|
||||
TaskNotFound { task_id: String, raw_body: String },
|
||||
}
|
||||
|
||||
impl Error for CometSpecificApiError {}
|
||||
|
||||
impl Display for CometSpecificApiError {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
|
||||
match self {
|
||||
Self::UnauthorizedInvalidApiKey { raw_body } => write!(f, "Unauthorized: invalid or missing API key: {}", raw_body),
|
||||
Self::TaskNotFound { task_id, raw_body } => write!(f, "Task not found: {} ({})", task_id, raw_body),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
pub mod categorize_comet_error;
|
||||
pub mod comet_bad_request_api_error;
|
||||
pub mod comet_client_error;
|
||||
pub mod comet_error;
|
||||
pub mod comet_generic_api_error;
|
||||
pub mod comet_specific_api_error;
|
||||
@@ -0,0 +1 @@
|
||||
pub mod video;
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometVideoModelRaw, CometVideoSize, CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Seedance 1.0 Pro supports 2-10 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 2;
|
||||
const MAX_DURATION_SECONDS: u8 = 10;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance1p0ProArgs<'a> {
|
||||
pub request: GenerateDoubaoSeedance1p0ProRequest,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
/// NB: Seedance 1.0 Pro is text-only — `input_reference` images are not
|
||||
/// supported, so this request deliberately has no image field.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateDoubaoSeedance1p0ProRequest {
|
||||
pub prompt: String,
|
||||
|
||||
/// 2-10 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
pub size: Option<DoubaoSeedance1p0ProSize>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance1p0ProSize {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
UltraWide21x9,
|
||||
Exact { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance1p0ProResponse {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_doubao_seedance_1p0_pro(
|
||||
args: GenerateDoubaoSeedance1p0ProArgs<'_>,
|
||||
) -> Result<GenerateDoubaoSeedance1p0ProResponse, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateDoubaoSeedance1p0ProResponse {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateDoubaoSeedance1p0ProRequest {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Seedance 1.0 Pro supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance1p0Pro,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: vec![],
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: DoubaoSeedance1p0ProSize) -> CometVideoSize {
|
||||
match size {
|
||||
DoubaoSeedance1p0ProSize::Landscape16x9 => CometVideoSize::Landscape16x9,
|
||||
DoubaoSeedance1p0ProSize::Standard4x3 => CometVideoSize::Standard4x3,
|
||||
DoubaoSeedance1p0ProSize::Square1x1 => CometVideoSize::Square,
|
||||
DoubaoSeedance1p0ProSize::Portrait3x4 => CometVideoSize::Portrait3x4,
|
||||
DoubaoSeedance1p0ProSize::Portrait9x16 => CometVideoSize::Portrait9x16,
|
||||
DoubaoSeedance1p0ProSize::UltraWide21x9 => CometVideoSize::UltraWide21x9,
|
||||
DoubaoSeedance1p0ProSize::Exact { width, height } => CometVideoSize::Exact { width, height },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateDoubaoSeedance1p0ProRequest {
|
||||
prompt: "time lapse of a city at dusk".to_string(),
|
||||
duration_seconds: Some(2),
|
||||
size: Some(DoubaoSeedance1p0ProSize::Square1x1),
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-1-0-pro".to_string()),
|
||||
("prompt", "time lapse of a city at dusk".to_string()),
|
||||
("seconds", "2".to_string()),
|
||||
("size", "1:1".to_string()),
|
||||
]);
|
||||
assert!(raw.input_reference_images.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(1)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(2)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(10)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(11)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateDoubaoSeedance1p0ProRequest {
|
||||
GenerateDoubaoSeedance1p0ProRequest {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometVideoModelRaw, CometVideoSize, CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Seedance 1.5 Pro supports 4-12 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 4;
|
||||
const MAX_DURATION_SECONDS: u8 = 12;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance1p5ProArgs<'a> {
|
||||
pub request: GenerateDoubaoSeedance1p5ProRequest,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
/// NB: Seedance 1.5 Pro is text-only — `input_reference` images are not
|
||||
/// supported, so this request deliberately has no image field.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateDoubaoSeedance1p5ProRequest {
|
||||
pub prompt: String,
|
||||
|
||||
/// 4-12 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
pub size: Option<DoubaoSeedance1p5ProSize>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance1p5ProSize {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
UltraWide21x9,
|
||||
Exact { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance1p5ProResponse {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_doubao_seedance_1p5_pro(
|
||||
args: GenerateDoubaoSeedance1p5ProArgs<'_>,
|
||||
) -> Result<GenerateDoubaoSeedance1p5ProResponse, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateDoubaoSeedance1p5ProResponse {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateDoubaoSeedance1p5ProRequest {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Seedance 1.5 Pro supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance1p5Pro,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: vec![],
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: DoubaoSeedance1p5ProSize) -> CometVideoSize {
|
||||
match size {
|
||||
DoubaoSeedance1p5ProSize::Landscape16x9 => CometVideoSize::Landscape16x9,
|
||||
DoubaoSeedance1p5ProSize::Standard4x3 => CometVideoSize::Standard4x3,
|
||||
DoubaoSeedance1p5ProSize::Square1x1 => CometVideoSize::Square,
|
||||
DoubaoSeedance1p5ProSize::Portrait3x4 => CometVideoSize::Portrait3x4,
|
||||
DoubaoSeedance1p5ProSize::Portrait9x16 => CometVideoSize::Portrait9x16,
|
||||
DoubaoSeedance1p5ProSize::UltraWide21x9 => CometVideoSize::UltraWide21x9,
|
||||
DoubaoSeedance1p5ProSize::Exact { width, height } => CometVideoSize::Exact { width, height },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateDoubaoSeedance1p5ProRequest {
|
||||
prompt: "a paper boat in a storm drain".to_string(),
|
||||
duration_seconds: Some(12),
|
||||
size: Some(DoubaoSeedance1p5ProSize::Portrait9x16),
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-1-5-pro".to_string()),
|
||||
("prompt", "a paper boat in a storm drain".to_string()),
|
||||
("seconds", "12".to_string()),
|
||||
("size", "9:16".to_string()),
|
||||
]);
|
||||
assert!(raw.input_reference_images.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(3)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(4)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(12)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(13)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateDoubaoSeedance1p5ProRequest {
|
||||
GenerateDoubaoSeedance1p5ProRequest {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
}
|
||||
}
|
||||
}
|
||||
+471
@@ -0,0 +1,471 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Seedance 2.0 supports 4-15 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 4;
|
||||
const MAX_DURATION_SECONDS: u8 = 15;
|
||||
|
||||
/// The API default duration when `seconds` is omitted.
|
||||
const DEFAULT_DURATION_SECONDS: u8 = 5;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance2p0Args<'a> {
|
||||
pub request: GenerateDoubaoSeedance2p0Request,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateDoubaoSeedance2p0Request {
|
||||
/// Reference attached images in the prompt as `[Image 1]`, `[Image 2]`, etc.
|
||||
pub prompt: String,
|
||||
|
||||
/// 4-15 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
/// `None` defaults to 16:9 (when a resolution is set).
|
||||
pub aspect_ratio: Option<DoubaoSeedance2p0AspectRatio>,
|
||||
|
||||
/// `None` defaults to 720p (when an aspect ratio is set).
|
||||
pub resolution: Option<DoubaoSeedance2p0Resolution>,
|
||||
|
||||
/// Reference images (JPEG, PNG, WebP) for image-to-video.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance2p0AspectRatio {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
UltraWide21x9,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance2p0Resolution {
|
||||
FourEightyP,
|
||||
SevenTwentyP,
|
||||
TenEightyP,
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Seedance 2.0 per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |------------|--------|
|
||||
// | 480p | 0.063 |
|
||||
// | 720p | 0.1368 |
|
||||
// | 1080p | 0.3366 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
|
||||
impl GenerateDoubaoSeedance2p0Request {
|
||||
/// Estimate the USD cost in cents for this generation request.
|
||||
pub fn estimate_cost_in_usd_cents(&self) -> u64 {
|
||||
let dollars_per_second: f64 = match self.resolution {
|
||||
Some(DoubaoSeedance2p0Resolution::FourEightyP) => 0.063,
|
||||
// Default resolution (None) is 720p.
|
||||
Some(DoubaoSeedance2p0Resolution::SevenTwentyP) | None => 0.1368,
|
||||
Some(DoubaoSeedance2p0Resolution::TenEightyP) => 0.3366,
|
||||
};
|
||||
let seconds = self.duration_seconds.unwrap_or(DEFAULT_DURATION_SECONDS);
|
||||
(f64::from(seconds) * dollars_per_second * 100.0).round() as u64
|
||||
}
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance2p0Response {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_doubao_seedance_2p0(
|
||||
args: GenerateDoubaoSeedance2p0Args<'_>,
|
||||
) -> Result<GenerateDoubaoSeedance2p0Response, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateDoubaoSeedance2p0Response {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateDoubaoSeedance2p0Request {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Seedance 2.0 supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.resolve_size(),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
|
||||
/// The wire `size` is a single exact-dimensions field determined by the
|
||||
/// (aspect ratio, resolution) pair. Dimensions mirror CometAPI's own
|
||||
/// playground options for `doubao-seedance-2-0`. When neither knob is
|
||||
/// set, `size` is omitted and the API picks its default.
|
||||
fn resolve_size(&self) -> Option<CometVideoSize> {
|
||||
if self.aspect_ratio.is_none() && self.resolution.is_none() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let aspect_ratio = self.aspect_ratio.unwrap_or(DoubaoSeedance2p0AspectRatio::Landscape16x9);
|
||||
let resolution = self.resolution.unwrap_or(DoubaoSeedance2p0Resolution::SevenTwentyP);
|
||||
|
||||
use DoubaoSeedance2p0AspectRatio as Ratio;
|
||||
use DoubaoSeedance2p0Resolution as Res;
|
||||
|
||||
let (width, height) = match (resolution, aspect_ratio) {
|
||||
(Res::FourEightyP, Ratio::Landscape16x9) => (864, 496),
|
||||
(Res::FourEightyP, Ratio::Standard4x3) => (752, 560),
|
||||
(Res::FourEightyP, Ratio::Square1x1) => (640, 640),
|
||||
(Res::FourEightyP, Ratio::Portrait3x4) => (560, 752),
|
||||
(Res::FourEightyP, Ratio::Portrait9x16) => (496, 864),
|
||||
(Res::FourEightyP, Ratio::UltraWide21x9) => (992, 432),
|
||||
|
||||
(Res::SevenTwentyP, Ratio::Landscape16x9) => (1280, 720),
|
||||
(Res::SevenTwentyP, Ratio::Standard4x3) => (1112, 834),
|
||||
(Res::SevenTwentyP, Ratio::Square1x1) => (960, 960),
|
||||
(Res::SevenTwentyP, Ratio::Portrait3x4) => (834, 1112),
|
||||
(Res::SevenTwentyP, Ratio::Portrait9x16) => (720, 1280),
|
||||
(Res::SevenTwentyP, Ratio::UltraWide21x9) => (1470, 630),
|
||||
|
||||
(Res::TenEightyP, Ratio::Landscape16x9) => (1920, 1080),
|
||||
(Res::TenEightyP, Ratio::Standard4x3) => (1664, 1248),
|
||||
(Res::TenEightyP, Ratio::Square1x1) => (1440, 1440),
|
||||
(Res::TenEightyP, Ratio::Portrait3x4) => (1248, 1664),
|
||||
(Res::TenEightyP, Ratio::Portrait9x16) => (1080, 1920),
|
||||
(Res::TenEightyP, Ratio::UltraWide21x9) => (2206, 946),
|
||||
};
|
||||
|
||||
Some(CometVideoSize::Exact { width, height })
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
use DoubaoSeedance2p0AspectRatio as Ratio;
|
||||
use DoubaoSeedance2p0Resolution as Res;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateDoubaoSeedance2p0Request {
|
||||
prompt: "animate [Image 1]".to_string(),
|
||||
duration_seconds: Some(8),
|
||||
aspect_ratio: Some(Ratio::UltraWide21x9),
|
||||
resolution: Some(Res::TenEightyP),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-2-0".to_string()),
|
||||
("prompt", "animate [Image 1]".to_string()),
|
||||
("seconds", "8".to_string()),
|
||||
("size", "2206x946".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_matrix_matches_cometapi_playground() {
|
||||
// (resolution, ratio) -> exact size, as offered by CometAPI's own
|
||||
// playground dropdown for doubao-seedance-2-0.
|
||||
let cases = [
|
||||
(Res::FourEightyP, Ratio::Landscape16x9, "864x496"),
|
||||
(Res::FourEightyP, Ratio::Standard4x3, "752x560"),
|
||||
(Res::FourEightyP, Ratio::Square1x1, "640x640"),
|
||||
(Res::FourEightyP, Ratio::Portrait3x4, "560x752"),
|
||||
(Res::FourEightyP, Ratio::Portrait9x16, "496x864"),
|
||||
(Res::FourEightyP, Ratio::UltraWide21x9, "992x432"),
|
||||
(Res::SevenTwentyP, Ratio::Landscape16x9, "1280x720"),
|
||||
(Res::SevenTwentyP, Ratio::Standard4x3, "1112x834"),
|
||||
(Res::SevenTwentyP, Ratio::Square1x1, "960x960"),
|
||||
(Res::SevenTwentyP, Ratio::Portrait3x4, "834x1112"),
|
||||
(Res::SevenTwentyP, Ratio::Portrait9x16, "720x1280"),
|
||||
(Res::SevenTwentyP, Ratio::UltraWide21x9, "1470x630"),
|
||||
(Res::TenEightyP, Ratio::Landscape16x9, "1920x1080"),
|
||||
(Res::TenEightyP, Ratio::Standard4x3, "1664x1248"),
|
||||
(Res::TenEightyP, Ratio::Square1x1, "1440x1440"),
|
||||
(Res::TenEightyP, Ratio::Portrait3x4, "1248x1664"),
|
||||
(Res::TenEightyP, Ratio::Portrait9x16, "1080x1920"),
|
||||
(Res::TenEightyP, Ratio::UltraWide21x9, "2206x946"),
|
||||
];
|
||||
|
||||
for (resolution, aspect_ratio, expected) in cases {
|
||||
let request = base_request(Some(aspect_ratio), Some(resolution));
|
||||
let size = request.resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), expected,
|
||||
"({resolution:?}, {aspect_ratio:?}) should map to {expected}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_defaults() {
|
||||
// Neither knob set: omit size, let the API default.
|
||||
assert!(base_request(None, None).resolve_size().is_none());
|
||||
|
||||
// Only ratio set: resolution defaults to 720p.
|
||||
let size = base_request(Some(Ratio::Portrait9x16), None).resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), "720x1280");
|
||||
|
||||
// Only resolution set: ratio defaults to 16:9.
|
||||
let size = base_request(None, Some(Res::TenEightyP)).resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), "1920x1080");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
let mut request = base_request(None, None);
|
||||
for (seconds, ok) in [(Some(3), false), (Some(4), true), (Some(15), true), (Some(16), false), (None, true)] {
|
||||
request.duration_seconds = seconds;
|
||||
assert_eq!(request.to_create_video_request().is_ok(), ok, "seconds: {seconds:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_estimates() {
|
||||
// 5 seconds at 480p: 5 × $0.063 = $0.315 -> 32¢
|
||||
let mut request = base_request(None, Some(Res::FourEightyP));
|
||||
request.duration_seconds = Some(5);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 32);
|
||||
|
||||
// 10 seconds at 1080p: 10 × $0.3366 = $3.366 -> 337¢
|
||||
request.resolution = Some(Res::TenEightyP);
|
||||
request.duration_seconds = Some(10);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 337);
|
||||
|
||||
// Defaults (5 seconds, 720p): 5 × $0.1368 = $0.684 -> 68¢
|
||||
request.resolution = None;
|
||||
request.duration_seconds = None;
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 68);
|
||||
}
|
||||
|
||||
fn base_request(
|
||||
aspect_ratio: Option<DoubaoSeedance2p0AspectRatio>,
|
||||
resolution: Option<DoubaoSeedance2p0Resolution>,
|
||||
) -> GenerateDoubaoSeedance2p0Request {
|
||||
GenerateDoubaoSeedance2p0Request {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds: None,
|
||||
aspect_ratio,
|
||||
resolution,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
|
||||
// ─────────────────────────────────────────────────────────────────────
|
||||
// ⚠️ EXPENSIVE LIVE TESTS ⚠️
|
||||
//
|
||||
// Each test below enqueues a REAL 10-second Seedance 2.0 generation with
|
||||
// four reference images and polls it to completion. These INCUR REAL
|
||||
// COSTS (per CometAPI's per-second pricing):
|
||||
//
|
||||
// 480p: 10s × $0.063 ≈ $0.63
|
||||
// 720p: 10s × $0.1368 ≈ $1.37
|
||||
// 1080p: 10s × $0.3366 ≈ $3.37
|
||||
//
|
||||
// They also take a while — generations have been observed to run well
|
||||
// past 10 minutes. Run one at a time, manually:
|
||||
//
|
||||
// cargo test -p comet_api_client live_generate_480p -- --ignored --nocapture
|
||||
// ─────────────────────────────────────────────────────────────────────
|
||||
mod live_tests {
|
||||
use std::time::Duration;
|
||||
|
||||
use test_data::web::image_urls::{
|
||||
ERNEST_GHOST_TREX_IMAGE_URL,
|
||||
FOREST_BACKDROP_IMAGE_URL,
|
||||
GHOST_IMAGE_URL,
|
||||
GRASSY_HILL_TRANSPARENT_IMAGE_URL,
|
||||
JUNO_AT_LAKE_IMAGE_URL,
|
||||
MOUNTAIN_TREE_IMAGE_URL,
|
||||
SUPER_WIDE_FALL_MOUNTAINS_IMAGE_URL,
|
||||
TALL_CORGI_SHIBA_TREASURE_OCEAN_URL,
|
||||
TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
|
||||
TREX_SKELETON_IMAGE_URL,
|
||||
WHITE_HOUSE_SUNSET_IMAGE_URL,
|
||||
WIDE_CORGI_SHIBA_TREASURE_OCEAN_URL,
|
||||
};
|
||||
|
||||
use super::*;
|
||||
use crate::requests::get_video_task::get_video_task::{get_video_task, GetVideoTaskArgs};
|
||||
use crate::test_utils::load_api_key;
|
||||
|
||||
/// ⚠️ EXPENSIVE: real 10s 480p generation (~$0.63) + a long poll.
|
||||
#[ignore]
|
||||
#[tokio::test]
|
||||
async fn live_generate_480p_with_references() {
|
||||
let input_reference_images = download_reference_images(&[
|
||||
ERNEST_GHOST_TREX_IMAGE_URL,
|
||||
GHOST_IMAGE_URL,
|
||||
TREX_SKELETON_IMAGE_URL,
|
||||
FOREST_BACKDROP_IMAGE_URL,
|
||||
]).await;
|
||||
|
||||
run_generation_to_completion(GenerateDoubaoSeedance2p0Request {
|
||||
prompt: "The frightened man from [Image 1] runs through the dark forest \
|
||||
from [Image 4], chased by the glowing ghost from [Image 2]. The t-rex \
|
||||
skeleton from [Image 3] rises out of the leaves behind them. Spooky, \
|
||||
comedic 90s horror movie tone."
|
||||
.to_string(),
|
||||
duration_seconds: Some(10),
|
||||
aspect_ratio: Some(DoubaoSeedance2p0AspectRatio::Landscape16x9),
|
||||
resolution: Some(DoubaoSeedance2p0Resolution::FourEightyP),
|
||||
input_reference_images,
|
||||
}).await;
|
||||
}
|
||||
|
||||
/// ⚠️ EXPENSIVE: real 10s 720p generation (~$1.37) + a long poll.
|
||||
#[ignore]
|
||||
#[tokio::test]
|
||||
async fn live_generate_720p_with_references() {
|
||||
let input_reference_images = download_reference_images(&[
|
||||
JUNO_AT_LAKE_IMAGE_URL,
|
||||
TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
|
||||
TALL_CORGI_SHIBA_TREASURE_OCEAN_URL,
|
||||
WIDE_CORGI_SHIBA_TREASURE_OCEAN_URL,
|
||||
]).await;
|
||||
|
||||
run_generation_to_completion(GenerateDoubaoSeedance2p0Request {
|
||||
prompt: "The dog from [Image 1] and the bespectacled dog from [Image 2] \
|
||||
join the corgi and shiba from [Image 3] on the beach, digging up the \
|
||||
treasure chest from [Image 4] as waves roll in. Joyful, sunny \
|
||||
adventure-film tone."
|
||||
.to_string(),
|
||||
duration_seconds: Some(10),
|
||||
aspect_ratio: Some(DoubaoSeedance2p0AspectRatio::Landscape16x9),
|
||||
resolution: Some(DoubaoSeedance2p0Resolution::SevenTwentyP),
|
||||
input_reference_images,
|
||||
}).await;
|
||||
}
|
||||
|
||||
/// ⚠️ EXPENSIVE: real 10s 1080p generation (~$3.37) + a long poll.
|
||||
#[ignore]
|
||||
#[tokio::test]
|
||||
async fn live_generate_1080p_with_references() {
|
||||
let input_reference_images = download_reference_images(&[
|
||||
GRASSY_HILL_TRANSPARENT_IMAGE_URL,
|
||||
MOUNTAIN_TREE_IMAGE_URL,
|
||||
SUPER_WIDE_FALL_MOUNTAINS_IMAGE_URL,
|
||||
WHITE_HOUSE_SUNSET_IMAGE_URL,
|
||||
]).await;
|
||||
|
||||
run_generation_to_completion(GenerateDoubaoSeedance2p0Request {
|
||||
prompt: "A cinematic drone shot glides over the grassy hill from \
|
||||
[Image 1], past the lone tree on the mountainside from [Image 2], \
|
||||
across the sweeping autumn mountain range from [Image 3], and settles \
|
||||
on the white house at sunset from [Image 4]. Golden hour, slow and \
|
||||
steady camera movement."
|
||||
.to_string(),
|
||||
duration_seconds: Some(10),
|
||||
aspect_ratio: Some(DoubaoSeedance2p0AspectRatio::Landscape16x9),
|
||||
resolution: Some(DoubaoSeedance2p0Resolution::TenEightyP),
|
||||
input_reference_images,
|
||||
}).await;
|
||||
}
|
||||
|
||||
// ── Helpers ──
|
||||
|
||||
async fn download_reference_images(urls: &[&str]) -> Vec<CometInputReferenceImage> {
|
||||
let mut images = Vec::with_capacity(urls.len());
|
||||
for url in urls {
|
||||
images.push(download_reference_image(url).await);
|
||||
}
|
||||
images
|
||||
}
|
||||
|
||||
async fn download_reference_image(url: &str) -> CometInputReferenceImage {
|
||||
let response = reqwest::get(url).await.expect("image download should succeed");
|
||||
assert!(response.status().is_success(), "image download failed: {} ({})", url, response.status());
|
||||
|
||||
let filename = url.rsplit('/').next().expect("url should have a path").to_string();
|
||||
let maybe_content_type = if filename.ends_with(".png") {
|
||||
Some("image/png".to_string())
|
||||
} else {
|
||||
Some("image/jpeg".to_string())
|
||||
};
|
||||
let file_bytes = response.bytes().await.expect("image body should download").to_vec();
|
||||
|
||||
println!("Downloaded reference: {} ({} bytes)", filename, file_bytes.len());
|
||||
|
||||
CometInputReferenceImage {
|
||||
file_bytes,
|
||||
filename,
|
||||
maybe_content_type,
|
||||
}
|
||||
}
|
||||
|
||||
/// Enqueue the generation, poll until terminal, and assert success.
|
||||
async fn run_generation_to_completion(request: GenerateDoubaoSeedance2p0Request) {
|
||||
// NB: Generations have been observed to run well past 10 minutes.
|
||||
const POLL_INTERVAL: Duration = Duration::from_secs(15);
|
||||
const MAX_POLLS: u32 = 120; // ~30 minutes
|
||||
|
||||
let api_key = load_api_key();
|
||||
println!("Estimated cost: {}¢", request.estimate_cost_in_usd_cents());
|
||||
|
||||
let created = generate_doubao_seedance_2p0(GenerateDoubaoSeedance2p0Args {
|
||||
request,
|
||||
api_key: &api_key,
|
||||
}).await.expect("generate_doubao_seedance_2p0 should succeed");
|
||||
|
||||
println!("Enqueued task: {} (status: {})", created.task_id, created.status);
|
||||
|
||||
for poll in 1..=MAX_POLLS {
|
||||
tokio::time::sleep(POLL_INTERVAL).await;
|
||||
|
||||
let task = get_video_task(GetVideoTaskArgs {
|
||||
api_key: &api_key,
|
||||
task_id: &created.task_id,
|
||||
}).await.expect("get_video_task should succeed");
|
||||
|
||||
println!("Poll {}: status {} (progress: {:?})", poll, task.status, task.maybe_progress);
|
||||
|
||||
if task.status.is_terminal() {
|
||||
assert!(task.status.is_success(), "task should complete successfully: {:?}", task);
|
||||
let video_url = task.maybe_video_url.expect("completed task should have a video url");
|
||||
println!("Video URL: {}", video_url);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
panic!("Task {} did not reach a terminal state in time", created.task_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
+278
@@ -0,0 +1,278 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Seedance 2.0 Fast supports 4-15 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 4;
|
||||
const MAX_DURATION_SECONDS: u8 = 15;
|
||||
|
||||
/// The API default duration when `seconds` is omitted.
|
||||
const DEFAULT_DURATION_SECONDS: u8 = 5;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance2p0FastArgs<'a> {
|
||||
pub request: GenerateDoubaoSeedance2p0FastRequest,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateDoubaoSeedance2p0FastRequest {
|
||||
/// Reference attached images in the prompt as `[Image 1]`, `[Image 2]`, etc.
|
||||
pub prompt: String,
|
||||
|
||||
/// 4-15 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
/// `None` defaults to 16:9 (when a resolution is set).
|
||||
pub aspect_ratio: Option<DoubaoSeedance2p0FastAspectRatio>,
|
||||
|
||||
/// `None` defaults to 720p (when an aspect ratio is set).
|
||||
pub resolution: Option<DoubaoSeedance2p0FastResolution>,
|
||||
|
||||
/// Reference images (JPEG, PNG, WebP) for image-to-video.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance2p0FastAspectRatio {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
UltraWide21x9,
|
||||
}
|
||||
|
||||
/// NB: 1080p is available for all Seedance models EXCEPT 2.0 Fast, so this
|
||||
/// enum deliberately has no 1080p variant.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum DoubaoSeedance2p0FastResolution {
|
||||
FourEightyP,
|
||||
SevenTwentyP,
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Seedance 2.0 Fast per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |------------|--------|
|
||||
// | 480p | 0.0504 |
|
||||
// | 720p | 0.108 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
|
||||
impl GenerateDoubaoSeedance2p0FastRequest {
|
||||
/// Estimate the USD cost in cents for this generation request.
|
||||
pub fn estimate_cost_in_usd_cents(&self) -> u64 {
|
||||
let dollars_per_second: f64 = match self.resolution {
|
||||
Some(DoubaoSeedance2p0FastResolution::FourEightyP) => 0.0504,
|
||||
// Default resolution (None) is 720p.
|
||||
Some(DoubaoSeedance2p0FastResolution::SevenTwentyP) | None => 0.108,
|
||||
};
|
||||
let seconds = self.duration_seconds.unwrap_or(DEFAULT_DURATION_SECONDS);
|
||||
(f64::from(seconds) * dollars_per_second * 100.0).round() as u64
|
||||
}
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateDoubaoSeedance2p0FastResponse {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_doubao_seedance_2p0_fast(
|
||||
args: GenerateDoubaoSeedance2p0FastArgs<'_>,
|
||||
) -> Result<GenerateDoubaoSeedance2p0FastResponse, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateDoubaoSeedance2p0FastResponse {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateDoubaoSeedance2p0FastRequest {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Seedance 2.0 Fast supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0Fast,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.resolve_size(),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
|
||||
/// The wire `size` is a single exact-dimensions field determined by the
|
||||
/// (aspect ratio, resolution) pair. Dimensions mirror CometAPI's own
|
||||
/// playground options for the Seedance 2.0 family. When neither knob is
|
||||
/// set, `size` is omitted and the API picks its default.
|
||||
fn resolve_size(&self) -> Option<CometVideoSize> {
|
||||
if self.aspect_ratio.is_none() && self.resolution.is_none() {
|
||||
return None;
|
||||
}
|
||||
|
||||
let aspect_ratio = self.aspect_ratio.unwrap_or(DoubaoSeedance2p0FastAspectRatio::Landscape16x9);
|
||||
let resolution = self.resolution.unwrap_or(DoubaoSeedance2p0FastResolution::SevenTwentyP);
|
||||
|
||||
use DoubaoSeedance2p0FastAspectRatio as Ratio;
|
||||
use DoubaoSeedance2p0FastResolution as Res;
|
||||
|
||||
let (width, height) = match (resolution, aspect_ratio) {
|
||||
(Res::FourEightyP, Ratio::Landscape16x9) => (864, 496),
|
||||
(Res::FourEightyP, Ratio::Standard4x3) => (752, 560),
|
||||
(Res::FourEightyP, Ratio::Square1x1) => (640, 640),
|
||||
(Res::FourEightyP, Ratio::Portrait3x4) => (560, 752),
|
||||
(Res::FourEightyP, Ratio::Portrait9x16) => (496, 864),
|
||||
(Res::FourEightyP, Ratio::UltraWide21x9) => (992, 432),
|
||||
|
||||
(Res::SevenTwentyP, Ratio::Landscape16x9) => (1280, 720),
|
||||
(Res::SevenTwentyP, Ratio::Standard4x3) => (1112, 834),
|
||||
(Res::SevenTwentyP, Ratio::Square1x1) => (960, 960),
|
||||
(Res::SevenTwentyP, Ratio::Portrait3x4) => (834, 1112),
|
||||
(Res::SevenTwentyP, Ratio::Portrait9x16) => (720, 1280),
|
||||
(Res::SevenTwentyP, Ratio::UltraWide21x9) => (1470, 630),
|
||||
};
|
||||
|
||||
Some(CometVideoSize::Exact { width, height })
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
use DoubaoSeedance2p0FastAspectRatio as Ratio;
|
||||
use DoubaoSeedance2p0FastResolution as Res;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateDoubaoSeedance2p0FastRequest {
|
||||
prompt: "a corgi surfing".to_string(),
|
||||
duration_seconds: Some(4),
|
||||
aspect_ratio: Some(Ratio::Landscape16x9),
|
||||
resolution: Some(Res::FourEightyP),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-2-0-fast".to_string()),
|
||||
("prompt", "a corgi surfing".to_string()),
|
||||
("seconds", "4".to_string()),
|
||||
("size", "864x496".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_matrix_matches_cometapi_playground() {
|
||||
// (resolution, ratio) -> exact size, as offered by CometAPI's own
|
||||
// playground dropdown for the Seedance 2.0 family. No 1080p row: Fast
|
||||
// doesn't support it (enforced by the resolution enum).
|
||||
let cases = [
|
||||
(Res::FourEightyP, Ratio::Landscape16x9, "864x496"),
|
||||
(Res::FourEightyP, Ratio::Standard4x3, "752x560"),
|
||||
(Res::FourEightyP, Ratio::Square1x1, "640x640"),
|
||||
(Res::FourEightyP, Ratio::Portrait3x4, "560x752"),
|
||||
(Res::FourEightyP, Ratio::Portrait9x16, "496x864"),
|
||||
(Res::FourEightyP, Ratio::UltraWide21x9, "992x432"),
|
||||
(Res::SevenTwentyP, Ratio::Landscape16x9, "1280x720"),
|
||||
(Res::SevenTwentyP, Ratio::Standard4x3, "1112x834"),
|
||||
(Res::SevenTwentyP, Ratio::Square1x1, "960x960"),
|
||||
(Res::SevenTwentyP, Ratio::Portrait3x4, "834x1112"),
|
||||
(Res::SevenTwentyP, Ratio::Portrait9x16, "720x1280"),
|
||||
(Res::SevenTwentyP, Ratio::UltraWide21x9, "1470x630"),
|
||||
];
|
||||
|
||||
for (resolution, aspect_ratio, expected) in cases {
|
||||
let request = base_request(Some(aspect_ratio), Some(resolution));
|
||||
let size = request.resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), expected,
|
||||
"({resolution:?}, {aspect_ratio:?}) should map to {expected}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_defaults() {
|
||||
// Neither knob set: omit size, let the API default.
|
||||
assert!(base_request(None, None).resolve_size().is_none());
|
||||
|
||||
// Only ratio set: resolution defaults to 720p.
|
||||
let size = base_request(Some(Ratio::Square1x1), None).resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), "960x960");
|
||||
|
||||
// Only resolution set: ratio defaults to 16:9.
|
||||
let size = base_request(None, Some(Res::FourEightyP)).resolve_size().expect("should resolve");
|
||||
assert_eq!(size.as_api_string(), "864x496");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
let mut request = base_request(None, None);
|
||||
for (seconds, ok) in [(Some(3), false), (Some(4), true), (Some(15), true), (Some(16), false), (None, true)] {
|
||||
request.duration_seconds = seconds;
|
||||
assert_eq!(request.to_create_video_request().is_ok(), ok, "seconds: {seconds:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_estimates() {
|
||||
// 5 seconds at 480p: 5 × $0.0504 = $0.252 -> 25¢
|
||||
let mut request = base_request(None, Some(Res::FourEightyP));
|
||||
request.duration_seconds = Some(5);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 25);
|
||||
|
||||
// 15 seconds at 720p: 15 × $0.108 = $1.62 -> 162¢
|
||||
request.resolution = Some(Res::SevenTwentyP);
|
||||
request.duration_seconds = Some(15);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 162);
|
||||
|
||||
// Defaults (5 seconds, 720p): 5 × $0.108 = $0.54 -> 54¢
|
||||
request.resolution = None;
|
||||
request.duration_seconds = None;
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 54);
|
||||
}
|
||||
|
||||
fn base_request(
|
||||
aspect_ratio: Option<DoubaoSeedance2p0FastAspectRatio>,
|
||||
resolution: Option<DoubaoSeedance2p0FastResolution>,
|
||||
) -> GenerateDoubaoSeedance2p0FastRequest {
|
||||
GenerateDoubaoSeedance2p0FastRequest {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds: None,
|
||||
aspect_ratio,
|
||||
resolution,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Vidu Q3 supports 1-16 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 1;
|
||||
const MAX_DURATION_SECONDS: u8 = 16;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateViduQ3Args<'a> {
|
||||
pub request: GenerateViduQ3Request,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateViduQ3Request {
|
||||
pub prompt: String,
|
||||
|
||||
/// 1-16 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
pub size: Option<ViduQ3Size>,
|
||||
|
||||
/// Reference images for image-to-video / start-end-to-video workflows.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
/// Vidu Q3 renders at 540p/720p/1080p (24 FPS). The API's `size` field takes
|
||||
/// an aspect ratio preset or exact dimensions (eg. 960x528).
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum ViduQ3Size {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
Exact { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Vidu Q3 per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |-------------|---------|
|
||||
// | 360p/540p | 0.056 |
|
||||
// | 720p/1080p | 0.1232 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
// NB: Not modeled as an estimator because the `size` field is an aspect
|
||||
// ratio in the common case, which doesn't determine the billed resolution.
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateViduQ3Response {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_vidu_q3(
|
||||
args: GenerateViduQ3Args<'_>,
|
||||
) -> Result<GenerateViduQ3Response, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateViduQ3Response {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateViduQ3Request {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Vidu Q3 supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::ViduQ3,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: ViduQ3Size) -> CometVideoSize {
|
||||
match size {
|
||||
ViduQ3Size::Landscape16x9 => CometVideoSize::Landscape16x9,
|
||||
ViduQ3Size::Standard4x3 => CometVideoSize::Standard4x3,
|
||||
ViduQ3Size::Square1x1 => CometVideoSize::Square,
|
||||
ViduQ3Size::Portrait3x4 => CometVideoSize::Portrait3x4,
|
||||
ViduQ3Size::Portrait9x16 => CometVideoSize::Portrait9x16,
|
||||
ViduQ3Size::Exact { width, height } => CometVideoSize::Exact { width, height },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateViduQ3Request {
|
||||
prompt: "a lighthouse in fog".to_string(),
|
||||
duration_seconds: Some(16),
|
||||
size: Some(ViduQ3Size::Exact { width: 960, height: 528 }),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "viduq3".to_string()),
|
||||
("prompt", "a lighthouse in fog".to_string()),
|
||||
("seconds", "16".to_string()),
|
||||
("size", "960x528".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(0)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(1)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(16)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(17)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateViduQ3Request {
|
||||
GenerateViduQ3Request {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Vidu Q3 Turbo supports 1-16 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 1;
|
||||
const MAX_DURATION_SECONDS: u8 = 16;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateViduQ3TurboArgs<'a> {
|
||||
pub request: GenerateViduQ3TurboRequest,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateViduQ3TurboRequest {
|
||||
pub prompt: String,
|
||||
|
||||
/// 1-16 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
pub size: Option<ViduQ3TurboSize>,
|
||||
|
||||
/// Reference images for image-to-video / start-end-to-video workflows.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
/// Vidu Q3 Turbo renders at 540p/720p/1080p (24 FPS). The API's `size` field
|
||||
/// takes an aspect ratio preset or exact dimensions (eg. 960x528).
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum ViduQ3TurboSize {
|
||||
Landscape16x9,
|
||||
Standard4x3,
|
||||
Square1x1,
|
||||
Portrait3x4,
|
||||
Portrait9x16,
|
||||
Exact { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Vidu Q3 Turbo per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |-------------|---------|
|
||||
// | 360p/540p | 0.028 |
|
||||
// | 720p/1080p | 0.0616 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
// NB: Not modeled as an estimator because the `size` field is an aspect
|
||||
// ratio in the common case, which doesn't determine the billed resolution.
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateViduQ3TurboResponse {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_vidu_q3_turbo(
|
||||
args: GenerateViduQ3TurboArgs<'_>,
|
||||
) -> Result<GenerateViduQ3TurboResponse, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateViduQ3TurboResponse {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateViduQ3TurboRequest {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Vidu Q3 Turbo supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::ViduQ3Turbo,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: ViduQ3TurboSize) -> CometVideoSize {
|
||||
match size {
|
||||
ViduQ3TurboSize::Landscape16x9 => CometVideoSize::Landscape16x9,
|
||||
ViduQ3TurboSize::Standard4x3 => CometVideoSize::Standard4x3,
|
||||
ViduQ3TurboSize::Square1x1 => CometVideoSize::Square,
|
||||
ViduQ3TurboSize::Portrait3x4 => CometVideoSize::Portrait3x4,
|
||||
ViduQ3TurboSize::Portrait9x16 => CometVideoSize::Portrait9x16,
|
||||
ViduQ3TurboSize::Exact { width, height } => CometVideoSize::Exact { width, height },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateViduQ3TurboRequest {
|
||||
prompt: "raindrops on a window".to_string(),
|
||||
duration_seconds: Some(1),
|
||||
size: Some(ViduQ3TurboSize::Portrait9x16),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "viduq3-turbo".to_string()),
|
||||
("prompt", "raindrops on a window".to_string()),
|
||||
("seconds", "1".to_string()),
|
||||
("size", "9:16".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(0)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(1)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(16)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(17)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateViduQ3TurboRequest {
|
||||
GenerateViduQ3TurboRequest {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,216 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Wan 2.6 supports 2-15 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 2;
|
||||
const MAX_DURATION_SECONDS: u8 = 15;
|
||||
|
||||
/// The API default duration when `seconds` is omitted.
|
||||
const DEFAULT_DURATION_SECONDS: u8 = 5;
|
||||
|
||||
/// Wan 2.6 accepts up to 5 references.
|
||||
const MAX_REFERENCE_IMAGES: usize = 5;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateWan2p6Args<'a> {
|
||||
pub request: GenerateWan2p6Request,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateWan2p6Request {
|
||||
pub prompt: String,
|
||||
|
||||
/// 2-15 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
/// `None` uses the API default (720p).
|
||||
pub size: Option<Wan2p6Size>,
|
||||
|
||||
/// Reference images for image-to-video and reference-to-video workflows.
|
||||
/// Wan 2.6 accepts up to 5 references.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
/// Wan 2.6 renders at 720p or 1080p.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum Wan2p6Size {
|
||||
SevenTwentyP,
|
||||
TenEightyP,
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Wan 2.6 per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |------------|-------|
|
||||
// | 720p | 0.08 |
|
||||
// | 1080p | 0.12 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
|
||||
impl GenerateWan2p6Request {
|
||||
/// Estimate the USD cost in cents for this generation request.
|
||||
pub fn estimate_cost_in_usd_cents(&self) -> u64 {
|
||||
let cents_per_second: u64 = match self.size {
|
||||
Some(Wan2p6Size::TenEightyP) => 12,
|
||||
// Default resolution (None) is 720p.
|
||||
Some(Wan2p6Size::SevenTwentyP) | None => 8,
|
||||
};
|
||||
let seconds = self.duration_seconds.unwrap_or(DEFAULT_DURATION_SECONDS);
|
||||
u64::from(seconds) * cents_per_second
|
||||
}
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateWan2p6Response {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_wan_2p6(
|
||||
args: GenerateWan2p6Args<'_>,
|
||||
) -> Result<GenerateWan2p6Response, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateWan2p6Response {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateWan2p6Request {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Wan 2.6 supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
if self.input_reference_images.len() > MAX_REFERENCE_IMAGES {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "input_reference_images",
|
||||
raw_value: self.input_reference_images.len().to_string(),
|
||||
reason: format!("Wan 2.6 accepts at most {MAX_REFERENCE_IMAGES} references"),
|
||||
});
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::Wan2p6,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: Wan2p6Size) -> CometVideoSize {
|
||||
match size {
|
||||
Wan2p6Size::SevenTwentyP => CometVideoSize::Exact { width: 1280, height: 720 },
|
||||
Wan2p6Size::TenEightyP => CometVideoSize::Exact { width: 1920, height: 1080 },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateWan2p6Request {
|
||||
prompt: "a steam train crossing a viaduct".to_string(),
|
||||
duration_seconds: Some(15),
|
||||
size: Some(Wan2p6Size::TenEightyP),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "wan2.6".to_string()),
|
||||
("prompt", "a steam train crossing a viaduct".to_string()),
|
||||
("seconds", "15".to_string()),
|
||||
("size", "1920x1080".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(1)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(2)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(15)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(16)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn too_many_references_rejected() {
|
||||
let mut request = request_with_seconds(Some(5));
|
||||
request.input_reference_images = (0..6)
|
||||
.map(|i| CometInputReferenceImage {
|
||||
file_bytes: vec![0u8],
|
||||
filename: format!("ref_{i}.png"),
|
||||
maybe_content_type: Some("image/png".to_string()),
|
||||
})
|
||||
.collect();
|
||||
|
||||
let error = request.to_create_video_request().expect_err("should reject 6 references");
|
||||
assert!(matches!(error, CometClientError::InvalidRequestField { field: "input_reference_images", .. }));
|
||||
|
||||
request.input_reference_images.truncate(5);
|
||||
assert!(request.to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_estimates() {
|
||||
// 5 seconds at 720p: 5 × 8¢ = 40¢
|
||||
let mut request = request_with_seconds(Some(5));
|
||||
request.size = Some(Wan2p6Size::SevenTwentyP);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 40);
|
||||
|
||||
// 10 seconds at 1080p: 10 × 12¢ = 120¢
|
||||
request.duration_seconds = Some(10);
|
||||
request.size = Some(Wan2p6Size::TenEightyP);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 120);
|
||||
|
||||
// Defaults (5 seconds, 720p): 40¢
|
||||
request.duration_seconds = None;
|
||||
request.size = None;
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 40);
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateWan2p6Request {
|
||||
GenerateWan2p6Request {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,186 @@
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::requests::create_video::create_video::{
|
||||
create_video, CometInputReferenceImage, CometVideoModelRaw, CometVideoSize,
|
||||
CreateVideoArgs, CreateVideoRequest,
|
||||
};
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Wan 2.7 supports 2-15 second durations.
|
||||
const MIN_DURATION_SECONDS: u8 = 2;
|
||||
const MAX_DURATION_SECONDS: u8 = 15;
|
||||
|
||||
/// The API default duration when `seconds` is omitted.
|
||||
const DEFAULT_DURATION_SECONDS: u8 = 5;
|
||||
|
||||
// ── Args ──
|
||||
|
||||
pub struct GenerateWan2p7Args<'a> {
|
||||
pub request: GenerateWan2p7Request,
|
||||
pub api_key: &'a CometApiKey,
|
||||
}
|
||||
|
||||
// ── Request ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct GenerateWan2p7Request {
|
||||
pub prompt: String,
|
||||
|
||||
/// 2-15 seconds. `None` uses the API default (5).
|
||||
pub duration_seconds: Option<u8>,
|
||||
|
||||
/// `None` uses the API default (720p).
|
||||
pub size: Option<Wan2p7Size>,
|
||||
|
||||
/// Reference images for image-to-video and first/last-frame workflows.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
// ── Enums ──
|
||||
|
||||
/// Wan 2.7 renders at 720p or 1080p.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub enum Wan2p7Size {
|
||||
SevenTwentyP,
|
||||
TenEightyP,
|
||||
}
|
||||
|
||||
// ── Pricing ──
|
||||
//
|
||||
// Wan 2.7 per-second USD pricing (via CometAPI):
|
||||
//
|
||||
// | Resolution | $/sec |
|
||||
// |------------|-------|
|
||||
// | 720p | 0.08 |
|
||||
// | 1080p | 0.12 |
|
||||
//
|
||||
// Total cost = price per second × video duration (seconds).
|
||||
|
||||
impl GenerateWan2p7Request {
|
||||
/// Estimate the USD cost in cents for this generation request.
|
||||
pub fn estimate_cost_in_usd_cents(&self) -> u64 {
|
||||
let cents_per_second: u64 = match self.size {
|
||||
Some(Wan2p7Size::TenEightyP) => 12,
|
||||
// Default resolution (None) is 720p.
|
||||
Some(Wan2p7Size::SevenTwentyP) | None => 8,
|
||||
};
|
||||
let seconds = self.duration_seconds.unwrap_or(DEFAULT_DURATION_SECONDS);
|
||||
u64::from(seconds) * cents_per_second
|
||||
}
|
||||
}
|
||||
|
||||
// ── Response ──
|
||||
|
||||
pub struct GenerateWan2p7Response {
|
||||
/// Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
pub status: CometVideoTaskStatus,
|
||||
}
|
||||
|
||||
// ── Entry point ──
|
||||
|
||||
pub async fn generate_wan_2p7(
|
||||
args: GenerateWan2p7Args<'_>,
|
||||
) -> Result<GenerateWan2p7Response, CometError> {
|
||||
let raw_request = args.request.to_create_video_request()?;
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: args.api_key,
|
||||
request: raw_request,
|
||||
}).await?;
|
||||
|
||||
Ok(GenerateWan2p7Response {
|
||||
task_id: result.task_id,
|
||||
status: result.status,
|
||||
})
|
||||
}
|
||||
|
||||
impl GenerateWan2p7Request {
|
||||
/// Validate and lower to the generic wire request.
|
||||
pub fn to_create_video_request(&self) -> Result<CreateVideoRequest, CometClientError> {
|
||||
if let Some(seconds) = self.duration_seconds {
|
||||
if !(MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "duration_seconds",
|
||||
raw_value: seconds.to_string(),
|
||||
reason: format!("Wan 2.7 supports {MIN_DURATION_SECONDS}-{MAX_DURATION_SECONDS} second durations"),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Ok(CreateVideoRequest {
|
||||
model: CometVideoModelRaw::Wan2p7,
|
||||
prompt: self.prompt.clone(),
|
||||
maybe_seconds: self.duration_seconds,
|
||||
maybe_size: self.size.map(map_size),
|
||||
input_reference_images: self.input_reference_images.clone(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn map_size(size: Wan2p7Size) -> CometVideoSize {
|
||||
match size {
|
||||
Wan2p7Size::SevenTwentyP => CometVideoSize::Exact { width: 1280, height: 720 },
|
||||
Wan2p7Size::TenEightyP => CometVideoSize::Exact { width: 1920, height: 1080 },
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn maps_to_wire_request() {
|
||||
let request = GenerateWan2p7Request {
|
||||
prompt: "a koi pond at golden hour".to_string(),
|
||||
duration_seconds: Some(5),
|
||||
size: Some(Wan2p7Size::SevenTwentyP),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
let raw = request.to_create_video_request().expect("should validate");
|
||||
assert_eq!(raw.text_form_fields(), vec![
|
||||
("model", "wan2.7".to_string()),
|
||||
("prompt", "a koi pond at golden hour".to_string()),
|
||||
("seconds", "5".to_string()),
|
||||
("size", "1280x720".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn duration_bounds() {
|
||||
assert!(request_with_seconds(Some(1)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(Some(2)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(15)).to_create_video_request().is_ok());
|
||||
assert!(request_with_seconds(Some(16)).to_create_video_request().is_err());
|
||||
assert!(request_with_seconds(None).to_create_video_request().is_ok());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cost_estimates() {
|
||||
// 5 seconds at 720p: 5 × 8¢ = 40¢
|
||||
let mut request = request_with_seconds(Some(5));
|
||||
request.size = Some(Wan2p7Size::SevenTwentyP);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 40);
|
||||
|
||||
// 10 seconds at 1080p: 10 × 12¢ = 120¢
|
||||
request.duration_seconds = Some(10);
|
||||
request.size = Some(Wan2p7Size::TenEightyP);
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 120);
|
||||
|
||||
// Defaults (5 seconds, 720p): 40¢
|
||||
request.duration_seconds = None;
|
||||
request.size = None;
|
||||
assert_eq!(request.estimate_cost_in_usd_cents(), 40);
|
||||
}
|
||||
|
||||
fn request_with_seconds(duration_seconds: Option<u8>) -> GenerateWan2p7Request {
|
||||
GenerateWan2p7Request {
|
||||
prompt: "ok".to_string(),
|
||||
duration_seconds,
|
||||
size: None,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
//! Concrete, strongly-typed per-model bindings over the generic
|
||||
//! [`crate::requests::create_video`] call. Each module encodes one model's
|
||||
//! constraints (duration range, size options, image-input support) in the
|
||||
//! type system and validates before hitting the wire.
|
||||
|
||||
pub mod generate_doubao_seedance_1p0_pro;
|
||||
pub mod generate_doubao_seedance_1p5_pro;
|
||||
pub mod generate_doubao_seedance_2p0;
|
||||
pub mod generate_doubao_seedance_2p0_fast;
|
||||
pub mod generate_vidu_q3;
|
||||
pub mod generate_vidu_q3_turbo;
|
||||
pub mod generate_wan_2p6;
|
||||
pub mod generate_wan_2p7;
|
||||
@@ -0,0 +1,21 @@
|
||||
//! comet_api_client
|
||||
//!
|
||||
//! HTTP client for CometAPI (https://www.cometapi.com/), which proxies a
|
||||
//! variety of third-party generative models. We use it for Doubao Seedance 2.0
|
||||
//! video generation ("Seedance 2.0" and "Seedance 2.0 Fast").
|
||||
//!
|
||||
//! Flow: enqueue with [`requests::create_video`], then poll with
|
||||
//! [`requests::get_video_task`] until the task reaches a terminal status.
|
||||
//!
|
||||
//! NB: There is deliberately no webhook module. CometAPI documents callbacks
|
||||
//! as provider-specific pass-through events with no standardized payload, and
|
||||
//! the Seedance video endpoint has no documented callback parameter. Comet's
|
||||
//! own guidance is to "keep polling as the source of truth".
|
||||
|
||||
pub mod creds;
|
||||
pub mod error;
|
||||
pub mod generate;
|
||||
pub mod requests;
|
||||
|
||||
#[cfg(test)]
|
||||
mod test_utils;
|
||||
@@ -0,0 +1,2 @@
|
||||
/// Base URL for the CometAPI HTTP API.
|
||||
pub const COMET_API_BASE_URL: &str = "https://api.cometapi.com";
|
||||
@@ -0,0 +1,439 @@
|
||||
use std::fmt;
|
||||
|
||||
use log::info;
|
||||
use reqwest::multipart::{Form, Part};
|
||||
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::categorize_comet_error::categorize_create_video_error;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::error::comet_generic_api_error::CometGenericApiError;
|
||||
use crate::requests::comet_host::COMET_API_BASE_URL;
|
||||
use crate::requests::create_video::request_types::CreateVideoRawResponse;
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
// ── Public args ──
|
||||
|
||||
/// Top-level argument to [`create_video`]. Borrows the API key separately
|
||||
/// from the request body so callers can log/save [`CreateVideoRequest`]
|
||||
/// without leaking the credential.
|
||||
pub struct CreateVideoArgs<'a> {
|
||||
pub api_key: &'a CometApiKey,
|
||||
pub request: CreateVideoRequest,
|
||||
}
|
||||
|
||||
/// The material part of a video creation request (`POST /v1/videos`).
|
||||
///
|
||||
/// This is the generic, model-agnostic wire shape. Per-model duration and
|
||||
/// size constraints are NOT enforced here — use the strongly-typed bindings
|
||||
/// in [`crate::generate::video`] which validate before delegating to this.
|
||||
#[derive(Clone)]
|
||||
pub struct CreateVideoRequest {
|
||||
/// Which video model fulfils the request.
|
||||
pub model: CometVideoModelRaw,
|
||||
|
||||
/// Text description of the desired video. Reference attached images in
|
||||
/// the prompt as `[Image 1]`, `[Image 2]`, etc.
|
||||
pub prompt: String,
|
||||
|
||||
/// Video duration in seconds. Valid ranges are model-specific. Default: 5.
|
||||
pub maybe_seconds: Option<u8>,
|
||||
|
||||
/// Output size: an aspect-ratio preset or exact dimensions.
|
||||
pub maybe_size: Option<CometVideoSize>,
|
||||
|
||||
/// Optional reference images (JPEG, PNG, WebP) for image-to-video.
|
||||
/// Each is sent as a repeated `input_reference` multipart field.
|
||||
/// Not all models support image input.
|
||||
pub input_reference_images: Vec<CometInputReferenceImage>,
|
||||
}
|
||||
|
||||
/// The video models CometAPI fronts on `POST /v1/videos`.
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
||||
pub enum CometVideoModelRaw {
|
||||
/// Seedance 2.0
|
||||
DoubaoSeedance2p0,
|
||||
/// Seedance 2.0 Fast
|
||||
DoubaoSeedance2p0Fast,
|
||||
/// Seedance 1.5 Pro (text-only)
|
||||
DoubaoSeedance1p5Pro,
|
||||
/// Seedance 1.0 Pro (text-only)
|
||||
DoubaoSeedance1p0Pro,
|
||||
/// Vidu Q3
|
||||
ViduQ3,
|
||||
/// Vidu Q3 Turbo
|
||||
ViduQ3Turbo,
|
||||
/// Alibaba Wan 2.7
|
||||
Wan2p7,
|
||||
/// Alibaba Wan 2.6
|
||||
Wan2p6,
|
||||
}
|
||||
|
||||
/// Output video size: a ratio preset or exact pixel dimensions.
|
||||
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
|
||||
pub enum CometVideoSize {
|
||||
/// 16:9 (landscape)
|
||||
Landscape16x9,
|
||||
/// 4:3
|
||||
Standard4x3,
|
||||
/// 1:1 (square)
|
||||
Square,
|
||||
/// 3:4
|
||||
Portrait3x4,
|
||||
/// 9:16 (portrait)
|
||||
Portrait9x16,
|
||||
/// 21:9 (ultra-wide)
|
||||
UltraWide21x9,
|
||||
/// Exact dimensions, eg. 1280x720.
|
||||
Exact { width: u32, height: u32 },
|
||||
}
|
||||
|
||||
/// A reference image attached to the request as a binary multipart part.
|
||||
#[derive(Clone)]
|
||||
pub struct CometInputReferenceImage {
|
||||
/// Raw bytes of the image (JPEG, PNG, or WebP). Excluded from `Debug`
|
||||
/// output — a megabyte-scale blob shouldn't end up in a log line.
|
||||
pub file_bytes: Vec<u8>,
|
||||
|
||||
/// Filename for the multipart `Content-Disposition` header.
|
||||
pub filename: String,
|
||||
|
||||
/// Optional MIME type, eg. "image/png". If `None`, reqwest uses
|
||||
/// `application/octet-stream`.
|
||||
pub maybe_content_type: Option<String>,
|
||||
}
|
||||
|
||||
// ── Public response ──
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct CreateVideoSuccess {
|
||||
/// Task identifier. Poll `GET /v1/videos/{task_id}` until terminal.
|
||||
pub task_id: String,
|
||||
|
||||
/// Initial lifecycle status, typically queued.
|
||||
pub status: CometVideoTaskStatus,
|
||||
|
||||
/// The model that will fulfil the task, as echoed by the API.
|
||||
pub maybe_model: Option<String>,
|
||||
|
||||
/// 0-100 completion percentage.
|
||||
pub maybe_progress: Option<u8>,
|
||||
|
||||
/// Unix timestamp (seconds).
|
||||
pub maybe_created_at: Option<i64>,
|
||||
}
|
||||
|
||||
/// Enqueue a Doubao Seedance 2.0 video generation task.
|
||||
///
|
||||
/// CometAPI's video creation endpoint takes `multipart/form-data`. The task
|
||||
/// id in the response is then polled with
|
||||
/// [`crate::requests::get_video_task::get_video_task::get_video_task`].
|
||||
pub async fn create_video(args: CreateVideoArgs<'_>) -> Result<CreateVideoSuccess, CometError> {
|
||||
let request = &args.request;
|
||||
request.validate()?;
|
||||
|
||||
let url = format!("{COMET_API_BASE_URL}/v1/videos");
|
||||
|
||||
let mut form = Form::new();
|
||||
for (field, value) in request.text_form_fields() {
|
||||
form = form.text(field, value);
|
||||
}
|
||||
for image in &request.input_reference_images {
|
||||
let mut part = Part::bytes(image.file_bytes.clone())
|
||||
.file_name(image.filename.clone());
|
||||
if let Some(content_type) = &image.maybe_content_type {
|
||||
part = part.mime_str(content_type)
|
||||
.map_err(|err| CometClientError::InvalidRequestField {
|
||||
field: "input_reference_images.maybe_content_type",
|
||||
raw_value: content_type.clone(),
|
||||
reason: format!("invalid mime type: {err}"),
|
||||
})?;
|
||||
}
|
||||
form = form.part("input_reference", part);
|
||||
}
|
||||
|
||||
let client = reqwest::Client::builder()
|
||||
.build()
|
||||
.map_err(CometClientError::ReqwestClientError)?;
|
||||
|
||||
let response = client.post(&url)
|
||||
.bearer_auth(args.api_key.as_str())
|
||||
.multipart(form)
|
||||
.send()
|
||||
.await
|
||||
.map_err(CometGenericApiError::ReqwestError)?;
|
||||
|
||||
let status_code = response.status();
|
||||
let body = response.text()
|
||||
.await
|
||||
.map_err(CometGenericApiError::ReqwestError)?;
|
||||
|
||||
if !status_code.is_success() {
|
||||
return Err(categorize_create_video_error(status_code, body));
|
||||
}
|
||||
|
||||
let raw: CreateVideoRawResponse = serde_json::from_str(&body)
|
||||
.map_err(|err| CometGenericApiError::SerdeResponseParseErrorWithBody(err, body.clone()))?;
|
||||
|
||||
info!("Comet video task enqueued: {} (status: {})", raw.id, raw.status);
|
||||
|
||||
Ok(CreateVideoSuccess {
|
||||
task_id: raw.id,
|
||||
status: raw.status,
|
||||
maybe_model: raw.model,
|
||||
maybe_progress: raw.progress,
|
||||
maybe_created_at: raw.created_at,
|
||||
})
|
||||
}
|
||||
|
||||
impl CreateVideoRequest {
|
||||
/// The text fields of the multipart form, in wire order. Split out from
|
||||
/// [`create_video`] so the form shape is testable without HTTP.
|
||||
pub fn text_form_fields(&self) -> Vec<(&'static str, String)> {
|
||||
let mut fields = vec![
|
||||
("model", self.model.as_api_str().to_string()),
|
||||
("prompt", self.prompt.clone()),
|
||||
];
|
||||
if let Some(seconds) = self.maybe_seconds {
|
||||
fields.push(("seconds", seconds.to_string()));
|
||||
}
|
||||
if let Some(size) = self.maybe_size {
|
||||
fields.push(("size", size.as_api_string()));
|
||||
}
|
||||
fields
|
||||
}
|
||||
|
||||
fn validate(&self) -> Result<(), CometClientError> {
|
||||
if self.prompt.trim().is_empty() {
|
||||
return Err(CometClientError::InvalidRequestField {
|
||||
field: "prompt",
|
||||
raw_value: self.prompt.clone(),
|
||||
reason: "prompt must not be empty".to_string(),
|
||||
});
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
impl CometVideoModelRaw {
|
||||
pub fn as_api_str(&self) -> &'static str {
|
||||
match self {
|
||||
Self::DoubaoSeedance2p0 => "doubao-seedance-2-0",
|
||||
Self::DoubaoSeedance2p0Fast => "doubao-seedance-2-0-fast",
|
||||
Self::DoubaoSeedance1p5Pro => "doubao-seedance-1-5-pro",
|
||||
Self::DoubaoSeedance1p0Pro => "doubao-seedance-1-0-pro",
|
||||
Self::ViduQ3 => "viduq3",
|
||||
Self::ViduQ3Turbo => "viduq3-turbo",
|
||||
Self::Wan2p7 => "wan2.7",
|
||||
Self::Wan2p6 => "wan2.6",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl CometVideoSize {
|
||||
pub fn as_api_string(&self) -> String {
|
||||
match self {
|
||||
Self::Landscape16x9 => "16:9".to_string(),
|
||||
Self::Standard4x3 => "4:3".to_string(),
|
||||
Self::Square => "1:1".to_string(),
|
||||
Self::Portrait3x4 => "3:4".to_string(),
|
||||
Self::Portrait9x16 => "9:16".to_string(),
|
||||
Self::UltraWide21x9 => "21:9".to_string(),
|
||||
Self::Exact { width, height } => format!("{width}x{height}"),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for CreateVideoRequest {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_struct("CreateVideoRequest")
|
||||
.field("model", &self.model)
|
||||
.field("prompt", &self.prompt)
|
||||
.field("maybe_seconds", &self.maybe_seconds)
|
||||
.field("maybe_size", &self.maybe_size)
|
||||
.field("input_reference_images", &self.input_reference_images)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for CometInputReferenceImage {
|
||||
// Print byte-length, not raw bytes — derived Debug on Vec<u8> would dump
|
||||
// the entire image into the log line.
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
f.debug_struct("CometInputReferenceImage")
|
||||
.field("file_bytes_len", &self.file_bytes.len())
|
||||
.field("filename", &self.filename)
|
||||
.field("maybe_content_type", &self.maybe_content_type)
|
||||
.finish()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
mod shape_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn model_api_strings() {
|
||||
assert_eq!(CometVideoModelRaw::DoubaoSeedance2p0.as_api_str(), "doubao-seedance-2-0");
|
||||
assert_eq!(CometVideoModelRaw::DoubaoSeedance2p0Fast.as_api_str(), "doubao-seedance-2-0-fast");
|
||||
assert_eq!(CometVideoModelRaw::DoubaoSeedance1p5Pro.as_api_str(), "doubao-seedance-1-5-pro");
|
||||
assert_eq!(CometVideoModelRaw::DoubaoSeedance1p0Pro.as_api_str(), "doubao-seedance-1-0-pro");
|
||||
assert_eq!(CometVideoModelRaw::ViduQ3.as_api_str(), "viduq3");
|
||||
assert_eq!(CometVideoModelRaw::ViduQ3Turbo.as_api_str(), "viduq3-turbo");
|
||||
assert_eq!(CometVideoModelRaw::Wan2p7.as_api_str(), "wan2.7");
|
||||
assert_eq!(CometVideoModelRaw::Wan2p6.as_api_str(), "wan2.6");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn size_api_strings() {
|
||||
assert_eq!(CometVideoSize::Landscape16x9.as_api_string(), "16:9");
|
||||
assert_eq!(CometVideoSize::Standard4x3.as_api_string(), "4:3");
|
||||
assert_eq!(CometVideoSize::Square.as_api_string(), "1:1");
|
||||
assert_eq!(CometVideoSize::Portrait3x4.as_api_string(), "3:4");
|
||||
assert_eq!(CometVideoSize::Portrait9x16.as_api_string(), "9:16");
|
||||
assert_eq!(CometVideoSize::UltraWide21x9.as_api_string(), "21:9");
|
||||
assert_eq!(CometVideoSize::Exact { width: 1280, height: 720 }.as_api_string(), "1280x720");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn minimal_form_fields() {
|
||||
let request = CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0Fast,
|
||||
prompt: "a corgi running through a field".to_string(),
|
||||
maybe_seconds: None,
|
||||
maybe_size: None,
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
assert_eq!(request.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-2-0-fast".to_string()),
|
||||
("prompt", "a corgi running through a field".to_string()),
|
||||
]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn full_form_fields() {
|
||||
let request = CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0,
|
||||
prompt: "make [Image 1] come alive".to_string(),
|
||||
maybe_seconds: Some(10),
|
||||
maybe_size: Some(CometVideoSize::Portrait9x16),
|
||||
input_reference_images: vec![],
|
||||
};
|
||||
|
||||
assert_eq!(request.text_form_fields(), vec![
|
||||
("model", "doubao-seedance-2-0".to_string()),
|
||||
("prompt", "make [Image 1] come alive".to_string()),
|
||||
("seconds", "10".to_string()),
|
||||
("size", "9:16".to_string()),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
mod validation_tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn empty_prompt_is_rejected() {
|
||||
let request = request_with_prompt_and_seconds(" ", None);
|
||||
let error = request.validate().expect_err("should reject empty prompt");
|
||||
assert!(matches!(error, CometClientError::InvalidRequestField { field: "prompt", .. }));
|
||||
}
|
||||
|
||||
// NB: Duration ranges are model-specific and validated by the concrete
|
||||
// bindings in `generate::video`; the generic layer accepts any value.
|
||||
|
||||
fn request_with_prompt_and_seconds(prompt: &str, maybe_seconds: Option<u8>) -> CreateVideoRequest {
|
||||
CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0,
|
||||
prompt: prompt.to_string(),
|
||||
maybe_seconds,
|
||||
maybe_size: None,
|
||||
input_reference_images: vec![],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mod live_tests {
|
||||
use super::*;
|
||||
use crate::test_utils::load_api_key;
|
||||
|
||||
/// Live test: enqueues a REAL generation and INCURS COSTS.
|
||||
/// Run manually with:
|
||||
/// cargo test -p comet_api_client live_create_video -- --ignored --nocapture
|
||||
#[ignore]
|
||||
#[tokio::test]
|
||||
async fn live_create_video() {
|
||||
let api_key = load_api_key();
|
||||
|
||||
let result = create_video(CreateVideoArgs {
|
||||
api_key: &api_key,
|
||||
request: CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0Fast,
|
||||
prompt: "a corgi running through a sunny meadow, cinematic".to_string(),
|
||||
maybe_seconds: Some(4),
|
||||
maybe_size: Some(CometVideoSize::Landscape16x9),
|
||||
input_reference_images: vec![],
|
||||
},
|
||||
}).await.expect("create_video should succeed");
|
||||
|
||||
println!("Enqueued task: {} (status: {})", result.task_id, result.status);
|
||||
assert!(!result.task_id.is_empty());
|
||||
}
|
||||
|
||||
/// Live test: enqueues a REAL generation and polls it to completion.
|
||||
/// INCURS COSTS and takes a few minutes. Run manually with:
|
||||
/// cargo test -p comet_api_client live_create_and_poll_video -- --ignored --nocapture
|
||||
#[ignore]
|
||||
#[tokio::test]
|
||||
async fn live_create_and_poll_video() {
|
||||
use std::time::Duration;
|
||||
|
||||
use crate::requests::get_video_task::get_video_task::{get_video_task, GetVideoTaskArgs};
|
||||
|
||||
// NB: Comet's docs claim most tasks finish in 1-3 minutes, but tasks
|
||||
// have been observed to sit at `in_progress` well past 10 minutes.
|
||||
const POLL_INTERVAL: Duration = Duration::from_secs(15);
|
||||
const MAX_POLLS: u32 = 120; // ~30 minutes
|
||||
|
||||
let api_key = load_api_key();
|
||||
|
||||
let created = create_video(CreateVideoArgs {
|
||||
api_key: &api_key,
|
||||
request: CreateVideoRequest {
|
||||
model: CometVideoModelRaw::DoubaoSeedance2p0Fast,
|
||||
prompt: "a corgi running through a sunny meadow, cinematic".to_string(),
|
||||
maybe_seconds: Some(4),
|
||||
maybe_size: Some(CometVideoSize::Landscape16x9),
|
||||
input_reference_images: vec![],
|
||||
},
|
||||
}).await.expect("create_video should succeed");
|
||||
|
||||
println!("Enqueued task: {} (status: {})", created.task_id, created.status);
|
||||
|
||||
for poll in 1..=MAX_POLLS {
|
||||
tokio::time::sleep(POLL_INTERVAL).await;
|
||||
|
||||
let task = get_video_task(GetVideoTaskArgs {
|
||||
api_key: &api_key,
|
||||
task_id: &created.task_id,
|
||||
}).await.expect("get_video_task should succeed");
|
||||
|
||||
println!("Poll {}: status {} (progress: {:?})", poll, task.status, task.maybe_progress);
|
||||
|
||||
if task.status.is_terminal() {
|
||||
assert!(task.status.is_success(), "task should complete successfully: {:?}", task);
|
||||
let video_url = task.maybe_video_url.expect("completed task should have a video url");
|
||||
println!("Video URL: {}", video_url);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
panic!("Task {} did not reach a terminal state in time", created.task_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
pub mod create_video;
|
||||
pub mod request_types;
|
||||
@@ -0,0 +1,77 @@
|
||||
use serde_derive::Deserialize;
|
||||
|
||||
use crate::requests::video_task_status::CometVideoTaskStatus;
|
||||
|
||||
/// Over-the-wire response from `POST /v1/videos`.
|
||||
///
|
||||
/// The docs show both `id` and `task_id` carrying the same task identifier;
|
||||
/// `task_id` is treated as an optional mirror of `id`.
|
||||
#[derive(Clone, Debug, Deserialize)]
|
||||
pub struct CreateVideoRawResponse {
|
||||
/// Task identifier, eg. "task_abc123". Use this with the poll endpoint.
|
||||
pub id: String,
|
||||
|
||||
/// Mirror of `id`.
|
||||
pub task_id: Option<String>,
|
||||
|
||||
/// Always "video".
|
||||
pub object: Option<String>,
|
||||
|
||||
/// The model that will fulfil the task, eg. "doubao-seedance-2-0".
|
||||
pub model: Option<String>,
|
||||
|
||||
/// Initial lifecycle status, typically "queued".
|
||||
pub status: CometVideoTaskStatus,
|
||||
|
||||
/// 0-100 completion percentage.
|
||||
pub progress: Option<u8>,
|
||||
|
||||
/// Unix timestamp (seconds).
|
||||
pub created_at: Option<i64>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
/// Documented response shape from
|
||||
/// https://apidoc.cometapi.com/api/video/seedance/create.md
|
||||
const REAL_CREATE_RESPONSE: &str = r#"
|
||||
{
|
||||
"id": "task_abc123",
|
||||
"task_id": "task_abc123",
|
||||
"object": "video",
|
||||
"model": "doubao-seedance-2-0",
|
||||
"status": "queued",
|
||||
"progress": 0,
|
||||
"created_at": 1776681149
|
||||
}
|
||||
"#;
|
||||
|
||||
#[test]
|
||||
fn parse_real_create_response() {
|
||||
let response: CreateVideoRawResponse = serde_json::from_str(REAL_CREATE_RESPONSE)
|
||||
.expect("should parse");
|
||||
|
||||
assert_eq!(response.id, "task_abc123");
|
||||
assert_eq!(response.task_id.as_deref(), Some("task_abc123"));
|
||||
assert_eq!(response.object.as_deref(), Some("video"));
|
||||
assert_eq!(response.model.as_deref(), Some("doubao-seedance-2-0"));
|
||||
assert_eq!(response.status, CometVideoTaskStatus::Queued);
|
||||
assert_eq!(response.progress, Some(0));
|
||||
assert_eq!(response.created_at, Some(1776681149));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_minimal_response() {
|
||||
// Only `id` and `status` are load-bearing; everything else is optional
|
||||
// so schema drift doesn't break enqueuing.
|
||||
let response: CreateVideoRawResponse = serde_json::from_str(
|
||||
r#"{"id":"task_xyz","status":"queued"}"#,
|
||||
).expect("should parse");
|
||||
|
||||
assert_eq!(response.id, "task_xyz");
|
||||
assert_eq!(response.status, CometVideoTaskStatus::Queued);
|
||||
assert_eq!(response.task_id, None);
|
||||
}
|
||||
}
|
||||
+169
@@ -0,0 +1,169 @@
|
||||
//! `GET /v1/videos/{id}/content` — the video download endpoint, used here to
|
||||
//! probe WHY a task failed.
|
||||
//!
|
||||
//! The regular poll endpoint ([`crate::requests::get_video_task`]) reports
|
||||
//! failed tasks as bare `status: "failed"` with no reason. The content
|
||||
//! endpoint's error message, however, leaks the underlying provider status,
|
||||
//! eg.:
|
||||
//!
|
||||
//! {"error":{"message":"Task is not completed yet, current status: VIOLATION", ...}}
|
||||
//!
|
||||
//! "VIOLATION" indicates a content-moderation rejection (these tasks run to
|
||||
//! `progress: 100` and then fail when the finished output is moderated).
|
||||
|
||||
use log::info;
|
||||
|
||||
use crate::creds::comet_api_key::CometApiKey;
|
||||
use crate::error::comet_client_error::CometClientError;
|
||||
use crate::error::comet_error::CometError;
|
||||
use crate::error::comet_generic_api_error::CometGenericApiError;
|
||||
use crate::requests::comet_host::COMET_API_BASE_URL;
|
||||
use crate::requests::get_video_content::request_types::VideoContentErrorRawResponse;
|
||||
|
||||
/// Marker preceding the underlying provider status in the content endpoint's
|
||||
/// error message.
|
||||
const CURRENT_STATUS_MARKER: &str = "current status: ";
|
||||
|
||||
// ── Public args ──
|
||||
|
||||
pub struct ProbeVideoFailureReasonArgs<'a> {
|
||||
pub api_key: &'a CometApiKey,
|
||||
|
||||
/// The task id returned by the creation endpoint, eg. "task_abc123".
|
||||
pub task_id: &'a str,
|
||||
}
|
||||
|
||||
// ── Public response ──
|
||||
|
||||
/// Why a video task isn't downloadable, recovered from the content
|
||||
/// endpoint's error message.
|
||||
///
|
||||
/// NB: The error envelope carries exactly two fields (`message`, `type`) —
|
||||
/// there is no richer structured reason. The request id comes from the
|
||||
/// `x-cometapi-request-id` response header and is useful when escalating
|
||||
/// to CometAPI support.
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct CometVideoFailureReason {
|
||||
/// The full error message, eg.
|
||||
/// "Task is not completed yet, current status: VIOLATION".
|
||||
pub raw_message: String,
|
||||
|
||||
/// The underlying provider status parsed out of the message, eg.
|
||||
/// "VIOLATION" (content moderation rejection). `None` if the message
|
||||
/// didn't follow the known "current status: X" shape.
|
||||
pub maybe_underlying_status: Option<String>,
|
||||
|
||||
/// The error envelope's `type` field, eg. "invalid_request_error".
|
||||
pub maybe_error_type: Option<String>,
|
||||
|
||||
/// CometAPI's request id (`x-cometapi-request-id` response header), for
|
||||
/// support escalation.
|
||||
pub maybe_request_id: Option<String>,
|
||||
}
|
||||
|
||||
impl CometVideoFailureReason {
|
||||
/// Whether the task was rejected by content moderation.
|
||||
pub fn is_content_violation(&self) -> bool {
|
||||
self.maybe_underlying_status.as_deref() == Some("VIOLATION")
|
||||
}
|
||||
}
|
||||
|
||||
/// Probe why a task's video isn't downloadable.
|
||||
///
|
||||
/// Returns `Ok(None)` when the content endpoint responds 2xx — the video
|
||||
/// exists and there is no failure (the body is NOT downloaded). Returns
|
||||
/// `Ok(Some(reason))` when the endpoint returns its error envelope, which is
|
||||
/// where the underlying provider status (eg. "VIOLATION") is surfaced.
|
||||
///
|
||||
/// NB: For tasks that are merely still running, the message reports the
|
||||
/// in-flight status the same way — call this for tasks the poll endpoint
|
||||
/// already reported as failed.
|
||||
pub async fn probe_video_failure_reason(
|
||||
args: ProbeVideoFailureReasonArgs<'_>,
|
||||
) -> Result<Option<CometVideoFailureReason>, CometError> {
|
||||
let url = format!("{COMET_API_BASE_URL}/v1/videos/{}/content", args.task_id);
|
||||
|
||||
let client = reqwest::Client::builder()
|
||||
.build()
|
||||
.map_err(CometClientError::ReqwestClientError)?;
|
||||
|
||||
let response = client.get(&url)
|
||||
.bearer_auth(args.api_key.as_str())
|
||||
.send()
|
||||
.await
|
||||
.map_err(CometGenericApiError::ReqwestError)?;
|
||||
|
||||
let status_code = response.status();
|
||||
|
||||
if status_code.is_success() {
|
||||
// The video exists; don't download the body.
|
||||
return Ok(None);
|
||||
}
|
||||
|
||||
let maybe_request_id = response.headers()
|
||||
.get("x-cometapi-request-id")
|
||||
.and_then(|value| value.to_str().ok())
|
||||
.map(|value| value.to_string());
|
||||
|
||||
let body = response.text()
|
||||
.await
|
||||
.map_err(CometGenericApiError::ReqwestError)?;
|
||||
|
||||
let raw: VideoContentErrorRawResponse = serde_json::from_str(&body)
|
||||
.map_err(|err| CometGenericApiError::SerdeResponseParseErrorWithBody(err, body.clone()))?;
|
||||
|
||||
let mut reason = failure_reason_from_message(raw.error.message);
|
||||
reason.maybe_error_type = raw.error.error_type;
|
||||
reason.maybe_request_id = maybe_request_id;
|
||||
|
||||
info!("Comet video task {} failure probe: {:?}", args.task_id, reason);
|
||||
|
||||
Ok(Some(reason))
|
||||
}
|
||||
|
||||
fn failure_reason_from_message(raw_message: String) -> CometVideoFailureReason {
|
||||
let maybe_underlying_status = raw_message
|
||||
.split(CURRENT_STATUS_MARKER)
|
||||
.nth(1)
|
||||
.map(|status| status.trim().trim_end_matches('.').to_string())
|
||||
.filter(|status| !status.is_empty());
|
||||
|
||||
CometVideoFailureReason {
|
||||
raw_message,
|
||||
maybe_underlying_status,
|
||||
maybe_error_type: None,
|
||||
maybe_request_id: None,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn extracts_violation_status_from_real_message() {
|
||||
let reason = failure_reason_from_message(
|
||||
"Task is not completed yet, current status: VIOLATION".to_string());
|
||||
|
||||
assert_eq!(reason.maybe_underlying_status.as_deref(), Some("VIOLATION"));
|
||||
assert!(reason.is_content_violation());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn extracts_other_statuses() {
|
||||
let reason = failure_reason_from_message(
|
||||
"Task is not completed yet, current status: IN_PROGRESS".to_string());
|
||||
|
||||
assert_eq!(reason.maybe_underlying_status.as_deref(), Some("IN_PROGRESS"));
|
||||
assert!(!reason.is_content_violation());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn unknown_message_shape_keeps_raw_message() {
|
||||
let reason = failure_reason_from_message("something unexpected".to_string());
|
||||
|
||||
assert_eq!(reason.maybe_underlying_status, None);
|
||||
assert!(!reason.is_content_violation());
|
||||
assert_eq!(reason.raw_message, "something unexpected");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
pub mod get_video_content;
|
||||
pub mod request_types;
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user