Handle missing schema better

Joel Collins · Joel Collins · commit 31a7a04864d4 · 2020-06-22T18:40:42.000+01:00
diff --git a/src/labthings/server/default_views/root.py b/src/labthings/server/default_views/root.py
@@ -3,5 +3,7 @@
 
 
 class RootView(View):
+    """W3C Thing Description"""
+
     def get(self):
         return current_labthing().thing_description.to_dict()
diff --git a/src/labthings/server/spec/apispec.py b/src/labthings/server/spec/apispec.py
@@ -69,8 +69,9 @@ def view_to_apispec_operations(view, apispec: APISpec):
                         "content": {
                             getattr(view, "content_type", "application/json"): {
                                 "schema": convert_to_schema_or_json(schema, apispec)
-                                or Schema()
                             }
+                            if schema
+                            else {}  # If no schema is defined, don't include one in the APISpec
                         },
                     }
             else:

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,9 @@ def view_to_apispec_operations(view, apispec: APISpec):`
`69`	`69`	`"content": {`
`70`	`70`	`getattr(view, "content_type", "application/json"): {`
`71`	`71`	`"schema": convert_to_schema_or_json(schema, apispec)`
`72`		`- or Schema()`
`73`	`72`	`}`
	`73`	`+ if schema`
	`74`	`+ else {} # If no schema is defined, don't include one in the APISpec`
`74`	`75`	`},`
`75`	`76`	`}`
`76`	`77`	`else:`