Skip to content

refactor: Move numtracker into utils package #1352

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
tpoliaw merged 1 commit into from
Jan 27, 2026
Merged

refactor: Move numtracker into utils package #1352

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
2 changes: 1 addition & 1 deletion src/blueapi/core/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
from pydantic_core import CoreSchema, core_schema

from blueapi import utils
from blueapi.client.numtracker import NumtrackerClient
from blueapi.config import (
ApplicationConfig,
DeviceManagerSource,
Expand All @@ -36,6 +35,7 @@
from blueapi.core.protocols import DeviceManager
from blueapi.utils import (
BlueapiPlanModelConfig,
NumtrackerClient,
is_function_sourced_from_module,
load_module_all,
)
Expand Down
2 changes: 2 additions & 0 deletions src/blueapi/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
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
from .numtracker import NumtrackerClient
from .serialization import serialize
from .thread_exception import handle_all_exceptions

Expand All @@ -14,6 +15,7 @@
"BlueapiModelConfig",
"BlueapiPlanModelConfig",
"InvalidConfigError",
"NumtrackerClient",
"connect_devices",
"is_sgid_set",
"get_owner_gid",
Expand Down
0 src/blueapi/client/numtracker.py → src/blueapi/utils/numtracker.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/unit_tests/client/test_numtracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from requests import HTTPError
from tests.conftest import NOT_CONFIGURED_INSTRUMENT

from blueapi.client.numtracker import (
from blueapi.utils.numtracker import (
DirectoryPath,
NumtrackerClient,
NumtrackerScanMutationResponse,
Expand Down
6 changes: 3 additions & 3 deletions tests/unit_tests/service/test_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from pydantic import HttpUrl
from stomp.connect import StompConnection11 as Connection

from blueapi.client.numtracker import NumtrackerClient
from blueapi.config import (
ApplicationConfig,
EnvironmentConfig,
Expand All @@ -42,6 +41,7 @@
WorkerTask,
)
from blueapi.utils.invalid_config_error import InvalidConfigError
from blueapi.utils.numtracker import NumtrackerClient
from blueapi.utils.path_provider import StartDocumentPathProvider
from blueapi.worker.event import TaskStatus, TaskStatusEnum, WorkerEvent, WorkerState
from blueapi.worker.task import Task
Expand Down Expand Up @@ -483,7 +483,7 @@ def test_configure_numtracker():
assert nt._url.unicode_string() == "https://numtracker-example.com/graphql"


@patch("blueapi.client.numtracker.requests.post")
@patch("blueapi.utils.numtracker.requests.post")
def test_headers_are_cleared(mock_post):
mock_response = Mock()
mock_post.return_value = mock_response
Expand Down Expand Up @@ -601,7 +601,7 @@ def test_setup_with_numtracker_raises_if_provider_is_defined_in_device_module():
clear_path_provider()


@patch("blueapi.client.numtracker.NumtrackerClient.create_scan")
@patch("blueapi.utils.numtracker.NumtrackerClient.create_scan")
def test_numtracker_create_scan_called_with_arguments_from_metadata(mock_create_scan):
conf = ApplicationConfig(
numtracker=NumtrackerConfig(
Expand Down
Loading