Merge remote-tracking branch 'upstream/main'

apps/aether-gateway/src/handlers/public/ai_public.rs

@@ -522,12 +522,45 @@ fn embedding_array_input_is_non_empty(items: &[Value]) -> bool {
             item.as_array()
                 .is_some_and(|items| embedding_token_array_is_non_empty(items))
         })
+        || items.iter().all(embedding_multimodal_content_is_non_empty)
 }
 
 fn embedding_token_array_is_non_empty(items: &[Value]) -> bool {
     !items.is_empty() && items.iter().all(|item| item.as_u64().is_some())
 }
 
+fn embedding_multimodal_content_is_non_empty(value: &Value) -> bool {
+    let Some(object) = value.as_object() else {
+        return false;
+    };
+    let valid_text = object
+        .get("text")
+        .map(|value| value.as_str().is_some_and(|text| !text.trim().is_empty()));
+    let valid_image = object
+        .get("image")
+        .map(|value| value.as_str().is_some_and(|image| !image.trim().is_empty()));
+    let valid_video = object
+        .get("video")
+        .map(|value| value.as_str().is_some_and(|video| !video.trim().is_empty()));
+    let valid_multi_images = object.get("multi_images").map(|value| {
+        value.as_array().is_some_and(|items| {
+            !items.is_empty()
+                && items
+                    .iter()
+                    .all(|item| item.as_str().is_some_and(|image| !image.trim().is_empty()))
+        })
+    });
+
+    [valid_text, valid_image, valid_video, valid_multi_images]
+        .into_iter()
+        .flatten()
+        .all(|valid| valid)
+        && [valid_text, valid_image, valid_video, valid_multi_images]
+            .into_iter()
+            .flatten()
+            .any(|valid| valid)
+}
+
 fn image_request_count(value: &Value) -> Option<u64> {
     value
         .as_u64()

apps/aether-gateway/src/handlers/public/support/billing.rs

@@ -327,6 +327,32 @@ pub(super) async fn handle_billing_plan_checkout(
             false,
         );
     }
+    match state
+        .find_pending_plan_purchase_order_by_user_id(&auth.user.id, &plan.id)
+        .await
+    {
+        Ok(Some(order)) => {
+            return build_auth_json_response(
+                http::StatusCode::OK,
+                json!({
+                    "order": payment_order_payload(&order, &plan),
+                    "payment_instructions": sanitize_wallet_gateway_response(
+                        order.gateway_response.clone()
+                    ),
+                    "reused_pending_order": true,
+                }),
+                None,
+            )
+        }
+        Ok(None) => {}
+        Err(err) => {
+            return build_auth_error_response(
+                http::StatusCode::INTERNAL_SERVER_ERROR,
+                format!("pending billing checkout lookup failed: {err:?}"),
+                false,
+            )
+        }
+    }
     let now = Utc::now();
     let order_no = billing_order_no(now);
     let expires_at = now + chrono::Duration::minutes(30);

apps/aether-gateway/src/handlers/public/support/models/shared.rs

@@ -25,6 +25,7 @@ pub(crate) fn models_api_format(request_context: &GatewayPublicRequestContext) -
         "jina:embedding" => Some("jina:embedding"),
         "jina:rerank" => Some("jina:rerank"),
         "doubao:embedding" => Some("doubao:embedding"),
+        "aliyun:multimodal_embedding" => Some("aliyun:multimodal_embedding"),
         _ => None,
     }
 }
@@ -43,6 +44,7 @@ const MODELS_EMBEDDING_QUERY_API_FORMATS: &[&str] = &[
     "jina:embedding",
     "gemini:embedding",
     "doubao:embedding",
+    "aliyun:multimodal_embedding",
 ];
 const MODELS_RERANK_QUERY_API_FORMATS: &[&str] = &["openai:rerank", "jina:rerank"];
 
@@ -54,9 +56,11 @@ pub(super) fn models_query_api_formats(api_format: &str) -> &'static [&'static s
         | "claude:messages"
         | "gemini:generate_content" => MODELS_CROSS_FORMAT_QUERY_API_FORMATS,
         "openai:image" => &["openai:image"],
-        "openai:embedding" | "jina:embedding" | "gemini:embedding" | "doubao:embedding" => {
-            MODELS_EMBEDDING_QUERY_API_FORMATS
-        }
+        "openai:embedding"
+        | "jina:embedding"
+        | "gemini:embedding"
+        | "doubao:embedding"
+        | "aliyun:multimodal_embedding" => MODELS_EMBEDDING_QUERY_API_FORMATS,
         "openai:rerank" | "jina:rerank" => MODELS_RERANK_QUERY_API_FORMATS,
         _ => &[],
     }