remla 0.2.5.dev0__tar.gz → 0.2.5.dev2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: remla
-Version: 0.2.5.dev0
+Version: 0.2.5.dev2
 Summary: 
 Author: Zak Espley
 Author-email: zespley@gmail.com
@@ -30,3 +30,4 @@ Description-Content-Type: text/markdown
 
 Remla is a portmanteau of Remote Labs. It is used to control physics laboratory equipment over the internet.
 
+This is a test

{remla-0.2.5.dev0 → remla-0.2.5.dev2}/README.md

@@ -1,3 +1,5 @@
 # Remla
 
 Remla is a portmanteau of Remote Labs. It is used to control physics laboratory equipment over the internet.
+
+This is a test

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

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

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

@@ -159,18 +159,25 @@ class Experiment(object):
         if lockGroupName:
             async with self.lockGroups[lockGroupName]:
                 loop = asyncio.get_event_loop()
-                response_type,result = await loop.run_in_executor(
+                response = await loop.run_in_executor(
                     self.executor, runMethod, device, method, params
                 )
+                if len(response) > 1:
+                    response_type = response[0]
+                    result = response[1]
+                else:
+                    response_type = "MESSAGE"
+                    result = response[0]
         else:
             logging.error("All devices need a lock")
             raise
             # result = await self.runMethod(device, method, params)
         if result is not None:
-            if result[0] == "ALERT":
-                await self.sendAlert(websocket, f"{result[1]}")
+            logging.info(f"Device {deviceName} ran {method} with result: {result}")
+            if response_type == "ALERT":
+                await self.sendAlert(websocket, f"{result}")
             else:
-                await self.sendMessage(websocket, f"{result[1]}")
+                await self.sendMessage(websocket, f"{result}")
         else:
             await self.sendMessage(websocket, f"{deviceName} ran {method}")
 

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

@@ -27,7 +27,7 @@ from remla.yaml import createDevicesFromYml, yaml
 
 from .customvalidators import *
 
-__version__ = "0.2.4"
+__version__ = "0.2.5.dev2"
 
 
 def version_callback(value: bool):