Enforce Editor Lock for Write, Append, and Upload Operations in DataNode

taipy/core/data/data_node.py

@@ -415,7 +415,7 @@ def read(self) -> Any:
             )
             return None
 
-    def append(self, data, job_id: Optional[JobId] = None, **kwargs: Dict[str, Any]):
+    def append(self, data, job_id: Optional[JobId] = None, editor_id: Optional[str] = None, **kwargs: Dict[str, Any]):
         """Append some data to this data node.
 
         Arguments:
@@ -426,12 +426,14 @@ def append(self, data, job_id: Optional[JobId] = None, **kwargs: Dict[str, Any])
         """
         from ._data_manager_factory import _DataManagerFactory
 
+        if self.edit_in_progress and self.editor_id != editor_id:
+            raise DataNodeIsBeingEdited(self.id, self.editor_id)
+
         self._append(data)
-        self.track_edit(job_id=job_id, **kwargs)
-        self.unlock_edit()
+        self.track_edit(job_id=job_id, editor_id=editor_id, **kwargs)
         _DataManagerFactory._build_manager()._set(self)
 
-    def write(self, data, job_id: Optional[JobId] = None, **kwargs: Dict[str, Any]):
+    def write(self, data, job_id: Optional[JobId] = None, editor_id: Optional[str] = None, **kwargs: Dict[str, Any]):
         """Write some data to this data node.
 
         Arguments:
@@ -442,11 +444,26 @@ def write(self, data, job_id: Optional[JobId] = None, **kwargs: Dict[str, Any]):
         """
         from ._data_manager_factory import _DataManagerFactory
 
+        if self.edit_in_progress and editor_id and self.editor_id != editor_id:
+            raise DataNodeIsBeingEdited(self.id, self.editor_id)
+
+        if not editor_id and self.edit_in_progress:
+            print("Orchestrator writing without editor_id")
+
         self._write(data)
-        self.track_edit(job_id=job_id, **kwargs)
-        self.unlock_edit()
+        self.last_edit_date = datetime.now()
+        self.edit_in_progress = False  # Ensure it's not locked after writing
+        self.track_edit(job_id=job_id, editor_id=editor_id, **kwargs)
         _DataManagerFactory._build_manager()._set(self)
 
+    def _upload(self, data, job_id: Optional[JobId] = None, editor_id: Optional[str] = None, **kwargs: Dict[str, Any]):
+        """Handle file uploads with editor lock enforcement."""
+        if self.edit_in_progress and self.editor_id != editor_id:
+            raise DataNodeIsBeingEdited(self.id, self.editor_id)
+
+        self._write(data)  # Assuming _write is called for uploads
+        self.track_edit(job_id=job_id, editor_id=editor_id, **kwargs)
+
     def track_edit(self, **options):
         """Creates and adds a new entry in the edits attribute without writing the data.
 
@@ -471,6 +488,10 @@ def lock_edit(self, editor_id: Optional[str] = None):
         Arguments:
             editor_id (Optional[str]): The editor's identifier.
         """
+
+        if self._editor_expiration_date and datetime.now() > self._editor_expiration_date:
+            self.unlock_edit()
+
         if editor_id:
             if (
                 self.edit_in_progress

taipy/core/data/in_memory.py

@@ -13,7 +13,7 @@
 from typing import Any, Dict, List, Optional, Set
 
 from taipy.common.config.common.scope import Scope
-
+from taipy.core.exceptions.exceptions import DataNodeIsBeingEdited
 from .._version._version_manager_factory import _VersionManagerFactory
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
@@ -98,3 +98,16 @@
 
     def _write(self, data):
         in_memory_storage[self.id] = data
+
+    def _append(self, data):
+        """Append data to the existing data in the in-memory storage."""
+        if self.id not in in_memory_storage:
+            in_memory_storage[self.id] = []
+
+        in_memory_storage[self.id].append(data)  # Append new data
+
+    def _upload(self, data, editor_id: Optional[str] = None):
+        """Simulate uploading data with editor locking enforcement."""
+        if self.edit_in_progress and self.editor_id != editor_id:
+            raise DataNodeIsBeingEdited(self.id, self.editor_id)
+        self._write(data)

tests/core/data/test_data_node.py

@@ -745,3 +745,33 @@ def test_change_data_node_name(self):
         # This new syntax will be the only one allowed: https://github.com/Avaiga/taipy-core/issues/806
         dn.properties["name"] = "baz"
         assert dn.name == "baz"
+
+    def test_locked_data_node_write_should_fail_with_wrong_editor(self):
+        dn = InMemoryDataNode("dn", Scope.SCENARIO)
+        dn.lock_edit("editor_1")
+
+        # Should raise exception for wrong editor
+        with pytest.raises(DataNodeIsBeingEdited):
+            dn.write("data", editor_id="editor_2")
+
+        # Should succeed with correct editor
+        dn.write("data", editor_id="editor_1")
+        assert dn.read() == "data"
+
+    def test_locked_data_node_append_should_fail_with_wrong_editor(self):
+        dn = InMemoryDataNode("dn", Scope.SCENARIO)
+        dn.lock_edit("editor_1")
+
+        with pytest.raises(DataNodeIsBeingEdited):
+            dn.append("data", editor_id="editor_2")
+
+        dn.append("data", editor_id="editor_1")
+        assert dn.read() == ["data"]
+
+    def test_orchestrator_write_without_editor_id(self):
+        dn = InMemoryDataNode("dn", Scope.SCENARIO)
+        dn.lock_edit("editor_1")
+
+        # Orchestrator write without editor_id should succeed
+        dn.write("orchestrator_data")
+        assert dn.read() == "orchestrator_data"