1

server-rs/crates/api-server/src/hyper3d_generation.rs

@@ -231,12 +231,7 @@ pub(crate) async fn query_task_status(
     .await?;
 
     let jobs = extract_job_statuses(&response);
-    let status = normalize_task_status(
-        find_first_string_by_key(&response, "status")
-            .or_else(|| jobs.first().map(|job| job.status.clone()))
-            .as_deref()
-            .unwrap_or("unknown"),
-    );
+    let status = resolve_hyper3d_overall_status(&response, &jobs);
 
     Ok(contract::Hyper3dTaskStatusResponse {
         ok: true,
@@ -539,6 +534,33 @@ fn extract_job_statuses(payload: &Value) -> Vec<contract::Hyper3dJobStatusPayloa
         .collect()
 }
 
+fn resolve_hyper3d_overall_status(
+    payload: &Value,
+    jobs: &[contract::Hyper3dJobStatusPayload],
+) -> String {
+    if !jobs.is_empty() {
+        if jobs.iter().any(|job| job.status == "failed") {
+            return "failed".to_string();
+        }
+        if jobs.iter().all(|job| job.status == "done") {
+            return "done".to_string();
+        }
+        if jobs.iter().any(|job| job.status == "generating") {
+            return "generating".to_string();
+        }
+        if jobs.iter().any(|job| job.status == "waiting") {
+            return "waiting".to_string();
+        }
+        return "unknown".to_string();
+    }
+
+    normalize_task_status(
+        find_first_string_by_key(payload, "status")
+            .as_deref()
+            .unwrap_or("unknown"),
+    )
+}
+
 fn extract_job_uuids(payload: &Value) -> Vec<String> {
     let mut job_uuids = Vec::new();
     if let Some(jobs) = find_first_array_by_keys(payload, &["jobs"]) {
@@ -580,6 +602,12 @@ fn collect_download_files(value: &Value, output: &mut Vec<contract::Hyper3dDownl
                 .get("url")
                 .or_else(|| object.get("download_url"))
                 .or_else(|| object.get("downloadUrl"))
+                .or_else(|| object.get("file_url"))
+                .or_else(|| object.get("fileUrl"))
+                .or_else(|| object.get("signed_url"))
+                .or_else(|| object.get("signedUrl"))
+                .or_else(|| object.get("presigned_url"))
+                .or_else(|| object.get("presignedUrl"))
                 .and_then(Value::as_str)
                 .map(str::trim)
                 .filter(|value| value.starts_with("http://") || value.starts_with("https://"));
@@ -588,6 +616,9 @@ fn collect_download_files(value: &Value, output: &mut Vec<contract::Hyper3dDownl
                     .get("name")
                     .or_else(|| object.get("file_name"))
                     .or_else(|| object.get("filename"))
+                    .or_else(|| object.get("fileName"))
+                    .or_else(|| object.get("display_name"))
+                    .or_else(|| object.get("displayName"))
                     .and_then(Value::as_str)
                     .map(str::trim)
                     .filter(|value| !value.is_empty())
@@ -1070,6 +1101,28 @@ mod tests {
         assert_eq!(files[0].name, "model.glb");
     }
 
+    #[test]
+    fn extracts_download_files_from_file_url_aliases() {
+        let files = extract_download_files(&json!({
+            "result": {
+                "files": [
+                    {
+                        "fileName": "rodin-result.glb",
+                        "fileUrl": "https://cdn.example/rodin-result.glb?token=1"
+                    },
+                    {
+                        "displayName": "preview.png",
+                        "signedUrl": "https://cdn.example/preview.png?token=1"
+                    }
+                ]
+            }
+        }));
+
+        assert_eq!(files.len(), 2);
+        assert_eq!(files[0].name, "rodin-result.glb");
+        assert_eq!(files[0].url, "https://cdn.example/rodin-result.glb?token=1");
+    }
+
     #[test]
     fn normalizes_status_values() {
         assert_eq!(normalize_task_status("Waiting"), "waiting");
@@ -1077,4 +1130,34 @@ mod tests {
         assert_eq!(normalize_task_status("Done"), "done");
         assert_eq!(normalize_task_status("Failed"), "failed");
     }
+
+    #[test]
+    fn resolves_status_done_only_when_all_jobs_done() {
+        let jobs = extract_job_statuses(&json!({
+            "jobs": [
+                { "uuid": "preview", "status": "Done" },
+                { "uuid": "model", "status": "Generating" }
+            ]
+        }));
+
+        assert_eq!(
+            resolve_hyper3d_overall_status(&json!({ "status": "Done" }), &jobs),
+            "generating"
+        );
+    }
+
+    #[test]
+    fn resolves_status_failed_when_any_job_failed() {
+        let jobs = extract_job_statuses(&json!({
+            "jobs": [
+                { "uuid": "preview", "status": "Done" },
+                { "uuid": "model", "status": "Failed", "message": "bad input" }
+            ]
+        }));
+
+        assert_eq!(
+            resolve_hyper3d_overall_status(&json!({ "status": "Generating" }), &jobs),
+            "failed"
+        );
+    }
 }