-
Notifications
You must be signed in to change notification settings - Fork 978
refactor(deps): make supervision an optional dependency #1090
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
everglow01
wants to merge
4
commits into
roboflow:develop
Choose a base branch
from
everglow01:refactor/1074-optional-supervision
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
b66bdb4
refactor(deps): make supervision an optional dependency (#1074)
everglow01 94d59c1
Potential fix for pull request finding
Borda 0363aaf
fix(deps): declare scipy as a core dependency (#1074)
everglow01 db7500e
ci: quote editable install extras spec (#1074)
everglow01 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| # ------------------------------------------------------------------------ | ||
| # RF-DETR | ||
| # Copyright (c) 2025 Roboflow. All Rights Reserved. | ||
| # Licensed under the Apache License, Version 2.0 [see LICENSE for details] | ||
| # ------------------------------------------------------------------------ | ||
| """Helpers for importing optional third-party dependencies with friendly errors.""" | ||
|
|
||
| from types import ModuleType | ||
| from typing import cast | ||
|
|
||
|
|
||
| def import_supervision() -> ModuleType: | ||
| """Import the optional ``supervision`` package, raising a friendly hint if it is missing. | ||
|
|
||
| ``supervision`` is an optional dependency: it is required for the ``Detections`` return type of | ||
| inference helpers and for annotation/visualization utilities, but is not installed by the core | ||
| ``rfdetr`` package. This helper defers the import to call time so the rest of the package remains | ||
| usable without it, and turns a bare ``ModuleNotFoundError`` into an actionable installation hint. | ||
|
|
||
| Returns: | ||
| The imported ``supervision`` module. | ||
|
|
||
| Raises: | ||
| ImportError: If ``supervision`` is not installed. | ||
| """ | ||
| try: | ||
| import supervision as sv | ||
| except ModuleNotFoundError as exc: | ||
| if exc.name != "supervision": | ||
| raise | ||
| raise ImportError( | ||
| "This feature requires the 'supervision' package. Install it with " | ||
| "`pip install supervision` (also bundled in the rfdetr[onnx], rfdetr[tflite], " | ||
| "rfdetr[train], and rfdetr[visual] extras)." | ||
| ) from exc | ||
|
Borda marked this conversation as resolved.
|
||
| return cast(ModuleType, sv) | ||
|
Comment on lines
+12
to
+36
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! I'd prefer to leave this un-memoized:
Happy to revisit if profiling ever shows this on a hot path. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| # ------------------------------------------------------------------------ | ||
| # RF-DETR | ||
| # Copyright (c) 2025 Roboflow. All Rights Reserved. | ||
| # Licensed under the Apache License, Version 2.0 [see LICENSE for details] | ||
| # ------------------------------------------------------------------------ | ||
| """Tests for optional-dependency import helpers.""" | ||
|
|
||
| import sys | ||
|
|
||
| import pytest | ||
|
|
||
| from rfdetr.utilities.optional_imports import import_supervision | ||
|
|
||
|
|
||
| class TestImportSupervision: | ||
| """Tests for ``import_supervision()``.""" | ||
|
|
||
| def test_returns_module_when_installed(self) -> None: | ||
| """When ``supervision`` is installed, the helper returns the module.""" | ||
| sv = pytest.importorskip("supervision") | ||
| assert import_supervision() is sv | ||
|
|
||
| def test_raises_with_install_hint_when_missing(self, monkeypatch: pytest.MonkeyPatch) -> None: | ||
| """When ``supervision`` cannot be imported, a friendly ImportError with an install hint is raised.""" | ||
| # Setting an entry to None makes the import machinery raise ImportError for that name. | ||
| monkeypatch.setitem(sys.modules, "supervision", None) | ||
|
|
||
| with pytest.raises(ImportError, match="pip install supervision"): | ||
| import_supervision() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good catch, quoted it. The install line now uses
uv pip install -e ".[plus,visual]", matching the style already used inci-tests-cpu.yml(".[train,cli,visual,kornia]").