Merge pull request #114 from labthings/100-restructure

Structural flattening and reorganisation

Author: jtc42

.coveragerc

@@ -1,7 +1,7 @@
 [run]
 branch = True
 source = ./src/labthings
-omit = .venv/*, ./src/labthings/server/wsgi/*, ./src/labthings/server/monkey.py
+omit = .venv/*, ./src/labthings/wsgi.py, ./src/labthings/monkey.py, ./src/labthings/server/*, ./src/labthings/core/*
 concurrency = greenlet
 
 [report]

examples/simple_thing.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python
-from gevent import monkey
+from labthings import monkey
 
-# Patch most system modules. Leave threads untouched so we can still use them normally if needed.
-print("Monkey patching with Gevenet")
-monkey.patch_all(thread=False)
-print("Monkey patching successful")
+monkey.patch_all()
 
 import random
 import math
@@ -25,11 +22,6 @@
 """
 
 
-from gevent.monkey import get_original
-
-get_ident = get_original("_thread", "get_ident")
-
-
 class MyComponent:
     def __init__(self):
         self.x_range = range(-100, 100)

poetry.lock

@@ -21,7 +21,6 @@ flask-cors = "^3.0.8"
 gevent = ">=1.4,<21.0"
 gevent-websocket = "^0.10.1"
 zeroconf = ">=0.24.5,<0.28.0"
-cbor2 = "^5.1.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^5.4"

pyproject.toml

@@ -1 +0,0 @@
-from .core import tasks, lock

src/labthings/__init__.py

@@ -0,0 +1,2 @@
+from .apispec import rule_to_apispec_path
+from .plugins import MarshmallowPlugin

src/labthings/apispec/__init__.py

@@ -1,8 +1,8 @@
 from apispec import APISpec
-from .paths import rule_to_path, rule_to_params
+from ..json.paths import rule_to_path, rule_to_params
 from .utilities import convert_to_schema_or_json
 
-from labthings.core.utilities import get_docstring, get_summary
+from ..utilities import get_docstring, get_summary
 
 from werkzeug.routing import Rule
 from http import HTTPStatus

src/labthings/server/spec/apispec.py src/labthings/apispec/apispec.pysrc/labthings/server/spec/apispec.py renamed to src/labthings/apispec/apispec.py

@@ -0,0 +1,16 @@
+from apispec.ext.marshmallow import OpenAPIConverter
+
+
+class ExtendedOpenAPIConverter(OpenAPIConverter):
+    field_mapping = OpenAPIConverter.field_mapping
+
+    def init_attribute_functions(self, *args, **kwargs):
+        OpenAPIConverter.init_attribute_functions(self, *args, **kwargs)
+        self.attribute_functions.append(self.bytes2json)
+
+    def bytes2json(self, field, **kwargs):
+        ret = {}
+        if hasattr(field, "_jsonschema_type_mapping"):
+            schema = field._jsonschema_type_mapping()
+            ret.update(schema)
+        return ret

src/labthings/apispec/converter.py

@@ -0,0 +1,6 @@
+from apispec.ext.marshmallow import MarshmallowPlugin as _MarshmallowPlugin
+from .converter import ExtendedOpenAPIConverter
+
+
+class MarshmallowPlugin(_MarshmallowPlugin):
+    Converter = ExtendedOpenAPIConverter