feat(s3): return existence on uploading

BobAnkh · BobAnkh · commit 2c8811ccba60 · 2025-11-20T14:35:09.000Z
diff --git a/netmito/src/api/groups.rs b/netmito/src/api/groups.rs
@@ -157,7 +157,7 @@ pub async fn upload_attachment(
     Path(group_name): Path<String>,
     Json(req): Json<UploadAttachmentReq>,
 ) -> Result<Json<UploadAttachmentResp>, ApiError> {
-    let url =
+    let (exist, url) =
         service::s3::user_upload_attachment(u.id, &pool, group_name, req.key, req.content_length)
             .await
             .map_err(|e| match e {
@@ -168,7 +168,7 @@ pub async fn upload_attachment(
                     ApiError::InternalServerError
                 }
             })?;
-    Ok(Json(UploadAttachmentResp { url }))
+    Ok(Json(UploadAttachmentResp { exist, url }))
 }
 
 pub async fn download_attachment(
diff --git a/netmito/src/api/tasks.rs b/netmito/src/api/tasks.rs
@@ -207,7 +207,7 @@ pub async fn upload_artifact(
     Path(uuid): Path<Uuid>,
     Json(req): Json<UploadArtifactReq>,
 ) -> Result<Json<UploadArtifactResp>, ApiError> {
-    let url =
+    let (exist, url) =
         service::s3::user_upload_artifact(&pool, u.id, uuid, req.content_type, req.content_length)
             .await
             .map_err(|e| match e {
@@ -218,7 +218,7 @@ pub async fn upload_artifact(
                     ApiError::InternalServerError
                 }
             })?;
-    Ok(Json(UploadArtifactResp { url }))
+    Ok(Json(UploadArtifactResp { exist, url }))
 }
 
 pub async fn download_artifact(
diff --git a/netmito/src/client/interactive.rs b/netmito/src/client/interactive.rs
@@ -221,6 +221,22 @@ pub(crate) fn output_group_info(info: &GroupQueryInfo) {
     }
 }
 
+pub(crate) fn output_upload_artifact_resp(exist: bool) {
+    if exist {
+        tracing::info!("Artifact already exists on server, replaced it");
+    } else {
+        tracing::info!("Artifact uploaded successfully");
+    }
+}
+
+pub(crate) fn output_upload_attachment_resp(exist: bool) {
+    if exist {
+        tracing::info!("Attachment already exists on server, replaced it");
+    } else {
+        tracing::info!("Attachment uploaded successfully");
+    }
+}
+
 pub(crate) fn fill_admin_create_user(
     username: Option<String>,
     password: Option<String>,
diff --git a/netmito/src/client/mod.rs b/netmito/src/client/mod.rs
@@ -630,7 +630,10 @@ impl MitoClient {
         self.http_client.user_submit_task(req).await
     }
 
-    pub async fn upload_artifact(&mut self, args: UploadArtifactArgs) -> crate::error::Result<()> {
+    pub async fn upload_artifact(
+        &mut self,
+        args: UploadArtifactArgs,
+    ) -> crate::error::Result<bool> {
         let metadata = args
             .local_file
             .metadata()
@@ -649,13 +652,14 @@ impl MitoClient {
         let resp = self.http_client.get_upload_artifact_resp(uuid, req).await?;
         self.http_client
             .upload_file(resp.url.as_str(), content_length, args.local_file, args.pb)
-            .await
+            .await?;
+        Ok(resp.exist)
     }
 
     pub async fn upload_attachment(
         &mut self,
         args: UploadAttachmentArgs,
-    ) -> crate::error::Result<()> {
+    ) -> crate::error::Result<bool> {
         fn get_fname<P: AsRef<std::path::Path>>(p: P) -> crate::error::Result<String> {
             let fname = p
                 .as_ref()
@@ -718,7 +722,8 @@ impl MitoClient {
             .await?;
         self.http_client
             .upload_file(resp.url.as_str(), content_length, args.local_file, args.pb)
-            .await
+            .await?;
+        Ok(resp.exist)
     }
 
     pub async fn admin_workers_cancel(
@@ -860,7 +865,7 @@ impl MitoClient {
     pub async fn tasks_artifacts_upload(
         &mut self,
         args: TaskArtifactUploadArgs,
-    ) -> crate::error::Result<()> {
+    ) -> crate::error::Result<bool> {
         self.upload_artifact(args).await
     }
 
@@ -874,7 +879,7 @@ impl MitoClient {
     pub async fn groups_attachments_upload(
         &mut self,
         args: GroupAttachmentUploadArgs,
-    ) -> crate::error::Result<()> {
+    ) -> crate::error::Result<bool> {
         self.upload_attachment(args).await
     }
 
@@ -1535,8 +1540,8 @@ impl MitoClient {
                         }
                     }
                     AttachmentsCommands::Upload(args) => match self.upload_attachment(args).await {
-                        Ok(_) => {
-                            tracing::info!("Attachment uploaded successfully");
+                        Ok(exist) => {
+                            output_upload_attachment_resp(exist);
                         }
                         Err(e) => {
                             tracing::error!("{}", e);
@@ -1837,8 +1842,8 @@ impl MitoClient {
                         }
                     }
                     ArtifactsCommands::Upload(args) => match self.upload_artifact(args).await {
-                        Ok(_) => {
-                            tracing::info!("Artifact uploaded successfully");
+                        Ok(exist) => {
+                            output_upload_artifact_resp(exist);
                         }
                         Err(e) => {
                             tracing::error!("{}", e);
diff --git a/netmito/src/schema.rs b/netmito/src/schema.rs
@@ -169,6 +169,7 @@ pub struct UploadAttachmentReq {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct UploadAttachmentResp {
+    pub exist: bool,
     pub url: String,
 }
 
@@ -180,6 +181,7 @@ pub struct UploadArtifactReq {
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct UploadArtifactResp {
+    pub exist: bool,
     pub url: String,
 }
 
diff --git a/netmito/src/service/s3.rs b/netmito/src/service/s3.rs
@@ -406,7 +406,7 @@ pub(crate) async fn group_upload_artifact(
     task: StoredTaskModel,
     content_type: ArtifactContentType,
     content_length: u64,
-) -> Result<String, crate::error::Error> {
+) -> Result<(bool, String), crate::error::Error> {
     let now = TimeDateTimeWithTimeZone::now_utc();
     let content_length = content_length as i64;
     let (uuid, group_id) = match task {
@@ -425,9 +425,10 @@ pub(crate) async fn group_upload_artifact(
     }
     let s3_client = pool.s3.clone();
     let artifacts_bucket = pool.artifacts_bucket.clone();
-    let url = pool
+    // This returns (exist, url)
+    let resp = pool
         .db
-        .transaction::<_, String, Error>(|txn| {
+        .transaction::<_, (bool, String), Error>(|txn| {
             Box::pin(async move {
                 // Update the task to reflect the artifact upload
                 match task {
@@ -456,7 +457,7 @@ pub(crate) async fn group_upload_artifact(
                 let s3_object_key = format!("{uuid}/{content_type}");
                 let url: String;
                 // Check group storage quota and allocate storage for the artifact
-                match artifact {
+                let exist = match artifact {
                     Some(artifact) => {
                         let recorded_content_length = content_length.max(artifact.size);
                         let new_storage_used =
@@ -486,6 +487,7 @@ pub(crate) async fn group_upload_artifact(
                             ..Default::default()
                         };
                         group.update(txn).await?;
+                        true
                     }
                     None => {
                         let new_storage_used = group.storage_used + content_length;
@@ -516,13 +518,14 @@ pub(crate) async fn group_upload_artifact(
                             ..Default::default()
                         };
                         group.update(txn).await?;
+                        false
                     }
-                }
-                Ok(url)
+                };
+                Ok((exist, url))
             })
         })
         .await?;
-    Ok(url)
+    Ok(resp)
 }
 
 pub async fn user_upload_artifact(
@@ -531,7 +534,7 @@ pub async fn user_upload_artifact(
     uuid: Uuid,
     content_type: ArtifactContentType,
     content_length: u64,
-) -> Result<String, crate::error::Error> {
+) -> Result<(bool, String), crate::error::Error> {
     // Find the task and group
     let (group_id, task) = find_task_by_uuid(pool, uuid).await?;
     // Check if user has permission to upload artifact to the task
@@ -861,7 +864,7 @@ pub async fn user_upload_attachment(
     group_name: String,
     key: String,
     content_length: u64,
-) -> Result<String, crate::error::Error> {
+) -> Result<(bool, String), crate::error::Error> {
     tracing::debug!(
         "Uploading attachment to group {} with key {} and size {}",
         group_name,
@@ -880,9 +883,9 @@ pub async fn user_upload_attachment(
     let s3_client = pool.s3.clone();
     let now = TimeDateTimeWithTimeZone::now_utc();
     let attachments_bucket = pool.attachments_bucket.clone();
-    let uri = pool
+    let resp = pool
         .db
-        .transaction::<_, String, crate::error::Error>(|txn| {
+        .transaction::<_, (bool, String), crate::error::Error>(|txn| {
             Box::pin(async move {
                 let group = Group::Entity::find()
                     .filter(Group::Column::GroupName.eq(group_name.clone()))
@@ -907,7 +910,7 @@ pub async fn user_upload_attachment(
                     .one(txn)
                     .await?;
                 let url: String;
-                match attachment {
+                let exist = match attachment {
                     Some(attachment) => {
                         let recorded_content_length = content_length.max(attachment.size);
                         let new_storage_used =
@@ -937,6 +940,7 @@ pub async fn user_upload_attachment(
                             ..Default::default()
                         };
                         group.update(txn).await?;
+                        true
                     }
                     None => {
                         let new_storage_used = group.storage_used + content_length;
@@ -968,13 +972,14 @@ pub async fn user_upload_attachment(
                             ..Default::default()
                         };
                         group.update(txn).await?;
+                        false
                     }
-                }
-                Ok(url)
+                };
+                Ok((exist, url))
             })
         })
         .await?;
-    Ok(uri)
+    Ok(resp)
 }
 
 // show_pb is used to show progress bar
diff --git a/netmito/src/service/worker/mod.rs b/netmito/src/service/worker/mod.rs
@@ -733,7 +733,7 @@ pub async fn report_task(
                 content_type,
                 content_length
             );
-            let url = group_upload_artifact(
+            let (_, url) = group_upload_artifact(
                 pool,
                 StoredTaskModel::Active(task),
                 content_type,

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ pub struct UploadAttachmentReq {`
`169`	`169`
`170`	`170`	`#[derive(Debug, Serialize, Deserialize, Clone)]`
`171`	`171`	`pub struct UploadAttachmentResp {`
	`172`	`+ pub exist: bool,`
`172`	`173`	`pub url: String,`
`173`	`174`	`}`
`174`	`175`
`@@ -180,6 +181,7 @@ pub struct UploadArtifactReq {`
`180`	`181`
`181`	`182`	`#[derive(Debug, Serialize, Deserialize, Clone)]`
`182`	`183`	`pub struct UploadArtifactResp {`
	`184`	`+ pub exist: bool,`
`183`	`185`	`pub url: String,`
`184`	`186`	`}`
`185`	`187`