Tidied up view descriptions

Author: Joel Collins

src/labthings/server/labthing.py

@@ -16,9 +16,7 @@
 from .representations import LabThingsJSONEncoder
 from .spec.apispec import rule_to_apispec_path
 from .spec.apispec_plugins import MarshmallowPlugin
-from .spec.utilities import get_spec
 from .spec.td import ThingDescription
-from .decorators import tag
 from .sockets import Sockets
 from .event import Event
 
@@ -225,7 +223,7 @@ def register_extension(self, extension_object):
 
             # Add route to the extensions blueprint
             self.add_view(
-                tag("extensions")(extension_view["view"]),
+                extension_view["view"],
                 *("/extensions" + url for url in extension_view["urls"]),
                 endpoint=endpoint,
                 **extension_view["kwargs"],

src/labthings/server/semantics/base.py

@@ -1,4 +1,3 @@
-from .. import decorators
 from .. import fields
 
 

src/labthings/server/spec/apispec.py

@@ -4,7 +4,7 @@
 
 from ..schema import Schema
 
-from labthings.core.utilities import get_docstring
+from labthings.core.utilities import get_docstring, get_summary
 
 from werkzeug.routing import Rule
 from http import HTTPStatus
@@ -47,9 +47,7 @@ def view_to_apispec_operations(view, apispec: APISpec):
             ops[op] = {
                 "description": getattr(view, "description", None)
                 or get_docstring(view),
-                "summary": (getattr(view, "description", None) or get_docstring(view))
-                .partition("\n")[0]
-                .strip(),
+                "summary": getattr(view, "summary", None) or get_summary(view),
             }
 
             # Add arguments schema

src/labthings/server/spec/td.py

@@ -6,7 +6,6 @@
 from ..event import Event
 
 from .utilities import (
-    get_spec,
     convert_to_schema_or_json,
     schema_to_json,
 )
@@ -17,37 +16,6 @@
 from labthings.core.utilities import get_docstring, snake_to_camel
 
 
-def find_schema_for_view(view: View):
-    """Find the broadest available data schema for a Flask view
-
-    Looks for GET, POST, and PUT methods depending on if the view is read/write only
-    
-    Args:
-        view (View): View to search for schema
-    
-    Returns:
-        Broadest available schema dictionary for the View. Returns empty dictionary
-            if no schema is found
-    """
-    prop_schema = {}
-    # If prop is read-only
-    if hasattr(view, "get") and not (hasattr(view, "post") or hasattr(view, "put")):
-        # Use GET schema
-        prop_schema = get_spec(view.get).get("_schema", {}).get(200)
-    # If prop is write-only
-    elif not hasattr(view, "get") and (hasattr(view, "post") or hasattr(view, "put")):
-        if hasattr(view, "post"):
-            # Use POST schema
-            prop_schema = get_spec(view.post).get("_params")
-        else:
-            # Use PUT schema
-            prop_schema = get_spec(view.put).get("_params")
-    else:
-        prop_schema = {}
-
-    return prop_schema
-
-
 def build_forms_for_view(rules: list, view: View, op: list):
     """Build a W3C form description for a particular View
 

src/labthings/server/view/builder.py

@@ -66,7 +66,8 @@ def _update(self, args):
         generated_class.schema = schema
 
     if description:
-        generated_class.docs = {"description": description, "summary": description}
+        generated_class.description = description
+        generated_class.summary = description.partition("\n")[0].strip()
 
     # Apply semantic type last, to ensure this is always used
     if semtype:
@@ -114,7 +115,8 @@ def _post_with_args(self, args):
         generated_class.schema = schema
 
     if description:
-        generated_class.docs = {"description": description, "summary": description}
+        generated_class.description = description
+        generated_class.summary = description.partition("\n")[0].strip()
 
     # Apply semantic type last, to ensure this is always used
     if semtype: