Skip to content

Log connected devices when using deviceManager #1337

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

Open
tpoliaw wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Log connected devices when using deviceManager #1337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/blueapi/core/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ def with_device_manager(self, manager: DeviceManager, mock: bool = False):
f"{len(errs)} errors while connecting devices",
exc_info=NotConnectedError(errs),
)
utils.report_successful_devices(build_result.devices, mock)
return build_result.devices, {
**build_result.build_errors,
**build_result.connection_errors,
Expand Down
3 changes: 2 additions & 1 deletion src/blueapi/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from .base_model import BlueapiBaseModel, BlueapiModelConfig, BlueapiPlanModelConfig
from .connect_devices import connect_devices
from .connect_devices import connect_devices, report_successful_devices
from .file_permissions import get_owner_gid, is_sgid_set
from .invalid_config_error import InvalidConfigError
from .modules import is_function_sourced_from_module, load_module_all
Expand All @@ -15,6 +15,7 @@
"BlueapiPlanModelConfig",
"InvalidConfigError",
"connect_devices",
"report_successful_devices",
"is_sgid_set",
"get_owner_gid",
"is_function_sourced_from_module",
Expand Down
6 changes: 3 additions & 3 deletions src/blueapi/utils/connect_devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
LOGGER = logging.getLogger(__name__)


def _report_successful_devices(
def report_successful_devices(
devices: Mapping[str, AnyDevice],
sim_backend: bool,
) -> None:
Expand Down Expand Up @@ -86,14 +86,14 @@ def is_simulated_device(name, factory, **kwargs):
real_devices, exceptions = _establish_device_connections(
run_engine, real_devices, False
)
_report_successful_devices(real_devices, False)
report_successful_devices(real_devices, False)
exception_map |= exceptions
if len(sim_devices) > 0:
sim_devices, exceptions = _establish_device_connections(
run_engine,
sim_devices, # type: ignore
True,
)
_report_successful_devices(sim_devices, True)
report_successful_devices(sim_devices, True)
exception_map |= exceptions
return exception_map
Loading