Update api_server.py

api_server.py

@@ -39,14 +39,14 @@ elif load_type == 'remote_hub_download':
     # 從 Hugging Face Hub 下載模型
     model_path = hf_hub_download(repo_id=REPO_ID, filename=MODEL_NAME)
     model = torch.load(model_path)
-    model.eval()
+    #model.eval()
 elif load_type == 'remote_hub_from_pretrained':
     # 使用 Hugging Face Hub 預訓練的模型方式下載
     os.environ['TRANSFORMERS_CACHE'] = str(Path(MODEL_DIR).absolute())
     from huggingface_hub import from_pretrained
 
     model = from_pretrained(REPO_ID, filename=MODEL_NAME, cache_dir=MODEL_DIR)
-    model.eval()
+    #model.eval()
 else:
     raise AssertionError('No load type is specified!')
 
@@ -63,15 +63,14 @@ def get_jpg_files(path):
   """
   Args:
     path: 要搜尋的目錄路徑。
-
   Returns:
     一個包含所有 JPG 檔案路徑的列表。
   """
   return glob.glob(os.path.join(path, "*.jpg"))
 
 # 使用範例
-image_folder = '/content/drive/MyDrive/chiikawa'  # 替換成你的目錄路徑
-jpg_files = get_jpg_files(image_folder)
+# image_folder = '/content/drive/MyDrive/chiikawa'  # 替換成你的目錄路徑
+# jpg_files = get_jpg_files(image_folder)
 
 
 # Initialize the Flask application
@@ -84,7 +83,7 @@ def predict():
 
     #user_id = request.args.get('user_id') 
     file = request.files['image']
-    message_id = request.form.get('message_id') #str(uuid.uuid4()) # 生成一個唯一的 message_id
+    message_id = request.form.get('message_id') #str(uuid.uuid4())
     
     if 'image' not in request.files:
         # Handle if no file is selected
@@ -121,18 +120,25 @@ def predict():
         element_list =[]
 
         for element, count in element_counts.items():
-            if element_counts[element] > 1: #某隻角色的數量>1
-                output_path = f"{YOLO_DIR}/{message_id}/{element}"
-                output_file = get_jpg_files(output_path)
-                element_list.append(element)
-
-                for output_img in output_file: # 取得每張圖的路徑
-                    encoded_images.append(image_to_base64(output_img))
-
-            else  : #某隻角色的數量=1
-                output_path = f"{YOLO_DIR}/{message_id}/{element}/im.jpg.jpg"
-                encoded_images.append(image_to_base64(output_path))
-                element_list.append(element)
+            
+            output_path = f"{YOLO_DIR}/{message_id}/{element}"
+            output_file = get_jpg_files(output_path)
+
+            element_list.append(element)
+            
+            for output_img in output_file: # 取得每張圖的路徑
+                encoded_images.append(image_to_base64(output_img))
+
+            # if element_counts[element] > 1: #某隻角色的數量>1
+            #     output_path = f"{YOLO_DIR}/{message_id}/{element}"
+            #     output_file = get_jpg_files(output_path)
+
+            #     for output_img in output_file: # 取得每張圖的路徑
+            #         encoded_images.append(image_to_base64(output_img))
+
+            # else  : #某隻角色的數量=1
+            #     output_path = f"{YOLO_DIR}/{message_id}/{element}/im.jpg.jpg"
+            #     encoded_images.append(image_to_base64(output_path))
                 
         # 建立回應資料
         response_data = {