cognite-toolkit 0.6.86__tar.gz → 0.6.88__tar.gz

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/.vscode/launch.json

@@ -66,6 +66,22 @@
       "console": "integratedTerminal",
       "justMyCode": false
     },
+    {
+      "name": "cdf modules init extlib",
+      "type": "debugpy",
+      "request": "launch",
+      "program": "./cdf-tk-dev.py",
+      "args": [
+        "--override-env",
+        "modules",
+        "init",
+        "cognite_toolkit",
+        "--library-url=https://github.com/cognitedata/library/raw/refs/heads/context/packages.zip",
+        "--library-checksum=sha256:772709baf8eebdcd3966d8963b7ca5d48c23fdb5543101e7ff5fa911b64801d1"
+      ],
+      "console": "integratedTerminal",
+      "justMyCode": false
+    },
     {
       "name": "cdf modules add",
       "type": "debugpy",

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/LIBRARIES.md

@@ -62,6 +62,7 @@ toolkit-version = ">=0.6.0" # Recommended version of the Toolkit required to use
 canCherryPick = true # Set to false if the user should not be able to pick individual modules in this package
 
 [packages.quickstart]
+id = "tk:quickstart"
 title = "Quickstart"
 description = "Get started with Cognite Data Fusion in minutes."
 canCherryPick = false
@@ -79,6 +80,7 @@ modules = [
 
 [packages.infield]
 title = "InField"
+id = "infield"
 description = "Put real-time data into the hands of every field worker."
 modules = [
     "infield/cdf_infield_location",
@@ -98,6 +100,8 @@ The **module.toml** file should contain the following information:
 [module]
 title = "OSIsoft/AVEVA PI Data Source" # Title displayed to the user
 is_selected_by_default = false # If true, the checkbox is selected by default
+id = "aveva"
+package_id = "quickstart"
 
 [dependencies]
 modules = [] # List of modules that this module depends on

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cognite_toolkit
-Version: 0.6.86
+Version: 0.6.88
 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.6.86 → cognite_toolkit-0.6.88}/cdf.toml

@@ -31,7 +31,7 @@ dump = 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.6.86"
+version = "0.6.88"
 
 
 [library.toolkit-data]

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/cdf_toml.py

@@ -78,17 +78,13 @@ class Library:
     url: str
     checksum: str
 
-    @classmethod
-    def load(cls, raw: dict[str, Any]) -> Self:
-        if "url" not in raw:
-            raise ValueError("Library configuration must contain 'url' field.")
+    def __post_init__(self) -> None:
+        self._validate()
 
-        if "checksum" not in raw:
-            raise ValueError("Library configuration must contain 'checksum' field.")
+    def _validate(self) -> None:
+        parsed_url = urllib.parse.urlparse(self.url)
 
-        parsed_url = urllib.parse.urlparse(raw["url"])
-
-        if not all([parsed_url.scheme, parsed_url.netloc]):
+        if not (parsed_url.scheme and parsed_url.netloc):
             raise ValueError("URL is missing scheme or network location (e.g., 'https://domain.com')")
 
         if parsed_url.scheme != "https":
@@ -97,6 +93,14 @@ class Library:
         if not parsed_url.path.casefold().endswith(".zip"):
             raise ValueError("URL must point to a .zip file.")
 
+    @classmethod
+    def load(cls, raw: dict[str, Any]) -> Self:
+        if "url" not in raw:
+            raise ValueError("Library configuration must contain 'url' field.")
+
+        if "checksum" not in raw:
+            raise ValueError("Library configuration must contain 'checksum' field.")
+
         return cls(**raw)
 
 

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/commands/_base.py

@@ -5,6 +5,7 @@ from typing import Any
 from rich import print
 from rich.console import Console
 
+from cognite_toolkit._cdf_tk.data_classes import CommandTrackingInfo
 from cognite_toolkit._cdf_tk.tk_warnings import (
     ToolkitWarning,
     WarningList,
@@ -20,7 +21,7 @@ class ToolkitCommand:
         self.silent = silent
         self.warning_list = WarningList[ToolkitWarning]()
         self.tracker = Tracker(skip_tracking)
-        self._additional_tracking_info: dict[str, Any] = {}
+        self._additional_tracking_info = CommandTrackingInfo()
 
     @property
     def print_warning(self) -> bool:

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/commands/_upload.py

@@ -8,15 +8,16 @@ from rich.console import Console
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.constants import DATA_MANIFEST_STEM, DATA_RESOURCE_DIR
+from cognite_toolkit._cdf_tk.exceptions import ToolkitValueError
 from cognite_toolkit._cdf_tk.storageio import T_Selector, UploadableStorageIO, are_same_kind, get_upload_io
-from cognite_toolkit._cdf_tk.storageio._base import T_WriteCogniteResource, UploadItem
+from cognite_toolkit._cdf_tk.storageio._base import T_WriteCogniteResource, TableUploadableStorageIO, UploadItem
 from cognite_toolkit._cdf_tk.storageio.selectors import Selector, SelectorAdapter
 from cognite_toolkit._cdf_tk.tk_warnings import HighSeverityWarning, MediumSeverityWarning
 from cognite_toolkit._cdf_tk.tk_warnings.fileread import ResourceFormatWarning
 from cognite_toolkit._cdf_tk.utils.auth import EnvironmentVariables
 from cognite_toolkit._cdf_tk.utils.collection import chunker
 from cognite_toolkit._cdf_tk.utils.file import read_yaml_file
-from cognite_toolkit._cdf_tk.utils.fileio import FileReader
+from cognite_toolkit._cdf_tk.utils.fileio import TABLE_READ_CLS_BY_FORMAT, FileReader
 from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, ItemMessage, SuccessResponseItems
 from cognite_toolkit._cdf_tk.utils.producer_worker import ProducerWorkerExecutor
 from cognite_toolkit._cdf_tk.utils.progress_tracker import ProgressTracker
@@ -178,13 +179,19 @@ class UploadCommand(ToolkitCommand):
                     if verbose:
                         console.print(f"{action} {selector.display_name} from {file_display.as_posix()!r}")
                     reader = FileReader.from_filepath(data_file)
+                    is_table = reader.format in TABLE_READ_CLS_BY_FORMAT
+                    if is_table and not isinstance(io, TableUploadableStorageIO):
+                        raise ToolkitValueError(f"{selector.display_name} does not support {reader.format!r} files.")
                     tracker = ProgressTracker[str]([self._UPLOAD])
+                    data_name = "row" if is_table else "line"
                     executor = ProducerWorkerExecutor[list[tuple[str, dict[str, JsonVal]]], Sequence[UploadItem]](
                         download_iterable=chunker(
-                            ((f"line {line_no}", item) for line_no, item in enumerate(reader.read_chunks(), 1)),
+                            ((f"{data_name} {line_no}", item) for line_no, item in enumerate(reader.read_chunks(), 1)),
                             io.CHUNK_SIZE,
                         ),
-                        process=io.json_chunk_to_data,
+                        process=partial(io.rows_to_data, selector=selector)
+                        if is_table and isinstance(io, TableUploadableStorageIO)
+                        else io.json_chunk_to_data,
                         write=partial(
                             self._upload_items,
                             upload_client=upload_client,

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/commands/build_cmd.py

@@ -143,7 +143,9 @@ class BuildCommand(ToolkitCommand):
             config.environment.selected = parse_user_selected_modules(selected, organization_dir)
 
         # tracking which project the module is being built for to trace promotion
-        self._additional_tracking_info["project"] = config.environment.project
+        if client:
+            self._additional_tracking_info.project = client.config.project
+            self._additional_tracking_info.cluster = client.config.cdf_cluster
 
         directory_name = "current directory" if organization_dir == Path(".") else f"project '{organization_dir!s}'"
         root_modules = [
@@ -331,15 +333,11 @@ class BuildCommand(ToolkitCommand):
                 build.append(built_module)
 
                 if module.package_id:
-                    package_ids = self._additional_tracking_info.setdefault("packageId", [])
-                    if module.package_id not in package_ids:
-                        package_ids.append(module.package_id)
+                    self._additional_tracking_info.package_ids.add(module.package_id)
 
                 if module.module_id:
-                    module_ids = self._additional_tracking_info.setdefault("moduleIds", [])
-                    module_ids.append(module.module_id)
+                    self._additional_tracking_info.module_ids.add(module.module_id)
 
-                self.tracker.track_module_build(built_module)
         return build
 
     def _build_module_resources(

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/commands/deploy.py

@@ -79,6 +79,17 @@ class DeployCommand(ToolkitCommand):
         build = self._load_build(build_dir, build_env_name)
 
         client = env_vars.get_client(build.is_strict_validation)
+
+        self._additional_tracking_info.project = client.config.project
+        self._additional_tracking_info.cluster = client.config.cdf_cluster
+
+        if not dry_run:
+            for module in build.read_modules:
+                if module.module_id:
+                    self._additional_tracking_info.module_ids.add(module.module_id)
+                if module.package_id:
+                    self._additional_tracking_info.package_ids.add(module.package_id)
+
         selected_loaders = self._clean_command.get_selected_loaders(build_dir, build.read_resource_folders, include)
         ordered_loaders = self._order_loaders(selected_loaders, build_dir)
         self._start_message(build_dir, dry_run, env_vars)

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/commands/modules.py

@@ -95,11 +95,14 @@ class ModulesCommand(ToolkitCommand):
         print_warning: bool = True,
         skip_tracking: bool = False,
         silent: bool = False,
+        temp_dir_suffix: str | None = None,
         module_source_dir: Path | None = None,
     ):
         super().__init__(print_warning, skip_tracking, silent)
         self._module_source_dir: Path | None = module_source_dir
-        self._temp_download_dir = Path(tempfile.gettempdir()) / MODULES
+        # Use suffix to make temp directory unique (useful for parallel test execution)
+        modules_dir_name = f"{MODULES}.{temp_dir_suffix}" if temp_dir_suffix else MODULES
+        self._temp_download_dir = Path(tempfile.gettempdir()) / modules_dir_name
         if not self._temp_download_dir.exists():
             self._temp_download_dir.mkdir(parents=True, exist_ok=True)
 
@@ -170,6 +173,11 @@ class ModulesCommand(ToolkitCommand):
             print(f"{INDENT}[{'yellow' if mode == 'clean' else 'green'}]Creating {package_name}[/]")
 
             for module in package.modules:
+                if module.module_id:
+                    self._additional_tracking_info.installed_module_ids.add(module.module_id)
+                if module.package_id:
+                    self._additional_tracking_info.installed_package_ids.add(module.package_id)
+
                 if module.dir in seen_modules:
                     # A module can be part of multiple packages
                     continue
@@ -769,7 +777,6 @@ default_organization_dir = "{organization_dir.name}"''',
     def _get_available_packages(self, user_library: Library | None = None) -> tuple[Packages, Path]:
         """
         Returns a list of available packages, either from the CDF TOML file or from external libraries if the feature flag is enabled.
-        If the feature flag is not enabled and no libraries are specified, it returns the built-in modules.
         """
 
         cdf_toml = CDFToml.load()
@@ -778,9 +785,8 @@ default_organization_dir = "{organization_dir.name}"''',
 
             for library_name, library in libraries.items():
                 try:
-                    additional_tracking_info = self._additional_tracking_info.setdefault("downloadedLibraryIds", [])
-                    if library_name not in additional_tracking_info:
-                        additional_tracking_info.append(library_name)
+                    if library_name:
+                        self._additional_tracking_info.downloaded_library_ids.add(library_name)
 
                     print(f"[green]Adding library {library_name} from {library.url}[/]")
                     # Extract filename from URL, fallback to library_name.zip if no filename found
@@ -802,14 +808,12 @@ default_organization_dir = "{organization_dir.name}"''',
 
                     # Track deployment pack download for each package and module
                     for package in packages.values():
-                        downloaded_package_ids = self._additional_tracking_info.setdefault("downloadedPackageIds", [])
-                        if package.id and package.id not in downloaded_package_ids:
-                            downloaded_package_ids.append(package.id)
+                        if package.id:
+                            self._additional_tracking_info.downloaded_package_ids.add(package.id)
 
-                        downloaded_module_ids = self._additional_tracking_info.setdefault("downloadedModuleIds", [])
                         for module in package.modules:
-                            if module.module_id and module.module_id not in downloaded_module_ids:
-                                downloaded_module_ids.append(module.module_id)
+                            if module.module_id:
+                                self._additional_tracking_info.downloaded_module_ids.add(module.module_id)
 
                     return packages, file_path.parent
                 except Exception as e:
@@ -821,7 +825,7 @@ default_organization_dir = "{organization_dir.name}"''',
                         ) from e
 
                     raise ToolkitError(f"Failed to add library {library_name}, {e}")
-            # If no libraries are specified or the flag is not enabled, load the built-in modules
+            # If no libraries are specified or the flag is not enabled, raise an error
             raise ValueError("No valid libraries found.")
         else:
             if user_library:

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/data_classes/__init__.py

@@ -32,6 +32,7 @@ from ._deploy_results import (
 from ._module_directories import ModuleDirectories, ModuleLocation
 from ._module_resources import ModuleResources
 from ._packages import Package, Packages
+from ._tracking_info import CommandTrackingInfo
 from ._yaml_comments import YAMLComments
 
 __all__ = [
@@ -47,6 +48,7 @@ __all__ = [
     "BuiltResource",
     "BuiltResourceFull",
     "BuiltResourceList",
+    "CommandTrackingInfo",
     "ConfigEntry",
     "ConfigYAMLs",
     "DatapointDeployResult",

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/data_classes/_config_yaml.py

@@ -496,7 +496,9 @@ class InitConfigYAML(YAMLWithComments[tuple[str, ...], ConfigEntry], ConfigYAMLC
         adds them to the config.yaml file.
 
         Args:
-            cognite_root_module: The root module for all cognite modules.
+            cognite_root_module: Path to the root directory containing all Cognite modules.
+            defaults_files: List of paths to default.config.yaml files to load.
+            ignore_patterns: Optional list of tuples containing patterns to ignore when loading defaults.
 
         Returns:
             self
@@ -509,6 +511,10 @@ class InitConfigYAML(YAMLWithComments[tuple[str, ...], ConfigEntry], ConfigYAMLC
             raw_file = safe_read(default_config)
             file_comments = self._extract_comments(raw_file, key_prefix=tuple(parts))
             file_data = cast(dict, read_yaml_content(raw_file))
+
+            # a file may exist, but contain just comments, thus the file_data is None
+            if file_data is None:
+                continue
             for key, value in file_data.items():
                 if len(parts) >= 1 and parts[0] in ROOT_MODULES:
                     key_path = (self._variables, *parts, key)

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/data_classes/_module_directories.py

@@ -164,6 +164,8 @@ class ModuleLocation:
         return ReadModule(
             dir=self.dir,
             resource_directories=tuple(self.resource_directories),
+            module_id=self.module_id,
+            package_id=self.package_id,
         )
 
 
@@ -178,6 +180,8 @@ class ReadModule:
 
     dir: Path
     resource_directories: tuple[str, ...]
+    module_id: str | None
+    package_id: str | None
 
     def resource_dir_path(self, resource_folder: str) -> Path | None:
         """Returns the path to a resource in the module.
@@ -198,12 +202,16 @@ class ReadModule:
         return cls(
             dir=Path(data["dir"]),
             resource_directories=tuple(data["resource_directories"]),
+            module_id=data.get("module_id"),
+            package_id=data.get("package_id"),
         )
 
     def dump(self) -> dict[str, Any]:
         return {
             "dir": self.dir.as_posix(),
             "resource_directories": list(self.resource_directories),
+            "module_id": self.module_id,
+            "package_id": self.package_id,
         }
 
 

cognite_toolkit-0.6.88/cognite_toolkit/_cdf_tk/data_classes/_tracking_info.py

@@ -0,0 +1,43 @@
+"""Data class for command tracking information."""
+
+from typing import Any
+
+from pydantic import BaseModel, Field
+
+
+class CommandTrackingInfo(BaseModel):
+    """Structured tracking information for CLI commands.
+
+    This model provides type-safe tracking information that can be collected
+    during command execution and sent to Mixpanel for analytics.
+
+    Attributes:
+        project: The CDF project name.
+        cluster: The CDF cluster name.
+        module_ids: List of module IDs that were deployed or built.
+        package_ids: List of package IDs that were deployed or built.
+        installed_module_ids: List of module IDs that were installed.
+        installed_package_ids: List of package IDs that were installed.
+        downloaded_library_ids: List of library IDs that were downloaded.
+        downloaded_package_ids: List of package IDs that were downloaded.
+        downloaded_module_ids: List of module IDs that were downloaded.
+    """
+
+    project: str | None = Field(default=None)
+    cluster: str | None = Field(default=None)
+    module_ids: set[str] = Field(default_factory=set, alias="moduleIds")
+    package_ids: set[str] = Field(default_factory=set, alias="packageIds")
+    installed_module_ids: set[str] = Field(default_factory=set, alias="installedModuleIds")
+    installed_package_ids: set[str] = Field(default_factory=set, alias="installedPackageIds")
+    downloaded_library_ids: set[str] = Field(default_factory=set, alias="downloadedLibraryIds")
+    downloaded_package_ids: set[str] = Field(default_factory=set, alias="downloadedPackageIds")
+    downloaded_module_ids: set[str] = Field(default_factory=set, alias="downloadedModuleIds")
+
+    def to_dict(self) -> dict[str, Any]:
+        """Convert the tracking info to a dictionary for Mixpanel.
+
+        Returns:
+            A dictionary with camelCase keys matching Mixpanel's expected format.
+            Default values are excluded.
+        """
+        return self.model_dump(by_alias=True, exclude_defaults=True)

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/storageio/_asset_centric.py

@@ -72,7 +72,7 @@ from ._base import (
     Page,
     StorageIOConfig,
     TableStorageIO,
-    UploadableStorageIO,
+    TableUploadableStorageIO,
     UploadItem,
 )
 from .selectors import AssetCentricSelector, AssetSubtreeSelector, DataSetSelector
@@ -82,7 +82,7 @@ class BaseAssetCentricIO(
     Generic[T_ID, T_WriteClass, T_WritableCogniteResource, T_CogniteResourceList, T_WritableCogniteResourceList],
     TableStorageIO[AssetCentricSelector, T_WritableCogniteResource],
     ConfigurableStorageIO[AssetCentricSelector, T_WritableCogniteResource],
-    UploadableStorageIO[AssetCentricSelector, T_WritableCogniteResource, T_WriteClass],
+    TableUploadableStorageIO[AssetCentricSelector, T_WritableCogniteResource, T_WriteClass],
     ABC,
 ):
     RESOURCE_TYPE: ClassVar[AssetCentricType]
@@ -199,6 +199,19 @@ class BaseAssetCentricIO(
             rows.append(chunk)
         return rows
 
+    def row_to_resource(self, row: dict[str, JsonVal], selector: AssetCentricSelector | None = None) -> T_WriteClass:
+        metadata: dict[str, JsonVal] = {}
+        cleaned_row: dict[str, JsonVal] = {}
+        for key, value in row.items():
+            if key.startswith("metadata."):
+                metadata_key = key[len("metadata.") :]
+                metadata[metadata_key] = value
+            else:
+                cleaned_row[key] = value
+        if metadata:
+            cleaned_row["metadata"] = metadata
+        return self.json_to_resource(cleaned_row)
+
 
 class AssetIO(BaseAssetCentricIO[str, AssetWrite, Asset, AssetWriteList, AssetList]):
     KIND = "Assets"

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/storageio/_base.py

@@ -206,6 +206,41 @@ class UploadableStorageIO(
         raise NotImplementedError()
 
 
+class TableUploadableStorageIO(UploadableStorageIO[T_Selector, T_CogniteResource, T_WriteCogniteResource], ABC):
+    """A base class for storage items that support uploading data with table schemas."""
+
+    def rows_to_data(
+        self, rows: list[tuple[str, dict[str, JsonVal]]], selector: T_Selector | None = None
+    ) -> Sequence[UploadItem[T_WriteCogniteResource]]:
+        """Convert a row-based JSON-compatible chunk of data back to a writable Cognite resource list.
+
+        Args:
+            rows: A list of tuples, each containing a source ID and a dictionary representing
+                the data in a JSON-compatible format.
+            selector: Optional selection criteria to identify where to upload the data. This is required for some storage types.
+
+        Returns:
+            A writable Cognite resource list representing the data.
+        """
+        result: list[UploadItem[T_WriteCogniteResource]] = []
+        for source_id, row in rows:
+            item = self.row_to_resource(row, selector=selector)
+            result.append(UploadItem(source_id=source_id, item=item))
+        return result
+
+    @abstractmethod
+    def row_to_resource(self, row: dict[str, JsonVal], selector: T_Selector | None = None) -> T_WriteCogniteResource:
+        """Convert a row-based JSON-compatible dictionary back to a writable Cognite resource.
+
+        Args:
+            row: A dictionary representing the data in a JSON-compatible format.
+            selector: Optional selection criteria to identify where to upload the data. This is required for some storage types.
+        Returns:
+            A writable Cognite resource representing the data.
+        """
+        raise NotImplementedError()
+
+
 class ConfigurableStorageIO(StorageIO[T_Selector, T_CogniteResource], ABC):
     """A base class for storage items that support configurations for different storage items."""
 

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/storageio/_raw.py

@@ -1,4 +1,5 @@
 from collections.abc import Iterable, Sequence
+from uuid import uuid4
 
 from cognite.client.data_classes import Row, RowWrite
 
@@ -8,13 +9,19 @@ from cognite_toolkit._cdf_tk.utils import sanitize_filename
 from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient, HTTPMessage, ItemsRequest
 from cognite_toolkit._cdf_tk.utils.useful_types import JsonVal
 
-from ._base import ConfigurableStorageIO, Page, StorageIOConfig, UploadableStorageIO, UploadItem
+from ._base import (
+    ConfigurableStorageIO,
+    Page,
+    StorageIOConfig,
+    TableUploadableStorageIO,
+    UploadItem,
+)
 from .selectors import RawTableSelector
 
 
 class RawIO(
     ConfigurableStorageIO[RawTableSelector, Row],
-    UploadableStorageIO[RawTableSelector, Row, RowWrite],
+    TableUploadableStorageIO[RawTableSelector, Row, RowWrite],
 ):
     KIND = "RawRows"
     DISPLAY_NAME = "Raw Rows"
@@ -81,3 +88,9 @@ class RawIO(
         yield StorageIOConfig(
             kind=RawTableCRUD.kind, folder_name=RawTableCRUD.folder_name, value=selector.table.model_dump(by_alias=True)
         )
+
+    def row_to_resource(self, row: dict[str, JsonVal], selector: RawTableSelector | None = None) -> RowWrite:
+        key = str(uuid4())
+        if selector is not None and selector.key is not None and selector.key in row:
+            key = str(row.pop(selector.key))
+        return RowWrite(key=key, columns=row)

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/storageio/selectors/_raw.py

@@ -14,6 +14,7 @@ class RawTableSelector(DataSelector):
     type: Literal["rawTable"] = "rawTable"
     kind: Literal["RawRows"] = "RawRows"
     table: SelectedTable
+    key: str | None = None
 
     @property
     def group(self) -> str:

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/tracker.py

@@ -14,7 +14,7 @@ from mixpanel import Consumer, Mixpanel, MixpanelException
 
 from cognite_toolkit._cdf_tk.cdf_toml import CDFToml
 from cognite_toolkit._cdf_tk.constants import IN_BROWSER
-from cognite_toolkit._cdf_tk.data_classes._built_modules import BuiltModule
+from cognite_toolkit._cdf_tk.data_classes import CommandTrackingInfo
 from cognite_toolkit._cdf_tk.tk_warnings import ToolkitWarning, WarningList
 from cognite_toolkit._cdf_tk.utils import get_cicd_environment
 from cognite_toolkit._version import __version__
@@ -49,7 +49,7 @@ class Tracker:
         warning_list: WarningList[ToolkitWarning],
         result: str | Exception,
         cmd: str,
-        additional_tracking_info: dict[str, Any] | None = None,
+        additional_tracking_info: CommandTrackingInfo | None = None,
     ) -> bool:
         warning_count = Counter([type(w).__name__ for w in warning_list])
 
@@ -76,20 +76,10 @@ class Tracker:
         }
 
         if additional_tracking_info:
-            event_information.update(additional_tracking_info)
+            event_information.update(additional_tracking_info.to_dict())
 
         return self._track(f"command{cmd.capitalize()}", event_information)
 
-    def track_module_build(self, module: BuiltModule) -> bool:
-        event_information = {
-            "module": module.name,
-            "location_path": module.location.path.as_posix(),
-            "warning_count": module.warning_count,
-            "status": module.status,
-            **{resource_type: len(resource_build) for resource_type, resource_build in module.resources.items()},
-        }
-        return self._track("moduleBuild", event_information)
-
     def _track(self, event_name: str, event_information: dict[str, Any]) -> bool:
         if self.skip_tracking or not self.opted_in or "PYTEST_CURRENT_TEST" in os.environ:
             return False

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/utils/fileio/__init__.py

@@ -8,6 +8,7 @@ from ._compression import (
 )
 from ._readers import (
     FILE_READ_CLS_BY_FORMAT,
+    TABLE_READ_CLS_BY_FORMAT,
     CSVReader,
     FailedParsing,
     FileReader,
@@ -32,6 +33,7 @@ __all__ = [
     "COMPRESSION_BY_SUFFIX",
     "FILE_READ_CLS_BY_FORMAT",
     "FILE_WRITE_CLS_BY_FORMAT",
+    "TABLE_READ_CLS_BY_FORMAT",
     "TABLE_WRITE_CLS_BY_FORMAT",
     "CSVReader",
     "CSVWriter",

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_cdf_tk/utils/fileio/_readers.py

@@ -87,7 +87,10 @@ class FailedParsing:
     error: str
 
 
-class CSVReader(FileReader):
+class TableReader(FileReader, ABC): ...
+
+
+class CSVReader(TableReader):
     """Reads CSV files and yields each row as a dictionary.
 
     Args:
@@ -229,7 +232,7 @@ class CSVReader(FileReader):
             yield from csv.DictReader(file)
 
 
-class ParquetReader(FileReader):
+class ParquetReader(TableReader):
     format = ".parquet"
 
     def read_chunks(self) -> Iterator[dict[str, JsonVal]]:
@@ -257,6 +260,7 @@ class ParquetReader(FileReader):
 
 
 FILE_READ_CLS_BY_FORMAT: Mapping[str, type[FileReader]] = {}
+TABLE_READ_CLS_BY_FORMAT: Mapping[str, type[TableReader]] = {}
 for subclass in get_concrete_subclasses(FileReader):  # type: ignore[type-abstract]
     if not getattr(subclass, "format", None):
         continue
@@ -267,3 +271,10 @@ for subclass in get_concrete_subclasses(FileReader):  # type: ignore[type-abstra
         )
     # We know we have a dict, but we want to expose FILE_READ_CLS_BY_FORMAT as a Mapping
     FILE_READ_CLS_BY_FORMAT[subclass.format] = subclass  # type: ignore[index]
+    if issubclass(subclass, TableReader):
+        if subclass.format in TABLE_READ_CLS_BY_FORMAT:
+            raise TypeError(
+                f"Duplicate table file format {subclass.format!r} found for classes "
+                f"{TABLE_READ_CLS_BY_FORMAT[subclass.format].__name__!r} and {subclass.__name__!r}."
+            )
+        TABLE_READ_CLS_BY_FORMAT[subclass.format] = subclass  # type: ignore[index]

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

{cognite_toolkit-0.6.86 → cognite_toolkit-0.6.88}/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.6.86
+      image: cognite/toolkit:0.6.88
       env:
         CDF_CLUSTER: ${{ vars.CDF_CLUSTER }}
         CDF_PROJECT: ${{ vars.CDF_PROJECT }}