cognite-toolkit 0.6.97__py3-none-any.whl → 0.7.39__py3-none-any.whl

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/classic.py

@@ -1,6 +1,6 @@
 import collections.abc
 import io
-from collections.abc import Hashable, Iterable
+from collections.abc import Hashable, Iterable, Sequence
 from pathlib import Path
 from typing import Any, final
 
@@ -10,53 +10,69 @@ from cognite.client.data_classes import (
     Asset,
     AssetList,
     AssetWrite,
-    AssetWriteList,
     Event,
     EventList,
     EventWrite,
-    EventWriteList,
-    Sequence,
     SequenceList,
     SequenceWrite,
-    SequenceWriteList,
     capabilities,
 )
+from cognite.client.data_classes import Sequence as CDFSequence
 from cognite.client.data_classes.capabilities import Capability
 from cognite.client.exceptions import CogniteAPIError, CogniteNotFoundError
 from cognite.client.utils.useful_types import SequenceNotStr
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.sequences import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.sequences import (
     ToolkitSequenceRows,
     ToolkitSequenceRowsList,
     ToolkitSequenceRowsWrite,
-    ToolkitSequenceRowsWriteList,
 )
+from cognite_toolkit._cdf_tk.constants import TABLE_FORMATS, YAML_SUFFIX
 from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceCRUD
+from cognite_toolkit._cdf_tk.feature_flags import Flags
 from cognite_toolkit._cdf_tk.resource_classes import AssetYAML, EventYAML, SequenceRowYAML, SequenceYAML
-from cognite_toolkit._cdf_tk.tk_warnings import LowSeverityWarning
+from cognite_toolkit._cdf_tk.tk_warnings import LowSeverityWarning, ToolkitDeprecationWarning
 from cognite_toolkit._cdf_tk.utils import load_yaml_inject_variables
 from cognite_toolkit._cdf_tk.utils.diff_list import diff_list_hashable, diff_list_identifiable
 from cognite_toolkit._cdf_tk.utils.file import read_csv
 
 from .data_organization import DataSetsCRUD, LabelCRUD
 
+_DEPRECATION_WARNING_ISSUED = False
+
 
 @final
-class AssetCRUD(ResourceCRUD[str, AssetWrite, Asset, AssetWriteList, AssetList]):
+class AssetCRUD(ResourceCRUD[str, AssetWrite, Asset]):
     folder_name = "classic"
-    filename_pattern = r"^.*\.Asset$"  # Matches all yaml files whose stem ends with '.Asset'.
-    filetypes = frozenset({"yaml", "yml", "csv", "parquet"})
     resource_cls = Asset
     resource_write_cls = AssetWrite
-    list_cls = AssetList
-    list_write_cls = AssetWriteList
     yaml_cls = AssetYAML
     kind = "Asset"
     dependencies = frozenset({DataSetsCRUD, LabelCRUD})
     _doc_url = "Assets/operation/createAssets"
 
+    @classmethod
+    def is_supported_file(cls, file: Path) -> bool:
+        if Flags.v08.is_enabled():
+            return super().is_supported_file(file)
+        global _DEPRECATION_WARNING_ISSUED
+        if not file.stem.casefold().endswith(cls.kind.casefold()):
+            return False
+        if file.suffix in YAML_SUFFIX:
+            return True
+        if file.suffix in TABLE_FORMATS:
+            if not _DEPRECATION_WARNING_ISSUED:
+                ToolkitDeprecationWarning(
+                    feature="deployment of asset from CSV or Parquet files",
+                    alternative="data plugin and cdf data upload commands",
+                    removal_version="0.8",
+                ).print_warning()
+                _DEPRECATION_WARNING_ISSUED = True
+            return True
+        return False
+
     @property
     def display_name(self) -> str:
         return "assets"
@@ -103,13 +119,13 @@ class AssetCRUD(ResourceCRUD[str, AssetWrite, Asset, AssetWriteList, AssetList])
 
         return capabilities.AssetsAcl(actions, scope)
 
-    def create(self, items: AssetWriteList) -> AssetList:
+    def create(self, items: Sequence[AssetWrite]) -> AssetList:
         return self.client.assets.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> AssetList:
         return self.client.assets.retrieve_multiple(external_ids=ids, ignore_unknown_ids=True)
 
-    def update(self, items: AssetWriteList) -> AssetList:
+    def update(self, items: Sequence[AssetWrite]) -> AssetList:
         return self.client.assets.update(items, mode="replace")
 
     def delete(self, ids: SequenceNotStr[str | int]) -> int:
@@ -232,13 +248,10 @@ class AssetCRUD(ResourceCRUD[str, AssetWrite, Asset, AssetWriteList, AssetList])
 
 
 @final
-class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList, SequenceList]):
+class SequenceCRUD(ResourceCRUD[str, SequenceWrite, CDFSequence]):
     folder_name = "classic"
-    filename_pattern = r"^.*\.Sequence$"
-    resource_cls = Sequence
+    resource_cls = CDFSequence
     resource_write_cls = SequenceWrite
-    list_cls = SequenceList
-    list_write_cls = SequenceWriteList
     kind = "Sequence"
     dependencies = frozenset({DataSetsCRUD, AssetCRUD})
     yaml_cls = SequenceYAML
@@ -249,7 +262,7 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
         return "sequences"
 
     @classmethod
-    def get_id(cls, item: Sequence | SequenceWrite | dict) -> str:
+    def get_id(cls, item: CDFSequence | SequenceWrite | dict) -> str:
         if isinstance(item, dict):
             return item["externalId"]
         if not item.external_id:
@@ -257,7 +270,7 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
         return item.external_id
 
     @classmethod
-    def get_internal_id(cls, item: Sequence | dict) -> int:
+    def get_internal_id(cls, item: CDFSequence | dict) -> int:
         if isinstance(item, dict):
             return item["id"]
         if not item.id:
@@ -270,7 +283,7 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
 
     @classmethod
     def get_required_capability(
-        cls, items: collections.abc.Sequence[SequenceWrite] | None, read_only: bool
+        cls, items: Sequence[SequenceWrite] | None, read_only: bool
     ) -> Capability | list[Capability]:
         if not items and items is not None:
             return []
@@ -294,7 +307,7 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
             resource["assetId"] = self.client.lookup.assets.id(asset_external_id, is_dry_run)
         return SequenceWrite._load(resource)
 
-    def dump_resource(self, resource: Sequence, local: dict[str, Any] | None = None) -> dict[str, Any]:
+    def dump_resource(self, resource: CDFSequence, local: dict[str, Any] | None = None) -> dict[str, Any]:
         dumped = resource.as_write().dump()
         local = local or {}
         if data_set_id := dumped.pop("dataSetId", None):
@@ -322,13 +335,13 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
             return super().diff_list(local, cdf, json_path)
         return diff_list_identifiable(local, cdf, get_identifier=lambda col: col["externalId"])
 
-    def create(self, items: SequenceWriteList) -> SequenceList:
+    def create(self, items: Sequence[SequenceWrite]) -> SequenceList:
         return self.client.sequences.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> SequenceList:
         return self.client.sequences.retrieve_multiple(external_ids=ids, ignore_unknown_ids=True)
 
-    def update(self, items: SequenceWriteList) -> SequenceList:
+    def update(self, items: Sequence[SequenceWrite]) -> SequenceList:
         return self.client.sequences.upsert(items, mode="replace")
 
     def delete(self, ids: SequenceNotStr[str | int]) -> int:
@@ -349,7 +362,7 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
         data_set_external_id: str | None = None,
         space: str | None = None,
         parent_ids: list[Hashable] | None = None,
-    ) -> Iterable[Sequence]:
+    ) -> Iterable[CDFSequence]:
         return iter(
             self.client.sequences(data_set_external_ids=[data_set_external_id] if data_set_external_id else None)
         )
@@ -363,17 +376,10 @@ class SequenceCRUD(ResourceCRUD[str, SequenceWrite, Sequence, SequenceWriteList,
 
 
 @final
-class SequenceRowCRUD(
-    ResourceCRUD[
-        str, ToolkitSequenceRowsWrite, ToolkitSequenceRows, ToolkitSequenceRowsWriteList, ToolkitSequenceRowsList
-    ]
-):
+class SequenceRowCRUD(ResourceCRUD[str, ToolkitSequenceRowsWrite, ToolkitSequenceRows]):
     folder_name = "classic"
-    filename_pattern = r"^.*\.SequenceRow$"
     resource_cls = ToolkitSequenceRows
     resource_write_cls = ToolkitSequenceRowsWrite
-    list_cls = ToolkitSequenceRowsList
-    list_write_cls = ToolkitSequenceRowsWriteList
     kind = "SequenceRow"
     dependencies = frozenset({SequenceCRUD})
     parent_resource = frozenset({SequenceCRUD})
@@ -418,8 +424,7 @@ class SequenceRowCRUD(
         # We don't have any capabilities for SequenceRows, that is already handled by the Sequence
         return []
 
-    def create(self, items: ToolkitSequenceRowsWriteList) -> ToolkitSequenceRowsWriteList:
-        item: ToolkitSequenceRowsWrite
+    def create(self, items: Sequence[ToolkitSequenceRowsWrite]) -> Sequence[ToolkitSequenceRowsWrite]:
         for item in items:
             self.client.sequences.rows.insert(item.as_sequence_rows(), external_id=item.external_id)
         return items
@@ -495,14 +500,10 @@ class SequenceRowCRUD(
 
 
 @final
-class EventCRUD(ResourceCRUD[str, EventWrite, Event, EventWriteList, EventList]):
+class EventCRUD(ResourceCRUD[str, EventWrite, Event]):
     folder_name = "classic"
-    filename_pattern = r"^.*\.Event$"  # Matches all yaml files whose stem ends with '.Event'.
-    filetypes = frozenset({"yaml", "yml"})
     resource_cls = Event
     resource_write_cls = EventWrite
-    list_cls = EventList
-    list_write_cls = EventWriteList
     yaml_cls = EventYAML
     kind = "Event"
     dependencies = frozenset({DataSetsCRUD, AssetCRUD})
@@ -554,13 +555,13 @@ class EventCRUD(ResourceCRUD[str, EventWrite, Event, EventWriteList, EventList])
 
         return capabilities.EventsAcl(actions, scope)
 
-    def create(self, items: EventWriteList) -> EventList:
+    def create(self, items: Sequence[EventWrite]) -> EventList:
         return self.client.events.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> EventList:
         return self.client.events.retrieve_multiple(external_ids=ids, ignore_unknown_ids=True)
 
-    def update(self, items: EventWriteList) -> EventList:
+    def update(self, items: Sequence[EventWrite]) -> EventList:
         return self.client.events.update(items, mode="replace")
 
     def delete(self, ids: SequenceNotStr[str | int]) -> int:

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/configuration.py

@@ -7,11 +7,10 @@ from cognite.client.utils.useful_types import SequenceNotStr
 from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
-from cognite_toolkit._cdf_tk.client.data_classes.search_config import (
+from cognite_toolkit._cdf_tk.client.data_classes.legacy.search_config import (
     SearchConfig,
     SearchConfigList,
     SearchConfigWrite,
-    SearchConfigWriteList,
     ViewId,
 )
 from cognite_toolkit._cdf_tk.cruds._base_cruds import ResourceCRUD
@@ -23,14 +22,11 @@ from .datamodel import ViewCRUD
 
 
 @final
-class SearchConfigCRUD(ResourceCRUD[ViewId, SearchConfigWrite, SearchConfig, SearchConfigWriteList, SearchConfigList]):
+class SearchConfigCRUD(ResourceCRUD[ViewId, SearchConfigWrite, SearchConfig]):
     support_drop = False
     folder_name = "cdf_applications"
-    filename_pattern = r"^.*SearchConfig$"
     resource_cls = SearchConfig
     resource_write_cls = SearchConfigWrite
-    list_cls = SearchConfigList
-    list_write_cls = SearchConfigWriteList
     yaml_cls = SearchConfigYAML
     dependencies = frozenset({ViewCRUD})
     kind = "SearchConfig"
@@ -104,20 +100,17 @@ class SearchConfigCRUD(ResourceCRUD[ViewId, SearchConfigWrite, SearchConfig, Sea
             return diff_list_identifiable(local, cdf, get_identifier=dm_identifier)
         return super().diff_list(local, cdf, json_path)
 
-    def _upsert(self, items: SearchConfigWrite | SearchConfigWriteList) -> SearchConfigList:
+    def _upsert(self, items: Sequence[SearchConfigWrite]) -> SearchConfigList:
         """
         Upsert search configurations using the upsert method
         """
-        if isinstance(items, SearchConfigWrite):
-            items = SearchConfigWriteList([items])
-
         result = SearchConfigList([])
         for item in items:
             created = self.client.search.configurations.upsert(item)
             result.append(created)
         return result
 
-    def create(self, items: SearchConfigWriteList) -> SearchConfigList:
+    def create(self, items: Sequence[SearchConfigWrite]) -> SearchConfigList:
         """
         Create new search configurations using the upsert method
         """
@@ -129,7 +122,7 @@ class SearchConfigCRUD(ResourceCRUD[ViewId, SearchConfigWrite, SearchConfig, Sea
         # The API does not support server-side filtering, so we filter in memory.
         return SearchConfigList([config for config in all_configs if config.view in ids])
 
-    def update(self, items: SearchConfigWriteList) -> SearchConfigList:
+    def update(self, items: Sequence[SearchConfigWrite]) -> SearchConfigList:
         """
         Update search configurations using the upsert method
         """

cognite_toolkit/_cdf_tk/cruds/_resource_cruds/data_organization.py

@@ -21,7 +21,6 @@ from cognite.client.data_classes import (
     DataSet,
     DataSetList,
     DataSetWrite,
-    DataSetWriteList,
     LabelDefinition,
     LabelDefinitionList,
     LabelDefinitionWrite,
@@ -31,7 +30,6 @@ from cognite.client.data_classes.capabilities import (
     Capability,
     DataSetsAcl,
 )
-from cognite.client.data_classes.labels import LabelDefinitionWriteList
 from cognite.client.exceptions import CogniteAPIError, CogniteDuplicatedError, CogniteNotFoundError
 from cognite.client.utils.useful_types import SequenceNotStr
 
@@ -45,13 +43,11 @@ from .auth import GroupAllScopedCRUD
 
 
 @final
-class DataSetsCRUD(ResourceCRUD[str, DataSetWrite, DataSet, DataSetWriteList, DataSetList]):
+class DataSetsCRUD(ResourceCRUD[str, DataSetWrite, DataSet]):
     support_drop = False
     folder_name = "data_sets"
     resource_cls = DataSet
     resource_write_cls = DataSetWrite
-    list_cls = DataSetList
-    list_write_cls = DataSetWriteList
     yaml_cls = DataSetYAML
     kind = "DataSet"
     dependencies = frozenset({GroupAllScopedCRUD})
@@ -142,7 +138,7 @@ class DataSetsCRUD(ResourceCRUD[str, DataSetWrite, DataSet, DataSetWriteList, Da
     def retrieve(self, ids: SequenceNotStr[str]) -> DataSetList:
         return self.client.data_sets.retrieve_multiple(external_ids=ids, ignore_unknown_ids=True)
 
-    def update(self, items: DataSetWriteList) -> DataSetList:
+    def update(self, items: Sequence[DataSetWrite]) -> DataSetList:
         return self.client.data_sets.update(items, mode="replace")
 
     def delete(self, ids: SequenceNotStr[str]) -> int:
@@ -158,15 +154,10 @@ class DataSetsCRUD(ResourceCRUD[str, DataSetWrite, DataSet, DataSetWriteList, Da
 
 
 @final
-class LabelCRUD(
-    ResourceCRUD[str, LabelDefinitionWrite, LabelDefinition, LabelDefinitionWriteList, LabelDefinitionList]
-):
+class LabelCRUD(ResourceCRUD[str, LabelDefinitionWrite, LabelDefinition]):
     folder_name = "classic"
-    filename_pattern = r"^.*Label$"  # Matches all yaml files whose stem ends with *Label.
     resource_cls = LabelDefinition
     resource_write_cls = LabelDefinitionWrite
-    list_cls = LabelDefinitionList
-    list_write_cls = LabelDefinitionWriteList
     yaml_cls = LabelsYAML
     kind = "Label"
     dependencies = frozenset({DataSetsCRUD, GroupAllScopedCRUD})
@@ -210,7 +201,7 @@ class LabelCRUD(
 
         return capabilities.LabelsAcl(actions, scope)
 
-    def create(self, items: LabelDefinitionWriteList) -> LabelDefinitionList:
+    def create(self, items: Sequence[LabelDefinitionWrite]) -> LabelDefinitionList:
         return self.client.labels.create(items)
 
     def retrieve(self, ids: SequenceNotStr[str]) -> LabelDefinitionList: