Merge branch 'main' into fix/read_image_as_pil_chw_format

Author: onuralpszr

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup uv python package manager
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
         with:

.github/workflows/mmdet.yml

@@ -67,7 +67,7 @@ jobs:
       matrix:
         python-version: ["3.11"]  # Only test on Python 3.11
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup uv python package manager
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
         with:

.github/workflows/publish_docs.yml

@@ -29,7 +29,7 @@ jobs:
         python-version: ["3.12"]
     steps:
       - name: 📥 Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
 

.github/workflows/publish_pypi.yml

@@ -8,7 +8,7 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Setup uv python package manager
         uses: astral-sh/setup-uv@1e862dfacbd1d6d858c55d9b792c756523627244 # v7.1.4
         with:

.github/workflows/ruff.yaml

@@ -20,7 +20,7 @@ jobs:
   ruff:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python
         uses: actions/setup-python@v6
         with:

sahi/annotation.py

@@ -92,8 +92,8 @@ def get_expanded_box(self, ratio: float = 0.1, max_x: int | None = None, max_y:
 
         w = self.maxx - self.minx
         h = self.maxy - self.miny
-        y_mar = int(w * ratio)
-        x_mar = int(h * ratio)
+        y_mar = int(h * ratio)
+        x_mar = int(w * ratio)
         maxx = min(max_x, self.maxx + x_mar) if max_x else self.maxx + x_mar
         minx = max(0, self.minx - x_mar)
         maxy = min(max_y, self.maxy + y_mar) if max_y else self.maxy + y_mar

tests/test_annotation.py

@@ -17,9 +17,9 @@ def test_bounding_box(self):
         shifted_bbox = bbox.get_shifted_box()
 
         # compare
-        assert expanded_bbox.to_xywh() == [18, 23, 94, 134]
-        assert expanded_bbox.to_xyxy() == [18, 23, 112, 157]
-        assert shifted_bbox.to_xyxy() == [80, 70, 150, 190]
+        assert expanded_bbox.to_xywh() == [23.0, 18.0, 84.0, 144.0]
+        assert expanded_bbox.to_xyxy() == [23.0, 18.0, 107.0, 162.0]
+        assert shifted_bbox.to_xyxy() == [80.0, 70.0, 150.0, 190.0]
 
     def test_bounding_box_immutability(self):
         import dataclasses

tests/test_high_level_api.py

@@ -12,9 +12,9 @@ def test_bounding_box(self):
         shifted_bbox = bbox.get_shifted_box()
 
         # compare
-        assert expanded_bbox.to_xywh() == [18, 23, 94, 134]
-        assert expanded_bbox.to_xyxy() == [18, 23, 112, 157]
-        assert shifted_bbox.to_xyxy() == [80, 70, 150, 190]
+        assert expanded_bbox.to_xywh() == [23.0, 18.0, 84.0, 144.0]
+        assert expanded_bbox.to_xyxy() == [23.0, 18.0, 107.0, 162.0]
+        assert shifted_bbox.to_xyxy() == [80.0, 70.0, 150.0, 190.0]
 
     def test_category(self):
         from sahi import Category