Replace references to blueapi messaging package

.github/actions/install_requirements/action.yml

@@ -26,7 +26,11 @@ runs:
         python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install packages
-      run: pip install ${{ inputs.pip-install }}
+      run: pip install $([ -f dev-requirements.txt ] && echo '-c dev-requirements.txt') -e .[dev]
+      shell: bash
+
+    - name: Install bluesky_stomp
+      run: pip install git+https://github.com/DiamondLightSource/bluesky-stomp.git@main
       shell: bash
 
     - name: Report what was installed

dev-requirements.txt

@@ -18,6 +18,7 @@ black==24.8.0
 bluesky==1.13.0a4
 bluesky-kafka==0.10.0
 bluesky-live==0.0.8
+bluesky-stomp @ git+https://github.com/DiamondLightSource/bluesky-stomp@4dbdb6b144b4b03243a1784f2f53dc13cbbef30e
 boltons==24.0.0
 cachetools==5.4.0
 caproto==1.1.1

pyproject.toml

@@ -24,7 +24,7 @@ dependencies = [
     "aiohttp",
     "PyYAML",
     "click",
-    "fastapi[all]",
+    "fastapi>=0.112.0",
     "uvicorn",
     "requests",
     "dls-bluesky-core",    #requires ophyd-async
@@ -91,7 +91,7 @@ filterwarnings = ["error", "ignore::DeprecationWarning"]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests"
 markers = [
-    "handler: marks tests that interact with the global handler object in handler.py",
+    "stomp: marks tests that require the stomp" 
 ]
 asyncio_mode = "auto"
 

src/blueapi/cli/cli.py

@@ -6,6 +6,8 @@
 
 import click
 from bluesky.callbacks.best_effort import BestEffortCallback
+from bluesky_stomp.messaging import MessageContext, MessagingTemplate
+from bluesky_stomp.models import Broker
 from pydantic import ValidationError
 from requests.exceptions import ConnectionError
 
@@ -16,8 +18,6 @@
 from blueapi.client.rest import BlueskyRemoteControlError
 from blueapi.config import ApplicationConfig, ConfigLoader
 from blueapi.core import DataEvent
-from blueapi.messaging import MessageContext
-from blueapi.messaging.stomptemplate import StompMessagingTemplate
 from blueapi.service.main import start
 from blueapi.service.openapi import (
     DOCS_SCHEMA_LOCATION,
@@ -147,7 +147,9 @@ def listen_to_events(obj: dict) -> None:
     config: ApplicationConfig = obj["config"]
     if config.stomp is not None:
         event_bus_client = EventBusClient(
-            StompMessagingTemplate.autoconfigured(config.stomp)
+            MessagingTemplate.for_broker(
+                broker=Broker(host=config.stomp.host, port=config.stomp.port, auth=None)
+            )
         )
     else:
         raise RuntimeError("Message bus needs to be configured")

src/blueapi/client/client.py

@@ -1,9 +1,11 @@
 import time
 from concurrent.futures import Future
 
+from bluesky_stomp.messaging import MessageContext, MessagingTemplate
+from bluesky_stomp.models import Broker
+
 from blueapi.config import ApplicationConfig
 from blueapi.core.bluesky_types import DataEvent
-from blueapi.messaging import MessageContext, StompMessagingTemplate
 from blueapi.service.model import (
     DeviceModel,
     DeviceResponse,
@@ -38,7 +40,9 @@ def __init__(
     def from_config(cls, config: ApplicationConfig) -> "BlueapiClient":
         rest = BlueapiRestClient(config.api)
         if config.stomp is not None:
-            template = StompMessagingTemplate.autoconfigured(config.stomp)
+            template = MessagingTemplate.for_broker(
+                broker=Broker(host=config.stomp.host, port=config.stomp.port, auth=None)
+            )
             events = EventBusClient(template)
         else:
             events = None

src/blueapi/client/event_bus.py

@@ -1,7 +1,9 @@
 from collections.abc import Callable
 
+from bluesky_stomp.messaging import MessageContext, MessagingTemplate
+from bluesky_stomp.models import MessageQueue
+
 from blueapi.core import DataEvent
-from blueapi.messaging import MessageContext, MessagingTemplate
 from blueapi.worker import ProgressEvent, WorkerEvent
 
 
@@ -32,7 +34,7 @@ def subscribe_to_all_events(
     ) -> None:
         try:
             self.app.subscribe(
-                self.app.destinations.topic("public.worker.event"),
+                MessageQueue(name="public.worker.event"),
                 on_event,
             )
         except Exception as err: