dds-cli 2.2.63__tar.gz → 2.2.65__tar.gz

{dds_cli-2.2.63 → dds_cli-2.2.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dds_cli
-Version: 2.2.63
+Version: 2.2.65
 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

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/__init__.py

@@ -1,3 +1,4 @@
+# pylint: skip-file
 """DDS CLI."""
 
 import datetime
@@ -59,7 +60,7 @@ class DDSEndpoint:
     BASE_ENDPOINT_LOCAL = "http://127.0.0.1:5000/api/v1"
     BASE_ENDPOINT_DOCKER = "http://dds_backend:5000/api/v1"
     BASE_ENDPOINT_REMOTE = "https://delivery.scilifelab.se/api/v1"
-    BASE_ENDPOINT_REMOTE_TEST = "https://dds-dev.dckube.scilifelab.se/api/v1"
+    BASE_ENDPOINT_REMOTE_TEST = "https://dds-dev.dckube3.scilifelab.se/api/v1"
     if os.getenv("DDS_CLI_ENV") == "development":
         BASE_ENDPOINT = BASE_ENDPOINT_LOCAL
     elif os.getenv("DDS_CLI_ENV") == "docker-dev":

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/__main__.py

@@ -8,8 +8,8 @@
 import concurrent.futures
 import itertools
 import logging
-import os
 import sys
+import typing
 
 # Installed
 import pathlib
@@ -70,7 +70,6 @@ LOG = logging.getLogger("dds_cli")
 # Configuration for rich-click output
 click.rich_click.MAX_WIDTH = 100
 
-
 ## # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #                                                                                                  #
 #                          MMMM   MMMM      AAAA      II   NNNN    NN                              #
@@ -82,15 +81,15 @@ click.rich_click.MAX_WIDTH = 100
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # ##
 
 
-dds_url = dds_cli.DDSEndpoint.BASE_ENDPOINT
+DDS_URL = dds_cli.DDSEndpoint.BASE_ENDPOINT
+DDS_URL_BASE = DDS_URL[: DDS_URL.index("/", 8)]
+
 # Print header to STDERR
 dds_cli.utils.stderr_console.print(
     "[green]     ︵",
     "\n[green] ︵ (  )   ︵",
     "\n[green](  ) ) (  (  )[/]   [bold]SciLifeLab Data Delivery System",
-    "\n[green] ︶  (  ) ) ([/]    [blue][link={0}]{0}/[/link]".format(
-        dds_url[: dds_url.index("/", 8)]
-    ),
+    f"\n[green] ︶  (  ) ) ([/]    [blue][link={DDS_URL_BASE}]{DDS_URL_BASE}/[/link]",
     f"\n[green]      ︶ (  )[/]    [dim]CLI Version {dds_cli.__version__}",
     "\n[green]          ︶",
     highlight=False,
@@ -99,7 +98,7 @@ 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(f"[bold]Important information:[/bold]")
+        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")
 
@@ -379,7 +378,10 @@ def auth_group_command(_):
     is_flag=True,
     required=False,
     default=False,
-    help="[Not recommended, use with care] Allow read permissions to group. Sets 640 permission instead of 600, allowing others to access your authenticated session token.",
+    help=(
+        "[Not recommended, use with care] Allow read permissions to group. Sets 640 permission instead of 600, "
+        "allowing others to access your authenticated session token."
+    ),
 )
 @click.pass_obj
 def login(click_ctx, totp, allow_group):
@@ -403,7 +405,7 @@ def login(click_ctx, totp, allow_group):
             token_path=click_ctx.get("TOKEN_PATH"), totp=totp, allow_group=allow_group
         ):
             # Authentication token renewed in the init method.
-            LOG.info(f"[green] :white_check_mark: Authentication successful![/green]")
+            LOG.info("[green] :white_check_mark: Authentication successful![/green]")
     except (
         dds_cli.exceptions.APIError,
         dds_cli.exceptions.AuthenticationError,
@@ -561,7 +563,7 @@ def list_users(click_ctx, unit, invites):
             token_path=click_ctx.get("TOKEN_PATH"),
         ) as lister:
             if invites:
-                lister.list_invites(unit=unit, invites=invites)
+                lister.list_invites(invites=invites)
             else:
                 lister.list_users(unit=unit)
 
@@ -582,7 +584,7 @@ def list_users(click_ctx, unit, invites):
     required=True, help_message="[Super Admins only] The username of the account you want to check."
 )
 @click.pass_obj
-def list_users(click_ctx, username):
+def find_users(click_ctx, username):
     """Check if a username is registered to an account in the DDS."""
     try:
         with dds_cli.account_manager.AccountManager(
@@ -620,7 +622,7 @@ def list_users(click_ctx, username):
     ),
     help=(
         "Type of account. To include a space in the chosen role, use quotes "
-        '(e.g. "Unit Personnel") or escape the space (e.g. Unit\ Personnel)'
+        r'(e.g. "Unit Personnel") or escape the space (e.g. Unit\ Personnel)'
     ),
 )
 @click.option(
@@ -998,8 +1000,9 @@ def create(
                 email_overlap = set(owner) & set(researcher)
                 if email_overlap:
                     LOG.info(
-                        f"The email(s) {email_overlap} specified as both owner and researcher! "
-                        "Please specify a unique role for each email."
+                        "The email(s) %s specified as both owner and researcher! "
+                        "Please specify a unique role for each email.",
+                        email_overlap,
                     )
                     sys.exit(1)
                 if owner:
@@ -1686,7 +1689,8 @@ def get_data(
         sys.exit(1)
     elif not get_all and not (source or source_path_file):
         LOG.error(
-            "Specify either '--source' or '--source-path-file' to download specific directories/files, or '--get-all' to download all project contents."
+            "Specify either '--source' or '--source-path-file' to download specific directories/files, "
+            "or '--get-all' to download all project contents."
         )
         sys.exit(1)
 
@@ -1725,7 +1729,7 @@ def get_data(
 
                     # Schedule the first num_threads futures for upload
                     for file in itertools.islice(iterator, num_threads):
-                        LOG.debug(f"Starting: {rich.markup.escape(str(file))}")
+                        LOG.debug("Starting: %s", rich.markup.escape(str(file)))
                         # Execute download
                         download_threads[
                             texec.submit(getter.download_and_verify, file=file, progress=progress)
@@ -1741,19 +1745,21 @@ def get_data(
 
                         for dfut in ddone:
                             downloaded_file = download_threads.pop(dfut)
-                            LOG.debug(
-                                f"Future done: {rich.markup.escape(str(downloaded_file))}",
-                            )
+                            LOG.debug("Future done: %s", rich.markup.escape(str(downloaded_file)))
 
                             # Get result
                             try:
                                 file_downloaded = dfut.result()
                                 LOG.debug(
-                                    f"Download of {rich.markup.escape(str(downloaded_file))} successful: {file_downloaded}"
+                                    "Download of %s successful: %s",
+                                    rich.markup.escape(str(downloaded_file)),
+                                    file_downloaded,
                                 )
                             except concurrent.futures.BrokenExecutor as err:
                                 LOG.critical(
-                                    f"Download of file {rich.markup.escape(str(downloaded_file))} failed! Error: {err}"
+                                    "Download of file %s failed! Error: %s",
+                                    rich.markup.escape(str(downloaded_file)),
+                                    err,
                                 )
                                 continue
 
@@ -1762,7 +1768,7 @@ def get_data(
 
                         # Schedule the next set of futures for download
                         for next_file in itertools.islice(iterator, new_tasks):
-                            LOG.debug(f"Starting: {rich.markup.escape(str(next_file))}")
+                            LOG.debug("Starting: %s", rich.markup.escape(str(next_file)))
                             # Execute download
                             download_threads[
                                 texec.submit(
@@ -1867,7 +1873,7 @@ def rm_data(click_ctx, project, file, folder, rm_all):
     # Warn if trying to remove all contents
     if rm_all:
         if no_prompt:
-            LOG.warning(f"Deleting all files within project '{project}'")
+            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}'?"
@@ -2081,3 +2087,46 @@ def set_maintenance_mode(click_ctx, setting):
     ) as err:
         LOG.error(err)
         sys.exit(1)
+
+
+# Stats
+
+
+@dds_main.command(name="stats", no_args_is_help=False)
+@click.argument(
+    "stat_type", nargs=1, type=click.Choice(["active", "all", "size"], case_sensitive=True)
+)
+@click.pass_obj
+def get_stats(click_ctx, stat_type):
+    """Get statistics in the DDS."""
+    try:
+        # Num projects
+        with dds_cli.data_lister.DataLister(
+            show_usage=True,
+            no_prompt=click_ctx.get("NO_PROMPT", False),
+            json=True,
+            token_path=click_ctx.get("TOKEN_PATH"),
+        ) as lister:
+            # Get projects, only active by default
+            projects: typing.List = lister.list_projects(show_all=stat_type == "all")
+
+            if stat_type == "size":
+                # Calculate total amount of saved data in active projects
+                title_bold_part: str = "Bytes"
+                title_rest: str = "currently stored in DDS"
+                value: int = sum(x["Size"] for x in projects)
+            else:
+                # Get number of projects
+                title_bold_part: str = "Active" if stat_type == "active" else "Total"
+                title_rest: str = "projects"
+                value: int = len(projects)
+
+            LOG.info("[bold]%s[/bold] %s: %s", title_bold_part, title_rest, value)
+    except (
+        dds_cli.exceptions.APIError,
+        dds_cli.exceptions.AuthenticationError,
+        dds_cli.exceptions.ApiResponseError,
+        dds_cli.exceptions.ApiRequestError,
+    ) as err:
+        LOG.error(err)
+        sys.exit(1)

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/account_manager.py

@@ -5,12 +5,10 @@
 ###################################################################################################
 
 # Standard library
-from email import header
 import logging
 
 # Installed
 import rich.markup
-from rich.table import Table
 
 # Own modules
 import dds_cli
@@ -139,11 +137,16 @@ class AccountManager(dds_cli.base.DDSBaseClass):
         info = response.get("info")
         if info:
             LOG.info(
-                f"Username:          {info['username']} \
-                \nRole:              {info['role']} \
-                \nName:              {info['name']} \
-                \nPrimary Email:     {info['email_primary']} \
-                \nAssociated Emails: {', '.join(str(x) for x in info['emails_all'])}"
+                "Username:          %s \n"
+                "Role:              %s \n"
+                "Name:              %s \n"
+                "Primary Email:     %s \n"
+                "Associated Emails: %s \n",
+                info["username"],
+                info["role"],
+                info["name"],
+                info["email_primary"],
+                ", ".join(str(x) for x in info["emails_all"]),
             )
 
     def user_activation(self, email, action):
@@ -173,7 +176,7 @@ class AccountManager(dds_cli.base.DDSBaseClass):
         )
 
         if project_errors:
-            LOG.warning(f"Could not fix user '{email}' access to the following projects:")
+            LOG.warning("Could not fix user '%s' access to the following projects:", email)
             msg = project_errors
         else:
             msg = response_json.get(
@@ -197,7 +200,7 @@ class AccountManager(dds_cli.base.DDSBaseClass):
         )
 
         if response.get("empty"):
-            LOG.info(f"There are no Unit Admins or Unit Personnel connected to unit '{unit}'")
+            LOG.info("There are no Unit Admins or Unit Personnel connected to unit '%s'", unit)
             return
 
         users, keys = dds_cli.utils.get_required_in_response(
@@ -226,7 +229,7 @@ class AccountManager(dds_cli.base.DDSBaseClass):
         # Print out table
         dds_cli.utils.print_or_page(item=table)
 
-    def list_invites(self, unit: str = None, invites: bool = None) -> None:
+    def list_invites(self, invites: bool = None) -> None:
         """List all unit users within a specific unit."""
         response, _ = dds_cli.utils.perform_request(
             endpoint=dds_cli.DDSEndpoint.LIST_INVITED_USERS,
@@ -239,7 +242,7 @@ class AccountManager(dds_cli.base.DDSBaseClass):
         invites = response.get("invites")
 
         if not invites:
-            LOG.info(f"There are no current invites")
+            LOG.info("There are no current invites")
             return
 
         table = dds_cli.utils.create_table(
@@ -269,5 +272,5 @@ class AccountManager(dds_cli.base.DDSBaseClass):
             )
 
         LOG.info(
-            f"Account exists: {'[blue][bold]Yes[/bold][/blue]' if exists else '[red][bold]No[/bold][/red]'}"
+            "Account exists: [bold]%s[/bold]", "[blue]Yes[/blue]" if exists else "[red]No[/red]"
         )

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/auth.py

@@ -4,7 +4,7 @@ import logging
 import getpass
 
 # Installed
-import rich
+from rich.prompt import Prompt
 
 # Own modules
 import dds_cli
@@ -48,6 +48,7 @@ class Auth(base.DDSBaseClass):
         )
 
     def check(self):
+        """Check if token exists and return info."""
         token_file = user.TokenFile(token_path=self.token_path)
         if token_file.file_exists():
             token = token_file.read_token()
@@ -55,10 +56,12 @@ class Auth(base.DDSBaseClass):
                 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]"
+                "[red]No saved token found, or token has expired. "
+                "Authenticate yourself with `dds auth login` to use this functionality![/red]"
             )
 
     def logout(self):
+        """Logout user by removing authenticated token."""
         token_file = user.TokenFile(token_path=self.token_path)
         if token_file.file_exists():
             token_file.delete_token()
@@ -67,6 +70,7 @@ class Auth(base.DDSBaseClass):
             LOG.info("[green]Already logged out![/green]")
 
     def twofactor(self, auth_method: str = None):
+        """Perform 2FA for user."""
         if auth_method == "totp":
             response_json, _ = dds_cli.utils.perform_request(
                 endpoint=dds_cli.DDSEndpoint.USER_ACTIVATE_TOTP,
@@ -78,7 +82,7 @@ class Auth(base.DDSBaseClass):
             LOG.info(
                 "Activating authentication via email, please (re-)enter your username and password:"
             )
-            username: str = rich.prompt.Prompt.ask("DDS username")
+            username: str = Prompt.ask("DDS username")
             password: str = getpass.getpass(prompt="DDS password: ")
 
             if password == "":
@@ -95,6 +99,7 @@ class Auth(base.DDSBaseClass):
         LOG.info(response_json.get("message"))
 
     def deactivate(self, username: str = None):
+        """Deactivate TOTP for user."""
         response_json, _ = dds_cli.utils.perform_request(
             endpoint=dds_cli.DDSEndpoint.TOTP_DEACTIVATE,
             headers=self.token,

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/base.py

@@ -6,14 +6,10 @@
 
 # Standard library
 import logging
-import os
 import pathlib
 import typing
 
 # Installed
-import http
-import time
-import simplejson
 from rich.progress import Progress, SpinnerColumn
 
 # Own modules
@@ -71,7 +67,7 @@ class DDSBaseClass:
             # Get attempted operation e.g. put/ls/rm/get
             if self.method not in DDS_METHODS:
                 raise exceptions.InvalidMethodError(attempted_method=self.method)
-            LOG.debug(f"Attempted operation: {self.method}")
+            LOG.debug("Attempted operation: %s", self.method)
 
             # Use user defined destination if any specified
             if self.method in DDS_DIR_REQUIRED_METHODS:
@@ -114,14 +110,14 @@ class DDSBaseClass:
 
             self.keys = self.__get_project_keys()
 
-            self.status = dict()
+            self.status: typing.Dict = {}
             self.filehandler = None
 
     def __enter__(self):
         """Return self when using context manager."""
         return self
 
-    def __exit__(self, exc_type, exc_value, tb, max_fileerrs: int = 40):
+    def __exit__(self, exception_type, exception_value, traceback, max_fileerrs: int = 40):
         """Finish and print out delivery summary.
 
         This is not entered if there's an error during __init__.
@@ -131,8 +127,8 @@ class DDSBaseClass:
                 self.__printout_delivery_summary()
 
         # Exception is not handled
-        if exc_type is not None:
-            LOG.debug(f"Exception: {exc_type} with value {exc_value}")
+        if exception_type is not None:
+            LOG.debug("Exception: %s with value %s", exception_type, exception_value)
             return False
 
         return True
@@ -188,7 +184,7 @@ class DDSBaseClass:
     def __printout_delivery_summary(self):
         """Print out the delivery summary if any files were cancelled."""
         if self.stop_doing:
-            LOG.info(f"{'Upload' if self.method == 'put' else 'Download'} cancelled.\n")
+            LOG.info("%s cancelled.\n", "Upload" if self.method == "put" else "Download")
             return
 
         # TODO: Look into a better summary print out - old deleted for now
@@ -210,21 +206,23 @@ class DDSBaseClass:
                     f"Please verify that the following error log has been generated: {self.failed_delivery_log}\n"
                     "[red][bold]Do not[/bold][/red] delete this file; The Data Centre may need it during DDS support."
                 )
-            else:
-                # TODO: --destination should be able to >at least< overwrite the files in the
-                # previously created download location.
-                raise exceptions.DownloadError(
-                    "Errors occurred during download.\n"
-                    "If you wish to retry the download, re-run the `dds data get` command again, "
-                    "specifying the same options as you did now. A new directory will "
-                    "automatically be created and all files will be downloaded again.\n\n"
-                    f"See {self.failed_delivery_log} for more information."
-                )
 
-        elif nr_uploaded:
+            # TODO: --destination should be able to >at least< overwrite the files in the
+            # previously created download location.
+            raise exceptions.DownloadError(
+                "Errors occurred during download.\n"
+                "If you wish to retry the download, re-run the `dds data get` command again, "
+                "specifying the same options as you did now. A new directory will "
+                "automatically be created and all files will be downloaded again.\n\n"
+                f"See {self.failed_delivery_log} for more information."
+            )
+
+        if nr_uploaded:
             # Raise exception in order to give exit code 1
             LOG.warning(
-                f"{nr_uploaded} files have already been uploaded to this project.\nUpload [bold]partially[/bold] completed!\n"
+                "%s files have already been uploaded to this project.\n"
+                "Upload [bold]partially[/bold] completed!\n",
+                nr_uploaded,
             )
 
         else:
@@ -234,7 +232,7 @@ class DDSBaseClass:
             )
 
         if self.method == "get" and len(self.filehandler.data) > len(any_failed):
-            LOG.info(f"Any downloaded files are located: {self.filehandler.local_destination}.")
+            LOG.info("Any downloaded files are located at: %s.", self.filehandler.local_destination)
 
     def __collect_all_failed(self, sort: bool = True) -> list:
         """Put cancelled files from status in to failed dict and sort the output."""

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/custom_decorators.py

@@ -52,13 +52,13 @@ def verify_proceed(func):
 
         # Mark as started
         self.status[file]["started"] = True
-        LOG.debug(f"File {escape(str(file))} started {func.__name__}")
+        LOG.debug("File '%s' started: %s", escape(str(file)), func.__name__)
 
         # Run function
         ok_to_proceed, message = func(self, file=file, *args, **kwargs)
         # Cancel file(s) if something failed
         if not ok_to_proceed:
-            LOG.warning(f"{func.__name__} failed: {message}")
+            LOG.warning("%s failed: %s", func.__name__, message)
             self.status[file].update({"cancel": True, "message": message})
             if self.status[file].get("failed_op") is None:
                 self.status[file]["failed_op"] = "crypto"
@@ -91,13 +91,17 @@ def update_status(func):
     def wrapped(self, file, *args, **kwargs):
         # TODO (ina): add processing?
         if func.__name__ not in ["put", "add_file_db", "get", "update_db"]:
-            raise Exception(f"The function {func.__name__} cannot be used with this decorator.")
+            raise dds_cli.exceptions.DDSCLIException(
+                f"The function {func.__name__} cannot be used with this decorator."
+            )
         if func.__name__ not in self.status[file]:
-            raise Exception(f"No status found for function {func.__name__}.")
+            raise dds_cli.exceptions.DDSCLIException(
+                f"No status found for function {func.__name__}."
+            )
 
         # Update status to started
         self.status[file][func.__name__].update({"started": True})
-        LOG.debug(f"File {escape(str(file))} status updated to {func.__name__}: started")
+        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)
@@ -107,12 +111,12 @@ def update_status(func):
             # Save info about which operation failed
 
             self.status[file]["failed_op"] = func.__name__
-            LOG.warning(f"{func.__name__} failed: {message}")
+            LOG.warning("%s failed: %s", func.__name__, message)
 
         else:
             # Update status to done
             self.status[file][func.__name__].update({"done": True})
-            LOG.debug(f"File {escape(str(file))} status updated to {func.__name__}: done")
+            LOG.debug("File %s status updated to %s: done", escape(str(file)), func.__name__)
 
         return ok_to_continue, message
 
@@ -137,7 +141,7 @@ def subpath_required(func):
             except OSError as err:
                 return False, str(err)
 
-            LOG.debug(f"New directory created: {full_subpath}")
+            LOG.debug("New directory created: '%s'", full_subpath)
 
         return func(self, file=file, *args, **kwargs)
 
@@ -149,8 +153,6 @@ def removal_spinner(func):
 
     @functools.wraps(func)
     def create_and_remove_task(self, *args, **kwargs):
-        message = ""
-
         with Progress(
             "[bold]{task.description}",
             SpinnerColumn(spinner_name="dots12", style="white"),
@@ -186,7 +188,7 @@ def removal_spinner(func):
                     dds_cli.utils.console.print(self.failed_table)
             else:
                 dds_cli.utils.console.print(self.failed_table)
-            LOG.warning(f"Finished {description_lc} with errors, see table above")
+            LOG.warning("Finished %s with errors, see table above", description_lc)
         elif self.failed_files is not None:
             self.failed_files["result"] = f"Finished {description_lc} with errors"
             dds_cli.utils.console.print(self.failed_files)

{dds_cli-2.2.63 → dds_cli-2.2.65}/dds_cli/data_getter.py

@@ -10,7 +10,6 @@ import pathlib
 
 # Installed
 import requests
-import simplejson
 from rich.markup import escape
 from rich.progress import Progress, SpinnerColumn
 
@@ -101,7 +100,7 @@ class DataGetter(base.DDSBaseClass):
 
             if not self.filehandler.data:
                 if self.temporary_directory and self.temporary_directory.is_dir():
-                    LOG.debug(f"Deleting temporary folder {self.temporary_directory}.")
+                    LOG.debug("Deleting temporary folder '%s'.", self.temporary_directory)
                     dds_cli.utils.delete_folder(self.temporary_directory)
                 raise dds_cli.exceptions.DownloadError("No files to download.")
 
@@ -134,13 +133,13 @@ class DataGetter(base.DDSBaseClass):
             total=file_info["size_original"],
         )
 
-        LOG.debug(f"File {escape(str(file))} downloaded: {file_downloaded}")
+        LOG.debug("File '%s' downloaded: %s", escape(str(file)), file_downloaded)
 
         if file_downloaded:
             db_updated, message = self.update_db(file=file)
-            LOG.debug(f"Database updated: {db_updated}")
+            LOG.debug("Database updated: %s", db_updated)
 
-            LOG.debug(f"Beginning decryption of file {escape(str(file))}...")
+            LOG.debug("Beginning decryption of file '%s'...", escape(str(file)))
             file_saved = False
             with fe.Decryptor(
                 project_keys=self.keys,
@@ -160,7 +159,7 @@ class DataGetter(base.DDSBaseClass):
                     outfile=file,
                 )
 
-            LOG.debug(f"file saved? {file_saved}")
+            LOG.debug("File saved? %s", file_saved)
             if file_saved:
                 # TODO (ina): decide on checksum verification method --
                 # this checks original, the other is generated from compressed
@@ -184,6 +183,7 @@ 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:
                 req.raise_for_status()
                 with file_local.open(mode="wb") as new_file:
@@ -214,7 +214,6 @@ class DataGetter(base.DDSBaseClass):
     def update_db(self, file):
         """Update file info in db."""
         updated_in_db = False
-        error = ""
 
         # Get file info
         fileinfo = self.filehandler.data[file]