Updates for changes to SasData class

Author: summerhenson

sasdata/data.py

@@ -88,10 +88,11 @@ def deserialise(data: str) -> "SasData":
     @staticmethod
     def deserialise_json(json_data: dict) -> "SasData":
         name = json_data["name"]
-        data_contents = [] # deserialize Quantity
+        data_contents = {} # deserialize Quantity
+        dataset_type = json_data["dataset_type"]
         raw_metadata = Group.deserialise_json(json_data["raw_metadata"])
         verbose = json_data["verbose"]
-        return SasData(name, data_contents, raw_metadata, verbose)
+        return SasData(name, data_contents, dataset_type, raw_metadata, verbose)
 
     def serialise(self) -> str:
         return json.dumps(self._serialise_json())
@@ -100,12 +101,11 @@ def serialise(self) -> str:
     def _serialise_json(self) -> dict[str, Any]:
         return {
             "name": self.name,
-            "data_contents": [q.serialise_json() for q in self._data_contents],
+            "data_contents": {q: self._data_contents[q].serialise_json() for q in self._data_contents},
+            "dataset_type": None, # TODO: update when DatasetType is more finalized
             "raw_metadata": self._raw_metadata.serialise_json(),
             "verbose": self._verbose,
-            "metadata": self.metadata.serialise_json(),
-            "ordinate": self.ordinate.serialise_json(),
-            "abscissae": [q.serialise_json() for q in self.abscissae],
+            "metadata": self.metadata.serialise_json(), # TODO: fix metadata eventually
             "mask": {},
             "model_requirements": {}
         }

sasdata/fair_database/data/models.py

@@ -58,14 +58,11 @@ class DataSet(Data):
         "MetaData", blank=True, null=True, on_delete=models.CASCADE
     )
 
-    # ordinate
-    # ordinate = models.ForeignKey("Quantity", on_delete=models.CASCADE)
-
-    # abscissae
-    # abscissae = models.ManyToManyField("Quantity", on_delete=models.CASCADE)
-
     # data contents - maybe ManyToManyField
-    # data_contents = models.JSONField()
+    # data_contents = models.ManyToManyField("Quantity", through="LabeledQuantity")
+
+    # type of dataset
+    # dataset_type = models.JSONField()
 
 
 class Quantity(models.Model):
@@ -84,6 +81,14 @@ class Quantity(models.Model):
     hash = models.IntegerField()
 
 
+"""
+class LabeledQuantity(models.Model):
+    dataset = models.ForeignKey(DataSet, on_delete=models.CASCADE)
+    quantity = models.ForeignKey(Quantity, on_delete=models.CASCADE)
+    label = models.CharField(max_length=20)
+"""
+
+
 # TODO: revisit metadata when sasdata metadata is rewritten
 class MetaData(models.Model):
     """Database model for scattering metadata"""

sasdata/quantities/quantity.py

@@ -1020,7 +1020,11 @@ def jacobian(self) -> list[Operation]:
         return [self.operation_tree.derivative(key) for key in self.reference_key_list]
 
     def _recalculate(self):
-        """ Recalculate the value of this object - primary use case is for testing """
+        """ Recalculate the value of this object - primary use case is
+
+
+
+ for testing """
         return self.operation_tree.evaluate(self.references)
 
     def variance_propagate(self, quantity_units: Unit, covariances: dict[tuple[int, int]: "Quantity"] = {}):