cognite-toolkit 0.7.9__tar.gz → 0.7.10__tar.gz

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.7.9
+Version: 0.7.10
 Summary: Official Cognite Data Fusion tool for project templates and configuration deployment
 Project-URL: Homepage, https://docs.cognite.com/cdf/deploy/cdf_toolkit/
 Project-URL: Changelog, https://github.com/cognitedata/toolkit/releases

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cdf.toml

@@ -22,7 +22,7 @@ data = true
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"
 
 
 [library.toolkit-data]

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_cdf_tk/commands/_upload.py

@@ -262,7 +262,7 @@ class UploadCommand(ToolkitCommand):
         self, selector: Selector, data_file: Path, client: ToolkitClient
     ) -> UploadableStorageIO | None:
         try:
-            io_cls = get_upload_io(type(selector))
+            io_cls = get_upload_io(selector)
         except ValueError as e:
             self.warn(HighSeverityWarning(f"Could not find StorageIO for selector {selector}: {e}"))
             return None

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_cdf_tk/storageio/__init__.py

@@ -32,12 +32,12 @@ STORAGE_IO_CLASSES = get_concrete_subclasses(StorageIO)  # type: ignore[type-abs
 UPLOAD_IO_CLASSES = get_concrete_subclasses(UploadableStorageIO)  # type: ignore[type-abstract]
 
 
-def get_upload_io(selector_cls: type[DataSelector]) -> type[UploadableStorageIO]:
+def get_upload_io(selector: DataSelector) -> type[UploadableStorageIO]:
     """Get the appropriate UploadableStorageIO class based on the type of the provided selector."""
     for cls in UPLOAD_IO_CLASSES:
-        if issubclass(selector_cls, cls.BASE_SELECTOR):
+        if isinstance(selector, cls.BASE_SELECTOR) and selector.kind == cls.KIND:
             return cls
-    raise ValueError(f"No UploadableStorageIO found for selector of type {selector_cls.__name__}")
+    raise ValueError(f"No UploadableStorageIO found for selector of type {type(selector).__name__}")
 
 
 __all__ = [

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_cdf_tk/storageio/selectors/_datapoints.py

@@ -52,7 +52,7 @@ TimeSeriesColumn = Annotated[
 
 class DataPointsFileSelector(DataSelector):
     type: Literal["datapointsFile"] = "datapointsFile"
-    kind: Literal["datapoints"] = "datapoints"
+    kind: Literal["Datapoints"] = "Datapoints"
 
     timestamp_column: str
     columns: tuple[TimeSeriesColumn, ...]

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

@@ -12,7 +12,7 @@ jobs:
     environment: dev
     name: Deploy
     container:
-      image: cognite/toolkit:0.7.9
+      image: cognite/toolkit:0.7.10
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_repo_files/GitHub/.github/workflows/dry-run.yaml

@@ -10,7 +10,7 @@ jobs:
     environment: dev
     name: Deploy Dry Run
     container:
-      image: cognite/toolkit:0.7.9
+      image: cognite/toolkit:0.7.10
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/cognite_toolkit/_resources/cdf.toml

@@ -4,7 +4,7 @@ default_env = "<DEFAULT_ENV_PLACEHOLDER>"
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"
 
 
 [plugins]

cognite_toolkit-0.7.10/cognite_toolkit/_version.py

@@ -0,0 +1 @@
+__version__ = "0.7.10"

cognite_toolkit-0.7.10/last_changelog_entry.md

@@ -0,0 +1,6 @@
+## Changelog 
+
+### Fixed
+
+- Uploading timeseries or events using `cdf data upload dir` no longer
+creates assets.

cognite_toolkit-0.7.10/last_git_message.txt

@@ -0,0 +1,19 @@
+[CDF-26459] 🐛 Wrong datatype uploaded (#2269)
+
+# Description
+
+When using the Manifest to select which `IO` implementation to use, I
+forgot to check kind which leads to the AssetIO being selected when I
+wanted the `TimeSeriesIO`.
+
+## Bump
+
+- [x] Patch
+- [ ] Skip
+
+## Changelog
+
+### Fixed
+
+- Uploading timeseries or events using `cdf data upload dir` no longer
+creates assets.

cognite_toolkit-0.7.10/last_version.txt

@@ -0,0 +1 @@
+0.7.9

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cognite_toolkit"
-version = "0.7.9"
+version = "0.7.10"
 description = "Official Cognite Data Fusion tool for project templates and configuration deployment"
 authors = [
     {name ="Cognite AS", email="support@cognite.com"}

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/tests/data/build_group_with_unknown_acl/_build_environment.yaml

@@ -4,4 +4,4 @@ project: pytest-project
 type: dev
 selected:
 - modules
-cdf_toolkit_version: 0.7.9
+cdf_toolkit_version: 0.7.10

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/tests/data/cdf_toml_data/cdf.toml

@@ -1,7 +1,7 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"
 
 [plugins]
 graphql = true

{cognite_toolkit-0.7.9/tests/data/complete_org_alpha_flags → cognite_toolkit-0.7.10/tests/data/complete_org}/cdf.toml

@@ -1,4 +1,4 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"

{cognite_toolkit-0.7.9/tests/data/complete_org_only_identifier → cognite_toolkit-0.7.10/tests/data/complete_org_alpha_flags}/cdf.toml

@@ -1,4 +1,4 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"

{cognite_toolkit-0.7.9/tests/data/naughty_project → cognite_toolkit-0.7.10/tests/data/complete_org_only_identifier}/cdf.toml

@@ -1,4 +1,4 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"

{cognite_toolkit-0.7.9/tests/data/complete_org → cognite_toolkit-0.7.10/tests/data/naughty_project}/cdf.toml

@@ -1,4 +1,4 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"

cognite_toolkit-0.7.10/tests/data/project_no_cognite_modules/cdf.toml

@@ -0,0 +1,4 @@
+[modules]
+# This is the version of the modules. It should not be changed manually.
+# It will be updated by the 'cdf modules upgrade' command.
+version = "0.7.10"

cognite_toolkit-0.7.10/tests/data/project_with_bad_modules/cdf.toml

@@ -0,0 +1,4 @@
+[modules]
+# This is the version of the modules. It should not be changed manually.
+# It will be updated by the 'cdf modules upgrade' command.
+version = "0.7.10"

cognite_toolkit-0.7.10/tests/data/project_with_duplicates/cdf.toml

@@ -0,0 +1,4 @@
+[modules]
+# This is the version of the modules. It should not be changed manually.
+# It will be updated by the 'cdf modules upgrade' command.
+version = "0.7.10"

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/tests/data/run_data/cdf.toml

@@ -1,7 +1,7 @@
 [modules]
 # This is the version of the modules. It should not be changed manually.
 # It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"
+version = "0.7.10"
 
 [modules.packages]
 cdf_infield = [

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/tests/test_unit/test_cdf_tk/test_storageio/test_selectors.py

@@ -11,10 +11,12 @@ from cognite_toolkit._cdf_tk.storageio import (
     CanvasIO,
     ChartIO,
     DatapointsIO,
+    EventIO,
     FileContentIO,
     InstanceIO,
     RawIO,
     StorageIO,
+    TimeSeriesIO,
     get_upload_io,
 )
 from cognite_toolkit._cdf_tk.storageio.selectors import (
@@ -73,14 +75,42 @@ def example_selector_data() -> Iterable[tuple]:
         DataSetSelector,
         AssetIO,
         AssetIO.KIND,
-        id="DataSetSelector",
+        id="DataSetSelector Assets",
     )
     yield pytest.param(
         {"type": "assetSubtree", "hierarchy": "root/child", "kind": "Assets"},
         AssetSubtreeSelector,
         AssetIO,
         AssetIO.KIND,
-        id="AssetSubtreeSelector",
+        id="AssetSubtreeSelector Assets",
+    )
+    yield pytest.param(
+        {"type": "dataSet", "dataSetExternalId": "my_data_set", "kind": "TimeSeries"},
+        DataSetSelector,
+        TimeSeriesIO,
+        TimeSeriesIO.KIND,
+        id="DataSetSelector TimeSeries",
+    )
+    yield pytest.param(
+        {"type": "assetSubtree", "hierarchy": "root/child", "kind": "TimeSeries"},
+        AssetSubtreeSelector,
+        TimeSeriesIO,
+        TimeSeriesIO.KIND,
+        id="AssetSubtreeSelector TimeSeries",
+    )
+    yield pytest.param(
+        {"type": "dataSet", "dataSetExternalId": "my_data_set", "kind": "Events"},
+        DataSetSelector,
+        EventIO,
+        EventIO.KIND,
+        id="DataSetSelector Events",
+    )
+    yield pytest.param(
+        {"type": "assetSubtree", "hierarchy": "root/child", "kind": "Events"},
+        AssetSubtreeSelector,
+        EventIO,
+        EventIO.KIND,
+        id="AssetSubtreeSelector Events",
     )
     yield pytest.param(
         {"type": "chartOwner", "ownerId": "doctrino"},
@@ -259,8 +289,8 @@ class TestDataSelectors:
         assert instance.group, f"group property not implemented for {type(instance).__name__}"
 
         # Assert correct IO type
-        assert get_upload_io(type(instance)) is expected_io, (
-            f"Expected {expected_io.__name__} for selector {type(instance).__name__}, got {get_upload_io(type(instance)).__name__}"
+        assert get_upload_io(instance) is expected_io, (
+            f"Expected {expected_io.__name__} for selector {type(instance).__name__}, got {get_upload_io(instance).__name__}"
         )
 
         # Assert selector is hashable
@@ -274,27 +304,3 @@ class TestDataSelectors:
         loaded = SelectorAdapter.validate_python(data)
         assert loaded.model_dump() == instance.model_dump()
         assert type(loaded) is type(instance)
-
-
-class TestGetUploadIO:
-    @pytest.mark.parametrize(
-        "selector,path,expected_io",
-        [
-            pytest.param(
-                RawTableSelector,
-                Path(f"data.{RawIO.KIND}.csv"),
-                RawIO,
-                id="RawTableSelector with path",
-            ),
-            pytest.param(
-                RawTableSelector,
-                Path(f"data.{RawIO.KIND}.csv.gz"),
-                RawIO,
-                id="RawTableSelector with compressed data",
-            ),
-        ],
-    )
-    def test_get_upload_io_with_path(
-        self, selector: type[DataSelector], path: Path, expected_io: type[StorageIO]
-    ) -> None:
-        assert get_upload_io(selector) == expected_io

{cognite_toolkit-0.7.9 → cognite_toolkit-0.7.10}/uv.lock

@@ -271,7 +271,7 @@ wheels = [
 
 [[package]]
 name = "cognite-toolkit"
-version = "0.7.9"
+version = "0.7.10"
 source = { editable = "." }
 dependencies = [
     { name = "cognite-sdk" },

cognite_toolkit-0.7.9/cognite_toolkit/_version.py

@@ -1 +0,0 @@
-__version__ = "0.7.9"

cognite_toolkit-0.7.9/last_changelog_entry.md

@@ -1,7 +0,0 @@
-## Changelog 
-
-### Improved
-
-- If you upload a RAW table in csv or parquet format and specify which
-column to use for key using `cdf data upload dir`, Toolkit now validates
-that the column is in csv/parquet file.

cognite_toolkit-0.7.9/last_git_message.txt

@@ -1,18 +0,0 @@
-[CDF-26158] 🚸Validate raw column (#2266)
-
-# Description
-
-Small check
-
-## Bump
-
-- [x] Patch
-- [ ] Skip
-
-## Changelog
-
-### Improved
-
-- If you upload a RAW table in csv or parquet format and specify which
-column to use for key using `cdf data upload dir`, Toolkit now validates
-that the column is in csv/parquet file.

cognite_toolkit-0.7.9/last_version.txt

@@ -1 +0,0 @@
-0.7.8

cognite_toolkit-0.7.9/tests/data/project_no_cognite_modules/cdf.toml

@@ -1,4 +0,0 @@
-[modules]
-# This is the version of the modules. It should not be changed manually.
-# It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"

cognite_toolkit-0.7.9/tests/data/project_with_bad_modules/cdf.toml

@@ -1,4 +0,0 @@
-[modules]
-# This is the version of the modules. It should not be changed manually.
-# It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"

cognite_toolkit-0.7.9/tests/data/project_with_duplicates/cdf.toml

@@ -1,4 +0,0 @@
-[modules]
-# This is the version of the modules. It should not be changed manually.
-# It will be updated by the 'cdf modules upgrade' command.
-version = "0.7.9"