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

Author: Joel Collins

.deepsource.toml

@@ -37,6 +37,9 @@ jobs:
       - name: Analyse with MyPy
         run: poetry run mypy src
 
+      - name: Lint with PyLint
+        run: poetry run pylint src/labthings/
+
       - name: Test with pytest
         run: poetry run pytest
 

.github/workflows/codeql-analysis.yml

@@ -39,6 +39,9 @@ jobs:
       - name: Analyse with MyPy
         run: poetry run mypy src
 
+      - name: Lint with PyLint
+        run: poetry run pylint src/labthings/
+
       - name: Test with pytest
         run: poetry run pytest
 

.github/workflows/publish.yml

@@ -35,7 +35,7 @@ sphinx-rtd-theme = "^0.5.0"
 mypy = "^0.790"
 
 [tool.black]
-exclude = '(\.eggs|\.git|\.venv)'
+exclude = '(\.eggs|\.git|\.venv|node_modules/)'
 
 [tool.isort]
 multi_line_output = 3
@@ -45,6 +45,13 @@ use_parentheses = true
 ensure_newline_before_comments = true
 line_length = 88
 
+[tool.pylint.'MESSAGES CONTROL']
+disable = "fixme,C,R"
+max-line-length = 88
+
+[tool.pylint.'MASTER']
+ignore = "marshmallow_jsonschema"
+
 [build-system]
 requires = ["poetry-core>=1.0.0"]
 build-backend = "poetry.core.masonry.api"

.github/workflows/test.yml

@@ -70,7 +70,7 @@ def __init__(
 
         # copy_current_request_context allows threads to access flask current_app
         if has_request_context():
-            logging.debug(f"Copying request context to {self._target}")
+            logging.debug("Copying request context to %s", self._target)
             self._target = copy_current_request_context(self._target)
             try:
                 self.input = request.json
@@ -298,7 +298,7 @@ def terminate(self, exception=ActionKilledException) -> bool:
         :raises which: should cause the thread to exit silently
 
         """
-        _LOG.warning(f"Terminating thread {self}")
+        _LOG.warning("Terminating thread %s", self)
         if not (self.is_alive() or self._is_thread_proc_running()):
             logging.debug("Cannot kill thread that is no longer running.")
             return False
@@ -336,7 +336,7 @@ def stop(self, timeout=None, exception=ActionKilledException) -> bool:
                 self._status = "cancelled"
                 return True
         # If the timeout tracker stopped before the thread died, kill it
-        logging.warning(f"Forcefully terminating thread {self}")
+        logging.warning("Forcefully terminating thread %s", self)
         return self.terminate(exception=exception)
 
 
@@ -346,7 +346,6 @@ def __init__(
         thread: ActionThread,
         dest: LockableDeque,
         level=logging.INFO,
-        default_log_len: int = 100,
     ):
         """Set up a log handler that appends messages to a list.
 
@@ -371,7 +370,7 @@ def __init__(
         self.dest = dest
         self.addFilter(self.check_thread)
 
-    def check_thread(self, record):
+    def check_thread(self, *_):
         """Determine if a thread matches the desired record
 
         :param record:

pyproject.toml

@@ -25,13 +25,14 @@ def init_attribute_functions(self, *args, **kwargs):
         OpenAPIConverter.init_attribute_functions(self, *args, **kwargs)
         self.attribute_functions.append(self.jsonschema_type_mapping)
 
-    def jsonschema_type_mapping(self, field, **kwargs):
+    def jsonschema_type_mapping(self, field, **_):
         """
         :param field:
         :param **kwargs:
         """
         ret = {}
         if hasattr(field, "_jsonschema_type_mapping"):
+            # pylint: disable=protected-access
             schema = field._jsonschema_type_mapping()
             ret.update(schema)
         return ret
@@ -246,6 +247,7 @@ def spec_for_event(cls, event):
         )
         return d
 
+    # pylint: disable=signature-differs
     def operation_helper(self, path, operations, **kwargs):
         """Path helper that allows passing a Flask view function."""
         # rule = self._rule_for_view(interaction.dispatch_request, app=app)

src/labthings/actions/thread.py

@@ -1,4 +1,3 @@
-from .. import fields
 from ..schema import LogRecordSchema
 from ..views import EventView
 

src/labthings/apispec/plugins.py

@@ -7,7 +7,7 @@
 
 from flask import url_for
 
-from typing import List, Dict, Callable
+from typing import List, Dict, Callable, Union
 
 from .utilities import camel_to_snake, get_docstring, snake_to_spine
 from .views.builder import static_from
@@ -36,11 +36,11 @@ def __init__(
         self._meta: dict = {}  # Extra metadata to add to the extension description
 
         self._on_registers: List[
-            Dict
+            Union[Dict, Callable]
         ] = []  # List of dictionaries of functions to run on registration
 
         self._on_components: List[
-            Dict
+            Union[Dict, Callable]
         ] = []  # List of dictionaries of functions to run as components are added
 
         self._cls = str(self)  # String description of extension instance
@@ -64,6 +64,14 @@ def views(self):
         """ """
         return self._views
 
+    @property
+    def on_components(self):
+        return self._on_components
+
+    @property
+    def on_registers(self):
+        return self._on_registers
+
     def add_view(self, view_class, *urls, endpoint=None, **kwargs):
         """
 
@@ -217,7 +225,7 @@ def find_instances_in_module(module, class_to_find):
     for attribute in dir(module):
         if not attribute.startswith("__"):
             if isinstance(getattr(module, attribute), class_to_find):
-                logging.debug(f"Found extension {getattr(module, attribute).name}")
+                logging.debug("Found extension %s", getattr(module, attribute).name)
                 objs.append(getattr(module, attribute))
     return objs
 
@@ -235,17 +243,19 @@ def find_extensions_in_file(extension_path: str, module_name="extensions") -> li
     :rtype: list
 
     """
-    logging.debug(f"Loading extensions from {extension_path}")
+    logging.debug("Loading extensions from %s", extension_path)
 
     spec = util.spec_from_file_location(module_name, extension_path)
     mod = util.module_from_spec(spec)
     sys.modules[spec.name] = mod
 
     try:
         spec.loader.exec_module(mod)  # type: ignore
-    except Exception:  # skipcq: PYL-W0703
+    except Exception:  # pylint: disable=broad-except
         logging.error(
-            f"Exception in extension path {extension_path}: \n{traceback.format_exc()}"
+            "Exception in extension path %s: \n%s",
+            extension_path,
+            traceback.format_exc(),
         )
         return []
     else:
@@ -270,7 +280,7 @@ def find_extensions(extension_dir: str, module_name="extensions") -> list:
     :rtype: list
 
     """
-    logging.debug(f"Loading extensions from {extension_dir}")
+    logging.debug("Loading extensions from %s", extension_dir)
 
     extensions = []
     extension_paths = glob.glob(os.path.join(extension_dir, "*.py"))

src/labthings/default_views/events.py

@@ -27,7 +27,7 @@ def current_labthing(app=None):
     # reach the Flask app object. Just using current_app returns
     # a wrapper, which breaks it's use in Task threads
     try:
-        app = current_app._get_current_object()  # skipcq: PYL-W0212
+        app = current_app._get_current_object()  # pylint: disable=protected-access
     except RuntimeError:
         return None
     ext = app.extensions.get(EXTENSION_NAME, None)