Merge pull request #10 from sdsc-ordes/fair-levels

Fair levels
sdsc-ordes · Jan 16, 2025 · d73fae9 · d73fae9
2 parents bf81cc9 + 224babc
commit d73fae9
Show file tree

Hide file tree

Showing 4 changed files with 202 additions and 196 deletions.
diff --git a/locales/en/schema.json b/locales/en/schema.json
@@ -12,7 +12,6 @@
     "contentURL_label": "Content URL",
     "dateCreated_label": "Date created",
     "datePublished_label": "Date published",
-    "maintainer_label": "Maintainer",
     "memoryRequirements_label": "Memory requirements",
     "fairLevel_label": "FAIR Level",
     "affiliation_label": "Affiliation",
@@ -33,7 +32,7 @@
     "hasRorId_label": "Has ROR ID",
     "legalName_label": "Legal name",
     "operatingSystem_label": "Operating system",
-    "producer_label": "Producer",
+    "author_label": "Author",
     "programmingLanguage_label": "Programming Language",
     "softwareRequirements_label": "Software requirements",
     "softwareVersion_label": "Software version",
@@ -81,7 +80,6 @@
     "contentURL_placeholder": "Actual bytes of the media object, for example the image file or video file.",
     "dateCreated_placeholder": "The date on which the repository was created.",
     "datePublished_placeholder": "Latest published git release date, else, the publish date of the doi.",
-    "maintainer_placeholder": "A maintainer of a Dataset, software package or other Project. A maintainer is a Person or Organization that manages contributions to, and/or publication of, some (typically complex) artifact.",
     "memoryRequirements_placeholder": "Minimum RAM requirements in GB to run the software, 0 if not applicable.",
     "fairLevel_placeholder": "A score of 1-5 rating the Findability, Accessibility, Interoperability and Reusability of a piece of software based on the presence of certain properties for an instance of software",
     "affiliation_placeholder": "An organization that this person is affiliated with. For example, a university (EPFL/ETHZ), lab, company.",
@@ -102,7 +100,7 @@
     "hasRorId_placeholder": "A Research Organization Registry identifier, that points to a research organization",
     "legalName_placeholder": "The official name of the organization, e.g. the registered company name.",
     "operatingSystem_placeholder": "Operating systems supported (Windows 7/10/11, OS X 10.6, Android 1.6).",
-    "producer_placeholder": "The person or organization who produced the work (e.g. music album, movie, TV/radio series etc.).",
+    "author_placeholder": "The author of the software, this can be organizations or people that are maintainers and/or producers of the software.",
     "programmingLanguage_placeholder": "The computer programming language.",
     "softwareRequirements_placeholder": "Special third party dependencies (e.g. CUDA, Tensorflow etc. related requirements).",
     "softwareVersion_placeholder": "Version of the software instance.",

diff --git a/schemas/ImagingOntology.ttl b/schemas/ImagingOntology.ttl
@@ -57,9 +57,9 @@ schema:datePublished a rdf:Property;
   rdfs:comment "Latest published git release date, else, the publish date of the doi.";
   rdfs:label "Date published" .
 
-schema:maintainer a rdf:Property;
-  rdfs:comment "A maintainer of a Dataset, software package or other Project. A maintainer is a Person or Organization that manages contributions to, and/or publication of, some (typically complex) artifact.";
-  rdfs:label "Maintainer" .
+schema:author a rdf:Property;
+  rdfs:comment "The author of the software, this can be organizations or people that are maintainers and/or producers of the software.";
+  rdfs:label "Author" .
 
 schema:memoryRequirements a rdf:Property;
   rdfs:comment "Minimum RAM requirements in GB to run the software, 0 if not applicable.";
@@ -141,10 +141,6 @@ schema:operatingSystem a rdf:Property;
   rdfs:comment "Operating systems supported (Windows 7/10/11, OS X 10.6, Android 1.6).";
   rdfs:label "Operating system" .
 
-schema:producer a rdf:Property;
-  rdfs:comment "The person or organization who produced the work (e.g. music album, movie, TV/radio series etc.).";
-  rdfs:label "Producer" .
-
 schema:programmingLanguage a rdf:Property;
   rdfs:comment "The computer programming language.";
   rdfs:label "Programming Language" .

diff --git a/schemas/ImagingOntologyCombined.ttl b/schemas/ImagingOntologyCombined.ttl
@@ -22,72 +22,95 @@ prefix vann: <http://purl.org/vocab/vann/>
 		sh:prefix "imag" ;
 		sh:namespace <https://imaging-plaza.epfl.ch/ontology#> ;
 	] .
+  imag:fairlevel0Shape a sh:NodeShape    
+  .
 
-imag:fairlevel0Shape a sh:NodeShape    
-.
-imag:fairlevel1Shape a sh:NodeShape ;
-      sh:targetClass schema:SoftwareSourceCode ;
-			sh:property
-                  [sh:path schema:license ;
-                  sh:minCount 1;
-                  sh:message "Fair level 1"] ,
-
-                  [sh:path schema:citation ;
-                  sh:minCount 1;
-                  sh:message "Fair level 1"] ,
-
-                  [sh:path schema:name ;
-                  sh:minCount 1;
-                  sh:message "Fair level 1"];    
-.
-
-imag:fairlevel2Shape a sh:NodeShape ;
-      sh:targetClass schema:SoftwareSourceCode ;
-			sh:property 
-                  [sh:path sd:readme ;
-                  sh:minCount 1 ;
-                  sh:message "Fair level 2"] ;
-      sh:and (imag:fairlevel1Shape)
-.
-
-imag:fairlevel3Shape a sh:NodeShape ;
-      sh:targetClass schema:SoftwareSourceCode ;
-			sh:property 
-                  [sh:path schema:softwareRequirements ;
-                  sh:minCount 1 ;
-                  sh:message "Fair level 3"] ;
-      sh:and (imag:fairlevel2Shape) 
-.
-
-imag:fairlevel4Shape a sh:NodeShape ;
-      sh:targetClass schema:SoftwareSourceCode ;
-			sh:property 
-                  [sh:path schema:memoryRequirements ;
-                  sh:minCount 1;
-                  sh:message "Fair level 4"] ,
-
-                  [sh:path sd:hasDocumentation ;
-                  sh:minCount 1;
-                  sh:message "Fair level 4"] ,
-
-                  [sh:path sd:hasParameter ;
-                  sh:minCount 1;
-                  sh:message "Fair level 4"] ;
-      sh:and (imag:fairlevel3Shape)
-.
-
-imag:fairlevel5Shape a sh:NodeShape ;
-      sh:targetClass schema:SoftwareSourceCode ;
-			sh:property
-                  [sh:path sd:hasExecutableInstructions ;
-                  sh:minCount 1;
-                  sh:message "Fair level 5"] ,
-
-                  [sh:path imag:hasExecutableNotebook ;
-                  sh:minCount 1;
-                  sh:message "Fair level 5"];
-      sh:and (imag:fairlevel4Shape) 
-.
+  imag:fairlevel1Shape a sh:NodeShape ;
+    sh:targetClass schema:SoftwareSourceCode ;
+        sh:property
+        [sh:path schema:license ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:citation ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:description ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:url ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:dateCreated ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:datePublished ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] ,
+
+        [sh:path schema:image ;
+        sh:minCount 1;
+        sh:message "Fair level 1"] 
+  .
+
+  imag:fairlevel2Shape a sh:NodeShape ;
+    sh:targetClass schema:SoftwareSourceCode ;
+        sh:property 
+        [sh:path sd:readme ;
+        sh:minCount 1 ;
+        sh:message "Fair level 2"] ,
+
+        [sh:path schema:programmingLanguage ;
+        sh:minCount 1 ;
+        sh:message "Fair level 2"] ,
+
+        [sh:path schema:featureList ;
+        sh:minCount 1 ;
+        sh:message "Fair level 2"] ;
+    sh:and (imag:fairlevel1Shape)
+  .
+
+  imag:fairlevel3Shape a sh:NodeShape ;
+    sh:targetClass schema:SoftwareSourceCode ;
+        sh:property 
+        [sh:path schema:softwareRequirements ;
+        sh:minCount 1 ;
+        sh:message "Fair level 3"] ,
+
+        [sh:path schema:supportingData ;
+        sh:minCount 1 ;
+        sh:message "Fair level 3"] ;
+    sh:and (imag:fairlevel2Shape) 
+  .
+
+  imag:fairlevel4Shape a sh:NodeShape ;
+    sh:targetClass schema:SoftwareSourceCode ;
+        sh:property 
+        [sh:path schema:memoryRequirements ;
+        sh:minCount 1;
+        sh:message "Fair level 4"] ,
+
+        [sh:path sd:hasDocumentation ;
+        sh:minCount 1;
+        sh:message "Fair level 4"] ,
+
+        [sh:path sd:hasSoftwareImage ;
+        sh:minCount 1;
+        sh:message "Fair level 4"] ;
+    sh:and (imag:fairlevel3Shape)
+  .
+
+  imag:fairlevel5Shape a sh:NodeShape ;
+    sh:targetClass schema:SoftwareSourceCode ;
+        sh:property
+        [sh:path sd:hasExecutableInstructions ;
+        sh:minCount 1;
+        sh:message "Fair level 5"] ;
+  .
 
 imag:FeatureTaggerRule a sh:SPARQLRule ;
     sh:name "Feature tagger" ;
@@ -123,11 +146,10 @@ sh:property schema:SoftwareApplication-applicationCategory ,
               imag:isPluginModuleOfShape,
               imag:relatedToOrganizationShape, 
               schema:CreativeWork-license ,
-              schema:CreativeWork-maintainer ,
+              schema:CreativeWork-author ,
               schema:SoftwareApplication-memoryRequirements ,
               schema:Thing-name ,
               schema:SoftwareApplication-operatingSystem ,
-              schema:CreativeWork-producer ,
               schema:SoftwareSourceCode-programmingLanguage ,
               schema:SoftwareApplication-softwareRequirements ,
               schema:SoftwareApplication-processorRequirements ,
@@ -322,9 +344,9 @@ schema:CreativeWork-license
   sh:minCount 1 ;
 .
 
-schema:CreativeWork-maintainer
+schema:CreativeWork-author
   a sh:PropertyShape ;
-  sh:path schema:maintainer ;
+  sh:path schema:author ;
   sh:minCount 1 ;
   sh:or (
       [
@@ -405,20 +427,6 @@ schema:SoftwareApplication-operatingSystem
   sh:in ("Linux" "Windows" "MacOS" "Other") ;
 .
 
-schema:CreativeWork-producer
-  a sh:PropertyShape ;
-  sh:path schema:producer ;
-  sh:minCount 1 ;
-  sh:or (
-      [
-        sh:class schema:Organization ;
-      ]
-      [
-        sh:class schema:Person ;
-      ]
-    ) ;
-.
-
 schema:SoftwareSourceCode-programmingLanguage
   a sh:PropertyShape ;
   sh:path schema:programmingLanguage ;
@@ -678,9 +686,9 @@ schema:datePublished a rdf:Property;
   rdfs:comment "Latest published git release date, else, the publish date of the doi.";
   rdfs:label "Date published" .
 
-schema:maintainer a rdf:Property;
-  rdfs:comment "A maintainer of a Dataset, software package or other Project. A maintainer is a Person or Organization that manages contributions to, and/or publication of, some (typically complex) artifact.";
-  rdfs:label "Maintainer" .
+schema:author a rdf:Property;
+  rdfs:comment "The author of the software, this can be organizations or people that are maintainers and/or producers of the software." ;
+  rdfs:label "Author" .
 
 schema:memoryRequirements a rdf:Property;
   rdfs:comment "Minimum RAM requirements in GB to run the software, 0 if not applicable.";
@@ -762,10 +770,6 @@ schema:operatingSystem a rdf:Property;
   rdfs:comment "Operating systems supported (Windows 7/10/11, OS X 10.6, Android 1.6).";
   rdfs:label "Operating system" .
 
-schema:producer a rdf:Property;
-  rdfs:comment "The person or organization who produced the work (e.g. music album, movie, TV/radio series etc.).";
-  rdfs:label "Producer" .
-
 schema:programmingLanguage a rdf:Property;
   rdfs:comment "The computer programming language.";
   rdfs:label "Programming Language" .
@@ -1504,4 +1508,4 @@ imag:Cplusplus a imag:ComputerLanguageEnum ;
 
 imag:MatLab a imag:ComputerLanguageEnum ;
     rdfs:label "MATLAB" ;
-.
+.