Merge pull request #469 from djarecka/satra_ref/linkml1

additional changes based on testing library

contexts/reproschema

@@ -62,7 +62,7 @@
          "@type": "xsd:string"
       },
       "compute": {
-         "@container": "@list"
+         "@id": "reproschema:compute"
       },
       "contentUrl": {
          "@type": "@id",

linkml-schema/reproschema.yaml

@@ -572,6 +572,7 @@ classes:
   ResponseOption:
     title: Response option
     description: An element (object or by URL)to describe the properties of response of the Item.
+    is_a: CreativeWork
     slots:
     - choices
     - datumType

linkml-schema/reproschema_linkml.py

@@ -121,7 +121,7 @@ class Activity(CreativeWork):
     altLabel: Optional[Dict[str, str]] = Field(default_factory=dict, title="alternate label", description="""The alternate label.""")
     associatedMedia: Optional[str] = Field(None, title="associatedMedia", description="""A media object that encodes this CreativeWork. This property is a synonym for encoding.""")
     citation: Optional[Dict[str, str]] = Field(default_factory=dict)
-    compute: Optional[List[ComputeSpecification]] = Field(default_factory=list, title="computation", description="""An array of objects indicating computations in an activity or protocol and maps it to the corresponding Item. scoring logic is a subset of all computations that could be performed and not all computations will be scoring. For example, one may want to do conversion from one unit to another.""")
+    compute: Optional[Union[List[ComputeSpecification], ComputeSpecification]] = Field(default_factory=list, title="computation", description="""An array of objects indicating computations in an activity or protocol and maps it to the corresponding Item. scoring logic is a subset of all computations that could be performed and not all computations will be scoring. For example, one may want to do conversion from one unit to another.""")
     cronTable: Optional[str] = Field(None, title="cronTable", description="""TODO not described in reproschema""")
     description: Optional[Dict[str, str]] = Field(default_factory=dict)
     image: Optional[Union[ImageObject, str]] = Field(None, title="image", description="""An image of the item. This can be a <a class=\"localLink\" href=\"http://schema.org/URL\">URL</a> or a fully described <a class=\"localLink\" href=\"http://schema.org/ImageObject\">ImageObject</a>.""")
@@ -240,7 +240,7 @@ class Protocol(CreativeWork):
     about: Optional[str] = Field(None, description="""The subject matter of the Field.""")
     altLabel: Optional[Dict[str, str]] = Field(default_factory=dict, title="alternate label", description="""The alternate label.""")
     associatedMedia: Optional[str] = Field(None, title="associatedMedia", description="""A media object that encodes this CreativeWork. This property is a synonym for encoding.""")
-    compute: Optional[List[ComputeSpecification]] = Field(default_factory=list, title="computation", description="""An array of objects indicating computations in an activity or protocol and maps it to the corresponding Item. scoring logic is a subset of all computations that could be performed and not all computations will be scoring. For example, one may want to do conversion from one unit to another.""")
+    compute: Optional[Union[List[ComputeSpecification], ComputeSpecification]] = Field(default_factory=list, title="computation", description="""An array of objects indicating computations in an activity or protocol and maps it to the corresponding Item. scoring logic is a subset of all computations that could be performed and not all computations will be scoring. For example, one may want to do conversion from one unit to another.""")
     cronTable: Optional[str] = Field(None, title="cronTable", description="""TODO not described in reproschema""")
     description: Optional[Dict[str, str]] = Field(default_factory=dict)
     landingPage: Optional[List[Union[LandingPage, str]]] = Field(default_factory=list, title="Landing page content", description="""An element (by URL) to point to the protocol readme or landing page.""")
@@ -281,7 +281,7 @@ class ResponseActivity(CreativeWork):
 
 
 
-class ResponseOption(ConfiguredBaseModel):
+class ResponseOption(CreativeWork):
     """
     An element (object or by URL)to describe the properties of response of the Item.
     """
@@ -292,6 +292,8 @@ class ResponseOption(ConfiguredBaseModel):
     multipleChoice: Optional[bool] = Field(None, title="Multiple choice response expectation", description="""Indicates (by bool) if response for the Item has one or more answer.""")
     unitOptions: Optional[List[UnitOption]] = Field(default_factory=list, title="unitOptions", description="""A list of objects to represent a human displayable name alongside the more formal value for units.""")
     valueType: Optional[List[str]] = Field(default_factory=list, title="The type of the response", description="""The type of the response of an item. For example, string, integer, etc.""")
+    id: Optional[str] = Field(None)
+    category: Optional[str] = Field(None)