Parcourir la source

fix: rename data node mixin files

trgiangdo il y a 1 an
Parent
commit
e082013768

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

@@ -25,7 +25,7 @@ from taipy.config.common.scope import Scope
 from .._version._version_manager_factory import _VersionManagerFactory
 from ..data.operator import JoinOperator, Operator
 from ..exceptions.exceptions import MissingRequiredProperty, UnknownDatabaseEngine
-from ._abstract_tabular import _TabularDataNodeMixin
+from ._tabular_datanode_mixin import _TabularDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

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

@@ -24,8 +24,8 @@ from ..exceptions.exceptions import InvalidDataNodeType
 from ..notification import Event, EventEntityType, EventOperation, Notifier, _make_event
 from ..scenario.scenario_id import ScenarioId
 from ..sequence.sequence_id import SequenceId
-from ._abstract_file import _FileDataNodeMixin
 from ._data_fs_repository import _DataFSRepository
+from ._file_datanode_mixin import _FileDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId
 

+ 3 - 12
taipy/core/data/_abstract_file.py → taipy/core/data/_file_datanode_mixin.py

@@ -12,7 +12,6 @@
 import os
 import pathlib
 import shutil
-from abc import abstractmethod
 from datetime import datetime
 from os.path import isfile
 from typing import Any, Dict, Optional
@@ -41,16 +40,16 @@ class _FileDataNodeMixin(object):
         self._last_edit_date: Optional[datetime] = None
 
         if self._path and ".data" in self._path:
-            self._path = self._migrate_path(self.storage_type(), self._path)
+            self._path = self._migrate_path(self.storage_type(), self._path)  # type: ignore[attr-defined]
         if not self._path:
-            self._path = self._build_path(self.storage_type())
+            self._path = self._build_path(self.storage_type())  # type: ignore[attr-defined]
 
         properties[self._IS_GENERATED_KEY] = self._is_generated
         properties[self._PATH_KEY] = self._path
 
     def _write_default_data(self, default_value: Any):
         if default_value is not None and not os.path.exists(self._path):
-            self._write(default_value)
+            self._write(default_value)  # type: ignore[attr-defined]
             self._last_edit_date = datetime.now()
             self._edits.append(  # type: ignore[attr-defined]
                 Edit(
@@ -81,14 +80,6 @@ class _FileDataNodeMixin(object):
         self.properties[self._PATH_KEY] = value
         self.properties[self._IS_GENERATED_KEY] = False
 
-    @classmethod
-    def storage_type(cls) -> str:
-        raise NotImplementedError
-
-    @abstractmethod
-    def _write(self, data):
-        raise NotImplementedError
-
     def _build_path(self, storage_type) -> str:
         folder = f"{storage_type}s"
         dir_path = pathlib.Path(Config.core.storage_folder) / folder

+ 0 - 0
taipy/core/data/_abstract_tabular.py → taipy/core/data/_tabular_datanode_mixin.py


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

@@ -20,8 +20,8 @@ from taipy.config.common.scope import Scope
 
 from .._version._version_manager_factory import _VersionManagerFactory
 from ..job.job_id import JobId
-from ._abstract_file import _FileDataNodeMixin
-from ._abstract_tabular import _TabularDataNodeMixin
+from ._file_datanode_mixin import _FileDataNodeMixin
+from ._tabular_datanode_mixin import _TabularDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

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

@@ -21,8 +21,8 @@ from taipy.config.common.scope import Scope
 from .._version._version_manager_factory import _VersionManagerFactory
 from ..exceptions.exceptions import ExposedTypeLengthMismatch, NonExistingExcelSheet, SheetNameLengthMismatch
 from ..job.job_id import JobId
-from ._abstract_file import _FileDataNodeMixin
-from ._abstract_tabular import _TabularDataNodeMixin
+from ._file_datanode_mixin import _FileDataNodeMixin
+from ._tabular_datanode_mixin import _TabularDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

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

@@ -20,7 +20,7 @@ from taipy.config.common.scope import Scope
 
 from .._entity._reload import _self_reload
 from .._version._version_manager_factory import _VersionManagerFactory
-from ._abstract_file import _FileDataNodeMixin
+from ._file_datanode_mixin import _FileDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

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

@@ -21,8 +21,8 @@ from taipy.config.common.scope import Scope
 from .._version._version_manager_factory import _VersionManagerFactory
 from ..exceptions.exceptions import UnknownCompressionAlgorithm, UnknownParquetEngine
 from ..job.job_id import JobId
-from ._abstract_file import _FileDataNodeMixin
-from ._abstract_tabular import _TabularDataNodeMixin
+from ._file_datanode_mixin import _FileDataNodeMixin
+from ._tabular_datanode_mixin import _TabularDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

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

@@ -16,7 +16,7 @@ from typing import List, Optional, Set
 from taipy.config.common.scope import Scope
 
 from .._version._version_manager_factory import _VersionManagerFactory
-from ._abstract_file import _FileDataNodeMixin
+from ._file_datanode_mixin import _FileDataNodeMixin
 from .data_node import DataNode
 from .data_node_id import DataNodeId, Edit
 

+ 1 - 1
taipy/gui_core/_context.py

@@ -52,7 +52,7 @@ from taipy.core import (
 from taipy.core import delete as core_delete
 from taipy.core import get as core_get
 from taipy.core import submit as core_submit
-from taipy.core.data._abstract_tabular import _TabularDataNodeMixin
+from taipy.core.data._tabular_datanode_mixin import _TabularDataNodeMixin
 from taipy.core.notification import CoreEventConsumerBase, EventEntityType
 from taipy.core.notification.event import Event, EventOperation
 from taipy.core.notification.notifier import Notifier