Skip to content

armgit / uzu

Public Imported from GitHub
0

A high-performance inference engine for AI models

fix(download-manager): preserve partial download file and progress on error (#1051)

onenewcodedbe194c37c57
diff --git a/crates/legacy/download-manager/src/file_download/file_download_worker.rs b/crates/legacy/download-manager/src/file_download/file_download_worker.rs
index c5e083add..6edd7c5c2 100644
--- a/crates/legacy/download-manager/src/file_download/file_download_worker.rs
+++ b/crates/legacy/download-manager/src/file_download/file_download_worker.rs
@@ -133,10 +133,7 @@ impl FileDownloadWorker {
self.set(DownloadPhase::Downloading {}, downloaded_bytes, None);
Ok(())
},
- Err(error) => {
- let _ = fs::asyn::remove_file(&self.config.resume_artifact_path).await;
- Err(self.fail(error.into()))
- },
+ Err(error) => Err(self.fail(error.into())),
}
}
@@ -152,7 +149,8 @@ impl FileDownloadWorker {
self.complete().await;
} else {
let downloaded_bytes = self.backend.read_resume_progress(&self.config.resume_artifact_path).await;
- self.set(DownloadPhase::Paused {}, downloaded_bytes, None);
+ let total_bytes = (self.state.total_bytes > 0).then_some(self.state.total_bytes as u64);
+ self.set(DownloadPhase::Paused {}, downloaded_bytes, total_bytes);
}
Ok(())
}
@@ -246,13 +244,14 @@ impl FileDownloadWorker {
..
} => {
task.cancel().await;
- let _ = fs::asyn::remove_file(&self.config.resume_artifact_path).await;
+ let downloaded_bytes = self.backend.read_resume_progress(&self.config.resume_artifact_path).await;
+ let total_bytes = (self.state.total_bytes > 0).then_some(self.state.total_bytes as u64);
self.set(
DownloadPhase::Error {
message,
},
- 0,
- None,
+ downloaded_bytes,
+ total_bytes,
);
},
}
@@ -292,12 +291,13 @@ impl FileDownloadWorker {
&mut self,
error: FileDownloadError,
) -> FileDownloadError {
+ let total_bytes = (self.state.total_bytes > 0).then_some(self.state.total_bytes as u64);
self.set(
DownloadPhase::Error {
message: error.to_string(),
},
- 0,
- None,
+ self.state.downloaded_bytes.max(0) as u64,
+ total_bytes,
);
error
}
diff --git a/crates/legacy/download-manager/tests/download_manager.rs b/crates/legacy/download-manager/tests/download_manager.rs
index 026e3346c..f822779e5 100644
--- a/crates/legacy/download-manager/tests/download_manager.rs
+++ b/crates/legacy/download-manager/tests/download_manager.rs
@@ -236,6 +236,32 @@ async fn failures(#[case] kind: DownloadManagerType) -> Result<(), Box<dyn std::
Ok(())
}
+#[rstest]
+#[case::universal(DownloadManagerType::Universal)]
+#[tokio::test(flavor = "multi_thread")]
+async fn download_error_preserves_resume_artifact(
+ #[case] kind: DownloadManagerType
+) -> Result<(), Box<dyn std::error::Error>> {
+ let server = MockServer::start().await;
+ Mock::given(method("GET")).respond_with(ResponseTemplate::new(500)).mount(&server).await;
+
+ let dir = tempfile::tempdir()?;
+ let destination = dir.path().join("file.bin");
+ let artifact = artifact_path(&destination, "part");
+ tokio::fs::write(&artifact, b"partial").await?;
+
+ let manager = manager(kind);
+ let task =
+ manager.download_task(file_request(&format!("{}/file.bin", server.uri()), &destination, Some(100))).await?;
+ let mut progress = task.progress();
+ task.download().await?;
+
+ let state = wait_for_state(&task, &mut progress, |s| matches!(s.phase, DownloadPhase::Error { .. })).await;
+ assert_eq!(state.downloaded_bytes, b"partial".len() as i64);
+ assert_eq!(tokio::fs::read(&artifact).await?, b"partial");
+ Ok(())
+}
+
#[rstest]
#[case::universal(DownloadManagerType::Universal)]
#[cfg_attr(target_vendor = "apple", case::native(DownloadManagerType::Native))]