mirror of
https://github.com/fawney19/Aether.git
synced 2026-10-10 03:09:50 +08:00
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]>
185 lines
7.9 KiB
Rust
185 lines
7.9 KiB
Rust
use crate::ai_serving::build_request_trace_proxy_value;
|
|
use crate::ai_serving::planner::decision_input::apply_provider_request_routing_policy_to_decision;
|
|
use crate::ai_serving::planner::report_context::{
|
|
build_local_execution_report_context, LocalExecutionReportContextParts,
|
|
};
|
|
use crate::ai_serving::planner::spec_metadata::local_video_create_spec_metadata;
|
|
use crate::ai_serving::planner::{
|
|
build_ai_execution_decision_response, resolve_transport_request_encoding_policy,
|
|
AiExecutionDecisionResponseParts,
|
|
};
|
|
use crate::ai_serving::transport::xai::video::is_native_video_request;
|
|
use crate::ai_serving::transport::{
|
|
resolve_transport_execution_timeouts, resolve_transport_profile,
|
|
};
|
|
use crate::ai_serving::{ai_local_execution_contract_for_formats, PlannerAppState};
|
|
use crate::{append_local_failover_policy_to_value, AiExecutionDecision, AppState, GatewayError};
|
|
|
|
use super::request::resolve_local_video_create_candidate_payload_parts;
|
|
use super::support::{LocalVideoCreateCandidateAttempt, LocalVideoCreateDecisionInput};
|
|
use super::LocalVideoCreateSpec;
|
|
|
|
pub(super) async fn maybe_build_local_video_create_decision_payload_for_candidate(
|
|
state: &AppState,
|
|
parts: &http::request::Parts,
|
|
body_json: &serde_json::Value,
|
|
trace_id: &str,
|
|
input: &LocalVideoCreateDecisionInput,
|
|
attempt: LocalVideoCreateCandidateAttempt,
|
|
spec: LocalVideoCreateSpec,
|
|
) -> Result<Option<AiExecutionDecision>, GatewayError> {
|
|
let spec_metadata = local_video_create_spec_metadata(spec);
|
|
let planner_state = PlannerAppState::new(state);
|
|
let attempt_identity = attempt.attempt_identity();
|
|
let Some(resolved) = resolve_local_video_create_candidate_payload_parts(
|
|
state, parts, body_json, trace_id, input, &attempt, spec,
|
|
)
|
|
.await?
|
|
else {
|
|
return Ok(None);
|
|
};
|
|
let LocalVideoCreateCandidateAttempt {
|
|
eligible,
|
|
candidate_id,
|
|
..
|
|
} = attempt;
|
|
let candidate = eligible.candidate;
|
|
let transport = resolved.transport;
|
|
let (execution_strategy, conversion_mode) =
|
|
ai_local_execution_contract_for_formats(spec_metadata.api_format, spec_metadata.api_format);
|
|
let proxy = planner_state
|
|
.app()
|
|
.resolve_transport_proxy_snapshot_with_tunnel_affinity(&transport)
|
|
.await;
|
|
let transport_profile = resolve_transport_profile(&transport);
|
|
let mut extra_fields = serde_json::Map::new();
|
|
if is_native_video_request(&transport.provider.provider_type, parts.uri.path()) {
|
|
extra_fields.insert(
|
|
"video_client_protocol".to_string(),
|
|
serde_json::json!("xai"),
|
|
);
|
|
}
|
|
|
|
if let Some(proxy_value) = build_request_trace_proxy_value(Some(&transport), proxy.as_ref()) {
|
|
extra_fields.insert("proxy".to_string(), proxy_value);
|
|
}
|
|
if transport.provider.provider_type.eq_ignore_ascii_case("xai") {
|
|
extra_fields.insert("video_provider_xai".into(), serde_json::json!(true));
|
|
if let Some(duration) = resolved.provider_request_body.get("duration") {
|
|
extra_fields.insert("video_duration".into(), duration.clone());
|
|
}
|
|
if parts.uri.path() == "/openai/v1/videos" {
|
|
extra_fields.insert(
|
|
"video_size".into(),
|
|
body_json
|
|
.get("size")
|
|
.filter(|v| v.as_str().is_some_and(|s| !s.trim().is_empty()))
|
|
.cloned()
|
|
.unwrap_or_else(|| serde_json::json!("720x1280")),
|
|
);
|
|
}
|
|
}
|
|
let effective_headers = input.effective_headers(&parts.headers);
|
|
let report_context = build_local_execution_report_context(LocalExecutionReportContextParts {
|
|
auth_context: &input.auth_context,
|
|
request_id: trace_id,
|
|
candidate_id: &candidate_id,
|
|
attempt_identity,
|
|
model: &input.requested_model,
|
|
provider_name: &transport.provider.name,
|
|
provider_id: &candidate.provider_id,
|
|
endpoint_id: &candidate.endpoint_id,
|
|
key_id: &candidate.key_id,
|
|
key_name: None,
|
|
model_id: Some(&candidate.model_id),
|
|
global_model_id: Some(&candidate.global_model_id),
|
|
global_model_name: Some(&candidate.global_model_name),
|
|
provider_api_format: spec_metadata.api_format,
|
|
client_api_format: spec_metadata.api_format,
|
|
mapped_model: Some(&resolved.mapped_model),
|
|
candidate_group_id: eligible.orchestration.candidate_group_id.as_deref(),
|
|
pool_key_lease: eligible.orchestration.pool_key_lease.as_ref(),
|
|
ranking: eligible.ranking.as_ref(),
|
|
upstream_url: None,
|
|
header_rules: transport.endpoint.header_rules.as_ref(),
|
|
body_rules: transport.endpoint.body_rules.as_ref(),
|
|
provider_request_method: None,
|
|
provider_request_headers: None,
|
|
original_headers: effective_headers,
|
|
request_path: Some(parts.uri.path()),
|
|
request_query_string: parts.uri.query(),
|
|
request_origin: Some(crate::ai_serving::request_origin_from_parts(parts)),
|
|
original_request_body_json: Some(body_json),
|
|
original_request_body_base64: None,
|
|
client_session_affinity: input.client_session_affinity.as_ref(),
|
|
routing_policy: input.routing_policy.as_ref(),
|
|
scheduler_affinity_epoch: eligible.orchestration.scheduler_affinity_epoch,
|
|
sticky_key_attempts: eligible.orchestration.sticky_key_attempts,
|
|
client_requested_stream: false,
|
|
upstream_is_stream: false,
|
|
has_envelope: false,
|
|
needs_conversion: false,
|
|
extra_fields,
|
|
});
|
|
let report_context = append_local_failover_policy_to_value(report_context, &transport);
|
|
let super::request::LocalVideoCreateCandidatePayloadParts {
|
|
transport: _,
|
|
auth_header,
|
|
auth_value,
|
|
mapped_model,
|
|
provider_request_headers,
|
|
provider_request_body,
|
|
upstream_url,
|
|
} = resolved;
|
|
let request_encoding = resolve_transport_request_encoding_policy(&transport);
|
|
|
|
let mut decision = build_ai_execution_decision_response(AiExecutionDecisionResponseParts {
|
|
decision_is_stream: false,
|
|
decision_kind: spec_metadata.decision_kind.to_string(),
|
|
execution_strategy,
|
|
conversion_mode,
|
|
request_id: trace_id.to_string(),
|
|
candidate_id: candidate_id.clone(),
|
|
provider_name: transport.provider.name.clone(),
|
|
provider_type: transport.provider.provider_type.clone(),
|
|
provider_id: candidate.provider_id.clone(),
|
|
endpoint_id: candidate.endpoint_id.clone(),
|
|
key_id: candidate.key_id.clone(),
|
|
upstream_base_url: transport.endpoint.base_url.clone(),
|
|
upstream_url,
|
|
provider_request_method: Some(parts.method.to_string()),
|
|
auth_header: Some(auth_header),
|
|
auth_value: Some(auth_value),
|
|
provider_api_format: spec_metadata.api_format.to_string(),
|
|
client_api_format: spec_metadata.api_format.to_string(),
|
|
model_name: input.requested_model.clone(),
|
|
mapped_model,
|
|
prompt_cache_key: None,
|
|
provider_request_headers,
|
|
provider_request_body: Some(provider_request_body),
|
|
provider_request_body_base64: None,
|
|
content_type: parts
|
|
.headers
|
|
.get(http::header::CONTENT_TYPE)
|
|
.and_then(|value| value.to_str().ok())
|
|
.map(str::trim)
|
|
.filter(|value| !value.is_empty())
|
|
.map(ToOwned::to_owned),
|
|
content_encoding: request_encoding.content_encoding,
|
|
request_gzip: request_encoding.request_gzip,
|
|
proxy,
|
|
transport_profile,
|
|
timeouts: resolve_transport_execution_timeouts(&transport),
|
|
upstream_is_stream: false,
|
|
report_kind: spec_metadata.report_kind.map(ToOwned::to_owned),
|
|
report_context: Some(report_context),
|
|
auth_context: input.auth_context.clone(),
|
|
});
|
|
apply_provider_request_routing_policy_to_decision(
|
|
input,
|
|
&mut decision,
|
|
Some(transport.as_ref()),
|
|
)?;
|
|
Ok(Some(decision))
|
|
}
|