Skip to content

Commit 507387e

Browse files
committed
Change tools config
1 parent 297d36d commit 507387e

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

manager/manager/launcher/launcher_visualization.py renamed to manager/manager/launcher/launcher_tools.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
class LauncherTools(BaseModel):
5151
module: str = ".".join(__name__.split(".")[:-1])
5252
tools: list[str]
53-
visualization_config_path: Optional[str] = None
53+
tools_config: Optional[dict] = None
5454
launchers: Optional[ILauncher] = []
5555

5656
def run(self, consumer):
5757
for tool in self.tools:
5858
module = tools[tool]
59-
launcher = self.launch_module(module, consumer)
59+
launcher = self.launch_module(tool, module, consumer)
6060
self.launchers.append(launcher)
6161

6262
def terminate(self):
@@ -66,7 +66,7 @@ def terminate(self):
6666
launcher.terminate()
6767
self.launchers = []
6868

69-
def launch_module(self, configuration, consumer):
69+
def launch_module(self, name, configuration, consumer):
7070
def process_terminated(name, exit_code):
7171
LogManager.logger.info(
7272
f"LauncherEngine: {name} exited with code {exit_code}"
@@ -81,8 +81,12 @@ def process_terminated(name, exit_code):
8181
launcher_module_name = configuration["module"]
8282
launcher_module = f"{self.module}.launcher_{launcher_module_name}.Launcher{class_from_module(launcher_module_name)}"
8383
launcher_class = get_class(launcher_module)
84+
config = None
85+
if self.tools_config is not None and name in self.tools_config:
86+
config = self.tools_config[name]
87+
8488
launcher = launcher_class.from_config(launcher_class, configuration)
85-
launcher.run(self.visualization_config_path, process_terminated)
89+
launcher.run(config, process_terminated)
8690
return launcher
8791

8892
def pause(self):

manager/manager/manager.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from manager.libs.launch_world_model import ConfigurationManager
3333
from manager.manager.launcher.launcher_world import LauncherWorld
3434
from manager.manager.launcher.launcher_robot import LauncherRobot
35-
from manager.manager.launcher.launcher_visualization import LauncherTools
35+
from src.manager.manager.launcher.launcher_tools import LauncherTools
3636
from manager.ram_logging.log_manager import LogManager
3737
from manager.manager.application.robotics_python_application_interface import (
3838
IRoboticsPythonApplication,
@@ -343,11 +343,11 @@ def on_prepare_tools(self, event):
343343
LogManager.logger.info("Tools transition started")
344344

345345
cfg_dict = event.kwargs.get("data", {})
346-
self.tools = cfg_dict["tools"]
347-
config_file = cfg_dict["file"]
346+
tools = cfg_dict["tools"]
347+
config = cfg_dict["config"]
348348

349349
self.tools_launcher = LauncherTools(
350-
tools=self.tools, visualization_config_path=config_file
350+
tools=tools, tools_config=config
351351
)
352352

353353
self.tools_launcher.run(self.consumer)

0 commit comments

Comments
 (0)