Updated examples

Author: Joel Collins

examples/nested_thing.py

@@ -5,7 +5,7 @@
 
 from labthings.server.quick import create_app
 from labthings.server.decorators import ThingProperty, PropertySchema
-from labthings.server.view import View
+from labthings.server.view import PropertyView
 from labthings.server.find import find_component
 from labthings.server.schema import Schema
 from labthings.server import fields
@@ -64,19 +64,15 @@ class MyComponentSchema(Schema):
 """
 
 
-# Register this view as a Thing Property
-@ThingProperty
-# Define the data we're going to output (get), and what to expect in (post)
-@PropertySchema(
-    fields.Integer(
+class DenoiseProperty(PropertyView):
+
+    schema = fields.Integer(
         required=True,
         example=200,
         minimum=100,
         maximum=500,
         description="Value of magic_denoise",
     )
-)
-class DenoiseProperty(View):
 
     # Main function to handle GET requests (read)
     def get(self):
@@ -104,10 +100,11 @@ def post(self, new_property_value):
 """
 
 
-@ThingProperty
-@PropertySchema(MyComponentSchema())
-class MyComponentProperty(View):
+class MyComponentProperty(PropertyView):
     # Main function to handle GET requests
+
+    schema = MyComponentSchema()
+
     def get(self):
         """Show the current data value"""
 

examples/properties_dictionary.py

@@ -3,15 +3,7 @@
 import logging
 
 from labthings.server.quick import create_app
-from labthings.server.decorators import (
-    ThingProperty,
-    PropertySchema,
-    ThingAction,
-    use_args,
-    marshal_task,
-    doc,
-)
-from labthings.server.view import View
+from labthings.server.view import ActionView, PropertyView
 from labthings.server.find import find_component
 from labthings.server import fields
 from labthings.core.utilities import path_relative_to
@@ -28,25 +20,16 @@
 """
 
 
-@ThingAction
-class ExtensionMeasurementAction(View):
-    # Expect JSON parameters in the request body.
-    # Pass to post function as dictionary argument.
-    @use_args(
-        {
-            "averages": fields.Integer(
-                missing=10,
-                example=10,
-                description="Number of data sets to average over",
-            )
-        }
-    )
-    # Shorthand to say we're always going to return a Task object
-    @marshal_task
-    # Main function to handle POST requests
-    def post(self, args):
-        """Start an averaged measurement"""
+class ExtensionMeasurementAction(ActionView):
+    """Start an averaged measurement"""
+
+    args = {
+        "averages": fields.Integer(
+            missing=10, example=10, description="Number of data sets to average over",
+        )
+    }
 
+    def post(self, args):
         # Find our attached component
         my_component = find_component("org.labthings.example.mycomponent")
 
@@ -114,17 +97,15 @@ def data(self):
 """
 
 
-@ThingProperty  # Register this view as a Thing Property
-@PropertySchema(  # Define the data we're going to output (get), and what to expect in (post)
-    fields.Integer(
+class DenoiseProperty(PropertyView):
+
+    schema = fields.Integer(
         required=True,
         example=200,
         minimum=100,
         maximum=500,
         description="Value of magic_denoise",
     )
-)
-class DenoiseProperty(View):
 
     # Main function to handle GET requests (read)
     def get(self):
@@ -152,9 +133,10 @@ def post(self, new_property_value):
 """
 
 
-@ThingProperty
-@PropertySchema(fields.List(fields.Float()))
-class QuickDataProperty(View):
+class QuickDataProperty(PropertyView):
+
+    schema = fields.List(fields.Float())
+
     # Main function to handle GET requests
     def get(self):
         """Show the current data value"""