Enable to set random ranges to RandomEmojiOverlay parameters

augly/image/transforms.py

@@ -2326,21 +2326,28 @@ def __init__(
         self,
         emoji_directory: str = utils.SMILEY_EMOJI_DIR,
         opacity: float = 1.0,
-        emoji_size: float = 0.15,
-        x_pos: float = 0.4,
-        y_pos: float = 0.4,
+        emoji_size: Union[float, Tuple[float, float]] = 0.15,
+        x_pos: Union[float, Tuple[float, float]] = 0.4,
+        y_pos: Union[float, Tuple[float, float]] = 0.8,
+        seed: Optional[int] = 42,
         p: float = 1.0,
     ):
         """
         @param emoji_directory: iopath directory uri containing the emoji images
 
         @param opacity: the lower the opacity, the more transparent the overlaid emoji
 
-        @param emoji_size: size of the emoji is emoji_size * height of the original image
+        @param emoji_size: size of the emoji is emoji_size * height of the original image.
+            If set to a tuple, a position will randomly be chosen from the range provided
 
-        @param x_pos: position of emoji relative to the image width
+        @param x_pos: position of emoji relative to the image width.
+            If set to a tuple, a position will randomly be chosen from the range provided
 
-        @param y_pos: position of emoji relative to the image height
+        @param y_pos: position of emoji relative to the image height.
+            If set to a tuple, a position will randomly be chosen from the range provided
+
+        @param seed: if provided, this will set the random seed to ensure
+            consistency between runs
 
         @param p: the probability of the transform being applied; default value is 1.0
         """
@@ -2351,6 +2358,7 @@ def __init__(
         self.emoji_size = emoji_size
         self.x_pos = x_pos
         self.y_pos = y_pos
+        self.seed = seed
 
     def apply_transform(
         self,
@@ -2378,14 +2386,39 @@ def apply_transform(
 
         @returns: Augmented PIL Image
         """
+        if self.seed is not None:
+            random.seed(self.seed)
+
+        if isinstance(self.emoji_size, tuple):
+            assert (
+                self.emoji_size[0] < self.emoji_size[1]
+            ), "emoji_size must be a float or a tuple [low, high) to sample the value from"
+            emoji_size = random.uniform(self.emoji_size[0], self.emoji_size[1])
+        else:
+            emoji_size = self.emoji_size
+        if isinstance(self.x_pos, tuple):
+            assert (
+                self.x_pos[0] < self.x_pos[1]
+            ), "x_pos must be a float or a tuple [low, high) to sample the value from"
+            x_pos = random.uniform(self.x_pos[0], self.x_pos[1])
+        else:
+            x_pos = self.x_pos
+        if isinstance(self.y_pos, tuple):
+            assert (
+                self.y_pos[0] < self.y_pos[1]
+            ), "y_pos must be a float or a tuple [low, high) to sample the value from"
+            y_pos = random.uniform(self.y_pos[0], self.y_pos[1])
+        else:
+            y_pos = self.y_pos
+
         emoji_path = random.choice(self.emoji_paths)
         return F.overlay_emoji(
             image,
             emoji_path=os.path.join(self.emoji_directory, emoji_path),
             opacity=self.opacity,
-            emoji_size=self.emoji_size,
-            x_pos=self.x_pos,
-            y_pos=self.y_pos,
+            emoji_size=emoji_size,
+            x_pos=x_pos,
+            y_pos=y_pos,
             metadata=metadata,
             bboxes=bboxes,
             bbox_format=bbox_format,

augly/tests/image_tests/transforms_unit_test.py

@@ -175,7 +175,10 @@ def test_RandomBrightness(self):
     @unittest.skip("Failing on some envs, will fix")
     def test_RandomEmojiOverlay(self):
         random.seed(1)
-        self.evaluate_class(imaugs.RandomEmojiOverlay(), fname="RandomEmojiOverlay")
+        self.evaluate_class(
+            imaugs.RandomEmojiOverlay(emoji_size=(0.15, 0.3)),
+            fname="RandomEmojiOverlay",
+        )
 
     def test_RandomNoise(self):
         self.evaluate_class(imaugs.RandomNoise(), fname="random_noise")

augly/utils/expected_output/image_tests/expected_metadata.json

@@ -569,17 +569,17 @@
             "dst_bboxes": [[0.5, 0.5, 0.25, 0.75]],
             "dst_height": 1080,
             "dst_width": 1920,
-            "emoji_path": "twemojis/smileys/beating_heart.png",
-            "emoji_size": 0.15,
-            "intensity": 2.25,
+            "emoji_path": "twemojis/smileys/astonished_face.png",
+            "emoji_size": 0.24591401976868255,
+            "intensity": 6.047370511879199,
             "name": "overlay_emoji",
             "opacity": 1.0,
             "output_path": null,
             "src_bboxes": [[0.5, 0.5, 0.25, 0.75]],
             "src_height": 1080,
             "src_width": 1920,
             "x_pos": 0.4,
-            "y_pos": 0.4
+            "y_pos": 0.8
         }
     ],
     "RandomPixelization": [

requirements.txt

@@ -1,7 +1,7 @@
 iopath>=0.1.8
 nlpaug==1.1.3
 numpy>=1.19.5
-Pillow>=8.2.0
+Pillow>=8.2.0,<9.0.0
 python-magic>=0.4.22
 regex>=2021.4.4
 vidgear>=0.2.4