From 7436209fa2ec41c09821b21394daeeb9313eb217 Mon Sep 17 00:00:00 2001 From: sdRDM Bot Date: Mon, 13 May 2024 20:23:33 +0000 Subject: [PATCH] API update --- FAIRFlowChemistry/__init__.py | 2 +- FAIRFlowChemistry/core/calibration.py | 2 +- FAIRFlowChemistry/core/component.py | 4 ++-- FAIRFlowChemistry/core/data.py | 2 +- FAIRFlowChemistry/core/dataset.py | 4 ++-- FAIRFlowChemistry/core/experiment.py | 14 +++++++------- FAIRFlowChemistry/core/genericattibute.py | 2 +- FAIRFlowChemistry/core/measurement.py | 6 +++--- FAIRFlowChemistry/core/metadata.py | 2 +- FAIRFlowChemistry/core/parameter.py | 2 +- FAIRFlowChemistry/core/plantsetup.py | 4 ++-- FAIRFlowChemistry/core/speciesdata.py | 4 ++-- .../schemes/fairflowchemistry_schema.md | 1 + 13 files changed, 25 insertions(+), 24 deletions(-) diff --git a/FAIRFlowChemistry/__init__.py b/FAIRFlowChemistry/__init__.py index 4f7060c..6907b39 100644 --- 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 index 1d13221..521e9cc 100644 --- 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 index ba05ce8..a0a1e84 100644 --- 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 index 8be2af3..c96284f 100644 --- 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 index c28f2ba..fa6e780 100644 --- 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 index 6669175..c1e7a16 100644 --- 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 index ca424a2..1699c95 100644 --- 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 index becc582..b7aedcf 100644 --- 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 index e5a8251..1d657a6 100644 --- 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 index c393181..666787e 100644 --- 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 index 85697b8..d531fe2 100644 --- 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 index 2ac0111..c5102e6 100644 --- 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 index 1e16e36..f99e100 100644 --- a/FAIRFlowChemistry/schemes/fairflowchemistry_schema.md +++ b/FAIRFlowChemistry/schemes/fairflowchemistry_schema.md @@ -135,6 +135,7 @@ classDiagram +PEAKAREAPERCENTAGE +PEAKASSIGNMENT +FARADAYEFFIECENCY + +SIGNAL } class MeasurementType {