diff --git a/__init__.py b/__init__.py index 7394f23..2356df4 100644 --- a/__init__.py +++ b/__init__.py @@ -77,12 +77,14 @@ if __name__ == "__main__": # import rdancer_debug # will listen for debugger to attach def my_process_image(image_path, prompt): + from utils.sam import SAM_CHECKPOINT image = Image.open(image_path).convert("RGB") - annotated_image, mask = process_image(image, prompt) - output_image_path, output_mask_path = f"output_image_{os.path.basename(image_path)}", f"output_mask_{os.path.basename(image_path)}" + annotated_image, mask, masked_image = process_image(SAM_CHECKPOINT, image, prompt) + output_image_path, output_mask_path, output_masked_image_path = f"output_image_{os.path.basename(image_path)}", f"output_mask_{os.path.basename(image_path)}", f"output_masked_image_{os.path.basename(image_path)}" annotated_image.save(output_image_path) mask.save(output_mask_path) - return output_image_path, output_mask_path + masked_image.save(output_masked_image_path) + return output_image_path, output_mask_path, output_masked_image_path if len(sys.argv) < 2: print(f"Usage: python {os.path.basename(sys.argv[0])} [ ...] []") @@ -110,6 +112,6 @@ if __name__ == "__main__": from app import process_image for image in images: - output_image_path, mask_path = my_process_image(image, prompt) - print(f"Saved output image to {output_image_path} and mask to {mask_path}") + output_image_path, output_mask_path, output_masked_image_path = my_process_image(image, prompt) + print(f"Saved output image to {output_image_path} and mask to {output_mask_path} and masked image to {output_masked_image_path}") diff --git a/checkpoints/sam2_hiera_base_plus.pt b/models/sam2/sam2_hiera_base_plus.pt similarity index 100% rename from checkpoints/sam2_hiera_base_plus.pt rename to models/sam2/sam2_hiera_base_plus.pt diff --git a/checkpoints/sam2_hiera_large.pt b/models/sam2/sam2_hiera_large.pt similarity index 100% rename from checkpoints/sam2_hiera_large.pt rename to models/sam2/sam2_hiera_large.pt diff --git a/checkpoints/sam2_hiera_small.pt b/models/sam2/sam2_hiera_small.pt similarity index 100% rename from checkpoints/sam2_hiera_small.pt rename to models/sam2/sam2_hiera_small.pt diff --git a/checkpoints/sam2_hiera_tiny.pt b/models/sam2/sam2_hiera_tiny.pt similarity index 100% rename from checkpoints/sam2_hiera_tiny.pt rename to models/sam2/sam2_hiera_tiny.pt diff --git a/test/01_output.png b/test/01_output_mask.png similarity index 100% rename from test/01_output.png rename to test/01_output_mask.png diff --git a/test/01_output_masked_image.png b/test/01_output_masked_image.png new file mode 100644 index 0000000..9fa6faf Binary files /dev/null and b/test/01_output_masked_image.png differ diff --git a/test/02_output.png b/test/02_output_mask.png similarity index 100% rename from test/02_output.png rename to test/02_output_mask.png diff --git a/test/02_output_masked_image.png b/test/02_output_masked_image.png new file mode 100644 index 0000000..83c2b1b Binary files /dev/null and b/test/02_output_masked_image.png differ