Update api_server.py

api_server.py

@@ -176,7 +176,7 @@ def predict():
                     api_name="/predict"
                 )
                 top_k_words.append(clip_result) # CLIP預測3個結果(top_k_words)
-                #encoded_images.append(image_to_base64(yolo_img))
+                encoded_images.append(image_to_base64(yolo_img))
                 print(f"===== CLIP result:{top_k_words} =====\n")
 
             # if element_counts[element] > 1: #某隻角色的數量>1
@@ -190,25 +190,25 @@ def predict():
             #     yolo_path = f"{YOLO_DIR}/{message_id}/{element}/im.jpg.jpg"
             #     encoded_images.append(image_to_base64(yolo_path))
                 
-        ## 建立回應資料
-        # response_data = {
-        #     'message_id': message_id,
-        #     'description': element_list,
-        #     'images': [
-        #         {
-        #             'encoded_image': encoded_image,
-        #             'description_list': top_k_words
-        #         }
-        #         for encoded_image, description_list in zip(encoded_images, top_k_words)
-        #     ]
-        # }
-        # response_data = {
-        #     'message_id': message_id,
-        #     'images': encoded_images,
-        #     'description': element_list
-        # }
+        # 建立回應資料
+        response_data = {
+            'message_id': message_id,
+            'objects': [
+                {
+                    'element': element,
+                    'images': [
+                        {
+                            'encoded_image': encoded_image,
+                            'description_list': description_list
+                        }                
+                        for encoded_image, description_list in zip(encoded_images, top_k_words)
+                    ]
+                }
+                for element, encoded_images, top_k_words in zip(element_list, encoded_images, top_k_words)
+            ]
+        }
         
-        return jsonify(top_k_words), 200 #jsonify(response_data)
+        return jsonify(response_data), 200 #jsonify(response_data)
             
         # for label_name in label_names:
         #     yolo_file=f"{YOLO_DIR}/{message_id}/{label_name}/im.jpg.jpg"