Merge branch 'master' of https://github.com/labthings/python-labthings

Author: Joel Collins

.coveragerc

@@ -2,7 +2,7 @@
 branch = True
 source = ./src/labthings
 omit = .venv/*, ./src/labthings/wsgi.py, ./src/labthings/monkey.py, ./src/labthings/server/*, ./src/labthings/core/*
-concurrency = greenlet
+concurrency = thread
 
 [report]
 # Regexes for lines to exclude from consideration

CHANGELOG.md

@@ -2,6 +2,8 @@
 import math
 import time
 
+from labthings.tasks import current_task
+
 """
 Class for our lab component functionality. This could include serial communication,
 equipment API calls, network requests, or a "virtual" device as seen here.
@@ -44,6 +46,8 @@ def average_data(self, n: int):
         summed_data = self.data
 
         for _ in range(n):
+            if current_task() and current_task().stopped:
+                return summed_data
             summed_data = [summed_data[i] + el for i, el in enumerate(self.data)]
             time.sleep(0.25)
 

examples/components/pdf_component.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "labthings"
-version = "0.8.0-beta.1"
+version = "0.8.0-beta.2"
 description = "Python implementation of LabThings, based on the Flask microframework"
 readme = "README.md"
 repository = "https://github.com/labthings/python-labthings/"
@@ -18,9 +18,8 @@ marshmallow = "^3.4.0"
 webargs = "^6.0.0"
 apispec = "^3.2.0"
 flask-cors = "^3.0.8"
-gevent = ">=1.4,<21.0"
-gevent-websocket = "^0.10.1"
 zeroconf = ">=0.24.5,<0.29.0"
+flask-threaded-sockets = "^0.2.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^5.4"

poetry.lock

@@ -2,8 +2,10 @@
 
 from ..view import View
 from ..view.marshalling import marshal_with
+from ..view.args import use_args
 from ..schema import ActionSchema
 from ..find import current_thing
+from .. import fields
 
 
 class ActionQueue(View):
@@ -12,7 +14,7 @@ class ActionQueue(View):
     """
 
     def get(self):
-        return ActionSchema(many=True).dump(current_thing.actions.greenlets)
+        return ActionSchema(many=True).dump(current_thing.actions.threads)
 
 
 class ActionView(View):
@@ -38,19 +40,22 @@ def get(self, task_id):
 
         return ActionSchema().dump(task)
 
-    def delete(self, task_id):
+    @use_args({"timeout": fields.Int(missing=5)})
+    def delete(self, args, task_id):
         """
         Terminate a running task.
 
         If the task is finished, deletes its entry.
         """
+        timeout = args.get("timeout", 5)
         task_dict = current_thing.actions.to_dict()
 
         if task_id not in task_dict:
             return abort(404)  # 404 Not Found
 
         task = task_dict.get(task_id)
 
-        task.kill(block=True, timeout=3)
+        # TODO: Make non-blocking?
+        task.stop(timeout=timeout)
 
         return ActionSchema().dump(task)

pyproject.toml

@@ -1,7 +1,6 @@
 from ..sockets import SocketSubscriber
 from ..find import current_thing
 
-import gevent
 import logging
 
 
@@ -21,7 +20,6 @@ def socket_handler(ws):
         response = process_socket_message(message)
         if response:
             ws.send(response)
-        gevent.sleep(0.1)
     # Remove the subscriber once the loop returns
     current_thing.subscribers.remove(wssub)
     logging.info(f"Removed subscriber {wssub}")

src/labthings/default_views/actions.py

@@ -18,7 +18,7 @@ def get(self):
         logging.warning(
             "TaskList is deprecated and will be removed in a future version. Use the Actions list instead."
         )
-        return TaskSchema(many=True).dump(current_thing.actions.greenlets)
+        return TaskSchema(many=True).dump(current_thing.actions.threads)
 
 
 class TaskView(View):
@@ -64,7 +64,6 @@ def delete(self, task_id):
             return abort(404)  # 404 Not Found
 
         task = task_dict.get(task_id)
-
-        task.kill(block=True, timeout=3)
+        task.stop(timeout=5)
 
         return TaskSchema().dump(task)

src/labthings/default_views/sockets.py

@@ -1,4 +1,5 @@
 from flask import url_for
+from flask_threaded_sockets import Sockets
 from apispec import APISpec
 
 # from apispec.ext.marshmallow import MarshmallowPlugin
@@ -19,7 +20,6 @@
 from .representations import DEFAULT_REPRESENTATIONS
 from .apispec import MarshmallowPlugin, rule_to_apispec_path
 from .td import ThingDescription
-from .sockets import Sockets
 from .event import Event
 
 from .tasks import Pool
@@ -61,7 +61,7 @@ def __init__(
 
         self.extensions = {}
 
-        self.actions = Pool()  # Pool of greenlets for Actions
+        self.actions = Pool()  # Pool of threads for Actions
 
         self.events = {}
 

src/labthings/default_views/tasks.py

@@ -1,18 +1,3 @@
-from gevent.monkey import patch_all
-
-__all__ = ["patch_all"]
-
-"""
-NOTE: THIS FILE IS EXCLUDED FROM OUR UNIT TESTS.
-
-MONKEY PATCHING IN THE MIDDLE OF A TEST SUITE RUNNING
-MAY CAUSE PROBLEMS.
-
-GIVEN THAT THIS MODULE IS SIMPLY A PROXY FOR GEVENTS
-MONKEY PATCHER, TESTSING IS FAIRLY REDUNDANT ANYWAY.
-
-THIS SHOULD BE PERIODICALLY REVISITED TO MAKE SURE ITS
-STILL TRUE.
-
-THANKS
-"""
+def patch_all(*args, **kwargs):
+    # Here for backwards compatibility
+    return