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

…AIRFlowChemistry into devel-plantsetup
FAIRChemistry · May 13, 2024 · 5a065b3 · 5a065b3
2 parents 255bff3 + ebb5c70
commit 5a065b3
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 14 deletions.
diff --git a/FAIRFlowChemistry/__init__.py b/FAIRFlowChemistry/__init__.py
@@ -1,3 +1,3 @@
 
-__URL__ = ""
-__COMMIT__ = ""
+__URL__ = "https://github.com/FAIRChemistry/FAIRFlowChemistry"
+__COMMIT__ = "2db1d881b230dff78178a78a2360339d1bc95946"
diff --git a/FAIRFlowChemistry/core/calibration.py b/FAIRFlowChemistry/core/calibration.py
@@ -50,6 +50,12 @@ class Calibration(sdRDM.DataModel, search_mode="unordered"):
         tag="degree",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/component.py b/FAIRFlowChemistry/core/component.py
@@ -77,6 +77,12 @@ class Component(sdRDM.DataModel, search_mode="unordered"):
         tag="connections",
         json_schema_extra=dict(multiple=True),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/data.py b/FAIRFlowChemistry/core/data.py
@@ -44,6 +44,12 @@ class Data(sdRDM.DataModel, search_mode="unordered"):
         tag="unit",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/dataset.py b/FAIRFlowChemistry/core/dataset.py
@@ -8,10 +8,10 @@
 from sdRDM.base.listplus import ListPlus
 from sdRDM.base.utils import forge_signature
 from sdRDM.tools.utils import elem2dict
-from .measurement import Measurement
-from .experiment import Experiment
 from .speciesdata import SpeciesData
+from .experiment import Experiment
 from .plantsetup import PlantSetup
+from .measurement import Measurement
 
 
 @forge_signature
@@ -34,6 +34,12 @@ class GeneralInformation(sdRDM.DataModel, search_mode="unordered"):
     purpose: Optional[str] = element(
         default=None, tag="purpose", json_schema_extra=dict()
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")
@@ -75,6 +81,12 @@ class Dataset(sdRDM.DataModel, search_mode="unordered"):
         tag="experiments",
         json_schema_extra=dict(multiple=True),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

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 .component import Component
-from .calibration import Calibration
-from .quantity import Quantity
+from .plantsetup import PlantSetup
 from .measurement import Measurement
-from .datatype import DataType
+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 .data import Data
 from .speciesdata import SpeciesData
-from .plantsetup import PlantSetup
+from .calibration import Calibration
 
 
 @forge_signature
@@ -55,6 +55,12 @@ class Experiment(sdRDM.DataModel, search_mode="unordered"):
         tag="species_data",
         json_schema_extra=dict(multiple=True),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/genericattibute.py b/FAIRFlowChemistry/core/genericattibute.py
@@ -62,6 +62,12 @@ class GenericAttibute(sdRDM.DataModel, search_mode="unordered"):
         tag="units_uri",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/measurement.py b/FAIRFlowChemistry/core/measurement.py
@@ -10,12 +10,12 @@
 from sdRDM.base.datatypes import Unit
 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 .quantity import Quantity
 from .datatype import DataType
-from .metadata import Metadata
+from .quantity import Quantity
 from .measurementtype import MeasurementType
-from .data import Data
 
 
 @forge_signature
@@ -56,6 +56,12 @@ class Measurement(sdRDM.DataModel, search_mode="unordered"):
         tag="source",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/metadata.py b/FAIRFlowChemistry/core/metadata.py
@@ -72,6 +72,12 @@ class Metadata(sdRDM.DataModel, search_mode="unordered"):
         tag="description",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/parameter.py b/FAIRFlowChemistry/core/parameter.py
@@ -35,6 +35,12 @@ class Parameter(sdRDM.DataModel, search_mode="unordered"):
         tag="unit",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

diff --git a/FAIRFlowChemistry/core/plantsetup.py b/FAIRFlowChemistry/core/plantsetup.py
@@ -46,6 +46,12 @@ class PlantSetup(sdRDM.DataModel, search_mode="unordered"):
         tag="output",
         json_schema_extra=dict(multiple=True),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")

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 .calibration import Calibration
 from .data import Data
+from .calibration import Calibration
 
 
 @forge_signature
@@ -64,6 +64,12 @@ class SpeciesData(sdRDM.DataModel, search_mode="unordered"):
         tag="faraday_efficiency",
         json_schema_extra=dict(),
     )
+    _repo: Optional[str] = PrivateAttr(
+        default="https://github.com/FAIRChemistry/FAIRFlowChemistry"
+    )
+    _commit: Optional[str] = PrivateAttr(
+        default="2db1d881b230dff78178a78a2360339d1bc95946"
+    )
     _raw_xml_data: Dict = PrivateAttr(default_factory=dict)
 
     @model_validator(mode="after")