From d4f1ac1e0ecc3cc7148915ab0c4feb4f4fe0e5de Mon Sep 17 00:00:00 2001 From: Peter Holloway Date: Tue, 27 Jan 2026 15:07:10 +0000 Subject: [PATCH] Re-export BlueapiClient from client root --- src/blueapi/cli/cli.py | 2 +- src/blueapi/client/__init__.py | 7 +++++++ tests/system_tests/test_blueapi_system.py | 8 ++++---- tests/unit_tests/client/test_client.py | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/blueapi/cli/cli.py b/src/blueapi/cli/cli.py index e70922b9c5..4d974d35e2 100644 --- a/src/blueapi/cli/cli.py +++ b/src/blueapi/cli/cli.py @@ -21,7 +21,7 @@ from blueapi import __version__, config from blueapi.cli.format import OutputFormat -from blueapi.client.client import BlueapiClient +from blueapi.client import BlueapiClient from blueapi.client.event_bus import AnyEvent, BlueskyStreamingError, EventBusClient from blueapi.client.rest import ( BlueskyRemoteControlError, diff --git a/src/blueapi/client/__init__.py b/src/blueapi/client/__init__.py index e69de29bb2..db99dd6473 100644 --- a/src/blueapi/client/__init__.py +++ b/src/blueapi/client/__init__.py @@ -0,0 +1,7 @@ +from .client import BlueapiClient +from .rest import BlueapiRestClient + +__all__ = [ + "BlueapiClient", + "BlueapiRestClient", +] diff --git a/tests/system_tests/test_blueapi_system.py b/tests/system_tests/test_blueapi_system.py index 0271331a6d..c1b7ecc4c0 100644 --- a/tests/system_tests/test_blueapi_system.py +++ b/tests/system_tests/test_blueapi_system.py @@ -12,12 +12,12 @@ from requests.exceptions import ConnectionError from scanspec.specs import Line -from blueapi.client.client import ( - BlueapiClient, +from blueapi.client import BlueapiClient +from blueapi.client.event_bus import AnyEvent, BlueskyStreamingError +from blueapi.client.rest import ( BlueskyRemoteControlError, + BlueskyRequestError, ) -from blueapi.client.event_bus import AnyEvent, BlueskyStreamingError -from blueapi.client.rest import BlueskyRequestError from blueapi.config import ( ApplicationConfig, ConfigLoader, diff --git a/tests/unit_tests/client/test_client.py b/tests/unit_tests/client/test_client.py index d13ccce80d..d6d2e1f22b 100644 --- a/tests/unit_tests/client/test_client.py +++ b/tests/unit_tests/client/test_client.py @@ -9,7 +9,7 @@ asserting_span_exporter, ) -from blueapi.client.client import BlueapiClient +from blueapi.client import BlueapiClient from blueapi.client.event_bus import AnyEvent, BlueskyStreamingError, EventBusClient from blueapi.client.rest import BlueapiRestClient, BlueskyRemoteControlError from blueapi.config import MissingStompConfigurationError