updates from feedback

osc-em · Oct 30, 2024 · 6545af3 · 6545af3
1 parent b09592c
commit 6545af3
Show file tree

Hide file tree

Showing 26 changed files with 1,846 additions and 1,554 deletions.
diff --git a/examples/EMDataset-001.yaml b/examples/EMDataset-001.yaml
@@ -26,28 +26,30 @@ acquisition:
   pixel_size:
     value: 1.2
     unit: "Å"
-grants:
-  - project_id: "SNF321"
-    funder: "SNF"
-  - project_id: "Fundingofsomekind"
-    funder: "SNF"
-authors:
-  - name: "Doe"
-    first_name: "John"
-    email: "[email protected]"
-    work_phone: "+4132112312"
-    orcid: "ORCID_123124151231"
-    name_org: "University of Blub"
-    type_org: "Academic"
-    country: "Switzerland"
-  - name: "Doe"
-    first_name: "Jane"
-    email: "[email protected]"
-    work_phone: "+4132112312"
-    orcid: "ORCID_123124151221"
-    name_org: "University of Blub"
-    type_org: "Academic"
-    country: "Switzerland"
+organizational:
+  grants:
+    - project_id: "SNF321"
+    - project_id: "Fundingofsomekind"
+  funder:
+    - funder_name: "SNF"   
+    - funder_name: "SNF"
+  authors:
+    - name: "Doe"
+      first_name: "John"
+      email: "[email protected]"
+      work_phone: "+4132112312"
+      orcid: "ORCID_123124151231"
+      name_org: "University of Blub"
+      type_org: "Academic"
+      country: "Switzerland"
+    - name: "Doe"
+      first_name: "Jane"
+      email: "[email protected]"
+      work_phone: "+4132112312"
+      orcid: "ORCID_123124151221"
+      name_org: "University of Blub"
+      type_org: "Academic"
+      country: "Switzerland"
 sample:
   overall_molecule:
     molecular_type: "Complex"

diff --git a/examples/EMDataset-invalid-001.yaml b/examples/EMDataset-invalid-001.yaml
diff --git a/examples/output/EMDataset-001.json b/examples/output/EMDataset-001.json
@@ -98,37 +98,45 @@
       }
     }
   },
-  "grants": [
-    {
-      "funder": "SNF",
-      "project_id": "SNF321"
-    },
-    {
-      "funder": "SNF",
-      "project_id": "Fundingofsomekind"
-    }
-  ],
-  "authors": {
-    "ORCID_123124151231": {
-      "name": "Doe",
-      "first_name": "John",
-      "email": "[email protected]",
-      "work_phone": "+4132112312",
-      "orcid": "ORCID_123124151231",
-      "country": "Switzerland",
-      "name_org": "University of Blub",
-      "type_org": "Academic"
+  "organizational": {
+    "authors": {
+      "ORCID_123124151231": {
+        "name": "Doe",
+        "first_name": "John",
+        "email": "[email protected]",
+        "work_phone": "+4132112312",
+        "orcid": "ORCID_123124151231",
+        "country": "Switzerland",
+        "name_org": "University of Blub",
+        "type_org": "Academic"
+      },
+      "ORCID_123124151221": {
+        "name": "Doe",
+        "first_name": "Jane",
+        "email": "[email protected]",
+        "work_phone": "+4132112312",
+        "orcid": "ORCID_123124151221",
+        "country": "Switzerland",
+        "name_org": "University of Blub",
+        "type_org": "Academic"
+      }
     },
-    "ORCID_123124151221": {
-      "name": "Doe",
-      "first_name": "Jane",
-      "email": "[email protected]",
-      "work_phone": "+4132112312",
-      "orcid": "ORCID_123124151221",
-      "country": "Switzerland",
-      "name_org": "University of Blub",
-      "type_org": "Academic"
-    }
+    "funder": [
+      {
+        "funder_name": "SNF"
+      },
+      {
+        "funder_name": "SNF"
+      }
+    ],
+    "grants": [
+      {
+        "project_id": "SNF321"
+      },
+      {
+        "project_id": "Fundingofsomekind"
+      }
+    ]
   },
   "@type": "EMDataset"
 }
diff --git a/examples/output/EMDataset-001.yaml b/examples/output/EMDataset-001.yaml
@@ -76,27 +76,29 @@ sample:
     pretreatment_pressure:
       unit: Pa
       value: 1.0e-06
-grants:
-- funder: SNF
-  project_id: SNF321
-- funder: SNF
-  project_id: Fundingofsomekind
-authors:
-  ORCID_123124151231:
-    name: Doe
-    first_name: John
-    email: [email protected]
-    work_phone: '+4132112312'
-    orcid: ORCID_123124151231
-    country: Switzerland
-    name_org: University of Blub
-    type_org: Academic
-  ORCID_123124151221:
-    name: Doe
-    first_name: Jane
-    email: [email protected]
-    work_phone: '+4132112312'
-    orcid: ORCID_123124151221
-    country: Switzerland
-    name_org: University of Blub
-    type_org: Academic
+organizational:
+  authors:
+    ORCID_123124151231:
+      name: Doe
+      first_name: John
+      email: [email protected]
+      work_phone: '+4132112312'
+      orcid: ORCID_123124151231
+      country: Switzerland
+      name_org: University of Blub
+      type_org: Academic
+    ORCID_123124151221:
+      name: Doe
+      first_name: Jane
+      email: [email protected]
+      work_phone: '+4132112312'
+      orcid: ORCID_123124151221
+      country: Switzerland
+      name_org: University of Blub
+      type_org: Academic
+  funder:
+  - funder_name: SNF
+  - funder_name: SNF
+  grants:
+  - project_id: SNF321
+  - project_id: Fundingofsomekind
diff --git a/examples/output/README.md b/examples/output/README.md
@@ -13,28 +13,6 @@ acquisition:
   pixel_size:
     unit: "\u212B"
     value: 1.2
-authors:
-- country: Switzerland
-  email: [email protected]
-  first_name: John
-  name: Doe
-  name_org: University of Blub
-  orcid: ORCID_123124151231
-  type_org: Academic
-  work_phone: '+4132112312'
-- country: Switzerland
-  email: [email protected]
-  first_name: Jane
-  name: Doe
-  name_org: University of Blub
-  orcid: ORCID_123124151221
-  type_org: Academic
-  work_phone: '+4132112312'
-grants:
-- funder: SNF
-  project_id: SNF321
-- funder: SNF
-  project_id: Fundingofsomekind
 instrument:
   acceleration_voltage:
     unit: kV
@@ -49,6 +27,30 @@ instrument:
   illumination: FloodBeam
   imaging: Brightfield
   microscope: Titan
+organizational:
+  authors:
+  - country: Switzerland
+    email: [email protected]
+    first_name: John
+    name: Doe
+    name_org: University of Blub
+    orcid: ORCID_123124151231
+    type_org: Academic
+    work_phone: '+4132112312'
+  - country: Switzerland
+    email: [email protected]
+    first_name: Jane
+    name: Doe
+    name_org: University of Blub
+    orcid: ORCID_123124151221
+    type_org: Academic
+    work_phone: '+4132112312'
+  funder:
+  - funder_name: SNF
+  - funder_name: SNF
+  grants:
+  - project_id: SNF321
+  - project_id: Fundingofsomekind
 sample:
   grid:
     film_support: false

diff --git a/project/excel/oscem_schemas.xlsx b/project/excel/oscem_schemas.xlsx
diff --git a/project/graphql/oscem_schemas.graphql b/project/graphql/oscem_schemas.graphql
@@ -67,8 +67,7 @@ type EMDataset
     acquisition: Acquisition!
     instrument: Instrument!
     sample: Sample!
-    grants: [Grant]!
-    authors: [Author]!
+    organizational: Organizational!
   }
 
 type EnergyFilter
@@ -78,10 +77,16 @@ type EnergyFilter
     width: Integer!
   }
 
+type Funder
+  {
+    funderName: String
+    typeOrg: OrganizationTypeEnum
+    country: String
+  }
+
 type Grant
   {
-    name: String
-    funder: String
+    grantName: String
     startDate: Date
     endDate: Date
     budget: QuantityValue
@@ -141,6 +146,13 @@ type Molecule
     geneName: String
   }
 
+type Organizational
+  {
+    grants: [Grant]
+    authors: [Author]!
+    funder: [Funder]!
+  }
+
 type OverallMolecule
   {
     molecularType: String!

diff --git a/project/jsonld/oscem_schemas.context.jsonld b/project/jsonld/oscem_schemas.context.jsonld
@@ -1,7 +1,7 @@
 {
    "comments": {
       "description": "Auto generated by LinkML jsonld context generator",
-      "generation_date": "2024-10-30T13:48:38",
+      "generation_date": "2024-10-30T15:46:20",
       "source": "oscem_schemas.yaml"
    },
    "@context": {
@@ -15,7 +15,10 @@
          "@id": "instrument"
       },
       "linkml": "https://w3id.org/linkml/",
-      "organizational": "https://w3id.org/osc-em/organizational/",
+      "organizational": {
+         "@type": "@id",
+         "@id": "organizational"
+      },
       "oscem-schemas": "https://w3id.org/osc-em/oscem-schemas/",
       "qudt": "http://qudt.org/schema/qudt/",
       "sample": {
@@ -43,7 +46,7 @@
       },
       "authors": {
          "@type": "@id",
-         "@id": "authors"
+         "@id": "organizational:authors"
       },
       "beamshift": {
          "@type": "@id",
@@ -158,17 +161,24 @@
          "@id": "acquisition:frames_per_movie"
       },
       "funder": {
+         "@type": "@id",
          "@id": "organizational:funder"
       },
+      "funder_name": {
+         "@id": "organizational:funder_name"
+      },
       "gainref_flip_rotate": {
          "@id": "acquisition:gainref_flip_rotate"
       },
       "gene_name": {
          "@id": "sample:gene_name"
       },
+      "grant_name": {
+         "@id": "organizational:grant_name"
+      },
       "grants": {
          "@type": "@id",
-         "@id": "grants"
+         "@id": "organizational:grants"
       },
       "grid": {
          "@type": "@id",
@@ -457,6 +467,9 @@
       "EnergyFilter": {
          "@id": "acquisition:EnergyFilter"
       },
+      "Funder": {
+         "@id": "organizational:Funder"
+      },
       "Grant": {
          "@id": "schema:Grant"
       },
@@ -475,6 +488,9 @@
       "Molecule": {
          "@id": "sample:Molecule"
       },
+      "Organizational": {
+         "@id": "organizational:Organizational"
+      },
       "OverallMolecule": {
          "@id": "sample:OverallMolecule"
       },