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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dds_cli
-Version: 2.11.0
+Version: 2.13.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
@@ -18,7 +18,7 @@ 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==42.0.4
+Requires-Dist: cryptography==44.0.1
 Requires-Dist: immutabledict==2.2.1
 Requires-Dist: jwcrypto==1.5.6
 Requires-Dist: prettytable==3.7.0
@@ -27,12 +27,13 @@ Requires-Dist: PyNaCl==1.5.0
 Requires-Dist: pytz==2022.2.1
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: questionary==1.10.0
-Requires-Dist: requests==2.32.2
+Requires-Dist: requests==2.32.4
 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.23.0
+Requires-Dist: textual==2.1.2
 Dynamic: author
 Dynamic: classifier
 Dynamic: description
@@ -60,7 +61,7 @@ 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://opensource.org/licenses/MIT](https://github.com/psf/black)">
+<a href="https://github.com/psf/black">
     <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
 </a>
 <a href="https://prettier.io/">

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

@@ -15,7 +15,7 @@
 <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://opensource.org/licenses/MIT](https://github.com/psf/black)">
+<a href="https://github.com/psf/black">
     <img alt="Code style: black" src="https://img.shields.io/badge/code%20style-black-000000.svg">
 </a>
 <a href="https://prettier.io/">

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

@@ -44,7 +44,7 @@ DDS_DIR_REQUIRED_METHODS = ["put", "get"]
 DDS_KEYS_REQUIRED_METHODS = ["put", "get"]
 
 # Token related variables
-TOKEN_FILE = pathlib.Path(os.path.expanduser("~/.dds_cli_token"))
+TOKEN_FILE = pathlib.Path.home() / ".dds_cli_token"
 TOKEN_EXPIRATION_WARNING_THRESHOLD = datetime.timedelta(hours=6)
 
 

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

@@ -38,6 +38,7 @@ import dds_cli.project_status
 import dds_cli.project_info
 import dds_cli.user
 import dds_cli.utils
+import dds_cli.message_helper
 from dds_cli.options import (
     destination_option,
     email_arg,
@@ -60,6 +61,8 @@ from dds_cli.options import (
     users_flag,
 )
 
+# import dds_cli.dds_gui.app
+
 ####################################################################################################
 # START LOGGING CONFIG ###################################################### START LOGGING CONFIG #
 ####################################################################################################
@@ -95,11 +98,24 @@ dds_cli.utils.stderr_console.print(
 )
 
 if len(sys.argv) == 1 or (len(sys.argv) > 1 and sys.argv[1] != "motd"):
-    motds = dds_cli.motd_manager.MotdManager.list_all_active_motds(table=False)
-    if motds:
-        dds_cli.utils.stderr_console.print("[bold]Important information:[/bold]")
-        for motd in motds:
-            dds_cli.utils.stderr_console.print(f"{motd['Created']} - {motd['Message']} \n")
+    try:
+        motds = dds_cli.motd_manager.MotdManager.list_all_active_motds(table=False)
+        if motds:
+            dds_cli.utils.stderr_console.print("[bold]Important information:[/bold]")
+            for motd in motds:
+                dds_cli.utils.stderr_console.print(f"{motd['Created']} - {motd['Message']} \n")
+    except dds_cli.exceptions.NoMOTDsError as no_motds_err:
+        # Print message about no MOTD
+        LOG.info(no_motds_err)
+    except (
+        dds_cli.exceptions.ApiResponseError,
+        dds_cli.exceptions.ApiRequestError,
+    ) as api_err:
+        # Avoid breaking CLI startup on MOTD fetch issues
+        LOG.debug("Skipping MOTD display due to API error: %s", api_err)
+    except dds_cli.exceptions.DDSCLIException as dds_cli_err:
+        # Covers 400/403 and other handled DDS CLI errors from perform_request
+        LOG.debug("Skipping MOTD display due to DDS error: %s", dds_cli_err)
 
 
 # -- dds -- #
@@ -193,6 +209,21 @@ def dds_main(click_ctx, verbose, force_no_log, log_file, no_prompt, token_path):
                 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()
+
+
 # ************************************************************************************************ #
 # MAIN DDS COMMANDS ************************************************************ MAIN DDS COMMANDS #
 # ************************************************************************************************ #
@@ -425,7 +456,9 @@ def login(click_ctx, totp, allow_group):
         LOG.warning("The --no-prompt flag is ignored for `dds auth login`")
     try:
         with dds_cli.auth.Auth(
-            token_path=click_ctx.get("TOKEN_PATH"), totp=totp, allow_group=allow_group
+            token_path=click_ctx.get("TOKEN_PATH"),
+            totp=totp,
+            allow_group=allow_group,
         ):
             # Authentication token renewed in the init method.
             LOG.info("[green] :white_check_mark: Authentication successful![/green]")
@@ -452,7 +485,8 @@ def logout(click_ctx):
         with dds_cli.auth.Auth(
             authenticate=False, token_path=click_ctx.get("TOKEN_PATH")
         ) as authenticator:
-            authenticator.logout()
+            logout_ok = authenticator.logout()
+            dds_cli.message_helper.CLIMessageHelper().logout_message(logout_ok=logout_ok)
 
     except (dds_cli.exceptions.DDSCLIException, dds_cli.exceptions.ApiRequestError) as err:
         LOG.error(err)
@@ -474,7 +508,13 @@ def info(click_ctx):
         with dds_cli.auth.Auth(
             authenticate=False, token_path=click_ctx.get("TOKEN_PATH")
         ) as authenticator:
-            authenticator.check()
+            expiration_time = authenticator.check()
+            if expiration_time:
+                dds_cli.message_helper.CLIMessageHelper().token_report_message(
+                    expiration_time=expiration_time
+                )
+            else:
+                dds_cli.message_helper.CLIMessageHelper().token_expired_message()
     except (dds_cli.exceptions.DDSCLIException, dds_cli.exceptions.ApiRequestError) as err:
         LOG.error(err)
         sys.exit(1)
@@ -744,12 +784,12 @@ def delete_user(click_ctx, email, self, is_invite):
         proceed_deletion = True
     else:
         if is_invite and self:
-            LOG.error("You cannot specify both `--self` and `--is-invite. Choose one.")
+            LOG.error("You cannot specify both `--self` and `--is-invite`. Choose one.")
             sys.exit(0)
 
         if not self and not email:
             LOG.error(
-                "You must specify an email adress associated to the user you're requesting to delete."
+                "You must specify an email address associated to the user you're requesting to delete."
             )
             sys.exit(0)
 
@@ -1837,7 +1877,6 @@ def get_data(
 
                     # Schedule the first num_threads futures for upload
                     for file in itertools.islice(iterator, num_threads):
-                        LOG.debug("Starting: %s", rich.markup.escape(str(file)))
                         # Execute download
                         download_threads[
                             texec.submit(getter.download_and_verify, file=file, progress=progress)
@@ -1876,7 +1915,6 @@ def get_data(
 
                         # Schedule the next set of futures for download
                         for next_file in itertools.islice(iterator, new_tasks):
-                            LOG.debug("Starting: %s", rich.markup.escape(str(next_file)))
                             # Execute download
                             download_threads[
                                 texec.submit(
@@ -2120,6 +2158,8 @@ def list_active_motds(click_ctx):
     ) as err:
         LOG.error(err)
         sys.exit(1)
+    except dds_cli.exceptions.NoMOTDsError as err:
+        LOG.info(err)
 
 
 # -- dds motd deactivate -- #

{dds_cli-2.11.0 → dds_cli-2.13.0}/dds_cli/auth.py

@@ -3,6 +3,8 @@
 # Standard library
 import logging
 import getpass
+from datetime import datetime
+from typing import Optional
 
 # Installed
 from rich.prompt import Prompt
@@ -39,6 +41,10 @@ class Auth(base.DDSBaseClass):
     ):
         """Handle actions regarding session management in DDS."""
         # Initiate DDSBaseClass to authenticate user
+        # Will authenticate user automatically if authenticate is True,
+        # else need to call login and confirm_twofactor methods to authenticate user
+        # This is to be able to use the auth class in the GUI code,
+        # where the user is not prompted for username and password
         super().__init__(
             authenticate=authenticate,
             force_renew_token=force_renew_token,
@@ -47,27 +53,83 @@ class Auth(base.DDSBaseClass):
             allow_group=allow_group,
         )
 
-    def check(self):
-        """Check if token exists and return info."""
+        self.allow_group = allow_group
+
+    def login(self, username: Optional[str] = None, password: Optional[str] = None) -> tuple:
+        """Login user to DDS. Used to manually authenticate users with username and password.
+        If not provided, will prompt for them. Currently only used in the GUI.
+
+        :param username: The username to login with.
+        :param password: The password to login with.
+
+        :return: Partial auth token and second factor method
+        """
+        # Create a User instance to call the login method
+        user_instance = user.User(
+            force_renew_token=False,
+            no_prompt=False,
+            token_path=self.token_path,
+            allow_group=self.allow_group,
+            retrieve_token=False,
+        )
+        return user_instance.login(username, password)
+
+    def confirm_twofactor(
+        self,
+        partial_auth_token: str,
+        secondfactor_method: str,
+        totp: str = None,
+        twofactor_code: Optional[str] = None,
+    ):
+        """Confirm 2FA for user. Used to manually confirm the 2FA code.
+        If not provided, will prompt for it. Currently only used in the GUI.
+
+        Sets the token for the base class after confirming 2FA.
+
+        :param partial_auth_token: The partial auth token.
+        :param twofactor_code: The 2FA code to confirm.
+
+        """
+
+        user_instance = user.User(
+            force_renew_token=False,
+            token_path=self.token_path,
+            allow_group=self.allow_group,
+            totp=totp,
+            retrieve_token=False,
+        )
+
+        user_instance.confirm_twofactor(
+            partial_auth_token=partial_auth_token,
+            secondfactor_method=secondfactor_method,
+            totp=totp,
+            twofactor_code=twofactor_code,
+        )
+
+        self.set_token(user_instance.token_dict)
+
+    def check(self) -> Optional[datetime]:
+        """Check if token exists and returns the token expiration time.
+
+        :return: Token info if token exists, None otherwise.
+        """
         token_file = user.TokenFile(token_path=self.token_path)
         if token_file.file_exists():
             token = token_file.read_token()
             if token:
-                token_file.token_report(token=token)
-        else:
-            LOG.info(
-                "[red]No saved token found, or token has expired. "
-                "Authenticate yourself with `dds auth login` to use this functionality![/red]"
-            )
+                return token_file.token_report(token=token)
+        return None
+
+    def logout(self) -> bool:
+        """Logout user by removing authenticated token.
 
-    def logout(self):
-        """Logout user by removing authenticated token."""
+        :return: True if logout was successful, False if already logged out.
+        """
         token_file = user.TokenFile(token_path=self.token_path)
         if token_file.file_exists():
             token_file.delete_token()
-            LOG.info("[green] :white_check_mark: Successfully logged out![/green]")
-        else:
-            LOG.info("[green]Already logged out![/green]")
+            return True
+        return False
 
     def twofactor(self, auth_method: str = None):
         """Perform 2FA for user."""

{dds_cli-2.11.0 → dds_cli-2.13.0}/dds_cli/base.py

@@ -1,4 +1,4 @@
-"""Base class for the DDS CLI. Verifies the users access to the DDS."""
+"""Base class for the DDS CLI. Verifies the user's access to the DDS."""
 
 ###############################################################################
 # IMPORTS ########################################################### IMPORTS #
@@ -58,6 +58,8 @@ class DDSBaseClass:
         self.no_prompt = no_prompt
         self.token_path = token_path
 
+        self.totp = totp
+
         # Keyboardinterrupt
         self.stop_doing = False
 
@@ -67,8 +69,8 @@ class DDSBaseClass:
                 force_renew_token=force_renew_token,
                 no_prompt=no_prompt,
                 token_path=token_path,
-                totp=totp,
                 allow_group=allow_group,
+                totp=totp,
             )
             self.token = dds_user.token_dict
 
@@ -113,6 +115,13 @@ class DDSBaseClass:
 
     # Public methods ############################### Public methods #
 
+    def set_token(self, token_dict: dict) -> None:
+        """Sets the token for the base class.
+        Called from auth class to set the token when authenticating
+        in the gui without running the base class with authenticate set to true.
+        """
+        self.token = token_dict
+
     def get_project_info(self):
         """Collect project information from API."""
 

dds_cli-2.13.0/dds_cli/constants.py

@@ -0,0 +1,14 @@
+"""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
+
+# Import these constants when using '*'
+__all__ = ["READ_TIMEOUT", "CONNECT_TIMEOUT"]

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

@@ -40,7 +40,7 @@ def verify_proceed(func):
         # Check if keyboardinterrupt in dds
         if self.stop_doing:
             # TODO (ina): Add save to status here
-            message = "KeyBoardInterrupt - cancelling file {escape(file)}"
+            message = f"KeyboardInterrupt - cancelling file {escape(file)}"
             LOG.warning(message)
             return False  # Do not proceed
 
@@ -52,7 +52,6 @@ def verify_proceed(func):
 
         # Mark as started
         self.status[file]["started"] = True
-        LOG.debug("File '%s' started: %s", escape(str(file)), func.__name__)
 
         # Run function
         ok_to_proceed, message = func(self, file=file, *args, **kwargs)
@@ -101,7 +100,6 @@ def update_status(func):
 
         # Update status to started
         self.status[file][func.__name__].update({"started": True})
-        LOG.debug("File '%s' status updated to %s: started", escape(str(file)), func.__name__)
 
         # Run function
         ok_to_continue, message, *_ = func(self, file=file, *args, **kwargs)
@@ -109,14 +107,12 @@ def update_status(func):
         # ok_to_continue = False
         if not ok_to_continue:
             # Save info about which operation failed
-
             self.status[file]["failed_op"] = func.__name__
             LOG.warning("%s failed: %s", func.__name__, message)
 
         else:
             # Update status to done
             self.status[file][func.__name__].update({"done": True})
-            LOG.debug("File %s status updated to %s: done", escape(str(file)), func.__name__)
 
         return ok_to_continue, message
 

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

@@ -14,6 +14,7 @@ from rich.markup import escape
 from rich.progress import Progress, SpinnerColumn
 
 # Own modules
+from dds_cli import constants
 from dds_cli import DDSEndpoint, FileSegment
 from dds_cli import file_handler_remote as fhr
 from dds_cli import data_remover as dr
@@ -115,7 +116,9 @@ class DataGetter(base.DDSBaseClass):
         """Download the file, reveals the original data and verifies the integrity."""
         all_ok, message = (False, "")
         file_info = self.filehandler.data[file]
+        file_name_in_db = escape(str(file_info["name_in_db"]))
 
+        LOG.debug("Step 'download_and_verify': started file '%s'", file_name_in_db)
         # File task for downloading
         task = progress.add_task(
             description=txt.TextHandler.task_name(file=escape(str(file)), step="get"),
@@ -133,20 +136,49 @@ class DataGetter(base.DDSBaseClass):
             total=file_info["size_original"],
         )
 
-        LOG.debug("File '%s' downloaded: %s", escape(str(file)), file_downloaded)
+        LOG.debug("File '%s' downloaded: %s", file_name_in_db, file_downloaded)
+
+        file_size_verified = False
 
         if file_downloaded:
+            ## File size verification
+            expected_size = file_info["size_stored"]
+            actual_size = file_info["path_downloaded"].stat().st_size
+
+            if actual_size == expected_size:
+                file_size_verified = True
+                LOG.debug(
+                    "Downloaded file '%s' size matches expected size: %s bytes.",
+                    file_name_in_db,
+                    expected_size,
+                )
+            else:
+                LOG.debug(
+                    "Downloaded file '%s' size mismatch: expected %s bytes, got %s bytes. Not decrypting.",
+                    file_name_in_db,
+                    expected_size,
+                    actual_size,
+                )
+
+        if file_size_verified:
             db_updated, message = self.update_db(file=file)
-            LOG.debug("Database updated: %s", db_updated)
+            LOG.debug(
+                "API call: database updated for file '%s': %s",
+                file_name_in_db,
+                db_updated,
+            )
 
-            LOG.debug("Beginning decryption of file '%s'...", escape(str(file)))
+            LOG.debug("Beginning decryption of file '%s'...", file_name_in_db)
             file_saved = False
             with fe.Decryptor(
                 project_keys=self.keys,
                 peer_public=file_info["public_key"],
                 key_salt=file_info["salt"],
+                files_directory=self.dds_directory.directories["FILES"],
             ) as decryptor:
-                streamed_chunks = decryptor.decrypt_file(infile=file_info["path_downloaded"])
+                streamed_chunks = decryptor.decrypt_file(
+                    infile=file_info["path_downloaded"], outfile=file
+                )
 
                 stream_to_file_func = (
                     fc.Compressor.decompress_filechunks
@@ -157,14 +189,35 @@ class DataGetter(base.DDSBaseClass):
                 file_saved, message = stream_to_file_func(
                     chunks=streamed_chunks,
                     outfile=file,
+                    files_directory=self.dds_directory.directories["FILES"],
                 )
 
-            LOG.debug("File saved? %s", file_saved)
+            LOG.debug("File '%s' saved? %s", file_name_in_db, file_saved)
             if file_saved:
+                # Check file size post-decryption and post-decompression
+                expected_size = file_info["size_original"]
+                actual_size = pathlib.Path(file).stat().st_size
+                if actual_size == expected_size:
+                    LOG.debug(
+                        "Decrypted file '%s' size matches expected size: %s bytes.",
+                        file_name_in_db,
+                        expected_size,
+                    )
+                else:
+                    LOG.debug(
+                        "Decrypted file '%s' size mismatch: expected %s bytes, got %s bytes",
+                        file_name_in_db,
+                        expected_size,
+                        actual_size,
+                    )
                 # TODO (ina): decide on checksum verification method --
                 # this checks original, the other is generated from compressed
                 all_ok, message = (
-                    fe.Encryptor.verify_checksum(file=file, correct_checksum=file_info["checksum"])
+                    fe.Encryptor.verify_checksum(
+                        file=file,
+                        correct_checksum=file_info["checksum"],
+                        files_directory=self.dds_directory.directories["FILES"],
+                    )
                     if self.verify_checksum
                     else (True, "")
                 )
@@ -183,8 +236,11 @@ class DataGetter(base.DDSBaseClass):
         file_remote = self.filehandler.data[file]["url"]
 
         try:
-            # TODO: Set timeout? (pylint)
-            with requests.get(file_remote, stream=True) as req:
+            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):

{dds_cli-2.11.0 → dds_cli-2.13.0}/dds_cli/data_putter.py

@@ -95,7 +95,6 @@ def put(
 
                 # Schedule the first num_threads futures for upload
                 for file in itertools.islice(iterator, num_threads):
-                    LOG.debug("Starting: '%s'", escape(file))
                     upload_threads[
                         texec.submit(
                             putter.protect_and_upload,
@@ -119,7 +118,7 @@ def put(
                         # Get result from future and schedule database update
                         for fut in done:
                             uploaded_file = upload_threads.pop(fut)
-                            LOG.debug("Future done for file: %s", escape(uploaded_file))
+                            LOG.debug("Future done for file: '%s'", escape(uploaded_file))
 
                             # Get result
                             try:
@@ -291,6 +290,8 @@ class DataPutter(base.DDSBaseClass):
         all_ok, saved, message = (False, False, "")  # Error catching
         file_info = self.filehandler.data[file]  # Info on current file
         file_public_key, salt = ("", "")  # Crypto info
+        file_path_raw = escape(str(file_info["path_raw"]))
+        LOG.debug("Step '%s': started file '%s'", self.method, file_path_raw)
 
         # Progress bar for processing
         task = progress.add_task(
@@ -305,6 +306,7 @@ class DataPutter(base.DDSBaseClass):
         # Stream the chunks into the encryptor to save the encrypted chunks
         with fe.Encryptor(project_keys=self.keys) as encryptor:
             # Encrypt and save chunks
+            LOG.debug("Encrypting file '%s'", file_path_raw)
             saved, message = encryptor.encrypt_filechunks(
                 chunks=streamed_chunks,
                 outfile=file_info["path_processed"],
@@ -315,18 +317,21 @@ class DataPutter(base.DDSBaseClass):
             file_public_key = encryptor.get_public_component_hex(private_key=encryptor.my_private)
             salt = encryptor.salt
 
-        LOG.debug("Updating file processed size: %s", file_info["path_processed"])
-
         # Update file info incl size, public key, salt
         self.filehandler.data[file]["public_key"] = file_public_key
         self.filehandler.data[file]["salt"] = salt
         self.filehandler.data[file]["size_processed"] = file_info["path_processed"].stat().st_size
 
+        LOG.debug(
+            "File '%s' processed size: %s",
+            file_path_raw,
+            file_info["path_processed"].stat().st_size,
+        )
+
         if saved:
             LOG.debug(
-                "File successfully encrypted: '%s'. New location: '%s'",
-                escape(file),
-                escape(str(file_info["path_processed"])),
+                "File successfully encrypted: '%s'",
+                file_path_raw,
             )
             # Update progress bar for upload
             progress.reset(
@@ -346,7 +351,8 @@ class DataPutter(base.DDSBaseClass):
                 if db_updated:
                     all_ok = True
                     LOG.debug(
-                        "File successfully uploaded and added to the database: '%s'", escape(file)
+                        "File successfully uploaded and added to the database: '%s'",
+                        file_path_raw,
                     )
 
         if not saved or all_ok:
@@ -373,6 +379,8 @@ class DataPutter(base.DDSBaseClass):
         # File info
         file_local = str(self.filehandler.data[file]["path_processed"])
         file_remote = self.filehandler.data[file]["path_remote"]
+        file_path_raw = self.filehandler.data[file]["path_raw"]
+        LOG.debug("Step '%s': started file '%s'", self.method, file_path_raw)
 
         try:
             with self.s3connector as conn:
@@ -441,6 +449,7 @@ class DataPutter(base.DDSBaseClass):
                 error_message=f"Failed to add file '{file}' to database",
             )
             added_to_db, message = (True, response_json)
+            LOG.debug("API call for file '%s: Adding to database'", fileinfo["path_raw"])
         except (
             dds_cli.exceptions.ApiRequestError,
             dds_cli.exceptions.ApiResponseError,

dds_cli-2.13.0/dds_cli/dds_gui/__init__.py

@@ -0,0 +1,6 @@
+"""DDS GUI package."""
+
+# Make the GUI components available for import
+from dds_cli.dds_gui.app import DDSApp
+
+__all__ = ["DDSApp"]