remla 0.2.4__tar.gz → 0.2.5.dev0__tar.gz

{remla-0.2.4 → remla-0.2.5.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: remla
-Version: 0.2.4
+Version: 0.2.5.dev0
 Summary: 
 Author: Zak Espley
 Author-email: zespley@gmail.com
@@ -9,6 +9,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: adafruit-circuitpython-motorkit (>=1.6.14,<2.0.0)
 Requires-Dist: dlipower (>=1.0.176,<2.0.0)
 Requires-Dist: pathvalidate (>=3.2.0,<4.0.0)

{remla-0.2.4 → remla-0.2.5.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "remla"
-version = "0.2.4"
+version = "0.2.5-dev"
 description = ""
 authors = ["Zak Espley <zespley@gmail.com>"]
 readme = "README.md"

{remla-0.2.4 → remla-0.2.5.dev0}/remla/labcontrol/Controllers.py

@@ -391,9 +391,9 @@ class StepperI2C(MotorKit, BaseController):
                     if status == gpio.HIGH:
                         response = switch.switchAction(self, steps - i)
                         if response is None:
-                            return "{0}/{1}/{2}".format(self.name, "position", "limit")
+                            return ("ALERT", "{0}/{1}/{2}".format(self.name, "position", "limit"))
                         else:
-                            return response
+                            return ("MESSAGE", response)
 
             if self.homing:
                 homeStatus = self.homeSwitch.getStatus(1)
@@ -410,9 +410,9 @@ class StepperI2C(MotorKit, BaseController):
             self.currentPosition == self.upperBound
             or self.currentPosition == self.lowerBound
         ):
-            return "{0}/{1}/{2}".format(self.name, "position", "limit")
+            return ("ALERT", "{0}/{1}/{2}".format(self.name, "position", "limit"))
         else:
-            return "{0}/{1}/{2}".format(self.name, "position", self.currentPosition)
+            return ("MESSAGE", "{0}/{1}/{2}".format(self.name, "position", self.currentPosition))
 
     def move_parser(self, params):
         if len(params) != 1:
@@ -439,13 +439,13 @@ class StepperI2C(MotorKit, BaseController):
         print(position)
         endPoint = self.refPoints[position]
         response = self.move(endPoint - self.currentPosition)
-        return response
+        return ("MESSAGE", response)
 
     def admingoto(self, position):
         print(position)
         endPoint = self.refPoints[position]
         response = self.adminMove(endPoint - self.currentPosition)
-        return response
+        return ("MESSAGE", response)
 
     def goto_parser(self, params):
         if len(params) != 1:
@@ -470,7 +470,7 @@ class StepperI2C(MotorKit, BaseController):
         step = int(step * self.gearRatio)
         step = round(step)
         response = self.move(step)
-        return response
+        return ("MESSAGE", response)
 
     def homeMove(self, stepLimit=5000, additionalSteps=10):
         if self.currentPosition > 0:
@@ -1233,9 +1233,9 @@ class PololuStepperMotor(BaseController):
             self.currentPosition == self.upperBound
             or self.currentPosition == self.lowerBound
         ):
-            return "{0}/{1}/{2}".format(self.name, "position", "limit")
+            return ("ALERT", "{0}/{1}/{2}".format(self.name, "position", "limit"))
         else:
-            return "{0}/{1}/{2}".format(self.name, "position", self.currentPosition)
+            return ("MESSAGE", "{0}/{1}/{2}".format(self.name, "position", self.currentPosition))
 
     def move_parser(self, params):
         if len(params) != 1:
@@ -1265,7 +1265,7 @@ class PololuStepperMotor(BaseController):
         step = int(step * self.gearRatio)
         step = round(step)
         response = self.move(step)
-        return response
+        return ("MESSAGE", response)
 
     def homeMove(self, stepLimit=5000, additionalSteps=10):
         if self.currentPosition > 0:
@@ -1921,9 +1921,9 @@ class S42CStepperMotor(BaseController):
         self.state["position"] += moveSteps
 
         if self.state["position"] == self.UB or self.state["position"] == self.LB:
-            return "{0}/{1}/{2}".format(self.name, "position", "limit")
+            return ("ALERT", "{0}/{1}/{2}".format(self.name, "position", "limit"))
         else:
-            return "{0}/{1}/{2}".format(self.name, "position", self.state["position"])
+            return ("MESSAGE", "{0}/{1}/{2}".format(self.name, "position", self.state["position"]))
 
     def goto(self, ref: str, safe=True):
         """

{remla-0.2.4 → remla-0.2.5.dev0}/remla/labcontrol/Experiment.py

@@ -63,6 +63,9 @@ class Experiment(object):
         ####                Starting New Log                      ####
         ##############################################################    
         """)
+        self.startIpcListener()
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
 
     def logException(self, task):
         if task.exception():
@@ -156,7 +159,7 @@ class Experiment(object):
         if lockGroupName:
             async with self.lockGroups[lockGroupName]:
                 loop = asyncio.get_event_loop()
-                result = await loop.run_in_executor(
+                response_type,result = await loop.run_in_executor(
                     self.executor, runMethod, device, method, params
                 )
         else:
@@ -164,19 +167,22 @@ class Experiment(object):
             raise
             # result = await self.runMethod(device, method, params)
         if result is not None:
-            await self.sendMessage(websocket, f"{deviceName} - {result}")
+            if result[0] == "ALERT":
+                await self.sendAlert(websocket, f"{result[1]}")
+            else:
+                await self.sendMessage(websocket, f"{result[1]}")
         else:
             await self.sendMessage(websocket, f"{deviceName} ran {method}")
 
     def startServer(self):
         # This function sets up and runs the WebSocket server indefinitely
-        loop = asyncio.new_event_loop()
-        asyncio.set_event_loop(loop)
+        # loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
         start_server = websockets.serve(self.handleConnection, self.host, self.port)
 
         print(f"Server started at ws://{self.host}:{self.port}")
-        loop.run_until_complete(start_server)
-        loop.run_forever()
+        self.loop.run_until_complete(start_server)
+        self.loop.run_forever()
 
     async def sendDataToClient(self, websocket, dataStr: str):
         try:
@@ -290,6 +296,33 @@ class Experiment(object):
                     f"Socket file not found. Did you configure uv4l-uvc.conf to use {self.socketPath}?"
                 )
                 raise
-        except socket.error as err:
             logging.error("Socket Error!", exc_info=True)
             print(f"Socket error: {err}")
+
+    def startIpcListener(self, ipc_path="/tmp/remla_cmd.sock"):
+        # Remove old socket if exists
+        if os.path.exists(ipc_path):
+            os.unlink(ipc_path)
+        ipc_sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        ipc_sock.bind(ipc_path)
+        ipc_sock.listen(1)
+        print(f"IPC listener started at {ipc_path}")
+
+        def ipc_loop():
+            while True:
+                conn, _ = ipc_sock.accept()
+                data = conn.recv(1024).decode().strip()
+                if data == "boot":
+                    # Send boot message to active client
+                    if self.activeClient:
+                        future = asyncio.run_coroutine_threadsafe(
+                            self.sendMessage(self.activeClient, "Experiment/message/boot"),
+                            self.loop
+                        )
+                        print("Sent boot message to active client.")
+                    else:
+                        print("No active client to send boot message.")
+                conn.close()
+
+
+        threading.Thread(target=ipc_loop, daemon=True).start()

{remla-0.2.4 → remla-0.2.5.dev0}/remla/main.py

@@ -726,6 +726,18 @@ def testws():
     asyncio.get_event_loop().run_until_complete(start_server)
     asyncio.get_event_loop().run_forever()
 
+@app.command()
+def boot():
+    """Send 'boot' command to the running remla server via IPC."""
+    ipc_path = "/tmp/remla_cmd.sock"
+    try:
+        with socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) as sock:
+            sock.connect(ipc_path)
+            sock.sendall(b"boot")
+        print("Boot command sent to server.")
+    except Exception as e:
+        print(f"Failed to send boot command: {e}")
+
 
 if __name__ == "__main__":
     app()