Explorar el Código

refactor: remove _get_last_modified_datetime from DataNode

trgiangdo hace 3 semanas
padre
commit
dcc09ee21a

+ 1 - 1
taipy/core/data/csv.py

@@ -25,7 +25,7 @@ from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 
 
-class CSVDataNode(_FileDataNodeMixin, DataNode, _TabularDataNodeMixin):
+class CSVDataNode(DataNode, _FileDataNodeMixin, _TabularDataNodeMixin):
     """Data Node stored as a CSV file.
 
     The *properties* attribute can contain the following optional entries:

+ 4 - 7
taipy/core/data/data_node.py

@@ -210,9 +210,9 @@ class DataNode(_Entity, _Labeled):
     @_self_reload(_MANAGER_NAME)
     def last_edit_date(self) -> Optional[datetime]:
         """The date and time of the last modification."""
-        try:
+        if hasattr(self, "_get_last_modified_datetime"):
             last_modified_datetime = self._get_last_modified_datetime()
-        except NotImplementedError:
+        else:
             last_modified_datetime = None
 
         if last_modified_datetime and last_modified_datetime > self._last_edit_date:  # type: ignore
@@ -507,9 +507,9 @@ class DataNode(_Entity, _Labeled):
         if comment:
             edit[EDIT_COMMENT_KEY] = comment
         if not timestamp:
-            try:
+            if hasattr(self, "_get_last_modified_datetime"):
                 timestamp = self._get_last_modified_datetime() or datetime.now()
-            except NotImplementedError:
+            else:
                 timestamp = datetime.now()
         edit[EDIT_TIMESTAMP_KEY] = timestamp
         self.last_edit_date = edit.get(EDIT_TIMESTAMP_KEY)
@@ -713,9 +713,6 @@ class DataNode(_Entity, _Labeled):
         """Get user properties."""
         return {key: value for key, value in self.properties.items() if key not in self._TAIPY_PROPERTIES}
 
-    def _get_last_modified_datetime(self) -> Optional[datetime]:
-        raise NotImplementedError
-
     @staticmethod
     def _class_map():
         class_map = {}

+ 1 - 1
taipy/core/data/excel.py

@@ -26,7 +26,7 @@ from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 
 
-class ExcelDataNode(_FileDataNodeMixin, DataNode, _TabularDataNodeMixin):
+class ExcelDataNode(DataNode, _FileDataNodeMixin, _TabularDataNodeMixin):
     """Data Node stored as an Excel file.
 
     The Excel file format is _xlsx_.

+ 1 - 1
taipy/core/data/json.py

@@ -24,7 +24,7 @@ from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 
 
-class JSONDataNode(_FileDataNodeMixin, DataNode):
+class JSONDataNode(DataNode, _FileDataNodeMixin):
     """Data Node stored as a JSON file.
 
     The *properties* attribute can contain the following optional entries:

+ 1 - 1
taipy/core/data/parquet.py

@@ -26,7 +26,7 @@ from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 
 
-class ParquetDataNode(_FileDataNodeMixin, DataNode, _TabularDataNodeMixin):
+class ParquetDataNode(DataNode, _FileDataNodeMixin, _TabularDataNodeMixin):
     """Data Node stored as a Parquet file.
 
     The *properties* attribute can contain the following optional entries:

+ 1 - 1
taipy/core/data/pickle.py

@@ -21,7 +21,7 @@ from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 
 
-class PickleDataNode(_FileDataNodeMixin, DataNode):
+class PickleDataNode(DataNode, _FileDataNodeMixin):
     """Data Node stored as a pickle file.
 
     The *properties* attribute can contain the following optional entries: