Light refactoring

MANIFEST.in

@@ -1,8 +1,9 @@
 include LICENSE
 include README.md
 
-recursive-include crabs *.md
-recursive-include crabs *.sh
+recursive-include guides *.md
+recursive-include bash_scripts *.sh
+recursive-include opencv_notebooks *.py
 
 exclude .pre-commit-config.yaml
 

crabs/bboxes_labelling/annotations_utils.py

@@ -137,11 +137,12 @@ def combine_multiple_via_jsons(
     return str(json_out_fullpath)
 
 
+DEFAULT_CRAB_CATEGORY = {"id": 1, "name": "crab", "supercategory": "animal"}
+
+
 def convert_via_json_to_coco(
     json_file_path: str,
-    coco_category_ID: int = 1,
-    coco_category_name: str = "crab",
-    coco_supercategory_name: str = "animal",
+    coco_category: dict = DEFAULT_CRAB_CATEGORY,
     coco_out_filename: Optional[str] = None,
     coco_out_dir: Optional[str] = None,
 ) -> str:
@@ -183,18 +184,11 @@ def convert_via_json_to_coco(
     with open(json_file_path) as json_file:
         annotation_data = json.load(json_file)
 
-    # Create data structure for COCO format
-    coco_categories = [
-        {
-            "id": coco_category_ID,
-            "name": coco_category_name,
-            "supercategory": coco_supercategory_name,
-        },
-    ]
+    # Create data structure for COCO
     coco_data: dict[str, Any] = {
         "info": {},
         "licenses": [],
-        "categories": coco_categories,
+        "categories": [coco_category],
         "images": [],
         "annotations": [],
     }
@@ -222,7 +216,7 @@ def convert_via_json_to_coco(
             annotation_data = {
                 "id": annotation_id,
                 "image_id": image_id,
-                "category_id": coco_category_ID,
+                "category_id": coco_category["id"],
                 "bbox": [x, y, width, height],
                 "area": width * height,
                 "iscrowd": 0,

crabs/bboxes_labelling/combine_and_format_annotations.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from annotations_utils import (
+from crabs.bboxes_labelling.annotations_utils import (
     combine_multiple_via_jsons,
     convert_via_json_to_coco,
 )