-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Lazily import onnx so a broken onnx does not block 'import monai' (#8455) #8937
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
Shizoqua
wants to merge
1
commit into
Project-MONAI:dev
Choose a base branch
from
Shizoqua:fix/8455-lazy-onnx-import
base: dev
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.
+68
−4
Open
Changes from all commits
Commits
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| # Copyright (c) MONAI Consortium | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| from __future__ import annotations | ||
|
|
||
| import subprocess | ||
| import sys | ||
| import unittest | ||
|
|
||
| # Run in a subprocess with a meta-path finder that records any import *attempt* | ||
| # of the optional heavy backends (works whether or not they are installed, and | ||
| # does not shadow/replace them). After importing MONAI, fail if any were touched. | ||
| _PROBE = """ | ||
| import sys, importlib.abc | ||
| _WATCH = ("onnx", "onnxruntime") | ||
| _attempted = set() | ||
|
|
||
|
|
||
| class _Recorder(importlib.abc.MetaPathFinder): | ||
| def find_spec(self, name, path, target=None): | ||
| if name.split(".")[0] in _WATCH: | ||
| _attempted.add(name.split(".")[0]) | ||
| return None # delegate to the real finders | ||
|
|
||
|
|
||
| sys.meta_path.insert(0, _Recorder()) | ||
| {import_stmt} | ||
| sys.exit("eagerly imported: " + ", ".join(sorted(_attempted)) if _attempted else 0) | ||
| """ | ||
|
|
||
|
|
||
| class TestLazyOptionalImports(unittest.TestCase): | ||
| """Regression tests for #8455. | ||
|
|
||
| Importing MONAI must not eagerly import onnx / onnxruntime. These were | ||
| previously imported at module scope via ``optional_import`` in | ||
| ``monai/networks/utils.py`` and ``monai/bundle/scripts.py``, so a | ||
| broken/hanging onnx (e.g. onnx 1.18 on Windows) would take down | ||
| ``import monai`` entirely. | ||
| """ | ||
|
|
||
| def _assert_not_eagerly_imported(self, import_stmt: str) -> None: | ||
| code = _PROBE.format(import_stmt=import_stmt) | ||
| result = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True) | ||
| self.assertEqual(result.returncode, 0, msg=(result.stdout + result.stderr).strip()) | ||
|
|
||
| def test_import_monai_does_not_import_onnx(self): | ||
| self._assert_not_eagerly_imported("import monai") | ||
|
|
||
| def test_import_monai_bundle_does_not_import_onnx(self): | ||
| self._assert_not_eagerly_imported("import monai.bundle") | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| unittest.main() | ||
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.
🧩 Analysis chain
🏁 Script executed:
Repository: Project-MONAI/MONAI
Length of output: 94
🏁 Script executed:
Repository: Project-MONAI/MONAI
Length of output: 2879
🏁 Script executed:
Repository: Project-MONAI/MONAI
Length of output: 361
Add timeout to subprocess probe and docstrings to test methods.
Line 52
subprocess.runlacks a timeout parameter—ifimport monaihangs again, this test blocks the suite indefinitely. Additionally, the helper method_assert_not_eagerly_importedand test methods at lines 55–58 require docstrings per PEP257 guidelines.Suggested patch
def _assert_not_eagerly_imported(self, import_stmt: str) -> None: code = _PROBE.format(import_stmt=import_stmt) - result = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True) + result = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True, timeout=30) self.assertEqual(result.returncode, 0, msg=(result.stdout + result.stderr).strip())🧰 Tools
🪛 ast-grep (0.43.0)
[error] 51-51: Command coming from incoming request
Context: subprocess.run([sys.executable, "-c", code], capture_output=True, text=True)
Note: [CWE-20].
(subprocess-from-request)
🪛 Ruff (0.15.17)
[error] 52-52:
subprocesscall: check for execution of untrusted input(S603)
🤖 Prompt for AI Agents