fix: don't encode the prefix.

UCSD-E4E · Nov 13, 2024 · 7d1a8b4 · 7d1a8b4
1 parent 5dde8bf
commit 7d1a8b4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/fishsense_lite/commands/label_studio.py b/fishsense_lite/commands/label_studio.py
@@ -66,7 +66,8 @@ def execute_nn_laser(
     cv2.imwrite(output_file.absolute().as_posix(), image_dark)
 
     json_objects = LaserLabelStudioJSON(
-        f"{prefix}{output_file.relative_to(output.absolute()).as_posix()}",
+        prefix,
+        output_file.relative_to(output.absolute()).as_posix(),
         laser_image_coord,
         width,
         height,
@@ -110,7 +111,8 @@ def execute_fishial(
     cv2.imwrite(mask_file.absolute().as_posix(), debug_output)
 
     json_objects = SegmentationLabelStudioJSON(
-        f"{prefix}{output_file.relative_to(output.absolute()).as_posix()}",
+        prefix,
+        output_file.relative_to(output.absolute()).as_posix(),
         segmentations,
         fish_segmentation_inference.name,
     )

diff --git a/fishsense_lite/commands/label_studio_models/data.py b/fishsense_lite/commands/label_studio_models/data.py
@@ -2,5 +2,5 @@
 
 
 class Data:
-    def __init__(self, img: str):
-        self.img = urllib.parse.quote(img)
+    def __init__(self, prefix: str, img: str):
+        self.img = f"{prefix}{urllib.parse.quote(img)}"
diff --git a/fishsense_lite/commands/label_studio_models/laser_label_studio_json.py b/fishsense_lite/commands/label_studio_models/laser_label_studio_json.py
@@ -45,13 +45,14 @@ def __init__(
 class LaserLabelStudioJSON:
     def __init__(
         self,
+        prefix: str,
         img: str,
         laser_image_coord: np.ndarray,
         width: int,
         height: int,
         model_name: str,
     ):
-        self.data = Data(img)
+        self.data = Data(prefix, img)
         self.predictions = (
             [LaserPrediction(laser_image_coord, width, height, model_name)]
             if laser_image_coord is not None

diff --git a/fishsense_lite/commands/label_studio_models/segmentation_label_studio_json.py b/fishsense_lite/commands/label_studio_models/segmentation_label_studio_json.py
@@ -210,11 +210,12 @@ def __init__(self, mask: np.ndarray, model_name: str):
 class SegmentationLabelStudioJSON:
     def __init__(
         self,
+        prefix: str,
         img: str,
         mask: np.ndarray,
         model_name: str,
     ):
-        self.data = Data(img)
+        self.data = Data(prefix, img)
         self.predictions = (
             [SegmentationPrediction(mask, model_name)] if mask.sum() > 0 else []
         )