i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-10-04 00:17:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(xai): add native image and video endpoints

Browse Source 
Expose the xAI Imagine image and video surfaces on top of the `xai`
provider, and make the shared OpenAI video-task layer survive the
production configuration they need.

Native video requests live under /v1 (generations, edits, extensions,
with /v1/videos as a creation alias that only selects xAI candidates);
the OpenAI-compatible adapter stays under /openai/v1/videos and maps
`seconds` / `size` onto numeric duration, aspect ratio and resolution.
Clients receive an opaque Aether task ID scoped to the owning user;
polling uses the upstream task ID and the original credential, and
completed downloads fetch the returned media URL without forwarding
provider authorization to the media host.

Three fixes to the shared video layer are required for this to work
outside tests:

- OpenAI/xAI task persistence now supplies a stable 16-character
  short_id, which the PostgreSQL schema requires. Existing rows keep
  their original value across reconstruction, so no schema change or
  historical rewrite is needed.
- Task retrieval and content downloads are admitted by the production
  GET execution gate, and reconstructed tasks resolve proxy nodes,
  system proxy defaults, tunnel affinity and transport profiles through
  the same deployment resolver used for creation. A configured proxy
  route no longer silently becomes a direct request after restart.
- When the gateway also serves the frontend, /openai/v1/videos and its
  subpaths bypass the static SPA handler. Otherwise a video query
  returns HTTP 200 with text/html instead of the task JSON.

Co-Authored-By: Claude Opus 5 <[email protected]>
This commit is contained in:
stabey
2026-09-14 21:17:21 +08:00
co-authored by Claude Opus 5
parent e83399db2f
commit 04c4a97766
42 changed files with 1880 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/aether-ai/formats/src/formats/openai/responses/xai.rs
+2 -2
View File
@@ -872,7 +872,7 @@ mod tests {
#[test]
fn xai_image_refs_rewrite_openai_aliases_without_touching_chat_parts() {
let mut body = json!({
"model": "grok-4.6",
"model": "grok-imagine-image",
"prompt": "edit this",
"image": {"image_url": "https://cdn.example/a.png"},
"reference_images": [
@@ -887,7 +887,7 @@ mod tests {
}]
});
apply_xai_upstream_payload_edits(&mut body, "xai", "openai:responses");
apply_xai_upstream_payload_edits(&mut body, "xai", "openai:image");
assert_eq!(body["image"]["url"], "https://cdn.example/a.png");
assert!(body["image"].get("image_url").is_none());
crates/aether-ai/formats/src/formats/shared/routing.rs
+12 -1
View File
@@ -49,6 +49,10 @@ pub fn resolve_execution_runtime_stream_plan_kind_with_client_surface(
method: &Method,
path: &str,
) -> Option<&'static str> {
let path = path
.strip_prefix("/openai")
.filter(|p| *p == "/v1/videos" || p.starts_with("/v1/videos/"))
.unwrap_or(path);
if route_class != Some("ai_public") {
return None;
}
@@ -181,6 +185,10 @@ pub fn resolve_execution_runtime_sync_plan_kind_with_client_surface(
method: &Method,
path: &str,
) -> Option<&'static str> {
let path = path
.strip_prefix("/openai")
.filter(|p| *p == "/v1/videos" || p.starts_with("/v1/videos/"))
.unwrap_or(path);
if route_class != Some("ai_public") {
return None;
}
@@ -206,7 +214,10 @@ pub fn resolve_execution_runtime_sync_plan_kind_with_client_surface(
if route_family == Some("openai")
&& route_kind == Some("video")
&& *method == Method::POST
&& path == "/v1/videos"
&& matches!(
path,
"/v1/videos" | "/v1/videos/generations" | "/v1/videos/edits" | "/v1/videos/extensions"
)
{
return Some(OPENAI_VIDEO_CREATE_SYNC_PLAN_KIND);
}
crates/aether-data/adapters/postgres/src/candidate_selection.rs
+17 -15
View File
@@ -105,7 +105,7 @@ INNER JOIN LATERAL (
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($3) IN ('openai:responses', 'openai:responses:compact')
AND LOWER($3) IN ('openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video')
)
OR (
LOWER(BTRIM(p.provider_type)) IN ('gemini_cli', 'antigravity')
@@ -196,7 +196,7 @@ WHERE p.is_active = TRUE
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($3) IN ('openai:responses', 'openai:responses:compact')
AND LOWER($3) IN ('openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video')
)
OR (
LOWER(BTRIM(p.provider_type)) IN ('gemini_cli', 'antigravity')
@@ -380,7 +380,7 @@ INNER JOIN LATERAL (
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($4) IN ('openai:responses', 'openai:responses:compact')
AND LOWER($4) IN ('openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video')
)
OR (
LOWER(BTRIM(p.provider_type)) IN ('gemini_cli', 'antigravity')
@@ -472,7 +472,7 @@ WHERE p.is_active = TRUE
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($4) IN ('openai:responses', 'openai:responses:compact')
AND LOWER($4) IN ('openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video')
)
OR (
LOWER(BTRIM(p.provider_type)) IN ('gemini_cli', 'antigravity')
@@ -656,16 +656,16 @@ WHERE p.is_active = TRUE
)
)
)
OR (
LOWER(BTRIM(p.provider_type)) = 'grok'
AND LOWER(BTRIM(pak.auth_type)) = 'oauth'
AND LOWER($6) IN ('openai:chat', 'openai:responses', 'claude:messages', 'openai:image')
)
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($6) IN ('openai:responses', 'openai:responses:compact')
)
OR (
LOWER(BTRIM(p.provider_type)) = 'grok'
AND LOWER(BTRIM(pak.auth_type)) = 'oauth'
AND LOWER($6) IN ('openai:chat', 'openai:responses', 'claude:messages', 'openai:image')
)
OR (
LOWER(BTRIM(p.provider_type)) = 'xai'
AND LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')
AND LOWER($6) IN ('openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video')
)
OR (
LOWER(BTRIM(p.provider_type)) IN ('gemini_cli', 'antigravity')
AND LOWER(BTRIM(pak.auth_type)) = 'oauth'
@@ -1758,7 +1758,9 @@ mod tests {
] {
assert!(sql.contains("LOWER(BTRIM(p.provider_type)) = 'xai'"));
assert!(sql.contains("LOWER(BTRIM(pak.auth_type)) IN ('oauth', 'bearer', 'api_key')"));
assert!(sql.contains("'openai:responses', 'openai:responses:compact'"));
assert!(sql.contains(
"'openai:responses', 'openai:responses:compact', 'openai:image', 'openai:video'"
));
assert!(sql.contains("'xai'"));
}
}
crates/aether-data/runtime/src/repository/candidate_selection/memory.rs
+35 -1
View File
@@ -350,7 +350,10 @@ fn key_auth_channel_matches(row: &StoredMinimalCandidateSelectionRow, api_format
matches!(auth_type.as_str(), "oauth" | "bearer" | "api_key")
&& matches!(
api_format.as_str(),
"openai:responses" | "openai:responses:compact"
"openai:responses"
| "openai:responses:compact"
| "openai:image"
| "openai:video"
)
}
"windsurf" => {
@@ -620,6 +623,37 @@ mod tests {
assert_eq!(rows[0].global_model_name, "grok-4");
}
#[tokio::test]
async fn includes_xai_oauth_rows_for_image_and_video_models() {
let mut image = sample_row("provider-xai", "openai:image", "grok-imagine-image", 10);
image.provider_type = "xai".to_string();
image.provider_name = "xai".to_string();
image.key_auth_type = "oauth".to_string();
image.key_api_formats = Some(vec!["openai:image".to_string(), "openai:video".to_string()]);
let mut video = image.clone();
video.endpoint_id = "endpoint-video".to_string();
video.endpoint_api_format = "openai:video".to_string();
video.global_model_name = "grok-imagine-video".to_string();
video.model_provider_model_name = "grok-imagine-video".to_string();
let repository = InMemoryMinimalCandidateSelectionReadRepository::seed(vec![image, video]);
let image_rows = repository
.list_for_exact_api_format("openai:image")
.await
.expect("list should succeed");
assert_eq!(image_rows.len(), 1);
assert_eq!(image_rows[0].global_model_name, "grok-imagine-image");
let video_rows = repository
.list_for_exact_api_format("openai:video")
.await
.expect("list should succeed");
assert_eq!(video_rows.len(), 1);
assert_eq!(video_rows[0].global_model_name, "grok-imagine-video");
}
#[tokio::test]
async fn requested_model_filter_respects_endpoint_scoped_default_mapping() {
let mut selected = sample_row("provider-1", "openai:chat", "deepseek-v4-pro", 10);
crates/aether-model-fetch/src/logic.rs
+12 -1
View File
@@ -615,6 +615,10 @@ pub fn preset_models_for_provider(provider_type: &str) -> Option<Vec<Value>> {
preset_model("grok-3-mini", "xai", "Grok 3 Mini", "openai:responses"),
preset_model("grok-3-mini-fast", "xai", "Grok 3 Mini Fast", "openai:responses"),
preset_model("grok-composer-2.5-fast", "xai", "Grok Composer 2.5 Fast", "openai:responses"),
preset_model("grok-imagine-image", "xai", "Grok Imagine Image", "openai:image"),
preset_model("grok-imagine-image-quality", "xai", "Grok Imagine Image Quality", "openai:image"),
preset_model("grok-imagine-video", "xai", "Grok Imagine Video", "openai:video"),
preset_model("grok-imagine-video-1.5", "xai", "Grok Imagine Video 1.5", "openai:video"),
],
_ => return None,
};
@@ -2010,11 +2014,18 @@ mod tests {
"grok-3-mini",
"grok-3-mini-fast",
"grok-composer-2.5-fast",
"grok-imagine-image",
"grok-imagine-image-quality",
"grok-imagine-video",
"grok-imagine-video-1.5",
]
);
assert!(models.iter().all(|model| model["owned_by"] == json!("xai")));
assert_eq!(models[0]["api_formats"], json!(["openai:responses"]));
assert_eq!(models[10]["api_formats"], json!(["openai:image"]));
assert_eq!(models[12]["api_formats"], json!(["openai:video"]));
assert!(models
.iter()
.all(|model| model["api_formats"] == json!(["openai:responses"])));
.any(|model| model["id"] == "grok-imagine-image"));
}
}
crates/aether-provider/transport/src/conversion.rs
+36 -9
View File
@@ -776,18 +776,26 @@ mod tests {
&transport,
RequestConversionKind::ToOpenAiResponses
));
assert!(
!request_pair_allowed_for_transport(
&transport,
"openai:responses:compact",
"openai:responses"
),
"compact must not convert onto xAI Responses"
);
assert!(!request_pair_allowed_for_transport(
&transport,
"openai:image",
"openai:responses"
));
assert!(!request_pair_allowed_for_transport(
&transport,
"openai:video",
"openai:responses"
));
for isolated in ["openai:responses:compact", "openai:image", "openai:video"] {
assert!(
!request_pair_allowed_for_transport(&transport, isolated, "openai:responses"),
"{isolated} must not convert onto xAI Responses"
);
}
}
#[test]
fn xai_compact_endpoint_is_same_format_only() {
fn xai_compact_and_media_endpoints_are_same_format_only() {
let compact = transport_snapshot("xai", "openai:responses:compact", "oauth", true, None);
assert!(request_pair_allowed_for_transport(
&compact,
@@ -809,6 +817,25 @@ mod tests {
"{client_api_format} must not convert onto xAI compact"
);
}
for api_format in ["openai:image", "openai:video"] {
let transport = transport_snapshot("xai", api_format, "oauth", true, None);
assert!(
request_pair_allowed_for_transport(&transport, api_format, api_format),
"{api_format} same-format transport should be allowed"
);
for client_api_format in [
"openai:chat",
"openai:responses",
"claude:messages",
"gemini:generate_content",
] {
assert!(
!request_pair_allowed_for_transport(&transport, client_api_format, api_format),
"{client_api_format} must not convert onto {api_format}"
);
}
}
}
#[test]
crates/aether-provider/transport/src/openai_image/mod.rs
+61 -2
View File
@@ -84,6 +84,11 @@ fn is_dedicated_openai_image_provider(transport: &GatewayProviderTransportSnapsh
.trim()
.eq_ignore_ascii_case("codex")
|| is_grok_provider_transport(transport)
|| transport
.provider
.provider_type
.trim()
.eq_ignore_ascii_case("xai")
}
pub fn resolve_openai_image_auth(
@@ -92,7 +97,10 @@ pub fn resolve_openai_image_auth(
if is_grok_provider_transport(transport) {
return resolve_grok_session_auth(transport);
}
resolve_local_openai_bearer_auth(transport)
resolve_local_openai_bearer_auth(transport).or_else(|| {
crate::generic_oauth::resolve_local_generic_oauth_transport_authorization(transport)
.map(|value| ("authorization".to_string(), value))
})
}
pub fn build_openai_image_upstream_url(
@@ -100,7 +108,11 @@ pub fn build_openai_image_upstream_url(
request_path: Option<&str>,
request_query: Option<&str>,
) -> String {
build_openai_image_url(&transport.endpoint.base_url, request_path, request_query)
build_openai_image_url(
&crate::xai::resolved_xai_request_base_url(transport, "openai:image"),
request_path,
request_query,
)
}
pub fn build_openai_image_headers(
@@ -113,6 +125,11 @@ pub fn build_openai_image_headers(
&BTreeMap::new(),
);
provider_request_headers.insert("content-type".to_string(), "application/json".to_string());
crate::xai::insert_cli_identity_headers_if_needed(
input.transport,
"openai:image",
&mut provider_request_headers,
);
if let Some(accept) = input.accept {
provider_request_headers.insert("accept".to_string(), accept.to_string());
} else {
@@ -280,6 +297,48 @@ mod tests {
);
}
#[test]
fn xai_oauth_image_uses_cli_proxy() {
let mut transport = sample_transport();
transport.provider.provider_type = "xai".to_string();
transport.endpoint.base_url = "https://cli-chat-proxy.grok.com/v1".to_string();
transport.key.auth_type = "oauth".to_string();
transport.key.decrypted_auth_config =
Some(r#"{"refresh_token":"rt","using_api":false}"#.to_string());
assert_eq!(
openai_image_transport_unsupported_reason(&transport, "openai:image"),
None
);
assert_eq!(
build_openai_image_upstream_url(&transport, Some("/v1/images/generations"), None),
"https://cli-chat-proxy.grok.com/v1/images/generations"
);
assert_eq!(
build_openai_image_upstream_url(&transport, Some("/v1/images/edits"), None),
"https://cli-chat-proxy.grok.com/v1/images/edits"
);
let headers = build_openai_image_headers(ProviderOpenAiImageHeadersInput {
transport: &transport,
headers: &HeaderMap::new(),
auth_header: "authorization",
auth_value: "Bearer test-token",
accept: None,
header_rules: None,
provider_request_body: &json!({"prompt": "A cat"}),
original_request_body: &json!({"prompt": "A cat"}),
})
.unwrap();
assert_eq!(
headers.get("x-xai-token-auth").map(String::as_str),
Some("xai-grok-cli")
);
assert_eq!(
headers.get("authorization").map(String::as_str),
Some("Bearer test-token")
);
}
#[test]
fn codex_is_supported_by_dedicated_openai_image_transport_policy() {
let mut transport = sample_transport();
crates/aether-provider/transport/src/provider_types.rs
+19 -2
View File
@@ -474,6 +474,18 @@ const XAI_FIXED_PROVIDER_TEMPLATE: FixedProviderTemplate = FixedProviderTemplate
custom_path: None,
config_defaults: EMPTY_ENDPOINT_CONFIG_DEFAULTS,
},
FixedProviderEndpointTemplate {
item_key: "openai:image",
api_format: "openai:image",
custom_path: None,
config_defaults: EMPTY_ENDPOINT_CONFIG_DEFAULTS,
},
FixedProviderEndpointTemplate {
item_key: "openai:video",
api_format: "openai:video",
custom_path: None,
config_defaults: EMPTY_ENDPOINT_CONFIG_DEFAULTS,
},
],
runtime_policy: XAI_RUNTIME_POLICY,
};
@@ -869,7 +881,7 @@ mod tests {
}
#[test]
fn xai_fixed_provider_template_exposes_responses_endpoints() {
fn xai_fixed_provider_template_exposes_responses_media_endpoints() {
let template = fixed_provider_template("xai").expect("xai template should exist");
assert_eq!(template.provider_type, "xai");
assert_eq!(template.base_url, crate::xai::XAI_CHAT_PROXY_BASE_URL);
@@ -880,7 +892,12 @@ mod tests {
.iter()
.map(|item| item.api_format)
.collect::<Vec<_>>(),
vec!["openai:responses", "openai:responses:compact"]
vec![
"openai:responses",
"openai:responses:compact",
"openai:image",
"openai:video"
]
);
let policy = provider_runtime_policy("xai");
crates/aether-provider/transport/src/video/mod.rs
+225 -21
View File
@@ -1,6 +1,7 @@
use std::collections::BTreeMap;
use std::fmt;
use aether_contracts::ProxySnapshot;
use aether_data_contracts::repository::video_tasks::StoredVideoTask;
use aether_video_tasks_core::{
LocalVideoTaskSnapshot, LocalVideoTaskTransport, LocalVideoTaskTransportBridgeInput,
@@ -12,11 +13,13 @@ use super::auth::{
build_passthrough_headers_with_auth, resolve_local_gemini_auth,
resolve_local_openai_bearer_auth,
};
use super::network::{resolve_transport_execution_timeouts, resolve_transport_profile};
use super::network::{
resolve_transport_execution_timeouts, resolve_transport_profile,
resolve_transport_proxy_snapshot,
};
use super::policy::{
local_gemini_transport_unsupported_reason_with_network,
local_standard_transport_unsupported_reason_with_network, supports_local_gemini_transport,
supports_local_standard_transport,
local_standard_transport_unsupported_reason_with_network,
};
use super::rules::{
apply_local_body_rules_with_request_headers, apply_local_header_rules_with_request_headers,
@@ -32,6 +35,7 @@ pub enum ProviderVideoCreateFamily {
#[derive(Clone, Copy)]
pub struct ProviderVideoCreateHeadersInput<'a> {
pub transport: &'a GatewayProviderTransportSnapshot,
pub headers: &'a http::HeaderMap,
pub auth_header: &'a str,
pub auth_value: &'a str,
@@ -79,6 +83,13 @@ pub trait VideoTaskTransportSnapshotLookup: Send + Sync {
endpoint_id: &str,
key_id: &str,
) -> Result<Option<GatewayProviderTransportSnapshot>, String>;
async fn resolve_video_task_proxy(
&self,
transport: &GatewayProviderTransportSnapshot,
) -> Option<ProxySnapshot> {
resolve_transport_proxy_snapshot(transport)
}
}
pub fn resolve_local_video_task_transport(
@@ -89,13 +100,17 @@ pub fn resolve_local_video_task_transport(
let api_format = api_format.trim();
let (auth_header, auth_value) = match api_format {
"openai:video" => {
if !supports_local_standard_transport(transport, api_format) {
if local_standard_transport_unsupported_reason_with_network(transport, api_format)
.is_some()
{
return None;
}
resolve_local_openai_bearer_auth(transport)?
resolve_openai_compatible_video_auth(transport)?
}
"gemini:video" => {
if !supports_local_gemini_transport(transport, api_format) {
if local_gemini_transport_unsupported_reason_with_network(transport, api_format)
.is_some()
{
return None;
}
resolve_local_gemini_auth(transport)?
@@ -103,9 +118,9 @@ pub fn resolve_local_video_task_transport(
_ => return None,
};
Some(LocalVideoTaskTransport::from_bridge_input(
LocalVideoTaskTransportBridgeInput {
upstream_base_url: transport.endpoint.base_url.clone(),
let mut resolved =
LocalVideoTaskTransport::from_bridge_input(LocalVideoTaskTransportBridgeInput {
upstream_base_url: crate::xai::resolved_xai_request_base_url(transport, api_format),
provider_name: Some(transport.provider.name.clone()),
provider_id: transport.provider.id.clone(),
endpoint_id: transport.endpoint.id.clone(),
@@ -114,11 +129,12 @@ pub fn resolve_local_video_task_transport(
auth_value,
content_type: Some("application/json".to_string()),
model_name,
proxy: None,
proxy: resolve_transport_proxy_snapshot(transport),
transport_profile: resolve_transport_profile(transport),
timeouts: resolve_transport_execution_timeouts(transport),
},
))
});
crate::xai::insert_cli_identity_headers_if_needed(transport, api_format, &mut resolved.headers);
Some(resolved)
}
pub fn video_create_transport_unsupported_reason(
@@ -141,7 +157,7 @@ pub fn resolve_video_create_auth(
family: ProviderVideoCreateFamily,
) -> Option<(String, String)> {
match family {
ProviderVideoCreateFamily::OpenAi => resolve_local_openai_bearer_auth(transport),
ProviderVideoCreateFamily::OpenAi => resolve_openai_compatible_video_auth(transport),
ProviderVideoCreateFamily::Gemini => resolve_local_gemini_auth(transport),
}
}
@@ -173,6 +189,15 @@ pub fn build_video_create_request_body(
Some(provider_request_body)
}
fn resolve_openai_compatible_video_auth(
transport: &GatewayProviderTransportSnapshot,
) -> Option<(String, String)> {
resolve_local_openai_bearer_auth(transport).or_else(|| {
crate::generic_oauth::resolve_local_generic_oauth_transport_authorization(transport)
.map(|value| ("authorization".to_string(), value))
})
}
pub fn build_video_create_upstream_url(
transport: &GatewayProviderTransportSnapshot,
request_path: &str,
@@ -193,7 +218,13 @@ pub fn build_video_create_upstream_url(
ProviderVideoCreateFamily::Gemini => &["key"][..],
};
return build_passthrough_path_url(
&transport.endpoint.base_url,
&crate::xai::resolved_xai_request_base_url(
transport,
match family {
ProviderVideoCreateFamily::OpenAi => "openai:video",
ProviderVideoCreateFamily::Gemini => "gemini:video",
},
),
path,
request_query,
blocked_keys,
@@ -202,8 +233,14 @@ pub fn build_video_create_upstream_url(
match family {
ProviderVideoCreateFamily::OpenAi => build_passthrough_path_url(
&transport.endpoint.base_url,
openai_video_api_root_request_path(request_path),
&crate::xai::resolved_xai_request_base_url(transport, "openai:video"),
if crate::xai::is_xai_provider_transport(transport)
&& matches!(request_path, "/v1/videos" | "/openai/v1/videos")
{
"/videos/generations"
} else {
openai_video_api_root_request_path(request_path)
},
request_query,
&[],
),
@@ -216,6 +253,7 @@ pub fn build_video_create_upstream_url(
}
fn openai_video_api_root_request_path(request_path: &str) -> &str {
let request_path = request_path.strip_prefix("/openai").unwrap_or(request_path);
if request_path.starts_with("/v1/") {
&request_path[3..]
} else {
@@ -232,6 +270,11 @@ pub fn build_video_create_headers(
input.auth_value,
&BTreeMap::new(),
);
crate::xai::insert_cli_identity_headers_if_needed(
input.transport,
"openai:video",
&mut provider_request_headers,
);
if !apply_local_header_rules_with_request_headers(
&mut provider_request_headers,
input.header_rules,
@@ -281,16 +324,22 @@ pub async fn reconstruct_local_video_task_snapshot(
return Ok(None);
};
let Some(local_transport) =
let Some(mut local_transport) =
resolve_local_video_task_transport(&transport, provider_api_format, task.model.clone())
else {
return Ok(None);
};
Ok(LocalVideoTaskSnapshot::from_stored_task_with_transport(
task,
local_transport,
))
// Resolve deployment-managed nodes, system defaults and tunnel affinity just as
// creation does; serialized task metadata intentionally contains no credentials.
local_transport.proxy = lookup.resolve_video_task_proxy(&transport).await;
let mut snapshot =
LocalVideoTaskSnapshot::from_stored_task_with_transport(task, local_transport);
if let Some(LocalVideoTaskSnapshot::OpenAi(seed)) = &mut snapshot {
seed.xai_provider = crate::xai::is_xai_provider_transport(&transport);
}
Ok(snapshot)
}
#[cfg(test)]
@@ -441,6 +490,46 @@ mod tests {
assert_eq!(transport.provider_id, "provider-1");
}
#[tokio::test]
async fn reconstructs_video_with_configured_proxy_and_profile() {
let mut transport = sample_transport("openai:video", "oauth");
transport.provider.provider_type = "xai".into();
transport.endpoint.base_url = "https://cli-chat-proxy.grok.com/v1".into();
transport.provider.proxy = Some(json!({"enabled":true,"url":"http://127.0.0.1:9876"}));
transport.provider.config = Some(json!({"fingerprint":{"transport_profile":{
"profile_id":"test-video","backend":"reqwest_rustls","http_mode":"auto","pool_scope":"key"
}}}));
transport.key.decrypted_auth_config = Some(r#"{"using_api":false}"#.into());
let lookup = TestLookup(Some(transport));
let snapshot = reconstruct_local_video_task_snapshot(&lookup, &sample_stored_video_task())
.await
.unwrap()
.expect("proxied video must resume after restart");
let LocalVideoTaskSnapshot::OpenAi(seed) = snapshot else {
panic!("expected OpenAI video")
};
assert!(seed.xai_provider);
assert_eq!(
seed.transport.proxy.as_ref().unwrap().url.as_deref(),
Some("http://127.0.0.1:9876/")
);
assert_eq!(
seed.transport
.transport_profile
.as_ref()
.unwrap()
.profile_id,
"test-video"
);
assert_eq!(
seed.transport
.headers
.get("x-xai-token-auth")
.map(String::as_str),
Some("xai-grok-cli")
);
}
#[test]
fn resolves_gemini_video_transport() {
let transport = resolve_local_video_task_transport(
@@ -489,6 +578,120 @@ mod tests {
assert_eq!(url, "https://api.openai.example/v1/videos?trace=1");
}
#[test]
fn xai_video_create_paths_preserve_auth_hosts_and_custom_endpoints() {
for (auth, base) in [
("oauth", "https://cli-chat-proxy.grok.com/v1"),
("api_key", "https://api.x.ai/v1"),
] {
let mut transport = sample_transport("openai:video", auth);
transport.provider.provider_type = "xai".into();
transport.endpoint.base_url = "https://cli-chat-proxy.grok.com/v1".into();
transport.key.decrypted_auth_config =
(auth == "oauth").then(|| r#"{"using_api":false}"#.into());
for path in ["/v1/videos", "/openai/v1/videos", "/v1/videos/generations"] {
assert_eq!(
build_video_create_upstream_url(
&transport,
path,
Some("trace=1"),
"grok-imagine-video",
ProviderVideoCreateFamily::OpenAi
)
.unwrap(),
format!("{base}/videos/generations?trace=1")
);
}
transport.endpoint.base_url = "https://gateway.example/prefix/v1".into();
assert_eq!(
build_video_create_upstream_url(
&transport,
"/openai/v1/videos",
None,
"grok-imagine-video",
ProviderVideoCreateFamily::OpenAi
)
.unwrap(),
"https://gateway.example/prefix/v1/videos/generations"
);
transport.endpoint.custom_path = Some("/custom/videos/generations".into());
let url = build_video_create_upstream_url(
&transport,
"/openai/v1/videos",
None,
"grok-imagine-video",
ProviderVideoCreateFamily::OpenAi,
)
.unwrap();
assert!(url.ends_with("/custom/videos/generations"), "{url}");
}
let transport = sample_transport("openai:video", "api_key");
assert_eq!(
build_video_create_upstream_url(
&transport,
"/openai/v1/videos",
None,
"sora",
ProviderVideoCreateFamily::OpenAi
),
build_video_create_upstream_url(
&transport,
"/v1/videos",
None,
"sora",
ProviderVideoCreateFamily::OpenAi
)
);
}
#[test]
fn xai_oauth_video_uses_cli_proxy() {
let mut transport = sample_transport("openai:video", "oauth");
transport.provider.provider_type = "xai".to_string();
transport.endpoint.base_url = "https://cli-chat-proxy.grok.com/v1".to_string();
transport.key.decrypted_auth_config =
Some(r#"{"refresh_token":"rt","using_api":false}"#.to_string());
let url = build_video_create_upstream_url(
&transport,
"/v1/videos/generations",
None,
"grok-imagine-video",
ProviderVideoCreateFamily::OpenAi,
)
.expect("url should build");
assert_eq!(url, "https://cli-chat-proxy.grok.com/v1/videos/generations");
let headers = build_video_create_headers(ProviderVideoCreateHeadersInput {
transport: &transport,
headers: &http::HeaderMap::new(),
auth_header: "authorization",
auth_value: "Bearer test-token",
header_rules: None,
provider_request_body: &json!({"prompt": "A cat"}),
original_request_body: &json!({"prompt": "A cat"}),
})
.unwrap();
assert_eq!(
headers.get("x-xai-token-auth").map(String::as_str),
Some("xai-grok-cli")
);
let reconstructed = super::resolve_local_video_task_transport(
&transport,
"openai:video",
Some("grok-imagine-video".into()),
)
.unwrap();
assert_eq!(
reconstructed.upstream_base_url,
"https://cli-chat-proxy.grok.com/v1"
);
assert_eq!(
reconstructed.headers.get("x-xai-token-auth"),
headers.get("x-xai-token-auth")
);
}
#[test]
fn builds_gemini_video_create_url_and_removes_client_key_query() {
let transport = sample_transport("gemini:video", "api_key");
@@ -512,6 +715,7 @@ mod tests {
let provider_request_body = json!({"prompt": "make a clip"});
let original_request_body = provider_request_body.clone();
let headers = build_video_create_headers(ProviderVideoCreateHeadersInput {
transport: &sample_transport("openai:video", "bearer"),
headers: &http::HeaderMap::new(),
auth_header: "authorization",
auth_value: "Bearer secret",
crates/aether-provider/transport/src/xai.rs
+35
View File
@@ -1,3 +1,5 @@
pub mod video;
use std::collections::BTreeMap;
use aether_ai_formats::normalize_api_format_alias;
@@ -343,6 +345,39 @@ mod tests {
));
}
#[test]
fn media_routing_and_cli_headers_follow_auth_and_base_url() {
for api_format in ["openai:image", "openai:video"] {
for stored in ["", XAI_API_BASE_URL, XAI_CHAT_PROXY_BASE_URL] {
for (auth_type, config, expected) in [
(
"oauth",
Some(r#"{"refresh_token":"rt","using_api":false}"#),
XAI_CHAT_PROXY_BASE_URL,
),
("oauth", Some(r#"{"using_api":true}"#), XAI_API_BASE_URL),
("bearer", None, XAI_API_BASE_URL),
] {
let transport = sample_transport(auth_type, config, stored);
assert_eq!(
resolved_xai_upstream_base_url(&transport, api_format).as_deref(),
Some(expected)
);
assert_eq!(
should_attach_cli_identity_headers(&transport, api_format),
expected == XAI_CHAT_PROXY_BASE_URL
);
}
}
let custom = sample_transport("oauth", None, "https://custom.example/v1");
assert_eq!(
resolved_xai_upstream_base_url(&custom, api_format).as_deref(),
Some("https://custom.example/v1")
);
assert!(!should_attach_cli_identity_headers(&custom, api_format));
}
}
#[test]
fn bearer_without_refresh_uses_official_api() {
let transport = sample_transport("bearer", None, XAI_CHAT_PROXY_BASE_URL);
crates/aether-provider/transport/src/xai/video.rs
+147
View File
@@ -0,0 +1,147 @@
use serde_json::{json, Value};
/// Native xAI video requests live under /v1; the OpenAI-compatible adapter under /openai/v1.
pub fn is_native_video_request(provider_type: &str, path: &str) -> bool {
provider_type.trim().eq_ignore_ascii_case("xai")
&& matches!(
path,
"/v1/videos" | "/v1/videos/generations" | "/v1/videos/edits" | "/v1/videos/extensions"
)
}
pub fn is_explicit_native_video_path(path: &str) -> bool {
matches!(
path,
"/v1/videos/generations" | "/v1/videos/edits" | "/v1/videos/extensions"
)
}
/// Convert the OpenAI video request contract to xAI's native contract.
/// Native requests bypass this adapter so provider-specific fields remain intact.
pub fn convert_openai_video_request(body: &Value) -> Result<Value, &'static str> {
let prompt = text(&body["prompt"]).ok_or("prompt is required")?;
let seconds = match &body["seconds"] {
Value::Null => 4,
Value::String(value) if value.trim().is_empty() => 4,
Value::String(value) => value
.trim()
.parse::<i64>()
.map_err(|_| "seconds must be an integer")?,
value => value.as_i64().ok_or("seconds must be an integer")?,
}
.clamp(1, 15);
let size = text(&body["size"]).unwrap_or("720x1280");
let default_ratio = match size {
"720x1280" | "1024x1792" => "9:16",
"1280x720" | "1792x1024" => "16:9",
_ => return Err("size must be one of 720x1280, 1280x720, 1024x1792, or 1792x1024"),
};
let ratio = match text(&body["aspect_ratio"])
.unwrap_or("")
.to_ascii_lowercase()
.as_str()
{
"square" | "1:1" => "1:1",
"landscape" | "16:9" => "16:9",
"portrait" | "9:16" => "9:16",
"4:3" => "4:3",
"3:4" => "3:4",
"3:2" => "3:2",
"2:3" => "2:3",
_ => default_ratio,
};
let resolution = if text(&body["resolution"]).is_some_and(|v| v.eq_ignore_ascii_case("480p")) {
"480p"
} else {
"720p"
};
if text(&body["input_reference"]["file_id"]).is_some() {
return Err("input_reference.file_id is not supported for xAI video generation; use input_reference.image_url");
}
let image = text(&body["input_reference"]["image_url"])
.or_else(|| image_url(&body["image"]))
.or_else(|| text(&body["image_url"]));
let references: Vec<_> = ["reference_images", "reference_image_urls"]
.into_iter()
.filter_map(|key| body[key].as_array())
.flatten()
.filter_map(image_url)
.map(|url| json!({"url":url}))
.collect();
if references.len() > 7 {
return Err("reference_images supports at most 7 images on xAI");
}
if image.is_some() && !references.is_empty() {
return Err("image and reference_images cannot be combined on xAI");
}
let mut result = json!({"model":body["model"], "prompt":prompt, "duration":seconds, "aspect_ratio":ratio, "resolution":resolution});
if let Some(url) = image {
result["image"] = json!({"url":url});
}
if !references.is_empty() {
result["reference_images"] = json!(references);
}
Ok(result)
}
fn text(value: &Value) -> Option<&str> {
value
.as_str()
.map(str::trim)
.filter(|value| !value.is_empty())
}
fn image_url(value: &Value) -> Option<&str> {
text(value)
.or_else(|| text(&value["url"]))
.or_else(|| text(&value["image_url"]))
.or_else(|| text(&value["image_url"]["url"]))
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn xai_video_compatibility_maps_duration_size_and_references() {
let converted = convert_openai_video_request(&json!({
"model":"grok-imagine-video", "prompt":"A cat", "seconds":"8", "size":"1280x720",
"reference_images":[{"image_url":{"url":"https://example.com/a.png"}}],
"reference_image_urls":["https://example.com/b.png"]
}))
.unwrap();
assert_eq!(
converted,
json!({"model":"grok-imagine-video", "prompt":"A cat", "duration":8,
"aspect_ratio":"16:9", "resolution":"720p", "reference_images":[{"url":"https://example.com/a.png"},{"url":"https://example.com/b.png"}]})
);
let defaults = convert_openai_video_request(&json!({"prompt":"A cat"})).unwrap();
assert_eq!(defaults["duration"], 4);
assert_eq!(defaults["aspect_ratio"], "9:16");
for (seconds, expected) in [(-1, 1), (30, 15)] {
assert_eq!(
convert_openai_video_request(&json!({"prompt":"A cat", "seconds":seconds}))
.unwrap()["duration"],
expected
);
}
}
#[test]
fn xai_video_compatibility_validates_requests_and_maps_image_input() {
for invalid in [
json!({}),
json!({"prompt":"cat","seconds":"1.5"}),
json!({"prompt":"cat","size":"foo"}),
json!({"prompt":"cat","input_reference":{"file_id":"file-1"}}),
json!({"prompt":"cat","image":"https://example.com/a.png","reference_images":["https://example.com/b.png"]}),
json!({"prompt":"cat","reference_images":vec!["https://example.com/a.png";8]}),
] {
assert!(convert_openai_video_request(&invalid).is_err(), "{invalid}");
}
let body = convert_openai_video_request(&json!({"prompt":"cat","input_reference":{"image_url":"https://example.com/a.png"},"aspect_ratio":"square","resolution":"480p"})).unwrap();
assert_eq!(body["image"]["url"], "https://example.com/a.png");
assert_eq!(body["aspect_ratio"], "1:1");
assert_eq!(body["resolution"], "480p");
}
}
crates/aether-video-tasks-core/Cargo.toml
+1
View File
@@ -12,5 +12,6 @@ aether-data-contracts.workspace = true
async-trait.workspace = true
serde.workspace = true
serde_json.workspace = true
sha2.workspace = true
url.workspace = true
uuid.workspace = true
crates/aether-video-tasks-core/src/openai.rs
+181 -17
View File
@@ -43,6 +43,27 @@ pub fn map_openai_stored_task_to_read_response(
}
fn build_openai_stored_task_body(task: StoredVideoTask, status: VideoTaskStatus) -> Value {
if task.client_api_format.as_deref() == Some("xai:video") {
let mut body = json!({"status":match status {
VideoTaskStatus::Completed => "done",
VideoTaskStatus::Expired => "expired",
VideoTaskStatus::Failed | VideoTaskStatus::Cancelled | VideoTaskStatus::Deleted => "failed",
_ => "pending",
}});
if let Some(model) = task.model {
body["model"] = json!(model);
}
if let Some(url) = task.video_url {
body["video"] = json!({"url":url});
if let Some(duration) = task.duration_seconds {
body["video"]["duration"] = json!(duration);
}
}
if status == VideoTaskStatus::Failed {
body["error"] = json!({"code":sanitize_video_task_error_code(task.error_code).unwrap_or_else(|| "unknown".into()),"message":"Video generation failed"});
}
return body;
}
let mut body = json!({
"id": task.id,
"object": "video",
@@ -57,6 +78,9 @@ fn build_openai_stored_task_body(task: StoredVideoTask, status: VideoTaskStatus)
if let Some(prompt) = task.prompt {
body["prompt"] = Value::String(prompt);
}
if let Some(seconds) = task.duration_seconds {
body["seconds"] = json!(seconds.to_string());
}
if let Some(size) = task.size {
body["size"] = Value::String(size);
}
@@ -91,21 +115,97 @@ fn map_openai_stored_task_status(status: VideoTaskStatus) -> &'static str {
}
impl OpenAiVideoTaskSeed {
pub fn uses_xai_provider(&self) -> bool {
self.xai_provider || self.is_xai_native()
}
pub fn is_xai_native(&self) -> bool {
self.persistence.client_api_format == "xai:video"
}
pub fn native_create_body_json(&self) -> Value {
let mut body = self.native_response.clone().unwrap_or_else(|| json!({}));
body["request_id"] = json!(self.local_task_id);
if body.get("id").is_some() {
body["id"] = json!(self.local_task_id);
}
body
}
fn native_read_body_json(&self) -> Value {
if let Some(mut body) = self.native_response.clone().filter(|body| {
body.get("status").is_some()
|| body.get("error").is_some()
|| body.get("code").is_some()
}) {
if body.get("request_id").is_some() {
body["request_id"] = json!(self.local_task_id);
}
if body.get("id").is_some() {
body["id"] = json!(self.local_task_id);
}
return body;
}
let mut body = json!({"status":match self.status {
LocalVideoTaskStatus::Completed => "done",
LocalVideoTaskStatus::Expired => "expired",
LocalVideoTaskStatus::Failed | LocalVideoTaskStatus::Cancelled | LocalVideoTaskStatus::Deleted => "failed",
_ => "pending",
}});
if let Some(model) = &self.model {
body["model"] = json!(model);
}
if let Some(url) = &self.video_url {
body["video"] = json!({"url":url});
if let Some(duration) = self.seconds.as_deref().and_then(|v| v.parse::<u64>().ok()) {
body["video"]["duration"] = json!(duration);
}
}
if self.error_code.is_some() {
body["error"] = json!({"code":self.error_code,"message":"Video generation failed"});
}
body
}
pub fn apply_provider_body(&mut self, provider_body: &Map<String, Value>) {
if self.uses_xai_provider() {
self.native_response = Some(Value::Object(provider_body.clone()));
}
let raw_status = provider_body
.get("status")
.and_then(Value::as_str)
.map(str::trim)
.unwrap_or_default();
self.status = match raw_status {
"queued" => LocalVideoTaskStatus::Queued,
"processing" => LocalVideoTaskStatus::Processing,
"completed" => LocalVideoTaskStatus::Completed,
"failed" => LocalVideoTaskStatus::Failed,
"cancelled" => LocalVideoTaskStatus::Cancelled,
// Accept xAI's native lifecycle vocabulary alongside OpenAI's fields.
self.status = match raw_status.to_ascii_lowercase().as_str() {
"queued" | "pending" => LocalVideoTaskStatus::Queued,
"processing" | "in_progress" | "running" => LocalVideoTaskStatus::Processing,
"completed" | "done" | "succeeded" | "success" => LocalVideoTaskStatus::Completed,
"failed" | "error" => LocalVideoTaskStatus::Failed,
"cancelled" | "canceled" => LocalVideoTaskStatus::Cancelled,
"expired" => LocalVideoTaskStatus::Expired,
_ => LocalVideoTaskStatus::Submitted,
};
let error = provider_body.get("error").filter(|value| !value.is_null());
let error_code = provider_body
.get("code")
.and_then(Value::as_str)
.filter(|value| !value.trim().is_empty())
.or_else(|| {
error
.and_then(|value| value.get("code"))
.and_then(Value::as_str)
});
// xAI may report a failed job as a 200 response with code/error only.
if (error.is_some() || error_code.is_some())
&& !matches!(
self.status,
LocalVideoTaskStatus::Cancelled | LocalVideoTaskStatus::Expired
)
{
self.status = LocalVideoTaskStatus::Failed;
}
self.progress_percent = provider_body
.get("progress")
.and_then(Value::as_u64)
@@ -117,20 +217,35 @@ impl OpenAiVideoTaskSeed {
});
self.completed_at_unix_secs = provider_body.get("completed_at").and_then(Value::as_u64);
self.expires_at_unix_secs = provider_body.get("expires_at").and_then(Value::as_u64);
let error = provider_body.get("error").and_then(Value::as_object);
self.error_code = sanitize_video_task_error_code(
error
.and_then(|value| value.get("code"))
.and_then(Value::as_str)
.map(str::to_string),
);
self.error_code = sanitize_video_task_error_code(error_code.map(str::to_string));
self.error_message = None;
self.video_url = provider_body
.get("video_url")
.or_else(|| provider_body.get("url"))
.or_else(|| provider_body.get("result_url"))
.or_else(|| {
provider_body
.get("video")
.and_then(|video| video.get("url"))
})
.and_then(Value::as_str)
.map(str::to_string);
if let Some(seconds) = provider_body
.get("seconds")
.or_else(|| {
provider_body
.get("video")
.and_then(|video| video.get("duration"))
})
.filter(|value| value.is_string() || value.is_number())
{
self.seconds = Some(
seconds
.as_str()
.map(str::to_string)
.unwrap_or_else(|| seconds.to_string()),
);
}
}
pub fn build_content_stream_action(
@@ -239,6 +354,9 @@ impl OpenAiVideoTaskSeed {
}
pub fn client_body_json(&self) -> Value {
if self.is_xai_native() {
return self.native_read_body_json();
}
let mut body = json!({
"id": self.local_task_id,
"object": "video",
@@ -259,6 +377,9 @@ impl OpenAiVideoTaskSeed {
if let Some(seconds) = &self.seconds {
body["seconds"] = Value::String(seconds.clone());
}
if let Some(video_url) = &self.video_url {
body["video_url"] = Value::String(video_url.clone());
}
if let Some(remixed_from_video_id) = &self.remixed_from_video_id {
body["remixed_from_video_id"] = Value::String(remixed_from_video_id.clone());
}
@@ -357,12 +478,20 @@ impl OpenAiVideoTaskSeed {
}
pub fn build_get_follow_up_plan(&self, trace_id: &str) -> Option<ExecutionPlan> {
if !matches!(
let refreshable = matches!(
self.status,
LocalVideoTaskStatus::Submitted
| LocalVideoTaskStatus::Queued
| LocalVideoTaskStatus::Processing
) {
) || (self.uses_xai_provider()
&& self.native_response.is_none()
&& matches!(
self.status,
LocalVideoTaskStatus::Completed
| LocalVideoTaskStatus::Failed
| LocalVideoTaskStatus::Expired
));
if !refreshable {
return None;
}
@@ -573,7 +702,12 @@ impl OpenAiVideoTaskSeed {
};
let mut record = UpsertVideoTask {
id: self.local_task_id.clone(),
short_id: None,
// The production schema requires a unique, non-null short_id (at most 16 chars).
// Derive it deterministically so repeated capture and legacy snapshot reloads agree.
short_id: Some(self.local_short_id.clone().unwrap_or_else(|| {
use sha2::{Digest, Sha256};
format!("{:x}", Sha256::digest(self.local_task_id.as_bytes()))[..16].to_string()
})),
request_id: self.persistence.request_id.clone(),
user_id: self.user_id.clone(),
api_key_id: self.api_key_id.clone(),
@@ -589,7 +723,11 @@ impl OpenAiVideoTaskSeed {
model: self.model.clone().or_else(|| Some(String::new())),
prompt: self.prompt.clone().or_else(|| Some(String::new())),
original_request_body: None,
duration_seconds: request_body_u32(&self.persistence.original_request_body, "seconds"),
duration_seconds: self
.seconds
.as_deref()
.and_then(|value| value.parse().ok())
.or_else(|| request_body_u32(&self.persistence.original_request_body, "seconds")),
resolution: request_body_string(&self.persistence.original_request_body, "resolution"),
aspect_ratio: request_body_string(
&self.persistence.original_request_body,
@@ -697,6 +835,9 @@ mod tests {
#[test]
fn builds_minimal_openai_persistence_record_without_sensitive_snapshot() {
let seed = OpenAiVideoTaskSeed {
local_short_id: None,
native_response: None,
xai_provider: false,
local_task_id: "task-openai-sensitive".to_string(),
upstream_task_id: "upstream-openai-sensitive".to_string(),
created_at_unix_ms: 1_712_345_678,
@@ -747,6 +888,12 @@ mod tests {
let record = seed.to_upsert_record();
let short_id = record
.short_id
.as_deref()
.expect("database short_id is required");
assert_eq!(short_id.len(), 16);
assert_eq!(seed.to_upsert_record().short_id, record.short_id);
assert_eq!(record.error_code.as_deref(), Some("provider_error"));
assert!(record.original_request_body.is_none());
assert!(record.progress_message.is_none());
@@ -759,6 +906,8 @@ mod tests {
let mut stored = record.into_stored();
stored.status = VideoTaskStatus::Completed;
// Migrated tasks can already have a short ID unrelated to the derived ID.
stored.short_id = Some("legacy-short-id".to_string());
let snapshot =
LocalVideoTaskSnapshot::from_stored_task_with_transport(&stored, seed.transport)
.expect("stored task should reconstruct with current transport");
@@ -766,6 +915,21 @@ mod tests {
panic!("expected OpenAI snapshot");
};
assert_eq!(restored.prompt, stored.prompt);
assert_eq!(restored.to_upsert_record().short_id, stored.short_id);
let mut embedded = stored.clone();
let mut legacy_snapshot =
serde_json::to_value(LocalVideoTaskSnapshot::OpenAi(restored.clone())).unwrap();
legacy_snapshot["OpenAi"]
.as_object_mut()
.unwrap()
.remove("local_short_id");
embedded.request_metadata = Some(json!({"rust_local_snapshot": legacy_snapshot}));
let embedded_snapshot = LocalVideoTaskSnapshot::from_stored_task(&embedded)
.expect("legacy embedded snapshot should hydrate");
assert_eq!(
embedded_snapshot.to_upsert_record().short_id,
stored.short_id
);
assert_eq!(restored.to_upsert_record().video_url, stored.video_url);
let Some(LocalVideoTaskContentAction::StreamPlan(plan)) =
restored.build_content_stream_action(None, "trace-download")
crates/aether-video-tasks-core/src/path.rs
+12 -4
View File
@@ -8,7 +8,9 @@ use uuid::Uuid;
use crate::{LocalVideoTaskRegistryMutation, LocalVideoTaskStatus, VideoTaskTruthSourceMode};
pub fn extract_openai_task_id_from_path(path: &str) -> Option<&str> {
let suffix = path.strip_prefix("/v1/videos/")?;
let suffix = path
.strip_prefix("/v1/videos/")
.or_else(|| path.strip_prefix("/openai/v1/videos/"))?;
if suffix.is_empty()
|| suffix.contains('/')
|| suffix.ends_with(":cancel")
@@ -29,21 +31,27 @@ pub fn extract_gemini_short_id_from_path(path: &str) -> Option<&str> {
}
pub fn extract_openai_task_id_from_cancel_path(path: &str) -> Option<&str> {
let suffix = path.strip_prefix("/v1/videos/")?;
let suffix = path
.strip_prefix("/v1/videos/")
.or_else(|| path.strip_prefix("/openai/v1/videos/"))?;
suffix
.strip_suffix("/cancel")
.filter(|value| !value.is_empty())
}
pub fn extract_openai_task_id_from_remix_path(path: &str) -> Option<&str> {
let suffix = path.strip_prefix("/v1/videos/")?;
let suffix = path
.strip_prefix("/v1/videos/")
.or_else(|| path.strip_prefix("/openai/v1/videos/"))?;
suffix
.strip_suffix("/remix")
.filter(|value| !value.is_empty())
}
pub fn extract_openai_task_id_from_content_path(path: &str) -> Option<&str> {
let suffix = path.strip_prefix("/v1/videos/")?;
let suffix = path
.strip_prefix("/v1/videos/")
.or_else(|| path.strip_prefix("/openai/v1/videos/"))?;
suffix
.strip_suffix("/content")
.filter(|value| !value.is_empty())
crates/aether-video-tasks-core/src/read_side.rs
+4 -1
View File
@@ -73,7 +73,7 @@ async fn read_openai_video_task_response(
}
None => state.find_stored_video_task(lookup).await?,
};
let Some(task) = task else {
let Some(mut task) = task else {
return Ok(None);
};
@@ -81,6 +81,9 @@ async fn read_openai_video_task_response(
return Ok(None);
}
if request_path.starts_with("/openai/v1/videos/") {
task.client_api_format = Some("openai:video".into());
}
Ok(Some(map_openai_stored_task_to_read_response(task)))
}
crates/aether-video-tasks-core/src/service.rs
+3 -8
View File
@@ -105,13 +105,8 @@ impl VideoTaskService {
if self.truth_source_mode != VideoTaskTruthSourceMode::RustAuthoritative {
return None;
}
match route_family {
Some("openai") => extract_openai_task_id_from_path(request_path)
.and_then(|task_id| self.store.read_openai(task_id)),
Some("gemini") => extract_gemini_short_id_from_path(request_path)
.and_then(|short_id| self.store.read_gemini(short_id)),
_ => None,
}
self.snapshot_for_route(route_family, request_path)
.map(|snapshot| snapshot.read_response_for_path(request_path))
}
pub fn read_response_for_user(
@@ -126,7 +121,7 @@ impl VideoTaskService {
let snapshot = self.snapshot_for_route(route_family, request_path)?;
snapshot
.belongs_to_user(user_id)
.then(|| snapshot.read_response())
.then(|| snapshot.read_response_for_path(request_path))
}
pub fn snapshot_for_route(
crates/aether-video-tasks-core/src/snapshot.rs
+17
View File
@@ -29,6 +29,7 @@ impl LocalVideoTaskSnapshot {
// contain stale identity fields after a task import or repair.
match &mut snapshot {
Self::OpenAi(seed) => {
seed.local_short_id = task.short_id.clone();
seed.user_id = task.user_id.clone();
seed.api_key_id = task.api_key_id.clone();
}
@@ -51,6 +52,9 @@ impl LocalVideoTaskSnapshot {
"openai:video" => {
let upstream_task_id = non_empty_owned(task.external_task_id.as_ref())?;
Some(Self::OpenAi(OpenAiVideoTaskSeed {
local_short_id: task.short_id.clone(),
native_response: None,
xai_provider: persistence.client_api_format == "xai:video",
local_task_id: task.id.clone(),
upstream_task_id,
created_at_unix_ms: task.created_at_unix_ms,
@@ -142,6 +146,19 @@ impl LocalVideoTaskSnapshot {
}
}
pub fn read_response_for_path(&self, path: &str) -> LocalVideoTaskReadResponse {
if let Self::OpenAi(seed) = self {
let mut seed = seed.clone();
if path.starts_with("/openai/v1/videos/") {
seed.persistence.client_api_format = "openai:video".to_string();
} else if path.starts_with("/v1/videos/") && seed.uses_xai_provider() {
seed.persistence.client_api_format = "xai:video".to_string();
}
return Self::OpenAi(seed).read_response();
}
self.read_response()
}
pub fn read_response(&self) -> LocalVideoTaskReadResponse {
match self {
Self::OpenAi(seed) => match seed.status {
crates/aether-video-tasks-core/src/sync.rs
+276 -14
View File
@@ -19,14 +19,17 @@ impl LocalVideoTaskSeed {
) -> Option<Self> {
let transport = LocalVideoTaskTransport::from_plan(plan)?;
let persistence = LocalVideoTaskPersistence::from_report_context(report_context, plan);
match report_kind {
let mut seed = match report_kind {
"openai_video_create_sync_finalize" => {
let upstream_id = provider_body.get("id").and_then(Value::as_str)?.trim();
if upstream_id.is_empty() {
return None;
}
let upstream_id = openai_video_provider_task_id(provider_body)?;
Some(Self::OpenAiCreate(OpenAiVideoTaskSeed {
local_short_id: None,
native_response: None,
xai_provider: report_context
.get("video_provider_xai")
.and_then(Value::as_bool)
.unwrap_or(false),
local_task_id: context_text(report_context, "local_task_id")
.unwrap_or_else(|| Uuid::new_v4().to_string()),
upstream_task_id: upstream_id.to_string(),
@@ -37,8 +40,12 @@ impl LocalVideoTaskSeed {
model: context_text(report_context, "model")
.or_else(|| request_body_text(report_context, "model")),
prompt: request_body_text(report_context, "prompt"),
size: request_body_text(report_context, "size"),
seconds: request_body_text(report_context, "seconds"),
size: context_text(report_context, "video_size")
.or_else(|| request_body_text(report_context, "size")),
seconds: context_u64(report_context, "video_duration")
.map(|v| v.to_string())
.or_else(|| request_body_text(report_context, "seconds"))
.or_else(|| request_body_text(report_context, "duration")),
remixed_from_video_id: None,
status: LocalVideoTaskStatus::Submitted,
progress_percent: 0,
@@ -52,12 +59,15 @@ impl LocalVideoTaskSeed {
}))
}
"openai_video_remix_sync_finalize" => {
let upstream_id = provider_body.get("id").and_then(Value::as_str)?.trim();
if upstream_id.is_empty() {
return None;
}
let upstream_id = openai_video_provider_task_id(provider_body)?;
Some(Self::OpenAiRemix(OpenAiVideoTaskSeed {
local_short_id: None,
native_response: None,
xai_provider: report_context
.get("video_provider_xai")
.and_then(Value::as_bool)
.unwrap_or(false),
local_task_id: context_text(report_context, "local_task_id")
.unwrap_or_else(|| Uuid::new_v4().to_string()),
upstream_task_id: upstream_id.to_string(),
@@ -68,8 +78,12 @@ impl LocalVideoTaskSeed {
model: context_text(report_context, "model")
.or_else(|| request_body_text(report_context, "model")),
prompt: request_body_text(report_context, "prompt"),
size: request_body_text(report_context, "size"),
seconds: request_body_text(report_context, "seconds"),
size: context_text(report_context, "video_size")
.or_else(|| request_body_text(report_context, "size")),
seconds: context_u64(report_context, "video_duration")
.map(|v| v.to_string())
.or_else(|| request_body_text(report_context, "seconds"))
.or_else(|| request_body_text(report_context, "duration")),
remixed_from_video_id: context_text(report_context, "task_id")
.or_else(|| request_body_text(report_context, "remix_video_id")),
status: LocalVideoTaskStatus::Submitted,
@@ -110,7 +124,11 @@ impl LocalVideoTaskSeed {
}))
}
_ => None,
}?;
if let Self::OpenAiCreate(task) | Self::OpenAiRemix(task) = &mut seed {
task.apply_provider_body(provider_body);
}
Some(seed)
}
pub fn success_report_kind(&self) -> &'static str {
@@ -144,12 +162,28 @@ impl LocalVideoTaskSeed {
pub fn client_body_json(&self) -> Value {
match self {
Self::OpenAiCreate(seed) | Self::OpenAiRemix(seed) => seed.client_body_json(),
Self::OpenAiCreate(seed) | Self::OpenAiRemix(seed) => {
if seed.is_xai_native() {
seed.native_create_body_json()
} else {
seed.client_body_json()
}
}
Self::GeminiCreate(seed) => seed.client_body_json(),
}
}
}
fn openai_video_provider_task_id(body: &Map<String, Value>) -> Option<&str> {
// xAI's OpenAI-compatible video creation returns request_id instead of id.
["id", "request_id"].into_iter().find_map(|field| {
body.get(field)
.and_then(Value::as_str)
.map(str::trim)
.filter(|value| !value.is_empty())
})
}
impl VideoTaskTruthSourceMode {
pub fn prepare_sync_success(
self,
@@ -353,6 +387,234 @@ mod tests {
resolve_local_sync_success_background_report_kind,
};
#[test]
fn xai_native_video_protocol_survives_persistence_and_preserves_provider_fields() {
use crate::{
LocalVideoTaskContentAction, LocalVideoTaskSnapshot, VideoTaskService,
VideoTaskTruthSourceMode,
};
let mut plan =
build_internal_finalize_video_plan("native-create", "openai:video", None).unwrap();
plan.url = "https://api.x.ai/v1/videos/generations".into();
plan.headers
.insert("authorization".into(), "Bearer test-key".into());
let service = VideoTaskService::new(VideoTaskTruthSourceMode::RustAuthoritative);
let context = json!({"local_task_id":"native-local", "user_id":"owner", "model":"grok-imagine-video", "video_client_protocol":"xai", "video_duration":6});
let success = service
.prepare_sync_success(
"openai_video_create_sync_finalize",
json!({"request_id":"native-upstream", "future_field":true})
.as_object()
.unwrap(),
context.as_object().unwrap(),
&plan,
)
.unwrap();
assert_eq!(
success.client_body_json(),
json!({"request_id":"native-local","future_field":true})
);
let mut snapshot = success.to_snapshot();
let body = json!({"status":"done","video":{"url":"https://vidgen.x.ai/video.mp4","duration":6,"respect_moderation":true},"future_field":[1,2]});
snapshot.apply_provider_body(body.as_object().unwrap());
assert_eq!(snapshot.read_response().body_json, body);
assert_eq!(
snapshot
.read_response_for_path("/openai/v1/videos/native-local")
.body_json["status"],
"completed"
);
let LocalVideoTaskSnapshot::OpenAi(seed) = &snapshot else {
panic!("openai task expected")
};
let Some(LocalVideoTaskContentAction::StreamPlan(download)) =
seed.build_content_stream_action(None, "download")
else {
panic!("download expected")
};
assert_eq!(download.url, "https://vidgen.x.ai/video.mp4");
assert!(download.headers.is_empty());
let stored = snapshot.to_upsert_record().into_stored();
assert!(stored.request_metadata.is_none());
assert_eq!(stored.client_api_format.as_deref(), Some("xai:video"));
let restored = LocalVideoTaskSnapshot::from_stored_task_with_transport(
&stored,
seed.transport.clone(),
)
.unwrap();
assert_eq!(restored.read_response().body_json["status"], "done");
service.record_snapshot(restored);
let poll = service
.prepare_read_refresh_sync_plan_for_user(
Some("openai"),
"/v1/videos/native-local",
"owner",
"poll",
)
.unwrap();
assert_eq!(poll.plan.url, "https://api.x.ai/v1/videos/native-upstream");
assert!(service
.prepare_read_refresh_sync_plan_for_user(
Some("openai"),
"/v1/videos/native-local",
"foreign",
"poll"
)
.is_none());
assert!(service.apply_read_refresh_projection(&poll, body.as_object().unwrap()));
assert_eq!(
service
.read_response_for_user(Some("openai"), "/v1/videos/native-local", "owner")
.unwrap()
.body_json,
body
);
}
#[test]
fn xai_video_lifecycle_creates_polls_persists_and_downloads() {
use crate::{
LocalVideoTaskContentAction, LocalVideoTaskSnapshot, VideoTaskService,
VideoTaskTruthSourceMode,
};
for api_root in ["https://cli-chat-proxy.grok.com/v1", "https://api.x.ai/v1"] {
let mut plan =
build_internal_finalize_video_plan("xai-create", "openai:video", None).unwrap();
plan.url = format!("{api_root}/videos/generations");
plan.headers
.insert("authorization".into(), "Bearer test-token".into());
let service = VideoTaskService::new(VideoTaskTruthSourceMode::RustAuthoritative);
let context = json!({"local_task_id": "local-video", "model": "grok-imagine-video", "original_request_body": {"prompt": "A cat", "seconds": "6"}});
let success = service
.prepare_sync_success(
"openai_video_create_sync_finalize",
json!({"request_id": "xai-request"}).as_object().unwrap(),
context.as_object().unwrap(),
&plan,
)
.unwrap();
assert_eq!(success.client_body_json()["id"], "local-video");
assert_eq!(success.client_body_json()["status"], "queued");
let snapshot = success.to_snapshot();
assert_eq!(
snapshot.to_upsert_record().external_task_id.as_deref(),
Some("xai-request")
);
service.record_snapshot(snapshot.clone());
let poll = service
.prepare_poll_refresh_plan_for_snapshot(snapshot, "xai-poll")
.unwrap();
assert_eq!(poll.plan.method, "GET");
assert_eq!(poll.plan.url, format!("{api_root}/videos/xai-request"));
assert_eq!(
poll.plan.headers.get("authorization"),
plan.headers.get("authorization")
);
assert!(service.apply_read_refresh_projection(
&poll,
json!({"status": "pending"}).as_object().unwrap()
));
assert_eq!(
service
.read_response(Some("openai"), "/v1/videos/local-video")
.unwrap()
.body_json["status"],
"queued"
);
assert!(service.apply_read_refresh_projection(&poll, json!({
"status": "done", "video": {"url": "https://vidgen.x.ai/result.mp4", "duration": 6}
}).as_object().unwrap()));
let snapshot = service
.snapshot_for_route(Some("openai"), "/v1/videos/local-video")
.unwrap();
assert!(!snapshot.is_active_for_refresh());
let record = snapshot.to_upsert_record();
assert_eq!(
record.status,
aether_data_contracts::repository::video_tasks::VideoTaskStatus::Completed
);
assert_eq!(
record.video_url.as_deref(),
Some("https://vidgen.x.ai/result.mp4")
);
assert_eq!(record.duration_seconds, Some(6));
let response = snapshot.read_response();
assert_eq!(response.body_json["status"], "completed");
assert_eq!(response.body_json["progress"], 100);
assert_eq!(
response.body_json["video_url"],
"https://vidgen.x.ai/result.mp4"
);
let LocalVideoTaskSnapshot::OpenAi(seed) = snapshot else {
panic!("OpenAI video expected")
};
let Some(LocalVideoTaskContentAction::StreamPlan(download)) =
seed.build_content_stream_action(None, "download")
else {
panic!("download expected")
};
assert_eq!(download.url, "https://vidgen.x.ai/result.mp4");
assert!(
download.headers.is_empty(),
"provider credentials must not be sent to the media CDN"
);
}
}
#[test]
fn xai_video_errors_are_terminal_even_without_a_status() {
use crate::{LocalVideoTaskSnapshot, VideoTaskTruthSourceMode};
let mut plan =
build_internal_finalize_video_plan("xai-create", "openai:video", None).unwrap();
plan.url = "https://cli-chat-proxy.grok.com/v1/videos/generations".into();
for body in [
json!({"code": "content_policy_violation", "error": "Rejected"}),
json!({"error": {"code": "content_policy_violation", "message": "Rejected"}}),
json!({"status": "failed", "error": "Rejected"}),
] {
let mut snapshot = VideoTaskTruthSourceMode::RustAuthoritative
.prepare_sync_success(
"openai_video_create_sync_finalize",
json!({"request_id": "xai-request"}).as_object().unwrap(),
&Default::default(),
&plan,
)
.unwrap()
.to_snapshot();
snapshot.apply_provider_body(body.as_object().unwrap());
assert!(!snapshot.is_active_for_refresh());
assert_eq!(snapshot.read_response().body_json["status"], "failed");
let LocalVideoTaskSnapshot::OpenAi(seed) = snapshot else {
panic!("OpenAI video expected")
};
assert!(seed.error_message.is_none());
}
}
#[test]
fn openai_video_id_takes_precedence_over_xai_alias() {
assert_eq!(
super::openai_video_provider_task_id(
json!({"id": "openai-id", "request_id": "trace-id"})
.as_object()
.unwrap()
),
Some("openai-id")
);
assert_eq!(
super::openai_video_provider_task_id(
json!({"id": " ", "request_id": "xai-id"})
.as_object()
.unwrap()
),
Some("xai-id")
);
assert_eq!(
super::openai_video_provider_task_id(json!({"request_id": " "}).as_object().unwrap()),
None
);
}
#[test]
fn builds_local_sync_finalize_read_response_for_supported_video_finalize_kinds() {
let delete_response = build_local_sync_finalize_read_response(
crates/aether-video-tasks-core/src/transport_domain.rs
+10 -2
View File
@@ -71,8 +71,16 @@ impl LocalVideoTaskPersistence {
.unwrap_or_else(|| plan.request_id.clone()),
username: context_text(report_context, "username"),
api_key_name: context_text(report_context, "api_key_name"),
client_api_format: context_text(report_context, "client_api_format")
.unwrap_or_else(|| plan.client_api_format.clone()),
client_api_format: if report_context
.get("video_client_protocol")
.and_then(Value::as_str)
== Some("xai")
{
"xai:video".to_string()
} else {
context_text(report_context, "client_api_format")
.unwrap_or_else(|| plan.client_api_format.clone())
},
provider_api_format: context_text(report_context, "provider_api_format")
.unwrap_or_else(|| plan.provider_api_format.clone()),
original_request_body: report_context
crates/aether-video-tasks-core/src/types.rs
+7
View File
@@ -201,6 +201,13 @@ pub struct LocalVideoTaskPersistence {
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
pub struct OpenAiVideoTaskSeed {
/// Preserve existing database identity; older snapshots derive it from the local task ID.
#[serde(default)]
pub local_short_id: Option<String>,
#[serde(default)]
pub native_response: Option<Value>,
#[serde(default)]
pub xai_provider: bool,
pub local_task_id: String,
pub upstream_task_id: String,
pub created_at_unix_ms: u64,