local dev

.github/workflows/python-app.yml

@@ -22,8 +22,8 @@ jobs:
         python -m pip install --upgrade pip
         pip install .
         pip install .[dev]
-        git clone https://github.com/als-computing/arroyo.git
-        pip install ./arroyo
+        git clone https://github.com/als-computing/arroyopy.git
+        pip install ./arroyopy
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "arroyo"]
-	path = arroyo
-	url = git@github.com:als-computing/arroyo.git
+[submodule "arroyopy"]
+	path = arroyopy
+	url = https://github.com/als-computing/arroyopy.git

AP-XPS.code-workspace

@@ -4,7 +4,7 @@
             "path": "."
         },
         {
-            "path": "../arroyo"
+            "path": "../arroyopy"
         }
     ]
-}
+}

Dockerfile_labviewsim

@@ -6,7 +6,7 @@ RUN apt install git
 
 
 COPY . /app
-RUN pip install ./arroyo
+RUN pip install ./arroyopy
 RUN pip install --no-cache-dir --upgrade .
 RUN pip install --no-cache-dir .[simulator]
 

Dockerfile_processor

@@ -3,7 +3,7 @@ FROM python:3.11
 WORKDIR /app
 
 COPY . /app
-RUN pip install ./arroyo
+RUN pip install ./arroyopy 
 RUN pip install --no-cache-dir --upgrade .
 
 CMD ["python", "-m", "tr_ap_xps.apps.processor_cli"]

docker-compose.yml

@@ -2,6 +2,7 @@ services:
   tiled:
     # see the file ./tiled/deploy/config.yml for detailed configuration of tiled
     image: ghcr.io/bluesky/tiled:main
+    platform: linux/amd64
     ports:
       - "8000:8000"
     environment:

pyproject.toml

@@ -26,7 +26,8 @@ dependencies = [
     "tqdm",
     "typer",
     "websockets",
-    "zarr"
+    "zarr",
+    "scipy",
 ]
 
 [project.optional-dependencies]

src/tr_ap_xps/labview.py

@@ -5,7 +5,7 @@
 import numpy as np
 import zmq.asyncio
 
-from arroyo.zmq import ZMQListener
+from arroyopy.zmq import ZMQListener
 
 from .config import settings
 from .schemas import NumpyArrayModel, XPSImageInfo, XPSRawEvent, XPSStart, XPSStop

src/tr_ap_xps/pipeline/xps_operator.py

@@ -1,8 +1,8 @@
 import asyncio
 import logging
 
-from arroyo.operator import Operator
-from arroyo.schemas import Message
+from arroyopy.operator import Operator
+from arroyopy.schemas import Message
 
 from ..schemas import DataFrameModel, XPSRawEvent, XPSResultStop, XPSStart, XPSStop
 from ..timing import timer

src/tr_ap_xps/schemas.py

@@ -2,7 +2,14 @@
 
 from pydantic import BaseModel, Field
 
-from arroyo.schemas import DataFrameModel, Event, Message, NumpyArrayModel, Start, Stop
+from arroyopy.schemas import (
+    DataFrameModel,
+    Event,
+    Message,
+    NumpyArrayModel,
+    Start,
+    Stop,
+)
 
 """
     This module defines schemas for XPS (X-ray Photoelectron Spectroscopy) messages and events using

src/tr_ap_xps/tiled.py

@@ -11,7 +11,7 @@
 from tiled.structures.data_source import DataSource
 from tiled.structures.table import TableStructure
 
-from arroyo.publisher import Publisher
+from arroyopy.publisher import Publisher
 
 from .config import settings
 from .schemas import XPSResult, XPSResultStop, XPSStart

src/tr_ap_xps/websockets.py

@@ -8,7 +8,7 @@
 import pandas as pd
 import websockets
 
-from arroyo.publisher import Publisher
+from arroyopy.publisher import Publisher
 
 from .schemas import XPSResult, XPSResultStop, XPSStart