Skip to content

bug fix in plugin_loader #354

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.

Sign up for GitHub

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

Merged
pan-x-c merged 4 commits into from
Oct 30, 2025
Merged

bug fix in plugin_loader #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ad83a3
bug fix in plugin_loader
chenyushuo Oct 30, 2025
0cd2977
fix in unittest
chenyushuo Oct 30, 2025
339f6fb
apply suggestions from gemini
chenyushuo Oct 30, 2025
880d7ae
fix in unittest
chenyushuo Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions tests/utils/plugin_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from typing import Type

import ray
from parameterized import parameterized

from tests.tools import TensorBoardParser, get_checkpoint_path, get_template_config
from trinity.common.config import Config
Expand Down Expand Up @@ -46,10 +47,17 @@ def run(self, workflow_cls=Type[Workflow]):


class TestPluginLoader(unittest.TestCase):
def test_load_plugins_local(self):
my_workflow_cls = WORKFLOWS.get("my_workflow")
self.assertIsNone(my_workflow_cls)
os.environ[PLUGIN_DIRS_ENV_VAR] = str(Path(__file__).resolve().parent / "plugins")
PLUGIN_DIR_PARAMS = [
(str(Path(__file__).resolve().parent / "plugins"),),
(os.path.join("tests", "utils", "plugins"),),
]

@parameterized.expand(PLUGIN_DIR_PARAMS)
def test_load_plugins_local(self, plugin_dir):
if os.path.isabs(plugin_dir):
my_workflow_cls = WORKFLOWS.get("my_workflow")
self.assertIsNone(my_workflow_cls)
os.environ[PLUGIN_DIRS_ENV_VAR] = plugin_dir
try:
load_plugins()
except KeyError:
Expand All @@ -63,8 +71,9 @@ def test_load_plugins_local(self):
self.assertEqual(res[0], "Hello world")
self.assertEqual(res[1], "Hi")

def test_load_plugins_remote(self):
os.environ[PLUGIN_DIRS_ENV_VAR] = str(Path(__file__).resolve().parent / "plugins")
@parameterized.expand(PLUGIN_DIR_PARAMS)
def test_load_plugins_remote(self, plugin_dir):
os.environ[PLUGIN_DIRS_ENV_VAR] = plugin_dir
try:
load_plugins()
except KeyError:
Expand All @@ -73,9 +82,7 @@ def test_load_plugins_remote(self):
config = self.config
ray.init(
ignore_reinit_error=True,
runtime_env={
"env_vars": {PLUGIN_DIRS_ENV_VAR: str(Path(__file__).resolve().parent / "plugins")}
},
runtime_env={"env_vars": {PLUGIN_DIRS_ENV_VAR: plugin_dir}},
)
my_workflow_cls = WORKFLOWS.get("my_workflow")
# disable plugin and use custom class from registry
Expand All @@ -95,9 +102,10 @@ def test_load_plugins_remote(self):
rollout_cnt = parser.metric_values("rollout")
self.assertEqual(rollout_cnt, [2])

def test_passing_custom_class(self):
@parameterized.expand(PLUGIN_DIR_PARAMS)
def test_passing_custom_class(self, plugin_dir):
# disable plugin and pass custom class directly
os.environ[PLUGIN_DIRS_ENV_VAR] = str(Path(__file__).resolve().parent / "plugins")
os.environ[PLUGIN_DIRS_ENV_VAR] = plugin_dir
try:
load_plugins()
except KeyError:
Expand Down
2 changes: 1 addition & 1 deletion trinity/utils/plugin_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def load_plugin_from_dirs(plugin_dirs: Union[str, List[str]]) -> None:
logger.info(f"Loading plugin modules from [{file}]...")
# load modules from file
try:
load_from_file(os.path.join(plugin_dir, file))
load_from_file(str(file))
except Exception as e:
logger.warning(f"Failed to load plugin module from [{file}]: {e}")

Expand Down