dds-cli 2.13.0__tar.gz → 2.14.2__tar.gz

{dds_cli-2.13.0 → dds_cli-2.14.2}/PKG-INFO

@@ -1,39 +1,37 @@
 Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.13.0
+Version: 2.14.2
 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
 License: MIT
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: boto3==1.24.73
 Requires-Dist: botocore==1.27.73
 Requires-Dist: click==8.1.3
-Requires-Dist: click-pathlib==2020.3.13.0
-Requires-Dist: cryptography==44.0.1
+Requires-Dist: cryptography==46.0.6
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: prettytable==3.7.0
 Requires-Dist: prompt-toolkit==3.0.40
-Requires-Dist: PyNaCl==1.5.0
-Requires-Dist: pytz==2022.2.1
+Requires-Dist: PyNaCl==1.6.2
+Requires-Dist: pytz==2026.1.post1
 Requires-Dist: PyYAML==6.0.2
-Requires-Dist: questionary==1.10.0
-Requires-Dist: requests==2.32.4
-Requires-Dist: rich==13.6.0
+Requires-Dist: questionary==2.1.1
+Requires-Dist: requests==2.33.0
+Requires-Dist: rich==14.3.3
 Requires-Dist: rich-click==1.5.2
 Requires-Dist: simplejson==3.17.6
 Requires-Dist: tzlocal==4.2
 Requires-Dist: zstandard==0.23.0
-Requires-Dist: textual==2.1.2
+Requires-Dist: legacy-cgi==2.6.1; python_version >= "3.13"
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -61,15 +59,15 @@ Dynamic: summary
 <a href="https://opensource.org/licenses/MIT">
     <img alt="Licence: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg">
 </a>
-<a href="https://github.com/psf/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
+<a href="https://github.com/astral-sh/ruff">
+    <img alt="Linting: ruff" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
 </a>
 <a href="https://prettier.io/">
     <img alt="Code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg">
 </a>
 <br />
-<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml">
+    <img alt="Linting: ruff" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.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/github/ScilifelabDataCentre/dds_cli" > 

{dds_cli-2.13.0 → dds_cli-2.14.2}/README.md

@@ -15,15 +15,15 @@
 <a href="https://opensource.org/licenses/MIT">
     <img alt="Licence: MIT" src="https://img.shields.io/badge/License-MIT-yellow.svg">
 </a>
-<a href="https://github.com/psf/black">
-    <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
+<a href="https://github.com/astral-sh/ruff">
+    <img alt="Linting: ruff" src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json">
 </a>
 <a href="https://prettier.io/">
     <img alt="Code style: prettier" src="https://img.shields.io/badge/code_style-prettier-ff69b4.svg">
 </a>
 <br />
-<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml">
-    <img alt="Formatter: black" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-black-cli.yml/badge.svg?event=push">
+<a href="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.yml">
+    <img alt="Linting: ruff" src="https://github.com/ScilifelabDataCentre/dds_cli/actions/workflows/lint-ruff.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/github/ScilifelabDataCentre/dds_cli" > 

{dds_cli-2.13.0 → dds_cli-2.14.2}/dds_cli/__init__.py

@@ -1,4 +1,4 @@
-# pylint: skip-file
+# ruff: noqa
 """DDS CLI."""
 
 import datetime

{dds_cli-2.13.0 → dds_cli-2.14.2}/dds_cli/__main__.py

@@ -8,61 +8,59 @@
 import concurrent.futures
 import itertools
 import logging
+import pathlib
 import sys
 
 # Installed
-import pathlib
-import rich_click as click
-import click_pathlib
+
+import questionary
 import rich
 import rich.logging
 import rich.markup
 import rich.progress
 import rich.prompt
-import questionary
+import rich_click as click
 
 # Own modules
 import dds_cli
 import dds_cli.account_manager
-import dds_cli.unit_manager
-import dds_cli.motd_manager
-import dds_cli.superadmin_helper
+import dds_cli.auth
 import dds_cli.data_getter
 import dds_cli.data_lister
 import dds_cli.data_putter
 import dds_cli.data_remover
 import dds_cli.directory
+import dds_cli.message_helper
+import dds_cli.motd_manager
 import dds_cli.project_creator
-import dds_cli.auth
-import dds_cli.project_status
 import dds_cli.project_info
+import dds_cli.project_status
+import dds_cli.superadmin_helper
+import dds_cli.unit_manager
 import dds_cli.user
 import dds_cli.utils
-import dds_cli.message_helper
 from dds_cli.options import (
+    break_on_fail_flag,
     destination_option,
     email_arg,
     email_option,
     folder_option,
+    json_flag,
+    nomail_flag,
     num_threads_option,
     project_option,
+    silent_flag,
+    size_flag,
     sort_projects_option,
     source_option,
     source_path_file_option,
     token_path_option,
-    username_option,
-    break_on_fail_flag,
-    json_flag,
-    nomail_flag,
-    silent_flag,
-    size_flag,
     tree_flag,
     usage_flag,
+    username_option,
     users_flag,
 )
 
-# import dds_cli.dds_gui.app
-
 ####################################################################################################
 # START LOGGING CONFIG ###################################################### START LOGGING CONFIG #
 ####################################################################################################
@@ -201,27 +199,11 @@ def dds_main(click_ctx, verbose, force_no_log, log_file, no_prompt, token_path):
             else:
                 file_handler = dds_cli.utils.setup_logging_to_file(filename=log_file)
                 LOG.addHandler(file_handler)
-        else:
-            if force_no_log:
-                LOG.warning(
-                    "You have chosen to turn off the recommended default logging with the '--force-no-log' option."
-                )
-                click_ctx.obj.update({"DEFAULT_LOG": False})
-
-
-### GUI COMMAND ###
-
-# TODO: Should totp be passed to the gui?
-
-
-# @dds_main.command(name="gui")
-# @click.pass_obj
-# def gui(click_ctx):
-#     """Start the DDS GUI."""
-#     gui_app = dds_cli.dds_gui.app.DDSApp(token_path=click_ctx.get("TOKEN_PATH"))
-#     gui_app.title = "SciLifeLab Data Delivery System"
-#     gui_app.sub_title = "CLI Version: " + dds_cli.__version__
-#     gui_app.run()
+        elif force_no_log:
+            LOG.warning(
+                "You have chosen to turn off the recommended default logging with the '--force-no-log' option."
+            )
+            click_ctx.obj.update({"DEFAULT_LOG": False})
 
 
 # ************************************************************************************************ #
@@ -285,29 +267,27 @@ def list_projects_and_contents(
                 projects = lister.list_projects(sort_by=sort, show_all=show_all)
                 if json:
                     dds_cli.utils.console.print_json(data=projects)
-                else:
-                    # If an interactive terminal, ask user if they want to view files for a project
-                    if sys.stdout.isatty() and not lister.no_prompt:
-                        project_ids = [p["Project ID"] for p in projects]
-                        LOG.info(
-                            "Would you like to view files in a specific project? "
-                            "Leave blank to exit."
-                        )
-                        # Keep asking until we get a valid response
-                        while project not in project_ids:
-                            try:
-                                project = questionary.autocomplete(
-                                    "Project ID:",
-                                    choices=project_ids,
-                                    validate=lambda x: x in project_ids or x == "",
-                                    style=dds_cli.dds_questionary_styles,
-                                ).unsafe_ask()
-                                assert project and project != ""
-
-                            # If didn't enter anything, convert to None and exit
-                            except (KeyboardInterrupt, AssertionError):
-                                LOG.debug("No project entered, exiting.")
-                                break
+                # If an interactive terminal, ask user if they want to view files for a project
+                elif sys.stdout.isatty() and not lister.no_prompt:
+                    project_ids = [p["Project ID"] for p in projects]
+                    LOG.info(
+                        "Would you like to view files in a specific project? Leave blank to exit."
+                    )
+                    # Keep asking until we get a valid response
+                    while project not in project_ids:
+                        try:
+                            project = questionary.autocomplete(
+                                "Project ID:",
+                                choices=project_ids,
+                                validate=lambda x: x in project_ids or x == "",
+                                style=dds_cli.dds_questionary_styles,
+                            ).unsafe_ask()
+                            assert project and project != ""
+
+                        # If didn't enter anything, convert to None and exit
+                        except (KeyboardInterrupt, AssertionError):
+                            LOG.debug("No project entered, exiting.")
+                            break
 
         # List all files in a project if we know a project ID
         if project:
@@ -383,6 +363,7 @@ def list_projects_and_contents(
         dds_cli.exceptions.AuthenticationError,
         dds_cli.exceptions.ApiResponseError,
         dds_cli.exceptions.ApiRequestError,
+        dds_cli.exceptions.DDSCLIException,
     ) as err:
         LOG.error(err)
         sys.exit(1)
@@ -544,13 +525,14 @@ def configure():
             "Which method would you like to use?", choices=["Email", "Authenticator App", "Cancel"]
         ).ask()
 
+        auth_method: str | None = None  # type hint, initialized
         if auth_method_choice == "Cancel":
             LOG.info("Two-factor authentication method not configured.")
             sys.exit(0)
         elif auth_method_choice == "Authenticator App":
-            auth_method: str = "totp"
+            auth_method = "totp"
         elif auth_method_choice == "Email":
-            auth_method: str = "hotp"
+            auth_method = "hotp"
 
         with dds_cli.auth.Auth(authenticate=True, force_renew_token=False) as authenticator:
             authenticator.twofactor(auth_method=auth_method)
@@ -797,15 +779,14 @@ def delete_user(click_ctx, email, self, is_invite):
             proceed_deletion = rich.prompt.Confirm.ask(
                 f"Delete invitation of {email} to Data Delivery System?"
             )
+        elif self:
+            proceed_deletion = rich.prompt.Confirm.ask(
+                "Are you sure? Deleted accounts can't be restored!"
+            )
         else:
-            if self:
-                proceed_deletion = rich.prompt.Confirm.ask(
-                    "Are you sure? Deleted accounts can't be restored!"
-                )
-            else:
-                proceed_deletion = rich.prompt.Confirm.ask(
-                    f"Delete Data Delivery System user account associated with {email}"
-                )
+            proceed_deletion = rich.prompt.Confirm.ask(
+                f"Delete Data Delivery System user account associated with {email}"
+            )
 
     if proceed_deletion:
         try:
@@ -885,6 +866,8 @@ def activate_user(click_ctx, email):
     Super Admins: All users
     Unit Admins: Unit Admins / Personnel
     """
+    proceed_activation = False  # default assignment
+
     if click_ctx.get("NO_PROMPT", False):
         pass
     else:
@@ -925,6 +908,8 @@ def deactivate_user(click_ctx, email):
     Super Admins: All users
     Unit Admins: Unit Admins / Personnel
     """
+    proceed_deactivation = False  # default assignment
+
     if click_ctx.get("NO_PROMPT", False):
         pass
     else:
@@ -1166,6 +1151,13 @@ def display_project_status(click_ctx, project, show_history):
         sys.exit(1)
 
 
+def validate_deadline(_ctx, _param, value):
+    """Validate that the deadline is a positive number of days between 1 and 90."""
+    if value is not None and value not in range(1, 91):
+        raise click.BadParameter("Deadline must be a positive number of days between 1 and 90.")
+    return value
+
+
 # -- dds project status release -- #
 @project_status.command(name="release", no_args_is_help=True)
 # Options
@@ -1174,7 +1166,8 @@ def display_project_status(click_ctx, project, show_history):
     "--deadline",
     required=False,
     type=int,
-    help="Deadline in days when releasing a project.",
+    callback=validate_deadline,
+    help="Deadline in days when releasing a project. Must be a positive number of days (maximum 90 days).",
 )
 @nomail_flag(help_message="Do not send e-mail notifications regarding project updates.")
 @click.pass_obj
@@ -1315,7 +1308,8 @@ def delete_project(click_ctx, project: str):
     "--new-deadline",
     required=False,
     type=int,
-    help="Number of days to extend the deadline.",
+    callback=validate_deadline,
+    help="Number of days to extend the deadline. Must be a positive number of days (maximum 90 days).",
 )
 @click.pass_obj
 def extend_deadline(click_ctx, project: str, new_deadline: int):
@@ -1631,7 +1625,9 @@ def data_group_command(_):
     "--mount-dir",
     "-md",
     required=False,
-    type=click_pathlib.Path(exists=False, file_okay=False, dir_okay=True, resolve_path=True),
+    type=click.Path(
+        exists=False, file_okay=False, dir_okay=True, resolve_path=True, path_type=pathlib.Path
+    ),
     help=(
         "New directory where the files will be mounted before upload "
         "and any error log files will be saved for a specific upload."
@@ -1739,6 +1735,7 @@ def put_data(
         dds_cli.exceptions.ApiRequestError,
         dds_cli.exceptions.NoKeyError,
         dds_cli.exceptions.NoDataError,
+        dds_cli.exceptions.DDSCLIException,
     ) as err:
         LOG.error(err)
         sys.exit(1)
@@ -1753,7 +1750,9 @@ def put_data(
 @source_path_file_option()
 @destination_option(
     help_message="Destination of downloaded data.",
-    option_type=click_pathlib.Path(exists=False, file_okay=False, dir_okay=True, resolve_path=True),
+    option_type=click.Path(
+        exists=False, file_okay=False, dir_okay=True, resolve_path=True, path_type=pathlib.Path
+    ),
 )
 # Flags
 @break_on_fail_flag(help_message="Cancel download of all files if one fails.")
@@ -2020,12 +2019,11 @@ def rm_data(click_ctx, project, file, folder, rm_all):
     if rm_all:
         if no_prompt:
             LOG.warning("Deleting all files within project '%s'", project)
-        else:
-            if not rich.prompt.Confirm.ask(
-                f"Are you sure you want to delete all files within project '{project}'?"
-            ):
-                LOG.info("Probably for the best. Exiting.")
-                sys.exit(0)
+        elif not rich.prompt.Confirm.ask(
+            f"Are you sure you want to delete all files within project '{project}'?"
+        ):
+            LOG.info("Probably for the best. Exiting.")
+            sys.exit(0)
 
     try:
         with dds_cli.data_remover.DataRemover(
@@ -2269,6 +2267,7 @@ def get_stats(click_ctx):
         dds_cli.exceptions.AuthenticationError,
         dds_cli.exceptions.ApiResponseError,
         dds_cli.exceptions.ApiRequestError,
+        dds_cli.exceptions.DDSCLIException,
     ) as err:
         LOG.error(err)
         sys.exit(1)

dds_cli-2.14.2/dds_cli/constants.py

@@ -0,0 +1,25 @@
+"""Shared constants used in the DDS CLI.
+
+Using this will avoid e.g. circular imports and
+make it easier to maintain.
+
+TODO: Move other constants here from __init__.py.
+"""
+
+# Timeout settings for upload and download
+READ_TIMEOUT = 300
+CONNECT_TIMEOUT = 60
+
+# Retry settings for download
+DOWNLOAD_MAX_RETRIES = 5
+DOWNLOAD_BACKOFF_FACTOR = 2
+DOWNLOAD_INITIAL_WAIT = 1  # seconds
+
+# Import these constants when using '*'
+__all__ = [
+    "READ_TIMEOUT",
+    "CONNECT_TIMEOUT",
+    "DOWNLOAD_MAX_RETRIES",
+    "DOWNLOAD_BACKOFF_FACTOR",
+    "DOWNLOAD_INITIAL_WAIT",
+]

{dds_cli-2.13.0 → dds_cli-2.14.2}/dds_cli/custom_decorators.py

@@ -154,6 +154,7 @@ def removal_spinner(func):
             SpinnerColumn(spinner_name="dots12", style="white"),
             console=dds_cli.utils.stderr_console,
         ) as progress:
+            description: str | None = None  # type hint, initialized
             # Determine spinner text
             if func.__name__ == "remove_all":
                 description = f"Removing all files in project {self.project}"

{dds_cli-2.13.0 → dds_cli-2.14.2}/dds_cli/data_getter.py

@@ -7,6 +7,7 @@
 # Standard library
 import logging
 import pathlib
+import time
 
 # Installed
 import requests
@@ -101,8 +102,17 @@ class DataGetter(base.DDSBaseClass):
 
             if not self.filehandler.data:
                 if self.temporary_directory and self.temporary_directory.is_dir():
-                    LOG.debug("Deleting temporary folder '%s'.", self.temporary_directory)
-                    dds_cli.utils.delete_folder(self.temporary_directory)
+                    LOG.debug("Deleting staging directory '%s'.", self.temporary_directory)
+                    try:
+                        dds_cli.utils.delete_folder(self.temporary_directory)
+                    except OSError as err:
+                        # Folder deletion may fail if log file is still being written to
+                        # This is not critical - the important thing is to show the error message
+                        LOG.error(
+                            "Could not delete staging directory %s: %s",
+                            self.temporary_directory,
+                            err,
+                        )
                 raise dds_cli.exceptions.DownloadError("No files to download.")
 
             self.status = self.filehandler.create_download_status_dict()
@@ -234,35 +244,68 @@ class DataGetter(base.DDSBaseClass):
         error = ""
         file_local = self.filehandler.data[file]["path_downloaded"]
         file_remote = self.filehandler.data[file]["url"]
+        file_name_in_db = escape(str(self.filehandler.data[file]["name_in_db"]))
 
-        try:
-            with requests.get(
-                file_remote,
-                stream=True,
-                timeout=(constants.CONNECT_TIMEOUT, constants.READ_TIMEOUT),
-            ) as req:
-                req.raise_for_status()
-                with file_local.open(mode="wb") as new_file:
-                    for chunk in req.iter_content(chunk_size=FileSegment.SEGMENT_SIZE_CIPHER):
-                        progress.update(task, advance=len(chunk))
-                        new_file.write(chunk)
-        except (
+        retryable_exceptions = (
             requests.exceptions.ConnectTimeout,
-            requests.exceptions.HTTPError,
             requests.exceptions.ReadTimeout,
             requests.exceptions.Timeout,
             requests.exceptions.ConnectionError,
-        ) as err:
-            if (
-                hasattr(err, "response")
-                and hasattr(err.response, "status_code")
-                and err.response.status_code == 404
-            ):
-                error = "File not found! Please contact support."
-            else:
+        )
+
+        max_retries = constants.DOWNLOAD_MAX_RETRIES
+        backoff_factor = constants.DOWNLOAD_BACKOFF_FACTOR
+        wait = constants.DOWNLOAD_INITIAL_WAIT
+        retry_messages = []
+
+        for attempt in range(1, max_retries + 1):
+            error = ""
+            if attempt > 1:
+                progress.reset(task, completed=0)
+
+            try:
+                with requests.get(
+                    file_remote,
+                    stream=True,
+                    timeout=(constants.CONNECT_TIMEOUT, constants.READ_TIMEOUT),
+                ) as req:
+                    req.raise_for_status()
+                    with file_local.open(mode="wb") as new_file:
+                        for chunk in req.iter_content(chunk_size=FileSegment.SEGMENT_SIZE_CIPHER):
+                            progress.update(task, advance=len(chunk))
+                            new_file.write(chunk)
+            except (requests.exceptions.HTTPError, *retryable_exceptions) as err:
+                if (
+                    isinstance(err, requests.exceptions.HTTPError)
+                    and hasattr(err, "response")
+                    and hasattr(err.response, "status_code")
+                    and err.response.status_code == 404
+                ):
+                    error = "File not found! Please contact support."
+                    break
                 error = str(err)
-        else:
-            downloaded = True
+                if attempt < max_retries:
+                    retry_msg = (
+                        f"Download attempt {attempt}/{max_retries} failed for "
+                        f"'{file_name_in_db}': {error}. Retrying in {wait}s..."
+                    )
+                    retry_messages.append(retry_msg)
+                    LOG.warning(retry_msg)
+                    time.sleep(wait)
+                    wait *= backoff_factor
+            else:
+                downloaded = True
+                break
+
+        if not downloaded and error:
+            if retry_messages:
+                error = " | ".join(retry_messages) + f" | Final error: {error}"
+            LOG.error(
+                "Download failed for '%s' after %d attempts: %s",
+                file_name_in_db,
+                max_retries,
+                error,
+            )
 
         return downloaded, error
 

{dds_cli-2.13.0 → dds_cli-2.14.2}/dds_cli/data_lister.py

@@ -5,26 +5,24 @@
 ###############################################################################
 
 # Standard library
-from dataclasses import dataclass
-import logging
-from typing import Tuple, Union, List
 import datetime
+import logging
 import pathlib
+from dataclasses import dataclass
+from typing import List, Tuple, Union
 
 # Installed
-from rich.padding import Padding
+import pytz
+import tzlocal
 from rich.markup import escape
+from rich.padding import Padding
 from rich.table import Table
 from rich.tree import Tree
-import pytz
-import tzlocal
 
 # Own modules
-from dds_cli import base
-from dds_cli import exceptions
-import dds_cli.utils
-from dds_cli import DDSEndpoint
+from dds_cli import DDSEndpoint, base, exceptions
 from dds_cli import text_handler as th
+import dds_cli.utils
 
 
 ###############################################################################
@@ -235,7 +233,7 @@ class DataLister(base.DDSBaseClass):
                 error_message="Failed to list the project's directory tree",
             )
 
-            if not "files_folders" in resp_json:
+            if "files_folders" not in resp_json:
                 raise exceptions.NoDataError(f"Could not find folder: '{folder}'")
 
             sorted_files_folders = sorted(resp_json["files_folders"], key=lambda f: f["name"])
@@ -268,7 +266,11 @@ class DataLister(base.DDSBaseClass):
             # Get max length of size string
             max_size = max(
                 (
-                    len(x["size"].split(" ")[0])
+                    len(
+                        dds_cli.utils.format_api_response(
+                            response=x["size"], key="Size", binary=self.binary
+                        ).split(" ", maxsplit=1)[0]
+                    )
                     for x in sorted_files_folders
                     if show_size and "size" in x
                 ),
@@ -280,9 +282,12 @@ class DataLister(base.DDSBaseClass):
                 is_folder = item.pop("folder")
 
                 if not is_folder:
-                    tree.subtrees.append(
-                        (escape(item["name"]), item.get("size") if show_size else None)
-                    )
+                    formatted_size = None
+                    if show_size and "size" in item:
+                        formatted_size = dds_cli.utils.format_api_response(
+                            response=item["size"], key="Size", binary=self.binary
+                        )
+                    tree.subtrees.append((escape(item["name"]), formatted_size))
                 else:
                     subtree, _max_string, _max_size = __construct_file_tree(
                         pathlib.Path(folder, item["name"]).as_posix() if folder else item["name"],
@@ -348,15 +353,7 @@ class DataLister(base.DDSBaseClass):
                             string_len=len(node[0]),
                             max_string_len=max_str - 4 * depth,
                         )
-                        line += f"{tab}{node[1].split()[0]}"
-
-                        # Define space between number and size format
-                        tabs_bf_format = th.TextHandler.format_tabs(
-                            string_len=len(node[1].split()[1]),
-                            max_string_len=max_size,
-                            tab_len=2,
-                        )
-                        line += f"{tabs_bf_format}{node[1].split()[1]}"
+                        line += f"{tab}{node[1].split()[0]} {node[1].split()[1]}"
                     tree.add(line)
 
             return tree, tree_length