Update app.py

app.py

@@ -73,7 +73,7 @@ def genus_classify_images(files):
     results = ""
     predict = []
     for i, file_path in enumerate(files):
-        print(f'\ngenus_classify_image {i}:  {file_path.name} \n')
+        print(f'\ngenus_classify_image {i+1}:  {file_path.name} \n')
         try:
             inp = tf.keras.preprocessing.image.load_img(file_path.name, target_size=(224, 224))
             inp = tf.keras.preprocessing.image.img_to_array(inp)
@@ -120,7 +120,7 @@ def Aspergillus_Detect():
   # Construct the command to run the detect.py script
   command = [
       "python",
-      "yolov7_environment_data/yolov7/detect.py",
+      "./yolov7_environment_data/yolov7/detect.py",
       "--source",
       test_path,
       "--weights",
@@ -203,9 +203,9 @@ def Aspergillus_Detect():
 
 def classify_images(files):
     predict, result1 = genus_classify_images(files)
-    # if predict == 'Aspergillus':
-    #   result2 = Aspergillus_Detect()
-    #   return f'{result1}\n\n{result2}'
+    if predict == 'Aspergillus':
+      result2 = Aspergillus_Detect()
+      return f'{result1}\n\n{result2}'
     return result1
 
 import shutil
@@ -253,8 +253,8 @@ def upload_file(files):
         file_path = Path(test_path, file.name.split('/')[-1])
         print(f'\nupload_file:{file}, {file.name}, {os.path.abspath(file_path)}\n')
         try:
-            # shutil.copy(file.name, file_path)
-            # print(f"File copied successfully.")
+            shutil.copy(file.name, file_path)
+            print(f"File copied successfully.")
             
             # # Upload the image to the 'Test' directory
             # upload_image_path = file.name  # Replace with the path of the uploaded image
@@ -265,20 +265,20 @@ def upload_file(files):
             # else:
             #     print("Could not find the 'Test' directory in the project.")
 
-            # Open and read the image file
-            upload_image_path = file.name
-            with open(upload_image_path, 'rb') as file:
-                image_data = file.read()
+            # # Open and read the image file
+            # upload_image_path = file.name
+            # with open(upload_image_path, 'rb') as file:
+            #     image_data = file.read()
             
-            # Upload the image to the 'Test' subdirectory
-            upload_url = f"{api_url}/{upload_image_path.split('/')[-1]}"
-            response = requests.put(upload_url, data=image_data)
+            # # Upload the image to the 'Test' subdirectory
+            # upload_url = f"{api_url}/{upload_image_path.split('/')[-1]}"
+            # response = requests.put(upload_url, data=image_data)
             
-            # Check the response status
-            if response.status_code == 200:
-                print("Image successfully uploaded to the 'Test' subdirectory.")
-            else:
-                print("Failed to upload the image.")
+            # # Check the response status
+            # if response.status_code == 200:
+            #     print("Image successfully uploaded to the 'Test' subdirectory.")
+            # else:
+            #     print("Failed to upload the image.")
                 
         except:
             print("\nError occurred while copying file.\n")