Provide names for generated schemas

Names for schemas must be unique, or they get overwritten.
This change will help, but not 100% fix,
the problem; name clashes are still possible if multiple Actions have
the same __name__.

Author: rwb27

src/labthings/apispec/plugins.py

@@ -148,16 +148,22 @@ def spec_for_property(cls, prop):
         return d
 
     def spec_for_action(self, action):
-        action_input = ensure_schema(action.args)
-        action_output = ensure_schema(action.schema)
+        action_input = ensure_schema(action.args, name=f"{action.__name__}InputSchema")
+        action_output = ensure_schema(action.schema, name=f"{action.__name__}OutputSchema")
         # We combine input/output parameters with ActionSchema using an
         # allOf directive, so we don't end up duplicating the schema
         # for every action.
         if action_output or action_input:
             # It would be neater to combine the schemas in OpenAPI with allOf
-            # but this seems to break everything and I don't know why!!
+            # I think the code below does it - but I'm not yet convinced it is working
+            #TODO: add tests to validate this
             plugin = get_marshamallow_plugin(self.spec)
-            action_io_schema = build_action_schema(action_output, action_input, base_class=Schema)
+            action_io_schema = build_action_schema(
+                action_output, 
+                action_input, 
+                base_class=Schema, 
+                name=f"{action.__name__}InputOutputSchema"
+            )
             action_schema = {
                 "allOf": [
                     plugin.resolver.resolve_schema_dict(ActionSchema),

src/labthings/apispec/utilities.py

@@ -12,7 +12,8 @@ def field2property(field):
     return converter.field2pattern(field)
 
 def ensure_schema(
-    schema: Union[fields.Field, Schema, Dict[str, Union[fields.Field, type]]]
+    schema: Union[fields.Field, Schema, Dict[str, Union[fields.Field, type]]], 
+    name: str = "GeneratedFromDict"
 ) -> Union[dict, Schema]:
     """Create a Schema object, or OpenAPI dictionary, given a Field, Schema, or Dict.
     """
@@ -21,7 +22,7 @@ def ensure_schema(
     if isinstance(schema, fields.Field):
         return field2property(schema)
     elif isinstance(schema, dict):
-        return Schema.from_dict(schema)()
+        return Schema.from_dict(schema, name=name)()
     elif isinstance(schema, Schema):
         return schema
     else: