dds-cli 2.8.1__tar.gz → 2.10.0__tar.gz

{dds_cli-2.8.1 → dds_cli-2.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.8.1
+Version: 2.10.0
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
@@ -32,7 +32,16 @@ Requires-Dist: rich==13.6.0
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
-Requires-Dist: zstandard==0.22.0
+Requires-Dist: zstandard==0.23.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 <p>
    <h1 align="center">Data Delivery System: CLI</h1>
@@ -59,12 +68,12 @@ Requires-Dist: zstandard==0.22.0
 </a>
 <br />
 <a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="codecov" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
-<a href="https://codecov.io/gh/ScilifelabDataCentre/dds_web">
-    <img alt="codecov" src="https://codecov.io/gh/ScilifelabDataCentre/dds_cli/branch/dev/graph/badge.svg?token=r5tM6o08Sd">
-</a>
+<a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" > 
+ <img src="https://codecov.io/github/ScilifelabDataCentre/dds_cli/graph/badge.svg?token=zsrDpNqs6v"/> 
+ </a>
 <img alt="Tests" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/pytest-cli.yml/badge.svg">
 </p>
 

{dds_cli-2.8.1 → dds_cli-2.10.0}/README.md

@@ -23,12 +23,12 @@
 </a>
 <br />
 <a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="codecov" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
-<a href="https://codecov.io/gh/ScilifelabDataCentre/dds_web">
-    <img alt="codecov" src="https://codecov.io/gh/ScilifelabDataCentre/dds_cli/branch/dev/graph/badge.svg?token=r5tM6o08Sd">
-</a>
+<a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" > 
+ <img src="https://codecov.io/github/ScilifelabDataCentre/dds_cli/graph/badge.svg?token=zsrDpNqs6v"/> 
+ </a>
 <img alt="Tests" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/pytest-cli.yml/badge.svg">
 </p>
 

{dds_cli-2.8.1 → dds_cli-2.10.0}/dds_cli/base.py

@@ -72,7 +72,8 @@ class DDSBaseClass:
             # Use user defined destination if any specified
             if self.method in DDS_DIR_REQUIRED_METHODS:
                 default_dir = pathlib.Path(
-                    f"DataDelivery_{dds_cli.timestamp.TimeStamp().timestamp}_{self.project}"
+                    f"DataDelivery_{dds_cli.timestamp.TimeStamp().timestamp}_{self.project}_"
+                    f"{'upload' if self.method == 'put' else 'download'}"
                 )
                 if mount_dir:
                     new_directory = mount_dir / default_dir

{dds_cli-2.8.1 → dds_cli-2.10.0}/dds_cli/data_remover.py

@@ -39,6 +39,7 @@ class DataRemover(base.DDSBaseClass):
         self,
         project: str,
         method: str = "rm",
+        authenticate: bool = True,
         no_prompt: bool = False,
         token_path: str = None,
     ):
@@ -47,6 +48,7 @@ class DataRemover(base.DDSBaseClass):
         super().__init__(
             project=project,
             method=method,
+            authenticate=authenticate,
             no_prompt=no_prompt,
             token_path=token_path,
         )
@@ -115,7 +117,6 @@ class DataRemover(base.DDSBaseClass):
             LOG.warning("File deletion may have failed. Usage of space may increase.")
 
     # Public methods ###################### Public methods #
-    @removal_spinner
     def remove_all(self, *_, **__):
         """Remove all files in project."""
         # Perform request to API to perform deletion
@@ -128,12 +129,15 @@ class DataRemover(base.DDSBaseClass):
         )
 
         # Print out response - deleted or not?
-        if "removed" not in response_json:
+        queue_message: str = response_json.get("message")
+        if "removed" not in response_json or "message" not in response_json:
             raise dds_cli.exceptions.APIError(
                 "Malformatted response detected when attempting "
                 f"to remove all files from {self.project}."
             )
 
+        dds_cli.utils.console.print("\n" + queue_message)
+
     @removal_spinner
     def remove_file(self, files):
         """Remove specific files."""

{dds_cli-2.8.1 → dds_cli-2.10.0}/dds_cli/version.py

@@ -2,4 +2,4 @@
 
 # Do not change bump the major version unless absolutely necessary - makes incompatible with API
 # If mid or minor version reaches 9, continue to 10, 11 etc.
-__version__ = "2.8.1"
+__version__ = "2.10.0"

{dds_cli-2.8.1 → dds_cli-2.10.0}/dds_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.8.1
+Version: 2.10.0
 Summary: A command line tool to manage data and projects in the SciLifeLab Data Delivery System.
 Home-page: https://github.com/ScilifelabDataCentre/dds_cli
 Author: SciLifeLab Data Centre
@@ -32,7 +32,16 @@ Requires-Dist: rich==13.6.0
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
-Requires-Dist: zstandard==0.22.0
+Requires-Dist: zstandard==0.23.0
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 <p>
    <h1 align="center">Data Delivery System: CLI</h1>
@@ -59,12 +68,12 @@ Requires-Dist: zstandard==0.22.0
 </a>
 <br />
 <a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="codecov" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
 </a>
 <img alt="CodeQL" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/codeql-cli.yml/badge.svg">
-<a href="https://codecov.io/gh/ScilifelabDataCentre/dds_web">
-    <img alt="codecov" src="https://codecov.io/gh/ScilifelabDataCentre/dds_cli/branch/dev/graph/badge.svg?token=r5tM6o08Sd">
-</a>
+<a href="https://codecov.io/github/ScilifelabDataCentre/dds_cli" > 
+ <img src="https://codecov.io/github/ScilifelabDataCentre/dds_cli/graph/badge.svg?token=zsrDpNqs6v"/> 
+ </a>
 <img alt="Tests" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/pytest-cli.yml/badge.svg">
 </p>
 

{dds_cli-2.8.1 → dds_cli-2.10.0}/dds_cli.egg-info/requires.txt

@@ -16,4 +16,4 @@ rich==13.6.0
 rich-click==1.5.2
 simplejson==3.17.6
 tzlocal==4.2
-zstandard==0.22.0
+zstandard==0.23.0

{dds_cli-2.8.1 → dds_cli-2.10.0}/tests/test_data_remover.py

@@ -1,9 +1,13 @@
 from _pytest.logging import LogCaptureFixture
 from pyfakefs.fake_filesystem import FakeFilesystem
+from requests_mock.mocker import Mocker
+import pytest
 import pathlib
 import logging
 
 from dds_cli import data_remover
+from dds_cli import DDSEndpoint
+from dds_cli.exceptions import APIError
 
 
 def test_delete_tempfile_cannot_delete(fs: FakeFilesystem, caplog: LogCaptureFixture):
@@ -51,3 +55,42 @@ def test_delete_tempfile_ok(fs: FakeFilesystem, caplog: LogCaptureFixture):
             logging.WARNING,
             "File deletion may have failed. Usage of space may increase.",
         ) not in caplog.record_tuples
+
+
+def test_delete_all_ok(capfd: LogCaptureFixture):
+    """Delete all files. - ok"""
+
+    # Create mocker
+    with Mocker() as mock:
+        # Create mocked request - real request not executed
+        mock.delete(
+            DDSEndpoint.REMOVE_PROJ_CONT,
+            status_code=200,
+            json={"message": "All files removed.", "removed": True},
+        )
+
+        with data_remover.DataRemover(authenticate=False, project="project_1") as dr:
+            dr.token = {"Authorization": "Bearer FAKE_TOKEN"}  # required
+            dr.remove_all()
+
+            out, err = capfd.readouterr()
+            assert "All files removed." in out
+            assert not err
+
+
+def test_delete_all_malformated_response():
+    """Malformated response"""
+
+    # Create mocker
+    with Mocker() as mock:
+        # Create mocked request - real request not executed
+        mock.delete(DDSEndpoint.REMOVE_PROJ_CONT, status_code=200, json={})
+
+        with data_remover.DataRemover(authenticate=False, project="project_1") as dr:
+            dr.token = {"Authorization": "Bearer FAKE_TOKEN"}  # required
+
+            with pytest.raises(APIError) as err:
+                dr.remove_all()
+                assert "Malformatted response detected when attempting to remove all files" in str(
+                    err.value
+                )