From e9ce35570668e1ee07326f63fb2e1c0fbac4aa28 Mon Sep 17 00:00:00 2001
From: qwertyforce <qwertyforce@protonmail.com>
Date: Wed, 5 Jul 2023 21:29:56 +0300
Subject: [PATCH] better calculate_all error handling

---
 server/helpers/image_ops.ts                   | 28 +++++++++----------
 server/routes/calculate_all_image_features.ts | 13 ++++++---
 server/routes/delete_all_image_features.ts    | 19 ++++++++++++-
 3 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/server/helpers/image_ops.ts b/server/helpers/image_ops.ts
index ef63e3e..a6fa7bc 100644
--- a/server/helpers/image_ops.ts
+++ b/server/helpers/image_ops.ts
@@ -14,7 +14,7 @@ async function calculate_phash_features(image_id: number, image: Buffer) {
             ...form.getHeaders()
         }
     })
-    return status.data
+    return status
 }
 
 async function calculate_local_features(image_id: number, image: Buffer) {
@@ -28,7 +28,7 @@ async function calculate_local_features(image_id: number, image: Buffer) {
             ...form.getHeaders()
         }
     })
-    return status.data
+    return status
 }
 
 async function calculate_global_features(image_id: number, image: Buffer) {
@@ -42,7 +42,7 @@ async function calculate_global_features(image_id: number, image: Buffer) {
             ...form.getHeaders()
         }
     })
-    return status.data
+    return status
 }
 
 async function calculate_image_text_features(image_id: number, image: Buffer) {
@@ -56,7 +56,7 @@ async function calculate_image_text_features(image_id: number, image: Buffer) {
             ...form.getHeaders()
         }
     })
-    return status.data
+    return status
 }
 async function calculate_color_features(image_id: number, image: Buffer) {
     const form = new FormData()
@@ -69,7 +69,7 @@ async function calculate_color_features(image_id: number, image: Buffer) {
             ...form.getHeaders()
         }
     })
-    return status.data
+    return status
 }
 
 // async function calculate_text_features(image_id: number, image: Buffer) {
@@ -390,27 +390,27 @@ async function get_similar_images(image: Buffer, find_duplicate:boolean) {
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 async function delete_local_features_by_id(image_id: number) {
     const status = await axios.post(`${config.local_features_microservice_url}/delete_local_features`, { image_id: image_id })
-    return status.data
+    return status
 }
 
 async function delete_global_features_by_id(image_id: number) {
     const status = await axios.post(`${config.global_features_microservice_url}/delete_global_features`, { image_id: image_id })
-    return status.data
+    return status
 }
 
 async function delete_image_text_features_by_id(image_id: number) {
     const status = await axios.post(`${config.image_text_features_microservice_url}/delete_image_text_features`, { image_id: image_id })
-    return status.data
+    return status
 }
 
 async function delete_color_features_by_id(image_id: number) {
     const status = await axios.post(`${config.color_microservice_url}/delete_color_features`, { image_id: image_id })
-    return status.data
+    return status
 }
 
 async function delete_phash_features_by_id(image_id: number) {
     const status = await axios.post(`${config.phash_microservice_url}/delete_phash_features`, { image_id: image_id })
-    return status.data
+    return status
 }
 
 // async function delete_text_features_by_id(image_id: number) {
@@ -423,8 +423,8 @@ async function delete_phash_features_by_id(image_id: number) {
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 async function calculate_all_image_features(image_id: number, image_buffer: Buffer) {
     return Promise.allSettled([
-        calculate_global_features(image_id, image_buffer),
-        calculate_local_features(image_id, image_buffer),
+        // calculate_global_features(image_id, image_buffer),
+        // calculate_local_features(image_id, image_buffer),
         calculate_color_features(image_id, image_buffer),
         calculate_phash_features(image_id, image_buffer),
         calculate_image_text_features(image_id, image_buffer),
@@ -434,8 +434,8 @@ async function calculate_all_image_features(image_id: number, image_buffer: Buff
 
 async function delete_all_image_features(image_id: number) {
     return Promise.allSettled([
-        delete_global_features_by_id(image_id),
-        delete_local_features_by_id(image_id),
+        // delete_global_features_by_id(image_id),
+        // delete_local_features_by_id(image_id),
         delete_color_features_by_id(image_id),
         delete_phash_features_by_id(image_id),
         delete_image_text_features_by_id(image_id)
diff --git a/server/routes/calculate_all_image_features.ts b/server/routes/calculate_all_image_features.ts
index 6e96b40..da7fa34 100644
--- a/server/routes/calculate_all_image_features.ts
+++ b/server/routes/calculate_all_image_features.ts
@@ -34,18 +34,23 @@ async function calculate_all_image_features(req: FastifyRequest<{ Body: FromSche
     if (req.body.image_id.value) {
         const image_id = parseInt(req.body.image_id.value)
         const results:any = await image_ops.calculate_all_image_features(image_id, image_buffer)
-        console.log(results[3])
+        
         for(let i=0;i<results.length;i++){
             const new_obj:any = {status:results[i].status}
             if(results[i]?.reason?.message){
                 new_obj.reason = results[i].reason.message
             }
-            if(results[i]?.value!==undefined){
-                new_obj.value=results[i].value
-            }
             if(results[i]?.reason?.response?.data){
                 new_obj.data=results[i]?.reason?.response?.data
             }
+            if(results[i]?.reason?.config?.url){
+                new_obj.url=results[i]?.reason?.config?.url
+            }
+            if(results[i]?.value){
+                new_obj.value=results[i].value.data
+                new_obj.url=results[i].value.config.url
+            }
+            
             results[i] = new_obj
         }
         console.log(results)
diff --git a/server/routes/delete_all_image_features.ts b/server/routes/delete_all_image_features.ts
index 5e4ee51..afe105b 100644
--- a/server/routes/delete_all_image_features.ts
+++ b/server/routes/delete_all_image_features.ts
@@ -10,7 +10,24 @@ const body_schema_delete_all_image_features = {
 } as const;
 
 async function delete_all_image_features(req: FastifyRequest<{ Body: FromSchema<typeof body_schema_delete_all_image_features> }>, res: FastifyReply) {
-    const results = await image_ops.delete_all_image_features(req.body.image_id)
+    const results:any = await image_ops.delete_all_image_features(req.body.image_id)
+    for(let i=0;i<results.length;i++){
+        const new_obj:any = {status:results[i].status}
+        if(results[i]?.reason?.message){
+            new_obj.reason = results[i].reason.message
+        }
+        if(results[i]?.reason?.response?.data){
+            new_obj.data=results[i]?.reason?.response?.data
+        }
+        if(results[i]?.reason?.config?.url){
+            new_obj.url=results[i]?.reason?.config?.url
+        }
+        if(results[i]?.value){
+            new_obj.value=results[i].value.data
+            new_obj.url=results[i].value.config.url
+        }
+        results[i] = new_obj
+    }
     console.log(results)
     res.send(results)
 }