Merge branch 'main' into extend-DetectionsProperty-to-handle-all-blocks-custom-data-keys

Author: grzegorz-roboflow

development/docs/write_cli_docs.py

@@ -24,7 +24,6 @@ def write_file(path: str, content: str) -> None:
 def main():
     cmd = f"typer inference_cli.main utils docs --name inference"
     result = subprocess.run(cmd.split(), capture_output=True, text=True)
-    print(result.stdout)
     write_file(FILENAME, result.stdout)
 
 

inference/core/workflows/core_steps/classical_cv/size_measurement/v1.py

@@ -271,7 +271,14 @@ def run(
             if obj_w_pixels > 0 and obj_h_pixels > 0:
                 obj_w_actual = obj_w_pixels * width_scale
                 obj_h_actual = obj_h_pixels * height_scale
-                dimensions.append({"width": obj_w_actual, "height": obj_h_actual})
+                dimensions.append(
+                    {
+                        "width": obj_w_actual,
+                        "height": obj_h_actual,
+                        "longer": max(obj_w_actual, obj_h_actual),
+                        "shorter": min(obj_w_actual, obj_h_actual),
+                    }
+                )
             else:
                 dimensions.append(None)
 

inference/core/workflows/core_steps/transformations/bounding_rect/v1.py

@@ -111,6 +111,18 @@ def run(
                 det.mask[0]
             )
 
+            det.mask = np.array(
+                [
+                    sv.polygon_to_mask(
+                        polygon=np.around(rect).astype(np.int32),
+                        resolution_wh=(det.mask[0].shape[1], det.mask[0].shape[0]),
+                    ).astype(bool)
+                ]
+            )
+            det.xyxy = np.array(
+                [sv.polygon_to_xyxy(polygon=np.around(rect).astype(np.int32))]
+            )
+
             det[BOUNDING_RECT_RECT_KEY_IN_SV_DETECTIONS] = np.array(
                 [rect], dtype=np.float16
             )

tests/workflows/unit_tests/core_steps/classical_cv/test_size_measurement.py

@@ -30,7 +30,10 @@ def test_size_measurement_block():
     result = block.run(reference_predictions, object_predictions, reference_dimensions)
 
     # then
-    expected_dimensions = [{"width": 5.0, "height": 5.0}, {"width": 5.0, "height": 5.0}]
+    expected_dimensions = [
+        {"width": 5.0, "height": 5.0, "longer": 5.0, "shorter": 5.0},
+        {"width": 5.0, "height": 5.0, "longer": 5.0, "shorter": 5.0},
+    ]
     assert result == {
         OUTPUT_KEY: expected_dimensions
     }, f"Expected {expected_dimensions}, but got {result}"
@@ -59,7 +62,10 @@ def test_size_measurement_block_with_mask():
     result = block.run(reference_predictions, object_predictions, reference_dimensions)
 
     # then
-    expected_dimensions = [{"width": 5.0, "height": 5.0}, {"width": 5.0, "height": 5.0}]
+    expected_dimensions = [
+        {"width": 5.0, "height": 5.0, "longer": 5.0, "shorter": 5.0},
+        {"width": 5.0, "height": 5.0, "longer": 5.0, "shorter": 5.0},
+    ]
     assert result == {
         OUTPUT_KEY: expected_dimensions
     }, f"Expected {expected_dimensions}, but got {result}"