rvimage 0.0.1__tar.gz → 0.1.0__tar.gz

rvimage-0.1.0/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: rvimage
+Version: 0.1.0
+Summary: Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool RV Image
+Project-URL: Repository, https://github.com/bertiqwerty/rvimage
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Requires-Dist: numpy>=2.3.0
+Requires-Dist: opencv-python-headless>=4.11.0.86
+Requires-Dist: pydantic>=2.11.7
+Requires-Dist: scipy>=1.15.3
+
+# RV Image
+
+This package contains Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool 
+[RV Image](https://github.com/bertiqwerty/rvimage).

rvimage-0.1.0/README.md

@@ -0,0 +1,4 @@
+# RV Image
+
+This package contains Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool 
+[RV Image](https://github.com/bertiqwerty/rvimage).

rvimage-0.1.0/pyproject.toml

@@ -0,0 +1,16 @@
+[project]
+name = "rvimage"
+version = "0.1.0"
+description = "Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool RV Image"
+readme = "README.md"
+requires-python = ">=3.12"
+dependencies = [
+    "numpy>=2.3.0",
+    "opencv-python-headless>=4.11.0.86",
+    "pydantic>=2.11.7",
+    "scipy>=1.15.3",
+]
+[project.urls]
+Repository = "https://github.com/bertiqwerty/rvimage"
+[dependency-groups]
+dev = ["pytest>=8.4.1"]

{rvimage-0.0.1 → rvimage-0.1.0}/rvimage/collection_types.py

@@ -1,5 +1,5 @@
 from typing import Self
-from pydantic import BaseModel
+from pydantic import BaseModel, model_serializer, model_validator
 import numpy as np
 from rvimage.converters import (
     extract_polys_from_mask,
@@ -11,11 +11,6 @@ from rvimage.converters import (
 from rvimage.domain import BbF, BbI, Poly, enclosing_bb, find_ccs
 
 
-class GeoFig(BaseModel):
-    bbox: BbF | None = None
-    poly: Poly | None = None
-
-
 class Labelinfo(BaseModel):
     new_label: str
     labels: list[str]
@@ -26,10 +21,31 @@ class Labelinfo(BaseModel):
 
 
 class BboxAnnos(BaseModel):
-    elts: list[GeoFig]
+    elts: list[BbF | Poly]
     cat_idxs: list[int]
     selected_mask: list[bool]
 
+    @model_validator(mode="before")
+    @classmethod
+    def resolve_bb_poly(cls, data: dict) -> dict:
+        # remove the type-info from the dict
+        data["elts"] = [next(v for v in d.values()) for d in data["elts"]]
+        return data
+
+    @model_serializer()
+    def serialize_model(self):
+        elts = [
+            {"BB": elt.model_dump()}
+            if isinstance(elt, BbF)
+            else {"Poly": elt.model_dump()}
+            for elt in self.elts
+        ]
+        return {
+            "cat_idxs": self.cat_idxs,
+            "selected_mask": self.selected_mask,
+            "elts": elts,
+        }
+
     @classmethod
     def from_mask(cls, mask: np.ndarray, cat_idx: int) -> "BboxAnnos":
         """
@@ -40,7 +56,7 @@ class BboxAnnos(BaseModel):
 
         return cls(
             elts=[
-                GeoFig(poly=Poly(points=points, enclosing_bb=enclosing_bb(points)))
+                Poly(points=points, enclosing_bb=enclosing_bb(points))
                 for points in polys
             ],
             cat_idxs=cat_idxs,
@@ -60,9 +76,9 @@ class BboxAnnos(BaseModel):
     def fill_mask(self, im_mask: np.ndarray, cat_idx: int):
         fill_polys_on_mask(
             polygons=(
-                elt.poly.points
+                elt.points
                 for elt, cat_idx_ in zip(self.elts, self.cat_idxs)
-                if cat_idx == cat_idx_ and elt.poly is not None
+                if cat_idx == cat_idx_ and isinstance(elt, Poly)
             ),
             value=1,
             im_mask=im_mask,
@@ -70,9 +86,9 @@ class BboxAnnos(BaseModel):
         )
         fill_bbs_on_mask(
             bbs=(
-                elt.bbox
+                elt
                 for elt, cat_idx_ in zip(self.elts, self.cat_idxs)
-                if cat_idx == cat_idx_ and elt.bbox is not None
+                if cat_idx == cat_idx_ and isinstance(elt, BbF)
             ),
             value=1,
             im_mask=im_mask,
@@ -125,10 +141,10 @@ class BrushData(BaseModel):
 
 
 class InputAnnotationData(BaseModel):
-    bbox: BboxData
-    brush: BrushData
+    bbox: BboxData | None
+    brush: BrushData | None
 
 
 class OutputAnnotationData(BaseModel):
-    bbox: BboxAnnos
-    brush: BrushAnnos
+    bbox: BboxAnnos | None
+    brush: BrushAnnos | None

rvimage-0.1.0/rvimage.egg-info/PKG-INFO

@@ -0,0 +1,16 @@
+Metadata-Version: 2.4
+Name: rvimage
+Version: 0.1.0
+Summary: Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool RV Image
+Project-URL: Repository, https://github.com/bertiqwerty/rvimage
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+Requires-Dist: numpy>=2.3.0
+Requires-Dist: opencv-python-headless>=4.11.0.86
+Requires-Dist: pydantic>=2.11.7
+Requires-Dist: scipy>=1.15.3
+
+# RV Image
+
+This package contains Pydantic types to facilitate writing prediction APIs integrated into the image annotation tool 
+[RV Image](https://github.com/bertiqwerty/rvimage).

{rvimage-0.0.1 → rvimage-0.1.0}/rvimage.egg-info/requires.txt

@@ -1,3 +1,4 @@
+numpy>=2.3.0
 opencv-python-headless>=4.11.0.86
 pydantic>=2.11.7
 scipy>=1.15.3

{rvimage-0.0.1 → rvimage-0.1.0}/test/test.py

@@ -1,4 +1,6 @@
+import json
 import numpy as np
+from rvimage.collection_types import BboxAnnos, BrushAnnos
 from rvimage.converters import extract_polys_from_mask, fill_polys_on_mask
 from rvimage.converters import rle_to_mask, mask_to_rle
 from rvimage.domain import Point
@@ -39,6 +41,28 @@ def test_polygon():
     assert np.allclose(mask, mask_converted), "Masks are not equal after conversion"
 
 
+def test_validation():
+    annos = {
+        "elts": [{"BB": {"x": 0.0, "y": 0.0, "w": 5.0, "h": 5.0}}],
+        "cat_idxs": [1],
+        "selected_mask": [False],
+    }
+    BboxAnnos.model_validate(annos)
+    with open("../rvimage/resources/test_data/rvprj_v4-0.json", "r") as f:
+        data_loaded = json.load(f)
+
+    def get_data(tool):
+        for d, _ in data_loaded["tools_data_map"][tool]["specifics"][tool][
+            "annotations_map"
+        ].values():
+            yield d
+
+    for brush_data in get_data("Brush"):
+        BrushAnnos.model_validate(brush_data)
+    for bbox_data in get_data("Bbox"):
+        BboxAnnos.model_validate(bbox_data)
+
+
 if __name__ == "__main__":
     test_rle()
     test_polygon()

rvimage-0.0.1/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.4
-Name: rvimage
-Version: 0.0.1
-Summary: Add your description here
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-Requires-Dist: opencv-python-headless>=4.11.0.86
-Requires-Dist: pydantic>=2.11.7
-Requires-Dist: scipy>=1.15.3

rvimage-0.0.1/pyproject.toml

@@ -1,11 +0,0 @@
-[project]
-name = "rvimage"
-version = "0.0.1"
-description = "Add your description here"
-readme = "README.md"
-requires-python = ">=3.12"
-dependencies = [
-    "opencv-python-headless>=4.11.0.86",
-    "pydantic>=2.11.7",
-    "scipy>=1.15.3",
-]

rvimage-0.0.1/rvimage.egg-info/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.4
-Name: rvimage
-Version: 0.0.1
-Summary: Add your description here
-Requires-Python: >=3.12
-Description-Content-Type: text/markdown
-Requires-Dist: opencv-python-headless>=4.11.0.86
-Requires-Dist: pydantic>=2.11.7
-Requires-Dist: scipy>=1.15.3