cognite-toolkit 0.7.19__tar.gz → 0.7.21__tar.gz

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/PKG-INFO

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

@@ -23,7 +23,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.19"
+version = "0.7.21"
 
 
 [library.toolkit-data]

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/cognite_toolkit/_cdf_tk/cruds/_resource_cruds/fieldops.py

@@ -437,4 +437,5 @@ class InFieldCDMLocationConfigCRUD(ResourceCRUD[NodeIdentifier, InFieldCDMLocati
         elif len(json_path) == 4 and json_path[:2] == ("dataExplorationConfig", "filters") and json_path[3] == "values":
             # Handles dataExplorationConfig.filters[i].values
             return diff_list_hashable(local, cdf)
+
         return super().diff_list(local, cdf, json_path)

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/cognite_toolkit/_cdf_tk/storageio/_asset_centric.py

@@ -219,9 +219,16 @@ class UploadableAssetCentricIO(
                 security_category_names.add(security_category_external_id)
         self.client.lookup.security_categories.id(list(security_category_names))
 
-    def row_to_resource(
-        self, source_id: str, row: dict[str, JsonVal], selector: AssetCentricSelector | None = None
-    ) -> T_ResourceRequest:
+    def rows_to_data(
+        self, rows: list[tuple[str, dict[str, JsonVal]]], selector: AssetCentricSelector | None = None
+    ) -> Sequence[UploadItem[T_ResourceRequest]]:
+        # We need to populate caches for any external IDs used in the rows before converting to resources.
+        # Thus, we override this method instead of row_to_resource, and reuse the json_to_resource method that
+        # does the cache population.
+        return self.json_chunk_to_data([(source_id, self.row_to_json(row)) for source_id, row in rows])
+
+    @classmethod
+    def row_to_json(cls, row: dict[str, JsonVal]) -> dict[str, JsonVal]:
         metadata: dict[str, JsonVal] = {}
         cleaned_row: dict[str, JsonVal] = {}
         for key, value in row.items():
@@ -232,7 +239,14 @@ class UploadableAssetCentricIO(
                 cleaned_row[key] = value
         if metadata:
             cleaned_row["metadata"] = metadata
-        return self.json_to_resource(cleaned_row)
+        return cleaned_row
+
+    def row_to_resource(
+        self, source_id: str, row: dict[str, JsonVal], selector: AssetCentricSelector | None = None
+    ) -> T_ResourceRequest:
+        raise NotImplementedError(
+            f"This method should not be called. {type(self).__name__} overrides rows_to_data instead."
+        )
 
 
 class AssetIO(UploadableAssetCentricIO[Asset, AssetWrite]):

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/cognite_toolkit/_cdf_tk/storageio/_file_content.py

@@ -12,7 +12,9 @@ from cognite.client.data_classes.data_modeling import NodeId, ViewId
 from cognite_toolkit._cdf_tk.client import ToolkitClient
 from cognite_toolkit._cdf_tk.cruds import FileMetadataCRUD
 from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
-from cognite_toolkit._cdf_tk.utils.collection import chunker_sequence
+from cognite_toolkit._cdf_tk.protocols import ResourceResponseProtocol
+from cognite_toolkit._cdf_tk.utils import sanitize_filename
+from cognite_toolkit._cdf_tk.utils.collection import chunker, chunker_sequence
 from cognite_toolkit._cdf_tk.utils.fileio import MultiFileReader
 from cognite_toolkit._cdf_tk.utils.http_client import (
     DataBodyRequest,
@@ -35,6 +37,7 @@ from .selectors._file_content import (
     FileIdentifier,
     FileInstanceID,
     FileInternalID,
+    FileTemplateSelector,
 )
 from .selectors._file_content import NodeId as SelectorNodeId
 
@@ -47,7 +50,16 @@ class UploadFileContentItem(UploadItem[FileMetadataWrite]):
     mime_type: str
 
 
-class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileMetadataWrite]):
+@dataclass
+class MetadataWithFilePath(ResourceResponseProtocol):
+    metadata: FileMetadata
+    file_path: Path
+
+    def as_write(self) -> FileMetadataWrite:
+        return self.metadata.as_write()
+
+
+class FileContentIO(UploadableStorageIO[FileContentSelector, MetadataWithFilePath, FileMetadataWrite]):
     SUPPORTED_DOWNLOAD_FORMATS = frozenset({".ndjson"})
     SUPPORTED_COMPRESSIONS = frozenset({".gz"})
     CHUNK_SIZE = 10
@@ -61,10 +73,12 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
         self._crud = FileMetadataCRUD(client, None, None)
         self._target_dir = target_dir
 
-    def as_id(self, item: FileMetadata) -> str:
-        return item.external_id or str(item.id)
+    def as_id(self, item: MetadataWithFilePath) -> str:
+        return item.metadata.external_id or str(item.metadata.id)
 
-    def stream_data(self, selector: FileContentSelector, limit: int | None = None) -> Iterable[Page[FileMetadata]]:
+    def stream_data(
+        self, selector: FileContentSelector, limit: int | None = None
+    ) -> Iterable[Page[MetadataWithFilePath]]:
         if not isinstance(selector, FileIdentifierSelector):
             raise ToolkitNotImplementedError(
                 f"Download with the manifest, {type(selector).__name__}, is not supported for FileContentIO"
@@ -77,7 +91,7 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
             if metadata is None:
                 continue
             identifiers_map = self._as_metadata_map(metadata)
-            downloaded_files: list[FileMetadata] = []
+            downloaded_files: list[MetadataWithFilePath] = []
             for identifier in identifiers:
                 if identifier not in identifiers_map:
                     continue
@@ -94,7 +108,12 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
                     with filepath.open(mode="wb") as file_stream:
                         for chunk in response.iter_bytes(chunk_size=8192):
                             file_stream.write(chunk)
-                downloaded_files.append(meta)
+                downloaded_files.append(
+                    MetadataWithFilePath(
+                        metadata=meta,
+                        file_path=filepath.relative_to(self._target_dir),
+                    )
+                )
             yield Page(items=downloaded_files, worker_id="Main")
 
     def _retrieve_metadata(self, identifiers: Sequence[FileIdentifier]) -> Sequence[FileMetadata] | None:
@@ -142,13 +161,13 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
 
     def _create_filepath(self, meta: FileMetadata, selector: FileIdentifierSelector) -> Path:
         # We now that metadata always have name set
-        filename = Path(cast(str, meta.name))
+        filename = Path(sanitize_filename(cast(str, meta.name)))
         if len(filename.suffix) == 0 and meta.mime_type:
             if mime_ext := mimetypes.guess_extension(meta.mime_type):
                 filename = filename.with_suffix(mime_ext)
-        directory = selector.file_directory
+        directory = sanitize_filename(selector.file_directory)
         if isinstance(meta.directory, str) and meta.directory != "":
-            directory = Path(meta.directory.removeprefix("/"))
+            directory = sanitize_filename(meta.directory.removeprefix("/"))
 
         counter = 1
         filepath = self._target_dir / directory / filename
@@ -185,7 +204,7 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
         return None
 
     def data_to_json_chunk(
-        self, data_chunk: Sequence[FileMetadata], selector: FileContentSelector | None = None
+        self, data_chunk: Sequence[MetadataWithFilePath], selector: FileContentSelector | None = None
     ) -> list[dict[str, JsonVal]]:
         """Convert a writable Cognite resource list to a JSON-compatible chunk of data.
 
@@ -197,7 +216,8 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
         """
         result: list[dict[str, JsonVal]] = []
         for item in data_chunk:
-            item_json = self._crud.dump_resource(item)
+            item_json = self._crud.dump_resource(item.metadata)
+            item_json[FILEPATH] = item.file_path.as_posix()
             result.append(item_json)
         return result
 
@@ -213,7 +233,7 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
         result: list[UploadFileContentItem] = []
         for source_id, item_json in data_chunk:
             item = self.json_to_resource(item_json)
-            filepath = cast(Path, item_json[FILEPATH])
+            filepath = Path(cast(str | Path, item_json[FILEPATH]))
             mime_type, _ = mimetypes.guess_type(filepath)
             # application/octet-stream is the standard fallback for binary data when the type is unknown. (at least Claude thinks so)
             result.append(
@@ -236,7 +256,7 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
         selector: FileContentSelector | None = None,
     ) -> Sequence[HTTPMessage]:
         results: MutableSequence[HTTPMessage] = []
-        if isinstance(selector, FileMetadataTemplateSelector):
+        if isinstance(selector, FileMetadataTemplateSelector | FileIdentifierSelector):
             upload_url_getter = self._upload_url_asset_centric
         elif isinstance(selector, FileDataModelingTemplateSelector):
             upload_url_getter = self._upload_url_data_modeling
@@ -379,13 +399,35 @@ class FileContentIO(UploadableStorageIO[FileContentSelector, FileMetadata, FileM
     def read_chunks(
         cls, reader: MultiFileReader, selector: FileContentSelector
     ) -> Iterable[list[tuple[str, dict[str, JsonVal]]]]:
-        for chunk in chunker_sequence(reader.input_files, cls.CHUNK_SIZE):
-            batch: list[tuple[str, dict[str, JsonVal]]] = []
-            for file_path in chunk:
-                metadata = selector.create_instance(file_path)
-                metadata[FILEPATH] = file_path
-                batch.append((str(file_path), metadata))
-            yield batch
+        if isinstance(selector, FileTemplateSelector):
+            for chunk in chunker_sequence(reader.input_files, cls.CHUNK_SIZE):
+                batch: list[tuple[str, dict[str, JsonVal]]] = []
+                for file_path in chunk:
+                    metadata = selector.create_instance(file_path)
+                    metadata[FILEPATH] = file_path
+                    batch.append((file_path.as_posix(), metadata))
+                yield batch
+        elif isinstance(selector, FileIdentifierSelector):
+            for item_chunk in chunker(reader.read_chunks(), cls.CHUNK_SIZE):
+                batch = []
+                for item in item_chunk:
+                    if FILEPATH not in item:
+                        # Todo Log warning
+                        continue
+                    try:
+                        file_path = Path(item[FILEPATH])
+                    except KeyError:
+                        # Todo Log warning
+                        continue
+                    if not file_path.is_absolute():
+                        file_path = reader.input_file.parent / file_path
+                    item[FILEPATH] = file_path
+                    batch.append((file_path.as_posix(), item))
+                yield batch
+        else:
+            raise ToolkitNotImplementedError(
+                f"Reading with the manifest, {type(selector).__name__}, is not supported for FileContentIO"
+            )
 
     @classmethod
     def count_chunks(cls, reader: MultiFileReader) -> int:

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/cognite_toolkit/_cdf_tk/storageio/selectors/_file_content.py

@@ -6,8 +6,6 @@ from typing import Annotated, Any, Literal
 
 from pydantic import ConfigDict, Field, field_validator, model_validator
 
-from cognite_toolkit._cdf_tk.exceptions import ToolkitNotImplementedError
-
 from ._base import DataSelector, SelectorObject
 from ._instances import SelectedView
 
@@ -17,6 +15,9 @@ FILEPATH = "$FILEPATH"
 
 class FileContentSelector(DataSelector, ABC):
     kind: Literal["FileContent"] = "FileContent"
+
+
+class FileTemplateSelector(FileContentSelector, ABC):
     file_directory: Path
 
     def find_data_files(self, input_dir: Path, manifest_file: Path) -> list[Path]:
@@ -52,7 +53,7 @@ class FileMetadataTemplate(FileTemplate):
         return v
 
 
-class FileMetadataTemplateSelector(FileContentSelector):
+class FileMetadataTemplateSelector(FileTemplateSelector):
     type: Literal["fileMetadataTemplate"] = "fileMetadataTemplate"
     template: FileMetadataTemplate
 
@@ -96,7 +97,7 @@ class FileDataModelingTemplate(FileTemplate):
         return data
 
 
-class FileDataModelingTemplateSelector(FileContentSelector):
+class FileDataModelingTemplateSelector(FileTemplateSelector):
     type: Literal["fileDataModelingTemplate"] = "fileDataModelingTemplate"
     view_id: SelectedView = SelectedView(space="cdf_cdm", external_id="CogniteFile", version="v1")
     template: FileDataModelingTemplate
@@ -150,7 +151,7 @@ FileIdentifier = Annotated[FileInstanceID | FileExternalID | FileInternalID, Fie
 
 class FileIdentifierSelector(FileContentSelector):
     type: Literal["fileIdentifier"] = "fileIdentifier"
-    file_directory: Path = Path("file_content")
+    file_directory: str = "file_content"
     use_metadata_directory: bool = True
     identifiers: tuple[FileIdentifier, ...]
 
@@ -161,6 +162,3 @@ class FileIdentifierSelector(FileContentSelector):
     def __str__(self) -> str:
         hash_ = hashlib.md5(",".join(sorted(str(self.identifiers))).encode()).hexdigest()[:8]
         return f"file_{len(self.identifiers)}_identifiers_{hash_}"
-
-    def create_instance(self, filepath: Path) -> dict[str, Any]:
-        raise ToolkitNotImplementedError("FileIdentifierSelector does not support creating instances from file paths.")

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/cognite_toolkit/_repo_files/GitHub/.github/workflows/deploy.yaml

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

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

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/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.19"
+version = "0.7.21"
 
 
 [plugins]

cognite_toolkit-0.7.21/cognite_toolkit/_version.py

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

cognite_toolkit-0.7.21/last_changelog_entry.md

@@ -0,0 +1,7 @@
+## Changelog 
+
+### Added
+
+- [alpha] When you download files with content, `cdf data download files
+--include-file-contents ...`, you can now upload them with `cdf data
+upload dir`.

cognite_toolkit-0.7.21/last_git_message.txt

@@ -0,0 +1,35 @@
+[CDF-26479]  Uploading file content (#2278)
+
+# Description
+
+To support upload when specifying individual files I have done the
+following changes.
+
+Downloading files now includes `$FILEPATH` 
+<img width="823" height="306" alt="image"
+src="https://github.com/user-attachments/assets/997f26b5-c68e-4914-855f-357b2e5c6854"
+/>
+I have done this by introducing the extra class `MetadataWithFilePath`.
+[ref](https://github.com/cognitedata/toolkit/pull/2278/files#diff-ce79b5b2ac0aaf38f25fa828a794531924903d6eb0d9abb461be8cd561155272R54)
+
+The upload logic no longer assumes that you always have a template
+manifest,
+[here](https://github.com/cognitedata/toolkit/pull/2278/files#diff-ce79b5b2ac0aaf38f25fa828a794531924903d6eb0d9abb461be8cd561155272R411)
+and
+[here](https://github.com/cognitedata/toolkit/pull/2278/files#diff-ce79b5b2ac0aaf38f25fa828a794531924903d6eb0d9abb461be8cd561155272R259)
+
+
+Note this is also tested manually on a real customer.
+
+## Bump
+
+- [x] Patch
+- [ ] Skip
+
+## Changelog
+
+### Added
+
+- [alpha] When you download files with content, `cdf data download files
+--include-file-contents ...`, you can now upload them with `cdf data
+upload dir`.

cognite_toolkit-0.7.21/last_version.txt

@@ -0,0 +1 @@
+0.7.20

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/pyproject.toml

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

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/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.19
+cdf_toolkit_version: 0.7.21

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/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.19"
+version = "0.7.21"
 
 [plugins]
 graphql = true

{cognite_toolkit-0.7.19/tests/data/complete_org_alpha_flags → cognite_toolkit-0.7.21/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.19"
+version = "0.7.21"

{cognite_toolkit-0.7.19/tests/data/complete_org_only_identifier → cognite_toolkit-0.7.21/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.19"
+version = "0.7.21"

{cognite_toolkit-0.7.19/tests/data/naughty_project → cognite_toolkit-0.7.21/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.19"
+version = "0.7.21"

{cognite_toolkit-0.7.19/tests/data/complete_org → cognite_toolkit-0.7.21/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.19"
+version = "0.7.21"

cognite_toolkit-0.7.21/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.21"

cognite_toolkit-0.7.21/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.21"

cognite_toolkit-0.7.21/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.21"

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/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.19"
+version = "0.7.21"
 
 [modules.packages]
 cdf_infield = [

{cognite_toolkit-0.7.19 → cognite_toolkit-0.7.21}/tests/test_integration/test_storageio/test_filecontent.py

@@ -1,9 +1,11 @@
 import time
 from pathlib import Path
 
+from cognite.client.data_classes import DataSet
 from cognite.client.data_classes.data_modeling import NodeId, Space
 
 from cognite_toolkit._cdf_tk.client import ToolkitClient
+from cognite_toolkit._cdf_tk.commands import UploadCommand
 from cognite_toolkit._cdf_tk.storageio import FileContentIO
 from cognite_toolkit._cdf_tk.storageio.selectors import (
     FileDataModelingTemplate,
@@ -14,11 +16,12 @@ from cognite_toolkit._cdf_tk.storageio.selectors import (
 )
 from cognite_toolkit._cdf_tk.storageio.selectors._file_content import (
     FILENAME_VARIABLE,
+    FILEPATH,
     FileExternalID,
     FileInstanceID,
     TemplateNodeId,
 )
-from cognite_toolkit._cdf_tk.utils.fileio import MultiFileReader
+from cognite_toolkit._cdf_tk.utils.fileio import MultiFileReader, NDJsonWriter, Uncompressed
 from cognite_toolkit._cdf_tk.utils.http_client import HTTPClient
 from tests.test_integration.constants import RUN_UNIQUE_ID
 
@@ -134,3 +137,47 @@ class TestFileContentIO:
         finally:
             # Clean up
             toolkit_client.data_modeling.instances.delete(nodes=instance_id)
+
+    def test_upload_download_file_identifier(
+        self, toolkit_client: ToolkitClient, tmp_path: Path, toolkit_dataset: DataSet
+    ) -> None:
+        external_id = f"test_file_identifier_{RUN_UNIQUE_ID}.txt"
+        selector = FileIdentifierSelector(identifiers=(FileExternalID(external_id=external_id),))
+        selector.dump_to_file(tmp_path)
+        file_content = "This is a test file for FileIdentifierSelector."
+        filepath = "file_content/test_file_identifier.txt"
+        (tmp_path / filepath).parent.mkdir(parents=True, exist_ok=True)
+        (tmp_path / filepath).write_text(file_content, encoding="utf-8")
+        file_metadata = {
+            "name": "test_file_identifier.txt",
+            "externalId": external_id,
+            "dataSetExternalId": toolkit_dataset.external_id,
+            "source": "TestUpload",
+            "mimeType": "text/plain",
+            FILEPATH: "file_content/test_file_identifier.txt",
+        }
+        with NDJsonWriter(tmp_path, selector.kind, Uncompressed) as writer:
+            writer.write_chunks([file_metadata], filestem=str(selector))
+
+        upload_cmd = UploadCommand(silent=True)
+        try:
+            upload_cmd.upload(
+                input_dir=tmp_path,
+                client=toolkit_client,
+                deploy_resources=False,
+                dry_run=False,
+                verbose=False,
+            )
+
+            retrieved = toolkit_client.files.retrieve(external_id=external_id)
+            assert retrieved is not None
+
+            io = FileContentIO(toolkit_client, tmp_path / "downloads")
+            downloaded_files = [item for page in io.stream_data(selector) for item in page.items]
+            assert len(downloaded_files) == 1
+            expected_file = tmp_path / "downloads" / selector.file_directory / "test_file_identifier.txt"
+            assert expected_file.is_file()
+            downloaded_content = expected_file.read_text(encoding="utf-8")
+            assert downloaded_content == file_content
+        finally:
+            toolkit_client.files.delete(external_id=external_id, ignore_unknown_ids=True)