Merge 208402d into b121182

Author: be-smith

pydatalab/pyproject.toml

@@ -27,6 +27,7 @@ dependencies = [
     "pint ~= 0.24",
     "pandas[excel] ~= 2.2",
     "pymongo ~= 4.7",
+    "deepdiff ~= 8.1",
 ]
 
 [project.urls]

pydatalab/schemas/cell.json

@@ -36,6 +36,11 @@
       "title": "Revisions",
       "type": "object"
     },
+    "version": {
+      "title": "Version",
+      "default": 1,
+      "type": "integer"
+    },
     "creator_ids": {
       "title": "Creator Ids",
       "default": [],
@@ -525,6 +530,11 @@
           "title": "Revisions",
           "type": "object"
         },
+        "version": {
+          "title": "Version",
+          "default": 1,
+          "type": "integer"
+        },
         "creator_ids": {
           "title": "Creator Ids",
           "default": [],

pydatalab/schemas/equipment.json

@@ -36,6 +36,11 @@
       "title": "Revisions",
       "type": "object"
     },
+    "version": {
+      "title": "Version",
+      "default": 1,
+      "type": "integer"
+    },
     "creator_ids": {
       "title": "Creator Ids",
       "default": [],
@@ -489,6 +494,11 @@
           "title": "Revisions",
           "type": "object"
         },
+        "version": {
+          "title": "Version",
+          "default": 1,
+          "type": "integer"
+        },
         "creator_ids": {
           "title": "Creator Ids",
           "default": [],

pydatalab/schemas/sample.json

@@ -48,6 +48,11 @@
       "title": "Revisions",
       "type": "object"
     },
+    "version": {
+      "title": "Version",
+      "default": 1,
+      "type": "integer"
+    },
     "creator_ids": {
       "title": "Creator Ids",
       "default": [],
@@ -578,6 +583,11 @@
           "title": "Revisions",
           "type": "object"
         },
+        "version": {
+          "title": "Version",
+          "default": 1,
+          "type": "integer"
+        },
         "creator_ids": {
           "title": "Creator Ids",
           "default": [],

pydatalab/schemas/startingmaterial.json

@@ -48,6 +48,11 @@
       "title": "Revisions",
       "type": "object"
     },
+    "version": {
+      "title": "Version",
+      "default": 1,
+      "type": "integer"
+    },
     "creator_ids": {
       "title": "Creator Ids",
       "default": [],
@@ -631,6 +636,11 @@
           "title": "Revisions",
           "type": "object"
         },
+        "version": {
+          "title": "Version",
+          "default": 1,
+          "type": "integer"
+        },
         "creator_ids": {
           "title": "Creator Ids",
           "default": [],

pydatalab/src/pydatalab/models/traits.py

@@ -22,6 +22,9 @@ class HasRevisionControl(BaseModel):
     revisions: dict[int, Any] | None = None
     """An optional mapping from old revision numbers to the model state at that revision."""
 
+    version: int = 1
+    """The version number used by the version control system for tracking snapshots."""
+
 
 class HasBlocks(BaseModel):
     blocks_obj: dict[str, DataBlockResponse] = Field({})