[do not merge] Numpy double import mwe

.github/dependabot.yml

@@ -14,10 +14,5 @@ updates:
   - package-ecosystem: "pip"
     directories: 
       - "**/*"
-    ignore:
-      - dependency-name: "bluesky"
-        versions: [ ">1.10.0" ]
-      - dependency-name: "bluesky-queueserver"
-        versions: [ ">0.0.20" ]
     schedule:
       interval: "weekly"

.github/workflows/test-docker-compose.yml

@@ -9,24 +9,26 @@ jobs:
     steps:
     - 
       name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     -
       name: Set up Docker Compose
       uses: docker/setup-compose-action@v2
     -
       name: Set up environment
       run: |
         cp -r ./tests/test.env .env
+        echo "HAPPI_DB_PATH= $GITHUB_WORKSPACE/tests/happi_db.json" >> .env
+        echo "WT5_DATA_PATH= $GITHUB_WORKSPACE/bluesky-cmds-data" >> .env
         mkdir bluesky-cmds-data
-        ls
     -
       name: Designate file permissions
       run: chmod +x ./re-manager/start_re.sh
     - 
       name: Build and start Docker images
       run: |
         docker compose up -d
-        sleep 30
+        sleep 5
+        docker compose ps --all
     -
       name: Stop Docker images
       if: always()

.github/workflows/test-np-import.yml

@@ -0,0 +1,26 @@
+name: numpy-import-test
+
+on:
+  push:
+
+jobs:
+  compose:
+    runs-on: ubuntu-latest
+    steps:
+    - 
+      name: Checkout code
+      uses: actions/checkout@v5
+    -
+      name: Set up environment
+      run: |
+        cp -r ./tests/numpy-test/* ./
+        cp -r ./tests/test.env .env
+        echo "HAPPI_DB_PATH= $GITHUB_WORKSPACE/tests/happi_db.json" >> .env
+    - 
+      name: Build image
+      run: |
+        ls
+        docker build -t test .
+    - 
+      name: Run container
+      run: docker run test

hwproxy/requirements.txt

@@ -1,5 +1,5 @@
 attune==0.5.1
-bluesky==1.10.0  # ignore
+bluesky==1.15.0  # ignore
 bluesky-hwproxy==2022.8.0
 bluesky-queueserver==0.0.24
 happi==3.0.1

hwproxy/startup.py

@@ -18,9 +18,12 @@
     run_holistic,
 )
 
+from bluesky import RunEngine
 from bluesky.plans import count
+from bluesky.plan_stubs import mv, sleep
 from bluesky.preprocessors import baseline_decorator
 from bluesky.protocols import Movable
+from bluesky.callbacks.zmq import Publisher
 
 happi_client = happi.Client(database=happi.backends.backend("/happi_db.json"))
 
@@ -37,6 +40,11 @@
 except socket.gaierror:
     host = "172.17.0.1"  # Default host ip on Linux
 
+# 0MQ
+zmq = Publisher(f"{host}:5567")
+RE = RunEngine({})
+RE.subscribe(zmq)
+
 for device in happi_client.all_items:
     # Skip devices marked inactive in happi
     if not device.active:

re-manager/dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm
+FROM debian:trixie
 
 # python
 RUN apt update
@@ -7,7 +7,6 @@ RUN apt install librdkafka-dev -y
 RUN apt install python3-pip -y
 RUN apt install python3-venv -y
 
-COPY ./databroker-config.yml /usr/local/share/intake/catalog.yml
 COPY ./happi.ini /happi.ini
 COPY ./startup.py ./startup.py
 COPY ./start_re.sh ./start_re.sh

re-manager/requirements.txt

@@ -1,8 +1,8 @@
 attune==0.5.1
-bluesky==1.10.0  # ignore
-bluesky-queueserver==0.0.20  # ignore
+bluesky==1.15.0  # ignore
+bluesky-queueserver==0.0.22  # ignore
 happi==3.0.1
-numpy < 2.4  # ignore
+numpy<2.4  # ignore
 pint==0.25.3
 wright-plans==2022.7.0
 yaqc-bluesky==2023.8.0

re-manager/start_re.sh

@@ -1,4 +1,4 @@
 #! /bin/sh
 
 qserver-list-plans-devices --startup-script startup.py
-start-re-manager --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --zmq-data-proxy-addr zmq-proxy:5567 --redis-addr redis:6379 --zmq-publish-console ON
+start-re-manager --startup-script=./startup.py --existing-plans-devices=./existing_plans_and_devices.yaml --user-group-permissions=./user_group_permissions.yaml --redis-addr redis:6379 --zmq-publish-console ON

re-manager/startup.py

@@ -18,10 +18,12 @@
     run_holistic,
 )
 
+from bluesky import RunEngine
 from bluesky.plans import count
 from bluesky.plan_stubs import mv, sleep
 from bluesky.preprocessors import baseline_decorator
 from bluesky.protocols import Movable
+from bluesky.callbacks.zmq import Publisher
 
 happi_client = happi.Client(database=happi.backends.backend("/happi_db.json"))
 
@@ -38,6 +40,11 @@
 except socket.gaierror:
     host = "172.17.0.1"  # Default host ip on Linux
 
+# 0MQ
+zmq = Publisher(f"{host}:5567")
+RE = RunEngine({})
+RE.subscribe(zmq)
+
 for device in happi_client.all_items:
     # Skip devices marked inactive in happi
     if not device.active:

tests/numpy-test/Dockerfile

@@ -0,0 +1,23 @@
+FROM debian:trixie
+
+# python
+RUN apt update
+RUN apt install git -y
+RUN apt install librdkafka-dev -y
+RUN apt install python3-pip -y
+RUN apt install python3-venv -y
+
+COPY ./startup.py ./startup.py
+COPY ./user_group_permissions.yaml ./user_group_permissions.yaml
+COPY ./requirements.txt /requirements.txt
+
+# Create a virtual environment
+RUN python3 -m venv /opt/venv
+
+# Activate the virtual environment
+ENV PATH="/opt/venv/bin:$PATH"
+
+# Install dependencies
+RUN python3 -m pip install -r requirements.txt
+
+RUN qserver-list-plans-devices --startup-script startup.py

tests/numpy-test/requirements.txt

@@ -0,0 +1,3 @@
+bluesky==1.15.0  # ignore
+bluesky-queueserver==0.0.24  # ignore
+numpy==2.4.4  # ignore

tests/numpy-test/startup.py

@@ -0,0 +1,2 @@
+# from bluesky.plans import count
+from bluesky.preprocessors import baseline_decorator

tests/numpy-test/user_group_permissions.yaml

@@ -0,0 +1,19 @@
+user_groups:
+  root:  # The group includes all available plan and devices
+    allowed_plans:
+      - null  # Allow all
+    forbidden_plans:
+      - ":^_"  # All plans with names starting with '_'
+    allowed_devices:
+      - null  # Allow all
+    forbidden_devices:
+      - ":^_"  # All devices with names starting with '_'
+  admin:  # The group includes beamline staff, includes all or most of the plans and devices
+    allowed_plans:
+      - ":.*"  # A different way to allow all
+    forbidden_plans:
+      - null  # Nothing is forbidden
+    allowed_devices:
+      - ":.*:?.*"  # A different way to allow all
+    forbidden_devices:
+      - null  # Nothing is forbidden

tests/test.env

@@ -1,3 +1 @@
-HAPPI_DB_PATH= /home/runner/work/bluesky-in-a-box/bluesky-in-a-box/tests/happi_db.json
-WT5_DATA_PATH= /home/runner/work/bluesky-in-a-box/bluesky-in-a-box/bluesky-cmds-data 
 TZ=America/Chicago

zmq-proxy/dockerfile

@@ -1,7 +1,4 @@
 FROM python:3.14-trixie
 COPY ./requirements.txt ./
 RUN python3 -m pip install -r requirements.txt
-CMD ["bluesky-0MQ-proxy", "5567", "5568"]
-
-
-
+CMD ["bluesky-0MQ-proxy", "--in-address", "5567", "--out-address", "5568"]

zmq-proxy/requirements.txt

@@ -1,2 +1,2 @@
-bluesky==1.10.0  # ignore
+bluesky==1.15.0  # ignore
 pyzmq==27.1.0