Merge pull request #21 from crs4/wfrun_resource_usage

workflow-run: add resourceUsage
ResearchObject · May 30, 2024 · d0fb908 · d0fb908
2 parents 5297c05 + b6614f5
commit d0fb908
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 2 deletions.
diff --git a/workflow-run/context.json b/workflow-run/context.json
@@ -16,7 +16,8 @@
             "environment": "https://w3id.org/ro/terms/workflow-run#environment",
             "registry": "https://w3id.org/ro/terms/workflow-run#registry",
             "tag": "https://w3id.org/ro/terms/workflow-run#tag",
-            "containerImage": "https://w3id.org/ro/terms/workflow-run#containerImage"
+            "containerImage": "https://w3id.org/ro/terms/workflow-run#containerImage",
+            "resourceUsage": "https://w3id.org/ro/terms/workflow-run#resourceUsage"
         }
     ]
 }
diff --git a/workflow-run/readme.md b/workflow-run/readme.md
@@ -54,3 +54,4 @@ For updates to terms, remember to:
 | registry | Property | registry | A service to register software products, such as container images | ContainerImage | Text | 
 | tag | Property | tag | A tag assigned to a software product, such as a container image | ContainerImage | Text | 
 | containerImage | Property | containerImage | A container image associated with this entity | CreateAction | ContainerImage URL |
+| resourceUsage | Property | resourceUsage | A resource usage item, such as peak memory | CreateAction | PropertyValue |
diff --git a/workflow-run/vocabulary.csv b/workflow-run/vocabulary.csv
@@ -14,3 +14,4 @@
 "registry","Property","registry","A service to register software products, such as container images","ContainerImage","Text"
 "tag","Property","tag","A tag assigned to a software product, such as a container image","ContainerImage","Text"
 "containerImage","Property","containerImage","A container image associated with this entity","CreateAction","ContainerImage URL"
+"resourceUsage","Property","resourceUsage","A resource usage item, such as peak memory","CreateAction","PropertyValue"
diff --git a/workflow-run/wfrun.jsonld b/workflow-run/wfrun.jsonld
@@ -17,7 +17,7 @@
             "registry": "https://w3id.org/ro/terms/workflow-run#registry",
             "tag": "https://w3id.org/ro/terms/workflow-run#tag",
             "containerImage": "https://w3id.org/ro/terms/workflow-run#containerImage",
-
+            "resourceUsage": "https://w3id.org/ro/terms/workflow-run#resourceUsage",
 	    "input": "https://bioschemas.org/properties/input",
 	    "output": "https://bioschemas.org/properties/output",
             "wfrun": "https://w3id.org/ro/terms/workflow-run#",
@@ -65,6 +65,9 @@
                 {
                     "@id": "wfrun:containerImage"
                 },
+                {
+                    "@id": "wfrun:resourceUsage"
+                },
                 {
                     "@id": "wfrun:md5"
                 },
@@ -400,6 +403,27 @@
             },
             "@type": "rdf:Property"
         },
+        {
+            "@id": "wfrun:resourceUsage",
+            "rdfs:comment": {
+                "@language": "en-gb",
+                "@value": "A resource usage item, such as peak memory"
+            },
+            "rdfs:label": {
+                "@language": "en-gb",
+                "@value": "resourceUsage"
+            },
+            "rdfs:isDefinedBy": {
+                "@id": "https://w3id.org/ro/terms/workflow-run#"
+            },
+            "rangeIncludes": {
+                "@id": "PropertyValue"
+            },
+            "domainIncludes": {
+                "@id": "CreateAction"
+            },
+            "@type": "rdf:Property"
+        },
         {
             "@id": "wfrun:md5",
             "rdfs:comment": {

diff --git a/workflow-run/wfrun.nt b/workflow-run/wfrun.nt
@@ -43,6 +43,12 @@
 <https://w3id.org/ro/terms/workflow-run#containerImage> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <https://w3id.org/ro/terms/workflow-run#> .
 <https://w3id.org/ro/terms/workflow-run#containerImage> <http://www.w3.org/2000/01/rdf-schema#label> "containerImage"@en-gb .
 <https://w3id.org/ro/terms/workflow-run#containerImage> <http://www.w3.org/2000/01/rdf-schema#comment> "A container image associated with this entity"@en-gb .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://schema.org/domainIncludes> <http://schema.org/CreateAction> .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://schema.org/rangeIncludes> <http://schema.org/PropertyValue> .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <https://w3id.org/ro/terms/workflow-run#> .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://www.w3.org/2000/01/rdf-schema#label> "resourceUsage"@en-gb .
+<https://w3id.org/ro/terms/workflow-run#resourceUsage> <http://www.w3.org/2000/01/rdf-schema#comment> "A resource usage item, such as peak memory"@en-gb .
 <https://w3id.org/ro/terms/workflow-run#environment> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/1999/02/22-rdf-syntax-ns#Property> .
 <https://w3id.org/ro/terms/workflow-run#environment> <http://schema.org/domainIncludes> <http://schema.org/CreateAction> .
 <https://w3id.org/ro/terms/workflow-run#environment> <http://schema.org/domainIncludes> <http://schema.org/SoftwareApplication> .

diff --git a/workflow-run/wfrun.rdf b/workflow-run/wfrun.rdf
@@ -61,6 +61,7 @@
     <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#sourceParameter"/>
     <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#environment"/>
     <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#containerImage"/>
+    <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#resourceUsage"/>
     <s:description>A Schema.org style Schema definitin of WRROC terms</s:description>
     <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#md5"/>
     <s:hasDefinedTerm rdf:resource="https://w3id.org/ro/terms/workflow-run#DockerImage"/>
@@ -87,6 +88,14 @@
     <s:domainIncludes rdf:resource="http://schema.org/CreateAction"/>
     <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
   </rdf:Description>
+  <rdf:Description rdf:about="https://w3id.org/ro/terms/workflow-run#resourceUsage">
+    <rdfs:comment xml:lang="en-gb">A resource usage item, such as peak memory</rdfs:comment>
+    <rdfs:label xml:lang="en-gb">resourceUsage</rdfs:label>
+    <rdfs:isDefinedBy rdf:resource="https://w3id.org/ro/terms/workflow-run#"/>
+    <s:rangeIncludes rdf:resource="https://w3id.org/ro/terms/workflow-run#PropertyValue"/>
+    <s:domainIncludes rdf:resource="http://schema.org/CreateAction"/>
+    <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#Property"/>
+  </rdf:Description>
   <rdf:Description rdf:about="https://w3id.org/ro/terms/workflow-run#ParameterConnection">
     <rdfs:comment xml:lang="en-gb">A connection between parameters of different applications</rdfs:comment>
     <rdfs:label xml:lang="en-gb">ParameterConnection</rdfs:label>

diff --git a/workflow-run/wfrun.ttl b/workflow-run/wfrun.ttl
@@ -55,6 +55,13 @@ wfrun:containerImage rdf:type rdf:Property ;
                      rdfs:label "containerImage"@en-gb ;
                      rdfs:comment "A container image associated with this entity"@en-gb .
 
+wfrun:resourceUsage rdf:type rdf:Property ;
+                    s:domainIncludes s:CreateAction ;
+                    s:rangeIncludes s:PropertyValue ;
+                    rdfs:isDefinedBy wfrun: ;
+                    rdfs:label "resourceUsage"@en-gb ;
+                    rdfs:comment "A resource usage item, such as peak memory"@en-gb .
+
 wfrun:environment rdf:type rdf:Property ;
                   s:domainIncludes  s:CreateAction,
                                     s:SoftwareApplication,