From d0ebd45bd67a08fedcebe5acb74d0a8fdcfb6f27 Mon Sep 17 00:00:00 2001 From: Abigail Emery Date: Fri, 26 Jun 2026 10:05:53 +0000 Subject: [PATCH 1/3] Remove dodal plans from default config --- src/blueapi/config.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/blueapi/config.py b/src/blueapi/config.py index f58ae9b389..c7c38f91ca 100644 --- a/src/blueapi/config.py +++ b/src/blueapi/config.py @@ -140,10 +140,7 @@ class EnvironmentConfig(BlueapiBaseModel): PlanSource | DeviceManagerSource, Field(discriminator="kind"), ] - ] = [ - PlanSource(module="dodal.plans"), - PlanSource(module="dodal.plan_stubs.wrapped"), - ] + ] = Field(default=[]) events: WorkerEventConfig = Field(default_factory=WorkerEventConfig) metadata: MetadataConfig | None = Field(default=None) From d56b9d1ec819245f0cf7313194c4dbd1f7dfb0b0 Mon Sep 17 00:00:00 2001 From: Abigail Emery Date: Fri, 26 Jun 2026 10:06:49 +0000 Subject: [PATCH 2/3] Update config schema --- helm/blueapi/config_schema.json | 11 +---------- helm/blueapi/values.schema.json | 11 +---------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/helm/blueapi/config_schema.json b/helm/blueapi/config_schema.json index 070c1ad981..fd9e958cdf 100644 --- a/helm/blueapi/config_schema.json +++ b/helm/blueapi/config_schema.json @@ -105,16 +105,7 @@ "description": "Config for the RunEngine environment", "properties": { "sources": { - "default": [ - { - "module": "dodal.plans", - "kind": "planFunctions" - }, - { - "module": "dodal.plan_stubs.wrapped", - "kind": "planFunctions" - } - ], + "default": [], "items": { "discriminator": { "mapping": { diff --git a/helm/blueapi/values.schema.json b/helm/blueapi/values.schema.json index 71c8a53954..7e088f96ae 100644 --- a/helm/blueapi/values.schema.json +++ b/helm/blueapi/values.schema.json @@ -554,16 +554,7 @@ }, "sources": { "title": "Sources", - "default": [ - { - "kind": "planFunctions", - "module": "dodal.plans" - }, - { - "kind": "planFunctions", - "module": "dodal.plan_stubs.wrapped" - } - ], + "default": [], "type": "array", "items": { "oneOf": [ From 65a3b9d8f8f0f24834419271e8f87d1f494f8e84 Mon Sep 17 00:00:00 2001 From: Abigail Emery Date: Fri, 26 Jun 2026 10:08:01 +0000 Subject: [PATCH 3/3] Add dodal plans to task worker unit tests --- tests/unit_tests/worker/test_task_worker.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/unit_tests/worker/test_task_worker.py b/tests/unit_tests/worker/test_task_worker.py index 41041c5018..f03ba7c5fe 100644 --- a/tests/unit_tests/worker/test_task_worker.py +++ b/tests/unit_tests/worker/test_task_worker.py @@ -20,7 +20,7 @@ ) from ophyd_async.core import AsyncStatus -from blueapi.config import DeviceManagerSource, EnvironmentConfig +from blueapi.config import DeviceManagerSource, EnvironmentConfig, PlanSource from blueapi.core import BlueskyContext, EventStream from blueapi.core.bluesky_types import DataEvent from blueapi.service.model import PlanModel @@ -109,7 +109,12 @@ def second_fake_device() -> FakeDevice: @pytest.fixture def context(fake_device: FakeDevice, second_fake_device: FakeDevice) -> BlueskyContext: ctx = BlueskyContext() - ctx_config = EnvironmentConfig() + ctx_config = EnvironmentConfig( + sources=[ + PlanSource(module="dodal.plans"), + PlanSource(module="dodal.plan_stubs.wrapped"), + ] + ) ctx_config.sources.append(DeviceManagerSource(module="devices")) ctx.register_plan(failing_plan) ctx.register_device(fake_device) @@ -121,7 +126,12 @@ def context(fake_device: FakeDevice, second_fake_device: FakeDevice) -> BlueskyC @pytest.fixture def context_without_devices() -> BlueskyContext: ctx = BlueskyContext() - ctx_config = EnvironmentConfig() + ctx_config = EnvironmentConfig( + sources=[ + PlanSource(module="dodal.plans"), + PlanSource(module="dodal.plan_stubs.wrapped"), + ] + ) ctx_config.sources.append(DeviceManagerSource(module="devices")) ctx.with_config(ctx_config) return ctx