mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-16 14:52:31 +00:00
width and height can be null
This commit is contained in:
1 parent
39dd4dee9a
commit
8667a0695d
2 files changed
+122
-6
No files matched your search
@@ -481,6 +481,29 @@ mod tests {
|
||||
assert_eq!(orders[0].total_credits, Some(13));
|
||||
}
|
||||
|
||||
/// Regression (paging outage): the Kinovi API started returning result
|
||||
/// `width`/`height` as `null`, which blew up the whole poll with
|
||||
/// "invalid type: null, expected a JSON number" and stalled the queue.
|
||||
/// They must coerce to `0` and let the rest of the response parse.
|
||||
#[test]
|
||||
fn null_dimensions_are_coerced_to_zero() {
|
||||
let body = r#"[{"result":{"data":{"json":{"orders":[{
|
||||
"orderId":"ord_foo",
|
||||
"resultUrl":"https://static.seedance2-pro.com/videos/seedance_video.mp4",
|
||||
"taskStatus":"COMPLETED",
|
||||
"results":[{"url":"https://static.seedance2-pro.com/videos/seedance_video.mp4","width":null,"height":null}],
|
||||
"failReason":null,
|
||||
"createdAt":"2026-02-19T01:20:50.398Z",
|
||||
"mediaType":"video"
|
||||
}],"nextCursor":null}}}}]"#;
|
||||
let orders = parse_orders(body);
|
||||
assert_eq!(orders.len(), 1);
|
||||
assert_eq!(orders[0].results.len(), 1);
|
||||
assert_eq!(orders[0].results[0].width, 0);
|
||||
assert_eq!(orders[0].results[0].height, 0);
|
||||
assert_eq!(orders[0].task_status, TaskStatus::Completed);
|
||||
}
|
||||
|
||||
/// Unrecognised mediaType values shouldn't crash deserialisation;
|
||||
/// they end up as `Unknown(_)`.
|
||||
#[test]
|
||||
@@ -634,4 +657,84 @@ mod tests {
|
||||
assert_eq!(1, 2); // NB: Intentional failure to inspect output.
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Live diagnostic for the paging outage: try EACH Kinovi account's cookies
|
||||
/// from the job's secrets env file and cursor across several pages, reporting
|
||||
/// which account(s) parse cleanly and which blow up. Never prints cookies.
|
||||
///
|
||||
/// cargo test -p seedance2pro_client live_cursor_all_accounts -- --ignored --nocapture
|
||||
#[tokio::test]
|
||||
#[ignore]
|
||||
async fn live_cursor_all_accounts() -> AnyhowResult<()> {
|
||||
setup_test_logging(LevelFilter::Info);
|
||||
|
||||
const SECRETS_ENV: &str = concat!(
|
||||
env!("CARGO_MANIFEST_DIR"),
|
||||
"/../../../crates/service/job/seedance2_pro_job/config/seedance2-pro-job.development-secrets.env",
|
||||
);
|
||||
const ACCOUNTS: &[&str] = &[
|
||||
"SEEDANCE2PRO_VOLCENGINE_COOKIES",
|
||||
"SEEDANCE2PRO_BYTEPLUS_COOKIES",
|
||||
"SEEDANCE2PRO_BYTEPLUS_ULTRA_COOKIES",
|
||||
];
|
||||
const MAX_PAGES: usize = 5;
|
||||
|
||||
let env_contents = std::fs::read_to_string(SECRETS_ENV)
|
||||
.unwrap_or_else(|e| panic!("could not read secrets env at {}: {}", SECRETS_ENV, e));
|
||||
|
||||
for account in ACCOUNTS {
|
||||
let Some(cookies) = read_env_value(&env_contents, account) else {
|
||||
println!("[{}] not present in secrets env — skipping", account);
|
||||
continue;
|
||||
};
|
||||
if cookies.is_empty() {
|
||||
println!("[{}] empty — skipping", account);
|
||||
continue;
|
||||
}
|
||||
|
||||
let session = Seedance2ProSession::from_cookies_string(cookies);
|
||||
let mut cursor: Option<u64> = None;
|
||||
let mut pages = 0usize;
|
||||
let mut total = 0usize;
|
||||
let mut ok = true;
|
||||
|
||||
for _ in 0..MAX_PAGES {
|
||||
match poll_orders(PollOrdersArgs { session: &session, cursor, host_override: None }).await {
|
||||
Ok(result) => {
|
||||
pages += 1;
|
||||
total += result.orders.len();
|
||||
cursor = result.next_cursor;
|
||||
if cursor.is_none() { break; }
|
||||
}
|
||||
Err(err) => {
|
||||
ok = false;
|
||||
println!("[{}] FAILED on page {}: {:?}", account, pages + 1, err);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
println!(
|
||||
"[{}] {} — {} page(s), {} order(s) parsed cleanly",
|
||||
account, if ok { "OK" } else { "ERROR" }, pages, total,
|
||||
);
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Minimal dotenv value reader: returns the value for `KEY=...` from raw env
|
||||
/// file contents, trimming surrounding quotes. Used so the diagnostic can try
|
||||
/// each account without depending on process-wide env being loaded.
|
||||
fn read_env_value(contents: &str, key: &str) -> Option<String> {
|
||||
for line in contents.lines() {
|
||||
let line = line.trim();
|
||||
if line.starts_with('#') { continue; }
|
||||
let Some((k, v)) = line.split_once('=') else { continue; };
|
||||
if k.trim() != key { continue; }
|
||||
let v = v.trim().trim_matches('"').trim_matches('\'').to_string();
|
||||
return Some(v);
|
||||
}
|
||||
None
|
||||
}
|
||||
}
|
||||
@@ -29,13 +29,15 @@ fn coerce_to_u32(number: &Number) -> u32 {
|
||||
}
|
||||
|
||||
/// `#[serde(deserialize_with = "...")]` for a required `u64` field that may
|
||||
/// arrive as an integer or a float.
|
||||
/// arrive as an integer or a float — or, increasingly, as `null`. A `null`
|
||||
/// (or JSON `null`) coerces to `0` rather than failing the whole parse; the
|
||||
/// Kinovi API intermittently returns `null` for fields it used to populate.
|
||||
pub fn de_u64_int_or_float<'de, D>(deserializer: D) -> Result<u64, D::Error>
|
||||
where
|
||||
D: Deserializer<'de>,
|
||||
{
|
||||
let number = Number::deserialize(deserializer)?;
|
||||
Ok(coerce_to_u64(&number))
|
||||
let maybe_number = Option::<Number>::deserialize(deserializer)?;
|
||||
Ok(maybe_number.as_ref().map(coerce_to_u64).unwrap_or(0))
|
||||
}
|
||||
|
||||
/// `#[serde(deserialize_with = "...")]` for an optional `u64` field (handles
|
||||
@@ -59,13 +61,15 @@ where
|
||||
}
|
||||
|
||||
/// `#[serde(deserialize_with = "...")]` for a required `u32` field that may
|
||||
/// arrive as an integer or a float.
|
||||
/// arrive as an integer or a float — or, increasingly, as `null`. A `null`
|
||||
/// coerces to `0` rather than failing the whole parse; the Kinovi API
|
||||
/// intermittently returns `null` for result `width`/`height`.
|
||||
pub fn de_u32_int_or_float<'de, D>(deserializer: D) -> Result<u32, D::Error>
|
||||
where
|
||||
D: Deserializer<'de>,
|
||||
{
|
||||
let number = Number::deserialize(deserializer)?;
|
||||
Ok(coerce_to_u32(&number))
|
||||
let maybe_number = Option::<Number>::deserialize(deserializer)?;
|
||||
Ok(maybe_number.as_ref().map(coerce_to_u32).unwrap_or(0))
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -126,6 +130,15 @@ mod tests {
|
||||
assert_eq!(parse_u64(r#"{"value": -5.5}"#), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn required_fields_coerce_null_to_zero() {
|
||||
// The Kinovi API intermittently returns `null` for numbers it used to
|
||||
// populate (e.g. result width/height). Required coercers must treat that
|
||||
// as 0 rather than failing the whole response parse.
|
||||
assert_eq!(parse_u32(r#"{"value": null}"#), 0);
|
||||
assert_eq!(parse_u64(r#"{"value": null}"#), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn optional_handles_null_missing_and_values() {
|
||||
assert_eq!(serde_json::from_str::<OptU32Holder>(r#"{"value": null}"#).unwrap().value, None);
|
||||
|
||||
Reference in new issue
Block a user