Merge branch 'devel-plantsetup' of https://github.com/FAIRChemistry/F…

…AIRFlowChemistry into devel-plantsetup
FAIRChemistry · May 15, 2024 · ceddb1a · ceddb1a
2 parents c29a302 + 7436209
commit ceddb1a
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 24 deletions.
diff --git a/FAIRFlowChemistry/__init__.py b/FAIRFlowChemistry/__init__.py
@@ -1,3 +1,3 @@
 
 __URL__ = "https://github.com/FAIRChemistry/FAIRFlowChemistry"
-__COMMIT__ = "2db1d881b230dff78178a78a2360339d1bc95946"
+__COMMIT__ = "5a065b3f0e832157cb4ab18d031b5495744fc831"
diff --git a/FAIRFlowChemistry/core/calibration.py b/FAIRFlowChemistry/core/calibration.py
@@ -54,7 +54,7 @@ class Calibration(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/component.py b/FAIRFlowChemistry/core/component.py
@@ -8,8 +8,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .componenttype import ComponentType
 from .genericattibute import GenericAttibute
+from .componenttype import ComponentType
 
 
 @forge_signature
@@ -81,7 +81,7 @@ class Component(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/data.py b/FAIRFlowChemistry/core/data.py
@@ -48,7 +48,7 @@ class Data(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/dataset.py b/FAIRFlowChemistry/core/dataset.py
@@ -38,7 +38,7 @@ class GeneralInformation(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
@@ -85,7 +85,7 @@ class Dataset(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/experiment.py b/FAIRFlowChemistry/core/experiment.py
@@ -10,16 +10,16 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .plantsetup import PlantSetup
-from .measurement import Measurement
+from .calibration import Calibration
+from .speciesdata import SpeciesData
 from .data import Data
-from .metadata import Metadata
 from .component import Component
 from .datatype import DataType
-from .quantity import Quantity
+from .plantsetup import PlantSetup
 from .measurementtype import MeasurementType
-from .speciesdata import SpeciesData
-from .calibration import Calibration
+from .measurement import Measurement
+from .quantity import Quantity
+from .metadata import Metadata
 
 
 @forge_signature
@@ -59,7 +59,7 @@ class Experiment(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/genericattibute.py b/FAIRFlowChemistry/core/genericattibute.py
@@ -66,7 +66,7 @@ class GenericAttibute(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/measurement.py b/FAIRFlowChemistry/core/measurement.py
@@ -11,11 +11,11 @@
 from sdRDM.tools.utils import elem2dict
 from datetime import datetime as Datetime
 from .data import Data
-from .metadata import Metadata
 from .component import Component
 from .datatype import DataType
-from .quantity import Quantity
 from .measurementtype import MeasurementType
+from .quantity import Quantity
+from .metadata import Metadata
 
 
 @forge_signature
@@ -60,7 +60,7 @@ class Measurement(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/metadata.py b/FAIRFlowChemistry/core/metadata.py
@@ -76,7 +76,7 @@ class Metadata(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/parameter.py b/FAIRFlowChemistry/core/parameter.py
@@ -39,7 +39,7 @@ class Parameter(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/plantsetup.py b/FAIRFlowChemistry/core/plantsetup.py
@@ -10,9 +10,9 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .componenttype import ComponentType
 from .component import Component
 from .genericattibute import GenericAttibute
+from .componenttype import ComponentType
 
 
 @forge_signature
@@ -50,7 +50,7 @@ class PlantSetup(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/core/speciesdata.py b/FAIRFlowChemistry/core/speciesdata.py
@@ -8,8 +8,8 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .data import Data
 from .calibration import Calibration
+from .data import Data
 
 
 @forge_signature
@@ -68,7 +68,7 @@ class SpeciesData(sdRDM.DataModel, search_mode="unordered"):
         default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
     )
     _commit: Optional[str] = PrivateAttr(
-        default="2db1d881b230dff78178a78a2360339d1bc95946"
+        default="5a065b3f0e832157cb4ab18d031b5495744fc831"
     )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 

diff --git a/FAIRFlowChemistry/schemes/fairflowchemistry_schema.md b/FAIRFlowChemistry/schemes/fairflowchemistry_schema.md
@@ -135,6 +135,7 @@ classDiagram
         +PEAKAREAPERCENTAGE
         +PEAKASSIGNMENT
         +FARADAYEFFIECENCY
+        +SIGNAL
     }
     
     class MeasurementType {