Merge pull request #1767 from roboflow/fix/loosing_data_during_detection_filtering

fix loosing data during detection filtering

.github/workflows/poetry-test.yml

@@ -1,4 +1,4 @@
-name: 🔧 Poetry Check and Installation Test Workflow
+name: 🔧 Poetry Checks and Test Workflow
 on:
   push:
     paths:
@@ -30,7 +30,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
+        uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1 # v4.0.0
 
       - name: 🔍 Check the correctness of the project config
         run: poetry check
@@ -40,3 +40,6 @@ jobs:
 
       - name: 🧪 Run the Import test
         run: poetry run python -c "import supervision; from supervision import assets; from supervision import metrics; print(supervision.__version__)"
+
+      - name: 🧪 Run the Test
+        run: poetry run pytest

.github/workflows/publish-docs.yml

@@ -39,7 +39,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
+        uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1 # v4.0.0
 
       - name: 📦 Install dependencies
         run: |

.github/workflows/publish-test.yml

@@ -14,7 +14,7 @@ jobs:
   build-and-publish-pre-release:
     name: Publish  Pre-releasePackage
     runs-on: ubuntu-latest
-    environment: release
+    environment: test
     timeout-minutes: 10
     permissions:
       id-token: write # Required for PyPI publishing
@@ -32,13 +32,13 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
+        uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1 # v4.0.0
 
       - name: 🏗️ Build source and wheel distributions
         run: |
           poetry install --with=build
           poetry build
-          twine check --strict dist/*
+          poetry run twine check --strict dist/*
 
       - name: 🚀 Publish to PyPi
         uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # v1.12.3

.github/workflows/publish.yml

@@ -30,13 +30,13 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
+        uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1 # v4.0.0
 
       - name: 🏗️ Build source and wheel distributions
         run: |
           poetry install --with=build
           poetry build
-          twine check --strict dist/*
+          poetry run twine check --strict dist/*
 
       - name: 🚀 Publish to PyPi
         uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # v1.12.3

.github/workflows/test-doc.yml

@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
+        uses: abatilo/actions-poetry@3765cf608f2d4a72178a9fc5b918668e542b89b1 # v4.0.0
 
       - name: 🏗️ Install dependencies
         run: |

.github/workflows/test.yml

@@ -1,47 +0,0 @@
-name: Test WorkFlow
-
-on:
-  pull_request:
-    branches: [main, develop]
-
-permissions:
-  contents: read
-  checks: write # Required for test reporting
-  pull-requests: write # Required for PR comments
-
-jobs:
-  pytest:
-    name: PyTest
-    timeout-minutes: 10
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-      fail-fast: false # Continue with other versions if one fails
-    runs-on: ${{ matrix.os }}
-    steps:
-      - name: 📥 Checkout the repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: 🐍 Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: 📜 Setup Poetry
-        uses: abatilo/actions-poetry@e78f54a89cb052fff327414dd9ff010b5d2b4dbd # v3.0.1
-
-      - name: 📦 Install dependencies
-        run: |
-          poetry install --with=test
-
-      - name: Run pytest
-        uses: pavelzw/pytest-action@510c5e90c360a185039bea56ce8b3e7e51a16507 # v2.2.0
-        with:
-          verbose: true
-          emoji: true
-          job-summary: true
-          custom-arguments: "-q"
-          click-to-expand: true
-          report-title: "Test Report"
-          custom-pytest: "poetry run pytest"

.pre-commit-config.yaml

@@ -32,7 +32,7 @@ repos:
           additional_dependencies: ["bandit[toml]"]
 
   -   repo: https://github.com/astral-sh/ruff-pre-commit
-      rev: v0.8.2
+      rev: v0.8.6
       hooks:
       -   id: ruff
           args: [--fix, --exit-non-zero-on-fix]

mkdocs.yml

@@ -178,8 +178,7 @@ markdown_extensions:
       anchor_linenums: true
 
 extra_javascript:
-  # disabled until 0.27.0, so we can test its functionality
-  # - "javascripts/init_kapa_widget.js"
+  - "javascripts/init_kapa_widget.js"
   - "javascripts/cookbooks-card.js"
   - "https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.0.8/purify.min.js"
 

pyproject.toml

@@ -1,18 +1,16 @@
-[tool.poetry]
+[project]
 name = "supervision"
-version = "0.26.0rc2"
 description = "A set of easy-to-use utils that will come in handy in any Computer Vision project"
-authors = ["Piotr Skalski <piotr.skalski92@gmail.com>"]
-maintainers = [
-    "Piotr Skalski <piotr.skalski92@gmail.com>",
-    "Linas Kondrackis <linas@roboflow.com>",
-]
+license = { text = "MIT" }
+version = "0.26.0rc3"
 readme = "README.md"
-license = "MIT"
-packages = [{ include = "supervision" }, { include = "supervision/py.typed" }]
-homepage = "https://github.com/roboflow/supervision"
-repository = "https://github.com/roboflow/supervision"
-documentation = "https://supervision.roboflow.com/latest/"
+requires-python = ">=3.8"
+authors = [
+    { name = "Piotr Skalski", email = "piotr.skalski92@gmail.com" }
+]
+maintainers = [
+    { name = "Piotr Skalski", email = "piotr.skalski92@gmail.com" },
+]
 keywords = [
     "machine-learning",
     "deep-learning",
@@ -22,7 +20,6 @@ keywords = [
     "AI",
     "Roboflow",
 ]
-
 classifiers = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
@@ -40,106 +37,62 @@ classifiers = [
     'Operating System :: POSIX :: Linux',
     'Operating System :: MacOS',
 ]
-
-[tool.poetry.dependencies]
-python = "^3.8"
-
-# For Python versions 3.13 and above, use numpy versions 2.1.0,
-# required for poetry to not fail.
-numpy = [
-    { version = ">=1.21.2", python = "<3.13" },
-    { version = ">=2.1.0", python = ">=3.13" },
+dependencies = [
+    "numpy>=1.21.2,<1.26.0; python_version < '3.12'",
+    "numpy>=1.26.0,<2.1.0; python_version >= '3.12' and python_version < '3.13'",
+    "numpy>=2.1.0; python_version >= '3.13'",
+    "scipy (==1.10.0); python_version < '3.9'",
+    "scipy (>=1.10.0,<1.14.1) ; python_version >= '3.9' and python_version < '3.13'",
+    "scipy (>=1.14.1); python_version >= '3.13'",
+    "matplotlib>=3.6.0",
+    "pyyaml>=5.3",
+    "defusedxml>=0.7.1",
+    "pillow>=9.4",
+    "requests>=2.26.0",
+    "tqdm>=4.62.3",
+    "opencv-python>=4.5.5.64"
 ]
 
-scipy = [
-    { version = "1.10.0", python = "<3.9" },
-    { version = "^1.10.0", python = ">=3.9" },
-    { version = ">=1.14.1", python = ">=3.13" },
+[project.urls]
+Homepage = "https://github.com/roboflow/supervision"
+Repository = "https://github.com/roboflow/supervision"
+Documentation = "https://supervision.roboflow.com/latest/"
 
+[project.optional-dependencies]
+metrics = [
+    "pandas>=2.0.0; python_version < '3.13'",
+    "pandas>=2.2.3; python_version >= '3.13'"
 ]
 
-# Matplotlib sub-dependency
-# The 'contourpy' package is required by Matplotlib for contour plotting.
-# We need to ensure compatibility with both Python 3.8 and Python 3.13.
-#
-# For Python 3.8 and above, we use version 1.0.7 or higher, as it is the lowest major version that supports Python 3.8.
-# For Python 3.13 and above, we use version 1.3.0 or higher, as it is the first version that explicitly supports Python 3.13.
-contourpy = [
-    { version = ">=1.0.7", python = ">=3.8,<3.13" },
-    { version = ">=1.3.0", python = ">=3.13" },
-]
+[tool.poetry]
+# Keep version here since it's dynamic
+packages = [{ include = "supervision" }, { include = "supervision/py.typed" }]
 
-matplotlib = [
-    { version = ">=3.6.0,<3.8.0", python = "3.8" },
-    { version = ">=3.6.0", python = ">=3.9" },
-    { version = ">=3.7.3", python = ">=3.12" },
-    { version = ">=3.9.2", python = ">=3.13" },
-]
-
-
-pyyaml = ">=5.3"
-defusedxml = "^0.7.1"
-pillow = ">=9.4"
-requests = ">=2.26.0"
-tqdm = ">=4.62.3"
-# pandas: picked lowest major version that supports Python 3.8
-# pandas 2.2.3 has been released with support for Python 3.13
-pandas = [
-    { version = ">=2.0.0", python = "<3.13", optional = true },
-    { version = ">=2.2.3", python = ">=3.13", optional = true },
-]
-
-opencv-python = ">=4.5.5.64"
-
-[tool.poetry.extras]
-metrics = ["pandas"]
-
-[tool.poetry.group.test.dependencies]
-pytest = ">=7.2.2,<9.0.0"
-pytest-md = "^0.2.0"
-pytest-emoji = "^0.2.0"
 
 [tool.poetry.group.dev.dependencies]
-twine = ">=5.1.1,<7.0.0"
 pytest = ">=7.2.2,<9.0.0"
-wheel = ">=0.40,<0.46"
-build = ">=0.10,<1.3"
-ruff = ">=0.1.0"
-mypy = "^1.4.1"
-pre-commit = "^3.3.3"
-tox = "^4.11.4"
+tox = ">=4.11.4"
 notebook = ">=6.5.3,<8.0.0"
-ipywidgets = "^8.1.1"
-jupytext = "^1.16.1"
-nbconvert = "^7.14.2"
-docutils = [
-    { version = "^0.20.1", python = "<3.9" },
-    { version = "^0.21.1", python = ">=3.9" },
-]
+ipywidgets = ">=8.1.1"
+jupytext = ">=1.16.1"
+nbconvert = ">=7.14.2"
+docutils = "!=0.21"
 
 [tool.poetry.group.docs.dependencies]
 mkdocs-material = { extras = ["imaging"], version = "^9.5.5" }
 mkdocstrings = ">=0.25.2,<0.27.0"
-mkdocstrings-python = "^1.10.9"
-mike = "^2.0.0"
+mkdocstrings-python = ">=1.10.9"
+mike = ">=2.0.0"
 # For Documentation Development use Python 3.10 or above
 # Use Latest mkdocs-jupyter min 0.24.6 for Jupyter Notebook Theme support
-mkdocs-jupyter = "^0.24.3"
-mkdocs-git-committers-plugin-2 = "^2.4.1"
-mkdocs-git-revision-date-localized-plugin = "^1.2.4"
-
-[tool.poetry.group.typecheck]
-optional = true
-
-[tool.poetry.group.typecheck.dependencies]
-types-pyyaml = "^6.0.12.20240808"
-types-cffi = "^1.16.0.20240331"
-types-requests = "^2.32.0.20240712"
-types-tqdm = "^4.66.0.20240417"
-pandas-stubs = ">=2.0.0.230412"
+mkdocs-jupyter = ">=0.24.3"
+mkdocs-git-committers-plugin-2 = { version = ">=2.4.1", python = ">=3.8,<4" }
+mkdocs-git-revision-date-localized-plugin = ">=1.2.4"
 
 [tool.poetry.group.build.dependencies]
 twine = ">=5.1.1,<7.0.0"
+wheel = ">=0.40,<0.46"
+build = ">=0.10,<1.3"
 
 [tool.bandit]
 target = ["test", "supervision"]

supervision/dataset/formats/yolo.py

@@ -2,8 +2,8 @@ import os
 from pathlib import Path
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple
 
-import cv2
 import numpy as np
+from PIL import Image
 
 from supervision.config import ORIENTED_BOX_COORDINATES
 from supervision.dataset.utils import approximate_mask_with_polygons
@@ -153,7 +153,18 @@ def load_yolo_annotations(
     image_paths = [
         str(path)
         for path in list_files_with_extensions(
-            directory=images_directory_path, extensions=["jpg", "jpeg", "png"]
+            directory=images_directory_path,
+            extensions=[
+                "bmp",
+                "dng",
+                "jpg",
+                "jpeg",
+                "mpo",
+                "png",
+                "tif",
+                "tiff",
+                "webp",
+            ],
         )
     ]
 
@@ -167,10 +178,16 @@ def load_yolo_annotations(
             annotations[image_path] = Detections.empty()
             continue
 
-        image = cv2.imread(image_path)
+        # PIL is much faster than cv2 for checking image shape and mode: https://github.com/roboflow/supervision/issues/1554
+        image = Image.open(image_path)
         lines = read_txt_file(file_path=annotation_path, skip_empty=True)
-        h, w, _ = image.shape
+        w, h = image.size
         resolution_wh = (w, h)
+        if image.mode not in ("RGB", "L"):
+            raise ValueError(
+                f"Images must be 'RGB' or 'grayscale', \
+                but {image_path} mode is '{image.mode}'."
+            )
 
         with_masks = _with_mask(lines=lines)
         with_masks = force_masks if force_masks else with_masks

supervision/detection/core.py

@@ -1203,7 +1203,7 @@ class Detections:
         if isinstance(index, str):
             return self.data.get(index)
         if self.is_empty():
-            return Detections.empty()
+            return self
         if isinstance(index, int):
             index = [index]
         return Detections(