From 6929d23aaff7e54b9a9bf5476cd56dbb2a7bba41 Mon Sep 17 00:00:00 2001
From: mkb79 <mkb79@hackitall.de>
Date: Fri, 7 Aug 2026 21:28:33 +0200
Subject: [PATCH] style: apply Ruff's safe autofixes

The baseline added with #281 recorded 442 findings. 219 of them Ruff can fix
on its own without changing behaviour, so this applies them and shrinks the
baseline accordingly.

Fully gone, 23 rules: the type annotation modernization the project's own
target-version already implies (UP006/UP007/UP045, 98 findings), import
sorting (I001), docstring formatting (D2xx/D4xx), quote style (Q000),
redundant f-strings and conversions (F541, RUF010), and a handful of one-off
simplifications (UP009, UP015, UP025, UP032, UP034, UP035, PLR5501, RUF021,
RUF022, RUF100).

  442 findings  ->  230
  168 file/rule pairs in the baseline  ->  75
  29 files with findings  ->  23

Nothing was fixed with --unsafe-fixes; those 109 remain untouched because
they can change behaviour and deserve to be read one by one.

`ruff check --fix` reorders imports, which left `src/audible_cli/__init__.py`
unformatted even though it had been clean. It is formatted here and dropped
from the formatter's exclude list.

The remainder is dominated by G004 (78 f-strings in logging calls), D415 (60
docstring endings) and W291 (24 trailing whitespace), none of which Ruff will
fix on its own.
---
 docs/source/conf.py                          |  2 +
 plugin_cmds/cmd_decrypt.py                   | 50 +++++++++---------
 plugin_cmds/cmd_get-annotations.py           |  4 +-
 plugin_cmds/cmd_goodreads-transform.py       | 10 ++--
 plugin_cmds/cmd_image-urls.py                |  1 +
 plugin_cmds/cmd_listening-stats.py           |  9 ++--
 plugin_cmds/convert_oa_cred.py               | 11 ++--
 pyi_entrypoint.py                            |  2 +-
 pyproject.toml                               | 51 +++++++++----------
 src/audible_cli/__init__.py                  |  4 +-
 src/audible_cli/__main__.py                  |  1 +
 src/audible_cli/_logging.py                  | 12 ++---
 src/audible_cli/cli.py                       |  9 ++--
 src/audible_cli/cmds/__init__.py             |  8 +--
 src/audible_cli/cmds/cmd_activation_bytes.py |  2 +-
 src/audible_cli/cmds/cmd_download.py         | 34 ++++++-------
 src/audible_cli/cmds/cmd_library.py          | 12 ++---
 src/audible_cli/cmds/cmd_manage.py           |  8 +--
 src/audible_cli/cmds/cmd_quickstart.py       |  8 +--
 src/audible_cli/cmds/cmd_wishlist.py         | 14 +++---
 src/audible_cli/config.py                    | 31 ++++++------
 src/audible_cli/constants.py                 |  3 +-
 src/audible_cli/decorators.py                |  9 ++--
 src/audible_cli/downloader.py                | 53 ++++++++++----------
 src/audible_cli/exceptions.py                |  2 +-
 src/audible_cli/models.py                    | 49 +++++++++---------
 src/audible_cli/plugins.py                   | 42 ++++++----------
 src/audible_cli/utils.py                     | 23 ++++-----
 utils/update_chapter_titles.py               |  5 +-
 29 files changed, 225 insertions(+), 244 deletions(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5c7d3226..9497168c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -12,6 +12,8 @@
 #
 import os
 import sys
+
+
 sys.path.insert(0, os.path.abspath("../../src"))
 import audible_cli
 
diff --git a/plugin_cmds/cmd_decrypt.py b/plugin_cmds/cmd_decrypt.py
index 8a09304a..dc428c64 100644
--- a/plugin_cmds/cmd_decrypt.py
+++ b/plugin_cmds/cmd_decrypt.py
@@ -13,7 +13,7 @@
 import operator
 import pathlib
 import re
-import subprocess  # noqa: S404
+import subprocess
 import tempfile
 import typing as t
 from enum import Enum
@@ -50,9 +50,9 @@ def is_supported_file(cls, value):
 
 
 def _get_input_files(
-    files: t.Union[t.Tuple[str], t.List[str]],
+    files: tuple[str] | list[str],
     recursive: bool = True
-) -> t.List[pathlib.Path]:
+) -> list[pathlib.Path]:
     filenames = []
     for filename in files:
         # if the shell does not do filename globbing
@@ -60,7 +60,7 @@ def _get_input_files(
 
         if (
             len(expanded) == 0
-            and '*' not in filename
+            and "*" not in filename
             and not SupportedFiles.is_supported_file(filename)
         ):
             raise click.BadParameter("{filename}: file not found or supported.")
@@ -74,7 +74,7 @@ def _get_input_files(
     return filenames
 
 
-def recursive_lookup_dict(key: str, dictionary: t.Dict[str, t.Any]) -> t.Any:
+def recursive_lookup_dict(key: str, dictionary: dict[str, t.Any]) -> t.Any:
     if key in dictionary:
         return dictionary[key]
     for value in dictionary.values():
@@ -85,7 +85,7 @@ def recursive_lookup_dict(key: str, dictionary: t.Dict[str, t.Any]) -> t.Any:
                 continue
             else:
                 return item
-            
+
     raise KeyError
 
 
@@ -104,12 +104,12 @@ def get_aaxc_credentials(voucher_file: pathlib.Path):
 
 
 class ApiChapterInfo:
-    def __init__(self, content_metadata: t.Dict[str, t.Any]) -> None:
+    def __init__(self, content_metadata: dict[str, t.Any]) -> None:
         chapter_info = self._parse(content_metadata)
         self._chapter_info = chapter_info
 
     @classmethod
-    def from_file(cls, file: t.Union[pathlib.Path, str]) -> "ApiChapterInfo":
+    def from_file(cls, file: pathlib.Path | str) -> "ApiChapterInfo":
         file = pathlib.Path(file)
         if not file.exists() or not file.is_file():
             raise ChapterError(f"Chapter file {file} not found.")
@@ -118,7 +118,7 @@ def from_file(cls, file: t.Union[pathlib.Path, str]) -> "ApiChapterInfo":
         return cls(content_json)
 
     @staticmethod
-    def _parse(content_metadata: t.Dict[str, t.Any]) -> t.Dict[str, t.Any]:
+    def _parse(content_metadata: dict[str, t.Any]) -> dict[str, t.Any]:
         if "chapters" in content_metadata:
             return content_metadata
 
@@ -167,17 +167,17 @@ def is_accurate(self):
     def _separate_intro_outro(self, chapters):
         echo("Separate Audible Brand Intro and Outro to own Chapter.")
         chapters.sort(key=operator.itemgetter("start_offset_ms"))
-    
+
         first = chapters[0]
         intro_dur_ms = self.get_intro_duration_ms()
         first["start_offset_ms"] = intro_dur_ms
         first["start_offset_sec"] = round(first["start_offset_ms"] / 1000)
         first["length_ms"] -= intro_dur_ms
-    
+
         last = chapters[-1]
         outro_dur_ms = self.get_outro_duration_ms()
         last["length_ms"] -= outro_dur_ms
-    
+
         chapters.append(
             {
                 "length_ms": intro_dur_ms,
@@ -197,13 +197,13 @@ def _separate_intro_outro(self, chapters):
             }
         )
         chapters.sort(key=operator.itemgetter("start_offset_ms"))
-    
+
         return chapters
 
     def _remove_intro_outro(self, chapters):
         echo("Delete Audible Brand Intro and Outro.")
         chapters.sort(key=operator.itemgetter("start_offset_ms"))
-    
+
         intro_dur_ms = self.get_intro_duration_ms()
         outro_dur_ms = self.get_outro_duration_ms()
 
@@ -216,14 +216,14 @@ def _remove_intro_outro(self, chapters):
 
         last = chapters[-1]
         last["length_ms"] -= outro_dur_ms
-    
+
         return chapters
 
 class FFMeta:
     SECTION = re.compile(r"\[(?P<header>[^]]+)\]")
     OPTION = re.compile(r"(?P<option>.*?)\s*(?:(?P<vi>=)\s*(?P<value>.*))?$")
 
-    def __init__(self, ffmeta_file: t.Union[str, pathlib.Path]) -> None:
+    def __init__(self, ffmeta_file: str | pathlib.Path) -> None:
         self._ffmeta_raw = pathlib.Path(ffmeta_file).read_text("utf-8")
         self._ffmeta_parsed = self._parse_ffmeta()
 
@@ -321,7 +321,7 @@ def update_chapters_from_chapter_info(
                 "title": chapter["title"],
             }
         self._ffmeta_parsed["CHAPTER"] = new_chapters
-    
+
     def get_start_end_without_intro_outro(
         self,
         chapter_info: ApiChapterInfo,
@@ -358,7 +358,7 @@ def __init__(
         file: pathlib.Path,
         target_dir: pathlib.Path,
         tempdir: pathlib.Path,
-        activation_bytes: t.Optional[str],
+        activation_bytes: str | None,
         overwrite: bool,
         rebuild_chapters: bool,
         force_rebuild_chapters: bool,
@@ -381,7 +381,7 @@ def __init__(
             credentials = get_aaxc_credentials(voucher_filename)
 
         self._source = file
-        self._credentials: t.Optional[t.Union[str, t.Tuple[str]]] = credentials
+        self._credentials: str | tuple[str] | None = credentials
         self._target_dir = target_dir
         self._tempdir = tempdir
         self._overwrite = overwrite
@@ -390,8 +390,8 @@ def __init__(
         self._skip_rebuild_chapters = skip_rebuild_chapters
         self._separate_intro_outro = separate_intro_outro
         self._remove_intro_outro = remove_intro_outro
-        self._api_chapter: t.Optional[ApiChapterInfo] = None
-        self._ffmeta: t.Optional[FFMeta] = None
+        self._api_chapter: ApiChapterInfo | None = None
+        self._ffmeta: FFMeta | None = None
         self._is_rebuilded: bool = False
 
     @property
@@ -429,9 +429,9 @@ def ffmeta(self) -> FFMeta:
                 credentials_cmd = [
                     "-activation_bytes",
                     self._credentials,
-                ]    
+                ]
             base_cmd.extend(credentials_cmd)
-    
+
             extract_cmd = [
                 "-i",
                 str(self._source),
@@ -484,7 +484,7 @@ def run(self):
             credentials_cmd = [
                 "-activation_bytes",
                 self._credentials,
-            ]    
+            ]
         base_cmd.extend(credentials_cmd)
 
         if self._rebuild_chapters:
@@ -616,7 +616,7 @@ def run(self):
 def cli(
     session,
     files: str,
-    directory: t.Union[pathlib.Path, str],
+    directory: pathlib.Path | str,
     all_: bool,
     overwrite: bool,
     rebuild_chapters: bool,
diff --git a/plugin_cmds/cmd_get-annotations.py b/plugin_cmds/cmd_get-annotations.py
index f8d2dcc1..01f7523b 100644
--- a/plugin_cmds/cmd_get-annotations.py
+++ b/plugin_cmds/cmd_get-annotations.py
@@ -1,6 +1,6 @@
 import click
-
 from audible.exceptions import NotFoundError
+
 from audible_cli.decorators import pass_client
 
 
@@ -8,7 +8,7 @@
 @click.argument("asin")
 @pass_client
 async def cli(client, asin):
-    url = f"https://cde-ta-g7g.amazon.com/FionaCDEServiceEngine/sidecar"
+    url = "https://cde-ta-g7g.amazon.com/FionaCDEServiceEngine/sidecar"
     params = {
         "type": "AUDI",
         "key": asin
diff --git a/plugin_cmds/cmd_goodreads-transform.py b/plugin_cmds/cmd_goodreads-transform.py
index 462f7e7f..aaf9aaed 100644
--- a/plugin_cmds/cmd_goodreads-transform.py
+++ b/plugin_cmds/cmd_goodreads-transform.py
@@ -2,15 +2,16 @@
 import pathlib
 
 import click
+from isbntools.app import isbn_from_words
+
 from audible_cli.decorators import (
     bunch_size_option,
-    timeout_option,
     pass_client,
-    pass_session
+    pass_session,
+    timeout_option,
 )
 from audible_cli.models import Library
 from audible_cli.utils import export_to_csv, parse_api_datetime
-from isbntools.app import isbn_from_words
 
 
 logger = logging.getLogger("audible_cli.cmds.cmd_goodreads-transform")
@@ -30,7 +31,6 @@
 @pass_client
 async def cli(session, client, output):
     """YOUR COMMAND DESCRIPTION"""
-
     logger.debug("fetching library")
     bunch_size = session.params.get("bunch_size")
     library = await Library.from_api_full_sync(
@@ -71,7 +71,7 @@ def _prepare_library_for_export(library):
         if authors is not None:
             authors = ", ".join([a["name"] for a in authors])
         is_finished = i.is_finished
-        
+
         isbn = i.isbn
         if isbn is None:
             isbn_counter += 1
diff --git a/plugin_cmds/cmd_image-urls.py b/plugin_cmds/cmd_image-urls.py
index a261256b..099fa0a3 100644
--- a/plugin_cmds/cmd_image-urls.py
+++ b/plugin_cmds/cmd_image-urls.py
@@ -1,4 +1,5 @@
 import click
+
 from audible_cli.decorators import pass_client, timeout_option
 
 
diff --git a/plugin_cmds/cmd_listening-stats.py b/plugin_cmds/cmd_listening-stats.py
index 99a12cc3..fe4d0117 100644
--- a/plugin_cmds/cmd_listening-stats.py
+++ b/plugin_cmds/cmd_listening-stats.py
@@ -5,6 +5,7 @@
 from datetime import datetime
 
 import click
+
 from audible_cli.decorators import pass_client
 
 
@@ -15,8 +16,8 @@
 
 def ms_to_hms(milliseconds):
     seconds = int((milliseconds / 1000) % 60)
-    minutes = int(((milliseconds / (1000*60)) % 60))
-    hours = int(((milliseconds / (1000*60*60)) % 24))
+    minutes = int((milliseconds / (1000*60)) % 60)
+    hours = int((milliseconds / (1000*60*60)) % 24)
     return {"hours": hours, "minutes": minutes, "seconds": seconds}
 
 
@@ -29,7 +30,7 @@ async def _get_stats_year(client, year):
         store="Audible"
     )
     # iterate over each month
-    for stat in stats['aggregated_monthly_listening_stats']:
+    for stat in stats["aggregated_monthly_listening_stats"]:
         stats_year[stat["interval_identifier"]] = ms_to_hms(stat["aggregated_sum"])
     return stats_year
 
@@ -51,7 +52,7 @@ async def _get_stats_year(client, year):
 )
 @pass_client
 async def cli(client, output, signup_year):
-    """get and analyse listening statistics"""
+    """Get and analyse listening statistics"""
     year_range = [y for y in range(signup_year, current_year+1)]
 
     r = await asyncio.gather(
diff --git a/plugin_cmds/convert_oa_cred.py b/plugin_cmds/convert_oa_cred.py
index 206cbf9b..edda9121 100644
--- a/plugin_cmds/convert_oa_cred.py
+++ b/plugin_cmds/convert_oa_cred.py
@@ -1,7 +1,8 @@
 """Converts the credentials.json file from OpenAudible >= v2.4 beta to an
 audible-cli auth file. The credentials.json file from OpenAudible leaves 
 unchanged, so you can use one device registration for OpenAudible and 
-audible-cli."""
+audible-cli.
+"""
 
 
 import json
@@ -9,6 +10,7 @@
 
 import audible
 import click
+
 from audible_cli.config import pass_session
 
 
@@ -41,7 +43,7 @@ def make_auth_file(fn, origin):
 
     website_cookies = dict()
     for cookie in tokens["website_cookies"]:
-        website_cookies[cookie["Name"]] = cookie["Value"].replace(r'"', r'')
+        website_cookies[cookie["Name"]] = cookie["Value"].replace(r'"', r"")
 
     data = {
         "adp_token": adp_token,
@@ -70,10 +72,11 @@ def make_auth_file(fn, origin):
 def cli(session, input):
     """Converts a OpenAudible credential file to a audible-cli auth file
     
-    Stores the auth files in app dir"""
+    Stores the auth files in app dir
+    """
     fdata = pathlib.Path(input).read_text("utf-8")
     fdata = json.loads(fdata)
-    
+
     x = extract_data_from_file(fdata)
     for k, v in x.items():
         app_dir = pathlib.Path(session.get_app_dir())
diff --git a/pyi_entrypoint.py b/pyi_entrypoint.py
index c2603636..0a185907 100644
--- a/pyi_entrypoint.py
+++ b/pyi_entrypoint.py
@@ -4,6 +4,6 @@
 multiprocessing.freeze_support()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     from audible_cli import cli
     cli.main()
diff --git a/pyproject.toml b/pyproject.toml
index 8ee82b4b..c1ce49ec 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -194,35 +194,30 @@ lines-after-imports = 2
 # does not, because per-file-ignores keys on file and rule rather than on
 # individual findings. Shrink the list by fixing a rule in a file and
 # dropping its code here.
-"docs/source/conf.py" = ["A001", "I001"]
-"plugin_cmds/cmd_decrypt.py" = ["C401", "C417", "PLR0917", "PLW0108", "Q000", "RUF005", "RUF100", "UP006", "UP007", "UP045", "W291", "W293"]
-"plugin_cmds/cmd_get-annotations.py" = ["F541", "I001"]
-"plugin_cmds/cmd_goodreads-transform.py" = ["D202", "D415", "G004", "I001", "W293"]
-"plugin_cmds/cmd_image-urls.py" = ["D415", "I001"]
-"plugin_cmds/cmd_listening-stats.py" = ["C416", "D403", "D415", "I001", "Q000", "UP034"]
-"plugin_cmds/convert_oa_cred.py" = ["A002", "C408", "D205", "D209", "D415", "I001", "Q000", "W291", "W293"]
-"pyi_entrypoint.py" = ["Q000"]
-"src/audible_cli/__init__.py" = ["RUF022", "UP009"]
-"src/audible_cli/__main__.py" = ["I001"]
-"src/audible_cli/_logging.py" = ["B028", "C408", "D205", "D209", "G004", "UP007", "UP045"]
-"src/audible_cli/cli.py" = ["C408", "D415", "I001"]
-"src/audible_cli/cmds/__init__.py" = ["D205", "D212", "D416", "I001"]
-"src/audible_cli/cmds/cmd_activation_bytes.py" = ["I001"]
+"docs/source/conf.py" = ["A001"]
+"plugin_cmds/cmd_decrypt.py" = ["C401", "C417", "PLR0917", "PLW0108", "RUF005", "W291"]
+"plugin_cmds/cmd_goodreads-transform.py" = ["D415", "G004"]
+"plugin_cmds/cmd_image-urls.py" = ["D415"]
+"plugin_cmds/cmd_listening-stats.py" = ["C416", "D415"]
+"plugin_cmds/convert_oa_cred.py" = ["A002", "C408", "D205", "D415", "W291", "W293"]
+"src/audible_cli/_logging.py" = ["B028", "C408", "D205", "G004"]
+"src/audible_cli/cli.py" = ["C408", "D415"]
+"src/audible_cli/cmds/__init__.py" = ["D205"]
 "src/audible_cli/cmds/cmd_api.py" = ["D415", "G004", "W291"]
-"src/audible_cli/cmds/cmd_download.py" = ["ASYNC240", "C901", "D403", "D415", "G004", "I001", "PLR0917", "PLR5501", "PLW0603", "PLW2901", "RUF010", "S101", "UP015"]
-"src/audible_cli/cmds/cmd_library.py" = ["D403", "D415", "I001"]
-"src/audible_cli/cmds/cmd_manage.py" = ["D403", "D415", "PLR0917"]
-"src/audible_cli/cmds/cmd_quickstart.py" = ["D415", "I001", "W291"]
-"src/audible_cli/cmds/cmd_wishlist.py" = ["D403", "D415", "G004", "I001", "Q000"]
-"src/audible_cli/config.py" = ["B904", "D202", "D415", "D416", "D417", "G004", "I001", "UP006", "UP007", "UP035", "UP045", "W291", "W293"]
-"src/audible_cli/constants.py" = ["UP006", "UP035"]
-"src/audible_cli/decorators.py" = ["B904", "D205", "D415", "F541", "G004", "I001", "RUF001", "UP035", "W293"]
-"src/audible_cli/downloader.py" = ["G004", "PGH004", "PLR0917", "RUF100", "UP006", "UP007", "UP015", "UP035", "UP045", "W293"]
-"src/audible_cli/exceptions.py" = ["D415", "UP032"]
-"src/audible_cli/models.py" = ["B904", "D202", "D205", "D415", "F541", "G004", "I001", "S101", "UP006", "UP007", "UP035", "UP045", "W291", "W293"]
-"src/audible_cli/plugins.py" = ["D200", "D201", "D202", "D205", "D212", "D415", "D416", "PGH004", "Q000", "RUF010", "RUF021", "RUF100", "UP007", "UP025", "UP031"]
-"src/audible_cli/utils.py" = ["D202", "G004", "I001", "PGH004", "PLR0917", "UP006", "UP007", "UP035", "UP045"]
-"utils/update_chapter_titles.py" = ["C408", "D205", "D212", "D415", "Q000", "S101", "W293"]
+"src/audible_cli/cmds/cmd_download.py" = ["ASYNC240", "C901", "D415", "G004", "PLR0917", "PLW0603", "PLW2901", "S101"]
+"src/audible_cli/cmds/cmd_library.py" = ["D415"]
+"src/audible_cli/cmds/cmd_manage.py" = ["D415", "PLR0917"]
+"src/audible_cli/cmds/cmd_quickstart.py" = ["D415", "W291"]
+"src/audible_cli/cmds/cmd_wishlist.py" = ["D415", "G004"]
+"src/audible_cli/config.py" = ["B904", "D415", "D417", "G004", "W291", "W293"]
+"src/audible_cli/decorators.py" = ["B904", "D205", "D415", "RUF001", "W293"]
+"src/audible_cli/downloader.py" = ["G004", "PLR0917"]
+"src/audible_cli/exceptions.py" = ["D415"]
+"src/audible_cli/models.py" = ["B904", "D205", "D415", "G004", "S101", "W293"]
+"src/audible_cli/plugins.py" = ["D200", "D205", "D415", "UP031"]
+"src/audible_cli/utils.py" = ["G004", "PGH004", "PLR0917"]
+"utils/update_chapter_titles.py" = ["C408", "D205", "D415", "S101", "W293"]
+
 
 [tool.pytest.ini_options]
 testpaths = ["tests"]
diff --git a/src/audible_cli/__init__.py b/src/audible_cli/__init__.py
index d9581cd5..c6d983cc 100644
--- a/src/audible_cli/__init__.py
+++ b/src/audible_cli/__init__.py
@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
-
 from ._logging import log_helper
 from ._version import __version__
 from .cli import main, quickstart
 
 
-__all__ = ["__version__", "main", "quickstart", "log_helper"]
+__all__ = ["__version__", "log_helper", "main", "quickstart"]
diff --git a/src/audible_cli/__main__.py b/src/audible_cli/__main__.py
index 718f4c3b..736b6e61 100644
--- a/src/audible_cli/__main__.py
+++ b/src/audible_cli/__main__.py
@@ -2,6 +2,7 @@
 
 from . import cli
 
+
 if __name__ == "__main__":
     sys.exit(
         cli.main(prog_name="python -m audible_cli")
diff --git a/src/audible_cli/_logging.py b/src/audible_cli/_logging.py
index 47aea17e..371292fb 100644
--- a/src/audible_cli/_logging.py
+++ b/src/audible_cli/_logging.py
@@ -1,6 +1,5 @@
 import logging
 import pathlib
-from typing import Optional, Union
 from warnings import warn
 
 import click
@@ -16,12 +15,12 @@
 
 
 class AudibleCliLogHelper:
-    def set_level(self, level: Union[str, int]) -> None:
+    def set_level(self, level: str | int) -> None:
         """Set logging level for the audible-cli package."""
         self._set_level(audible_cli_logger, level)
 
     @staticmethod
-    def _set_level(obj, level: Optional[Union[str, int]]) -> None:
+    def _set_level(obj, level: str | int | None) -> None:
         if level:
             level = level.upper() if isinstance(level, str) else level
             obj.setLevel(level)
@@ -45,7 +44,7 @@ def _set_handler(self, handler, name, level):
 
     def set_console_logger(
             self,
-            level: Optional[Union[str, int]] = None
+            level: str | int | None = None
     ) -> None:
         """Set up a console logger to the audible-cli package."""
         handler = logging.StreamHandler()
@@ -53,7 +52,7 @@ def set_console_logger(
         self._set_handler(handler, "ConsoleLogger", level)
 
     def set_file_logger(
-            self, filename: str, level: Optional[Union[str, int]] = None
+            self, filename: str, level: str | int | None = None
     ) -> None:
         """Set up a file logger to the audible-cli package."""
         filename = pathlib.Path(filename)
@@ -140,7 +139,8 @@ def _normalize_echo_kwargs(echo_kwargs):
 
 def click_basic_config(logger=None, style_kwargs=None, echo_kwargs=None):
     """Set up the default handler (:py:class:`ClickHandler`) and formatter
-    (:py:class:`ColorFormatter`) on the given logger."""
+    (:py:class:`ColorFormatter`) on the given logger.
+    """
     logger = _normalize_logger(logger)
     style_kwargs = _normalize_style_kwargs(style_kwargs)
     echo_kwargs = _normalize_echo_kwargs(echo_kwargs)
diff --git a/src/audible_cli/cli.py b/src/audible_cli/cli.py
index 3e42f448..9f1535eb 100644
--- a/src/audible_cli/cli.py
+++ b/src/audible_cli/cli.py
@@ -1,9 +1,12 @@
 import asyncio
 import logging
 import sys
+from importlib.metadata import entry_points
 
 import click
 
+from . import plugins
+from ._logging import click_basic_config
 from .cmds import build_in_cmds, cmd_quickstart
 from .config import get_plugin_dir
 from .constants import PLUGIN_ENTRY_POINT
@@ -11,13 +14,9 @@
     password_option,
     profile_option,
     verbosity_option,
-    version_option
+    version_option,
 )
 from .exceptions import AudibleCliException
-from ._logging import click_basic_config
-from . import plugins
-
-from importlib.metadata import entry_points
 
 
 logger = logging.getLogger("audible_cli")
diff --git a/src/audible_cli/cmds/__init__.py b/src/audible_cli/cmds/__init__.py
index 6123aef8..c60c1e4a 100644
--- a/src/audible_cli/cmds/__init__.py
+++ b/src/audible_cli/cmds/__init__.py
@@ -7,9 +7,10 @@
     cmd_library,
     cmd_manage,
     cmd_quickstart,
-    cmd_wishlist
+    cmd_wishlist,
 )
 
+
 cli_cmds = [
     cmd_activation_bytes.cli,
     cmd_api.cli,
@@ -22,11 +23,10 @@
 
 
 def build_in_cmds(func=None):
-    """
-    A decorator to register build-in CLI commands to an instance of
+    """A decorator to register build-in CLI commands to an instance of
     `click.Group()`.
 
-    Returns
+    Returns:
     -------
     click.Group()
     """
diff --git a/src/audible_cli/cmds/cmd_activation_bytes.py b/src/audible_cli/cmds/cmd_activation_bytes.py
index c03fd159..8bc088d5 100644
--- a/src/audible_cli/cmds/cmd_activation_bytes.py
+++ b/src/audible_cli/cmds/cmd_activation_bytes.py
@@ -3,7 +3,7 @@
 import click
 from audible.activation_bytes import (
     extract_activation_bytes,
-    fetch_activation_sign_auth
+    fetch_activation_sign_auth,
 )
 
 from ..decorators import pass_session
diff --git a/src/audible_cli/cmds/cmd_download.py b/src/audible_cli/cmds/cmd_download.py
index f1584a17..3f1ef159 100644
--- a/src/audible_cli/cmds/cmd_download.py
+++ b/src/audible_cli/cmds/cmd_download.py
@@ -2,8 +2,8 @@
 import asyncio.log
 import asyncio.sslproto
 import json
-import pathlib
 import logging
+import pathlib
 from datetime import UTC, datetime
 
 import aiofiles
@@ -16,21 +16,22 @@
 from ..decorators import (
     bunch_size_option,
     end_date_option,
+    pass_client,
+    pass_session,
     start_date_option,
     timeout_option,
-    pass_client,
-    pass_session
 )
-from ..downloader import Downloader as NewDownloader, Status
+from ..downloader import Downloader as NewDownloader
+from ..downloader import Status
 from ..exceptions import (
     AudibleCliException,
     DirectoryDoesNotExists,
     DownloadUrlExpired,
     NotDownloadableAsAAX,
-    VoucherNeedRefresh
+    VoucherNeedRefresh,
 )
 from ..models import Library
-from ..utils import datetime_type, Downloader
+from ..utils import Downloader, datetime_type
 
 
 logger = logging.getLogger("audible_cli.cmds.cmd_download")
@@ -165,7 +166,7 @@ def has_downloads(self):
 async def download_cover(
         client, output_dir, base_filename, item, res, overwrite_existing
 ):
-    filename = f"{base_filename}_({str(res)}).jpg"
+    filename = f"{base_filename}_({res!s}).jpg"
     filepath = output_dir / filename
 
     url = item.get_cover_url(res)
@@ -361,7 +362,7 @@ async def download_aax(
 
 async def _reuse_voucher(lr_file, item):
     logger.info(f"Loading data from voucher file {lr_file}.")
-    async with aiofiles.open(lr_file, "r") as f:
+    async with aiofiles.open(lr_file) as f:
         lr = await f.read()
     lr = json.loads(lr)
     content_license = lr["content_license"]
@@ -378,15 +379,14 @@ async def _reuse_voucher(lr_file, item):
     # Verification of allowed user
     if user_id is None:
         logger.debug("No user id found. Skip user verification.")
+    elif "allowed_users" in content_license:
+        allowed_users = content_license["allowed_users"]
+        if allowed_users and user_id not in allowed_users:
+            # Don't proceed here to prevent overwriting voucher file
+            msg = f"The current user is not entitled to use the voucher {lr_file}."
+            raise AudibleCliException(msg)
     else:
-        if "allowed_users" in content_license:
-            allowed_users = content_license["allowed_users"]
-            if allowed_users and user_id not in allowed_users:
-                # Don't proceed here to prevent overwriting voucher file
-                msg = f"The current user is not entitled to use the voucher {lr_file}."
-                raise AudibleCliException(msg)
-        else:
-            logger.debug(f"{lr_file} does not contain allowed users key.")
+        logger.debug(f"{lr_file} does not contain allowed users key.")
 
     # Verification of voucher validity
     # Test the value, not just the key: the field can be present but null
@@ -836,7 +836,7 @@ def display_counter():
 @pass_session
 @pass_client(headers=CLIENT_HEADERS)
 async def cli(session, api_client, **params):
-    """download audiobook(s) from library"""
+    """Download audiobook(s) from library"""
     client = api_client.session
     output_dir = pathlib.Path(params.get("output_dir")).resolve()
 
diff --git a/src/audible_cli/cmds/cmd_library.py b/src/audible_cli/cmds/cmd_library.py
index 956a5291..18ba1685 100644
--- a/src/audible_cli/cmds/cmd_library.py
+++ b/src/audible_cli/cmds/cmd_library.py
@@ -8,11 +8,11 @@
 from ..decorators import (
     bunch_size_option,
     end_date_option,
-    start_date_option,
-    timeout_option,
     pass_client,
     pass_session,
-    wrap_async
+    start_date_option,
+    timeout_option,
+    wrap_async,
 )
 from ..models import Library
 from ..utils import export_to_csv
@@ -20,7 +20,7 @@
 
 @click.group("library")
 def cli():
-    """interact with library"""
+    """Interact with library"""
 
 
 async def _get_library(session, client, resolve_podcasts):
@@ -77,7 +77,7 @@ async def _get_library(session, client, resolve_podcasts):
 @pass_session
 @pass_client
 async def export_library(session, client, **params):
-    """export library"""
+    """Export library"""
 
     @wrap_async
     def _prepare_item(item):
@@ -165,7 +165,7 @@ def _prepare_item(item):
 @pass_session
 @pass_client
 async def list_library(session, client, resolve_podcasts):
-    """list titles in library"""
+    """List titles in library"""
 
     @wrap_async
     def _prepare_item(item):
diff --git a/src/audible_cli/cmds/cmd_manage.py b/src/audible_cli/cmds/cmd_manage.py
index cc6d9452..70421403 100644
--- a/src/audible_cli/cmds/cmd_manage.py
+++ b/src/audible_cli/cmds/cmd_manage.py
@@ -17,22 +17,22 @@
 
 @click.group("manage")
 def cli():
-    """manage audible-cli"""
+    """Manage audible-cli"""
 
 
 @cli.group("config")
 def manage_config():
-    """manage config"""
+    """Manage config"""
 
 
 @cli.group("profile")
 def manage_profiles():
-    """manage profiles"""
+    """Manage profiles"""
 
 
 @cli.group("auth-file")
 def manage_auth_files():
-    """manage auth files"""
+    """Manage auth files"""
 
 
 @manage_config.command("edit")
diff --git a/src/audible_cli/cmds/cmd_quickstart.py b/src/audible_cli/cmds/cmd_quickstart.py
index 876ee3e4..ddb2bc34 100644
--- a/src/audible_cli/cmds/cmd_quickstart.py
+++ b/src/audible_cli/cmds/cmd_quickstart.py
@@ -3,16 +3,12 @@
 import sys
 
 import click
-from click import echo, secho, prompt
+from click import echo, prompt, secho
 from tabulate import tabulate
 
 from .. import __version__
 from ..config import ConfigFile
-from ..constants import (
-    AVAILABLE_MARKETPLACES,
-    CONFIG_FILE,
-    DEFAULT_AUTH_FILE_EXTENSION
-)
+from ..constants import AVAILABLE_MARKETPLACES, CONFIG_FILE, DEFAULT_AUTH_FILE_EXTENSION
 from ..decorators import pass_session
 from ..utils import build_auth_file
 
diff --git a/src/audible_cli/cmds/cmd_wishlist.py b/src/audible_cli/cmds/cmd_wishlist.py
index ed887500..babe177c 100644
--- a/src/audible_cli/cmds/cmd_wishlist.py
+++ b/src/audible_cli/cmds/cmd_wishlist.py
@@ -8,7 +8,7 @@
 import questionary
 from click import echo
 
-from ..decorators import timeout_option, pass_client, wrap_async
+from ..decorators import pass_client, timeout_option, wrap_async
 from ..models import Catalog, Wishlist
 from ..utils import export_to_csv
 
@@ -35,7 +35,7 @@ async def _get_wishlist(client):
 
 @click.group("wishlist")
 def cli():
-    """interact with wishlist"""
+    """Interact with wishlist"""
 
 
 @cli.command("export")
@@ -56,7 +56,7 @@ def cli():
 )
 @pass_client
 async def export_wishlist(client, **params):
-    """export wishlist"""
+    """Export wishlist"""
 
     @wrap_async
     def _prepare_item(item):
@@ -134,7 +134,7 @@ def _prepare_item(item):
 @timeout_option
 @pass_client
 async def list_wishlist(client):
-    """list titles in wishlist"""
+    """List titles in wishlist"""
 
     @wrap_async
     def _prepare_item(item):
@@ -179,7 +179,7 @@ def _prepare_item(item):
 @timeout_option
 @pass_client(limits=limits)
 async def add_wishlist(client, asin, title):
-    """add asin(s) to wishlist
+    """Add asin(s) to wishlist
 
     Run the command without any option for interactive mode.
     """
@@ -201,7 +201,7 @@ async def add_asin(asin):
             ]
         ).unsafe_ask_async()
 
-        if q == 'asin':
+        if q == "asin":
             q = await questionary.text("Please enter the asin").unsafe_ask_async()
             asin.append(q)
         else:
@@ -262,7 +262,7 @@ async def add_asin(asin):
 @timeout_option
 @pass_client(limits=limits)
 async def remove_wishlist(client, asin, title):
-    """remove asin(s) from wishlist
+    """Remove asin(s) from wishlist
 
     Run the command without any option for interactive mode.
     """
diff --git a/src/audible_cli/config.py b/src/audible_cli/config.py
index e9a778c8..f25d7c33 100644
--- a/src/audible_cli/config.py
+++ b/src/audible_cli/config.py
@@ -1,7 +1,7 @@
 import logging
 import os
 import pathlib
-from typing import Any, Dict, Optional, Union
+from typing import Any
 
 import audible
 import click
@@ -15,7 +15,7 @@
     CONFIG_FILE,
     DEFAULT_CONFIG_DATA,
     PLUGIN_DIR_ENV,
-    PLUGIN_PATH
+    PLUGIN_PATH,
 )
 from .exceptions import AudibleCliException, ProfileAlreadyExists
 
@@ -42,7 +42,7 @@ class ConfigFile:
 
     def __init__(
             self,
-            filename: Union[str, pathlib.Path],
+            filename: str | pathlib.Path,
             file_exists: bool = True
     ) -> None:
         filename = pathlib.Path(filename).resolve()
@@ -77,12 +77,12 @@ def dirname(self) -> pathlib.Path:
         return self.filename.parent
 
     @property
-    def data(self) -> Dict[str, Union[str, Dict]]:
+    def data(self) -> dict[str, str | dict]:
         """Returns the configuration data"""
         return self._config_data
 
     @property
-    def app_config(self) -> Dict[str, str]:
+    def app_config(self) -> dict[str, str]:
         """Returns the configuration data for the APP section"""
         return self.data["APP"]
 
@@ -94,7 +94,7 @@ def has_profile(self, name: str) -> bool:
         """
         return name in self.data["profile"]
 
-    def get_profile(self, name: str) -> Dict[str, str]:
+    def get_profile(self, name: str) -> dict[str, str]:
         """Returns the configuration data for these profile name
 
         Args:
@@ -114,7 +114,7 @@ def get_profile_option(
             self,
             profile: str,
             option: str,
-            default: Optional[str] = None
+            default: str | None = None
     ) -> str:
         """Returns the value for an option for the given profile.
 
@@ -137,7 +137,7 @@ def get_profile_option(
     def add_profile(
             self,
             name: str,
-            auth_file: Union[str, pathlib.Path],
+            auth_file: str | pathlib.Path,
             country_code: str,
             is_primary: bool = False,
             write_config: bool = True,
@@ -154,7 +154,6 @@ def add_profile(
                 ``APP`` section
             write_config: If ``True``, save the config to file
         """
-
         if self.has_profile(name):
             raise ProfileAlreadyExists(name)
 
@@ -180,7 +179,7 @@ def delete_profile(self, name: str, write_config: bool = True) -> None:
             name: The name of the profile
             write_config: If ``True``, save the config to file
 
-        Note:    
+        Note:
             Does not delete the auth file.
         """
         if not self.has_profile(name):
@@ -195,7 +194,7 @@ def delete_profile(self, name: str, write_config: bool = True) -> None:
 
     def write_config(
             self,
-            filename: Optional[Union[str, pathlib.Path]] = None
+            filename: str | pathlib.Path | None = None
     ) -> None:
         """Write the config data to file
 
@@ -217,9 +216,9 @@ def write_config(
 class Session:
     """Holds the settings for the current session"""
     def __init__(self) -> None:
-        self._auths: Dict[str, Authenticator] = {}
-        self._config: Optional[CONFIG_FILE] = None
-        self._params: Dict[str, Any] = {}
+        self._auths: dict[str, Authenticator] = {}
+        self._config: CONFIG_FILE | None = None
+        self._params: dict[str, Any] = {}
         self._app_dir: pathlib.Path = get_app_dir()
         self._plugin_dir: pathlib.Path = get_plugin_dir()
 
@@ -276,7 +275,7 @@ def selected_profile(self):
     def get_auth_for_profile(
             self,
             profile: str,
-            password: Optional[str] = None
+            password: str | None = None
     ) -> audible.Authenticator:
         """Returns an Authenticator for a profile
 
@@ -333,7 +332,7 @@ def auth(self):
     def get_client_for_profile(
             self,
             profile: str,
-            password: Optional[str] = None,
+            password: str | None = None,
             **kwargs
     ) -> AsyncClient:
         auth = self.get_auth_for_profile(profile, password)
diff --git a/src/audible_cli/constants.py b/src/audible_cli/constants.py
index a996d595..ea4c14c2 100644
--- a/src/audible_cli/constants.py
+++ b/src/audible_cli/constants.py
@@ -1,4 +1,3 @@
-from typing import Dict
 
 from audible.localization import LOCALE_TEMPLATES
 
@@ -11,7 +10,7 @@
 PLUGIN_ENTRY_POINT: str = "audible.cli_plugins"
 DEFAULT_AUTH_FILE_EXTENSION: str = "json"
 DEFAULT_AUTH_FILE_ENCRYPTION: str = "json"
-DEFAULT_CONFIG_DATA: Dict[str, str] = {
+DEFAULT_CONFIG_DATA: dict[str, str] = {
     "title": "Audible Config File",
     "APP": {},
     "profile": {}
diff --git a/src/audible_cli/decorators.py b/src/audible_cli/decorators.py
index 0d8023d3..394e9874 100644
--- a/src/audible_cli/decorators.py
+++ b/src/audible_cli/decorators.py
@@ -1,18 +1,19 @@
 import asyncio
 import logging
+from collections.abc import Callable
 from functools import partial, wraps
-from typing import Any, Callable
 from types import SimpleNamespace
+from typing import Any
 
 import click
 import httpx
 from click.core import Parameter, ParameterSource
 from packaging.version import parse
 
+from . import __version__
+from ._logging import _normalize_logger
 from .config import Session
 from .utils import datetime_type
-from ._logging import _normalize_logger
-from . import __version__
 
 
 logger = logging.getLogger("audible_cli.options")
@@ -78,7 +79,7 @@ def callback(ctx, param, value):
 
         url = "https://api.github.com/repos/mkb79/audible-cli/releases/latest"
         headers = {"Accept": "application/vnd.github.v3+json"}
-        logger.debug(f"Requesting Github API for latest release information")
+        logger.debug("Requesting Github API for latest release information")
         try:
             response = httpx.get(url, headers=headers, follow_redirects=True)
             response.raise_for_status()
diff --git a/src/audible_cli/downloader.py b/src/audible_cli/downloader.py
index 9b5ad998..ee8abdc8 100644
--- a/src/audible_cli/downloader.py
+++ b/src/audible_cli/downloader.py
@@ -1,8 +1,9 @@
 import logging
 import pathlib
 import re
+from collections.abc import Callable
 from enum import Enum, auto
-from typing import Any, Callable, Dict, List, Literal, NamedTuple, Optional, Union
+from typing import Any, Literal, NamedTuple
 
 import aiofiles
 import click
@@ -41,7 +42,7 @@ def is_weak(self) -> bool:
 
 
 class File:
-    def __init__(self, file: Union[pathlib.Path, str]) -> None:
+    def __init__(self, file: pathlib.Path | str) -> None:
         if not isinstance(file, pathlib.Path):
             file = pathlib.Path(file)
         self._file = file
@@ -78,10 +79,10 @@ async def read_text_content(
         read_size = min(max_bytes, file_size)
         try:
             async with aiofiles.open(
-                file=self.path, mode="r", encoding=encoding, errors=errors
+                file=self.path, encoding=encoding, errors=errors
             ) as file:
                 return await file.read(read_size)
-        except Exception:  # noqa
+        except Exception:
             return "Unknown"
 
 
@@ -90,10 +91,10 @@ def __init__(self, response: httpx.Response) -> None:
         self._response = response
         self.headers: httpx.Headers = response.headers
         self.status_code: int = response.status_code
-        self.content_length: Optional[int] = self._get_content_length(self.headers)
-        self.content_type: Optional[str] = self._get_content_type(self.headers)
+        self.content_length: int | None = self._get_content_length(self.headers)
+        self.content_type: str | None = self._get_content_type(self.headers)
         self.accept_ranges: bool = self._does_accept_ranges(self.headers)
-        self.etag: Optional[ETag] = self._get_etag(self.headers)
+        self.etag: ETag | None = self._get_etag(self.headers)
 
     @property
     def response(self) -> httpx.Response:
@@ -114,7 +115,7 @@ def _does_accept_ranges(headers: httpx.Headers) -> bool:
         return does_accept_ranges
 
     @staticmethod
-    def _get_content_length(headers: httpx.Headers) -> Optional[int]:
+    def _get_content_length(headers: httpx.Headers) -> int | None:
         content_length = headers.get(CONTENT_LENGTH_HEADER)
 
         if content_length is not None:
@@ -123,11 +124,11 @@ def _get_content_length(headers: httpx.Headers) -> Optional[int]:
         return content_length
 
     @staticmethod
-    def _get_content_type(headers: httpx.Headers) -> Optional[str]:
+    def _get_content_type(headers: httpx.Headers) -> str | None:
         return headers.get(CONTENT_TYPE_HEADER)
 
     @staticmethod
-    def _get_etag(headers: httpx.Headers) -> Optional[ETag]:
+    def _get_etag(headers: httpx.Headers) -> ETag | None:
         etag_header = headers.get(ETAG_HEADER)
         if etag_header is None:
             return etag_header
@@ -204,7 +205,7 @@ async def check_status_code(
 
 async def check_content_type(
     response: ResponseInfo, target_file: File, tmp_file: File,
-    expected_types: List[str], **kwargs: Any
+    expected_types: list[str], **kwargs: Any
 ) -> Status:
     if not expected_types:
         return Status.Success
@@ -235,16 +236,16 @@ async def check_status_for_message(
         if length <= MAX_FILE_READ_SIZE:
             message = await tmp_file.read_text_content()
             return _status_for_message(message)
-        
+
     return Status.Success
 
 
 class DownloadResult(NamedTuple):
     status: Status
     destination: File
-    head_response: Optional[ResponseInfo]
-    response: Optional[ResponseInfo]
-    message: Optional[str]
+    head_response: ResponseInfo | None
+    response: ResponseInfo | None
+    message: str | None
 
 
 class DummyProgressBar:
@@ -259,8 +260,8 @@ def update(self, *args, **kwargs):
 
 
 def get_progressbar(
-    destination: pathlib.Path, total: Optional[int], start: int = 0
-) -> Union[tqdm.tqdm, DummyProgressBar]:
+    destination: pathlib.Path, total: int | None, start: int = 0
+) -> tqdm.tqdm | DummyProgressBar:
     if total is None:
         return DummyProgressBar()
 
@@ -289,19 +290,19 @@ def __init__(
         self,
         source: httpx.URL,
         client: httpx.AsyncClient,
-        expected_types: Optional[Union[List[str], str]] = None,
-        additional_headers: Optional[Dict[str, str]] = None
+        expected_types: list[str] | str | None = None,
+        additional_headers: dict[str, str] | None = None
     ) -> None:
         self._source = source
         self._client = client
         self._expected_types = self._normalize_expected_types(expected_types)
         self._additional_headers = self._normalize_headers(additional_headers)
-        self._head_request: Optional[ResponseInfo] = None
+        self._head_request: ResponseInfo | None = None
 
     @staticmethod
     def _normalize_expected_types(
-        expected_types: Optional[Union[List[str], str]]
-    ) -> List[str]:
+        expected_types: list[str] | str | None
+    ) -> list[str]:
         if not isinstance(expected_types, list):
             if expected_types is None:
                 expected_types = []
@@ -310,7 +311,7 @@ def _normalize_expected_types(
         return expected_types
 
     @staticmethod
-    def _normalize_headers(headers: Optional[Dict[str, str]]) -> Dict[str, str]:
+    def _normalize_headers(headers: dict[str, str] | None) -> dict[str, str]:
         if headers is None:
             return {}
         return headers
@@ -387,8 +388,8 @@ async def _check_and_return_download_result(
         target_file: File,
         response: ResponseInfo,
         head_response: ResponseInfo,
-        expected_types: List[str]
-    ) -> Optional[DownloadResult]:
+        expected_types: list[str]
+    ) -> DownloadResult | None:
         status = await status_check_func(
             response=response,
             tmp_file=tmp_file,
@@ -446,7 +447,7 @@ async def _stream_download(
         tmp_file: File,
         target_file: File,
         start: int,
-        progressbar: Union[tqdm.tqdm, DummyProgressBar],
+        progressbar: tqdm.tqdm | DummyProgressBar,
         force_reload: bool = True
     ) -> DownloadResult:
         headers = self._additional_headers.copy()
diff --git a/src/audible_cli/exceptions.py b/src/audible_cli/exceptions.py
index 5c296b57..ec91c3d8 100644
--- a/src/audible_cli/exceptions.py
+++ b/src/audible_cli/exceptions.py
@@ -97,7 +97,7 @@ def __init__(self, asin: str, pub_date):
         seconds = published_in.seconds
         hours, remainder = divmod(seconds, 3600)
         minutes, seconds = divmod(remainder, 60)
-        hms = "{:02}h:{:02}m:{:02}s".format(int(hours), int(minutes), int(seconds))
+        hms = f"{int(hours):02}h:{int(minutes):02}m:{int(seconds):02}s"
         pub_str += hms
 
         message = f"{asin} is not published. It will be available in {pub_str}"
diff --git a/src/audible_cli/models.py b/src/audible_cli/models.py
index 82a1085a..0c3fba16 100644
--- a/src/audible_cli/models.py
+++ b/src/audible_cli/models.py
@@ -5,7 +5,7 @@
 import unicodedata
 from datetime import UTC, datetime
 from math import ceil
-from typing import List, Optional, Union
+from typing import Optional
 from warnings import warn
 
 import audible
@@ -16,16 +16,16 @@
 from .constants import CODEC_HIGH_QUALITY, CODEC_NORMAL_QUALITY
 from .exceptions import (
     AudibleCliException,
+    ItemNotPublished,
     LicenseDenied,
     NoDownloadUrl,
     NotDownloadableAsAAX,
-    ItemNotPublished
 )
 from .utils import (
-    full_response_callback,
     LongestSubString,
+    full_response_callback,
     parse_api_datetime,
-    to_utc_datetime
+    to_utc_datetime,
 )
 
 
@@ -38,13 +38,13 @@ def __init__(
             data: dict,
             api_client: audible.AsyncClient,
             parent: Optional["BaseItem"] = None,
-            response_groups: Optional[List] = None
+            response_groups: list | None = None
     ) -> None:
         self._data = self._prepare_data(data)
         self._client = api_client
         self._parent = parent
         self._response_groups = response_groups
-        self._children: Optional[BaseList] = None
+        self._children: BaseList | None = None
 
     def __iter__(self):
         return iter(self._data)
@@ -121,7 +121,7 @@ def substring_in_title(self, substring, p=100):
         accuracy = self.substring_in_title_accuracy(substring)
         return accuracy >= p
 
-    def get_cover_url(self, res: Union[str, int] = 500):
+    def get_cover_url(self, res: str | int = 500):
         images = self.product_images
         res = str(res)
         if images is not None and res in images:
@@ -220,8 +220,7 @@ async def get_child_items(self, **request_params) -> Optional["Library"]:
         With these all parts of a MultiPartBook or all episodes of a Podcasts
         can be shown.
         """
-
-        # Only items with content_delivery_type 
+        # Only items with content_delivery_type
         # MultiPartBook or Periodical have child elements
         if not self.has_children:
             return
@@ -327,7 +326,7 @@ async def get_aax_url(self, quality: str = "high"):
     async def get_aaxc_url(
             self,
             quality: str = "high",
-            license_response_groups: Optional[str] = None
+            license_response_groups: str | None = None
     ):
         if not self.is_published():
             raise ItemNotPublished(self.asin, self.publication_datetime)
@@ -348,7 +347,7 @@ async def get_aaxc_url(
     async def get_license(
             self,
             quality: str = "high",
-            response_groups: Optional[str] = None
+            response_groups: str | None = None
     ):
         assert quality in ("best", "high", "normal",)
 
@@ -433,7 +432,7 @@ async def get_content_metadata(
         return metadata
 
     async def get_annotations(self):
-        url = f"https://cde-ta-g7g.amazon.com/FionaCDEServiceEngine/sidecar"
+        url = "https://cde-ta-g7g.amazon.com/FionaCDEServiceEngine/sidecar"
         params = {
             "type": "AUDI",
             "key": self.asin
@@ -451,7 +450,7 @@ class WishlistItem(BaseItem):
 class BaseList:
     def __init__(
             self,
-            data: Union[dict, list],
+            data: dict | list,
             api_client: audible.AsyncClient
     ):
         self._client = api_client
@@ -463,7 +462,7 @@ def __len__(self):
     def __iter__(self):
         return iter(self._data)
 
-    def _prepare_data(self, data: Union[dict, list]) -> Union[dict, list]:
+    def _prepare_data(self, data: dict | list) -> dict | list:
         return data
 
     @property
@@ -489,7 +488,7 @@ def search_item_by_title(self, search_title, p=80):
 
 
 class Library(BaseList):
-    def _prepare_data(self, data: Union[dict, list]) -> list:
+    def _prepare_data(self, data: dict | list) -> list:
         response_groups = None
         if isinstance(data, dict):
             response_groups = data.get("response_groups")
@@ -510,8 +509,8 @@ async def from_api(
             cls,
             api_client: audible.AsyncClient,
             include_total_count_header: bool = False,
-            start_date: Optional[datetime] = None,
-            end_date: Optional[datetime] = None,
+            start_date: datetime | None = None,
+            end_date: datetime | None = None,
             **request_params
     ):
         # Callers may pass naive datetimes, so normalize the bounds before
@@ -538,7 +537,7 @@ def filter_by_date(item):
             if start_date is not None and start_date > date_added:
                 return False
             # If a new episode is added to a parent podcast, the purchase_date
-            # and date_added is set to this date. This can makes things 
+            # and date_added is set to this date. This can makes things
             # difficult to get older podcast episodes
             # the end date will be filtered by the resolve_podcasts function later
             if item.is_parent_podcast():
@@ -625,8 +624,8 @@ async def from_api_full_sync(
 
     async def resolve_podcats(
             self,
-            start_date: Optional[datetime] = None,
-            end_date: Optional[datetime] = None
+            start_date: datetime | None = None,
+            end_date: datetime | None = None
     ):
         warn(
             "resolve_podcats is deprecated, use resolve_podcasts instead",
@@ -637,11 +636,11 @@ async def resolve_podcats(
 
     async def resolve_podcasts(
             self,
-            start_date: Optional[datetime] = None,
-            end_date: Optional[datetime] = None
+            start_date: datetime | None = None,
+            end_date: datetime | None = None
     ):
         podcast_items = await asyncio.gather(
-            *[i.get_child_items(start_date=start_date, end_date=end_date) 
+            *[i.get_child_items(start_date=start_date, end_date=end_date)
               for i in self if i.is_parent_podcast()]
         )
         for i in podcast_items:
@@ -649,7 +648,7 @@ async def resolve_podcasts(
 
 
 class Catalog(BaseList):
-    def _prepare_data(self, data: Union[dict, list]) -> list:
+    def _prepare_data(self, data: dict | list) -> list:
         response_groups = None
         if isinstance(data, dict):
             response_groups = data.get("response_groups")
@@ -713,7 +712,7 @@ async def resolve_podcasts(self):
 
 
 class Wishlist(BaseList):
-    def _prepare_data(self, data: Union[dict, list]) -> list:
+    def _prepare_data(self, data: dict | list) -> list:
         response_groups = None
         if isinstance(data, dict):
             response_groups = data.get("response_groups")
diff --git a/src/audible_cli/plugins.py b/src/audible_cli/plugins.py
index b4d00f35..adcf1b7f 100644
--- a/src/audible_cli/plugins.py
+++ b/src/audible_cli/plugins.py
@@ -1,5 +1,4 @@
-"""
-Core components for click_plugins
+"""Core components for click_plugins
 https://github.com/click-contrib/click-plugins
 """
 import os
@@ -7,14 +6,12 @@
 import sys
 import traceback
 from importlib import import_module
-from typing import Union
 
 import click
 
 
-def from_folder(plugin_dir: Union[str, pathlib.Path]):
-    """
-    A decorator to register external CLI commands to an instance of
+def from_folder(plugin_dir: str | pathlib.Path):
+    """A decorator to register external CLI commands to an instance of
     `click.Group()`.
 
     Parameters
@@ -22,7 +19,7 @@ def from_folder(plugin_dir: Union[str, pathlib.Path]):
     plugin_dir : str
         Desc.
 
-    Returns
+    Returns:
     -------
     click.Group()
     """
@@ -48,10 +45,10 @@ def decorator(group):
 
                 orig_help = cmd.help or ""
                 new_help = (
-                    f"(P) {orig_help}\n\nPlugin loaded from file: {str(cmd_path)}"
+                    f"(P) {orig_help}\n\nPlugin loaded from file: {cmd_path!s}"
                 )
                 cmd.help = new_help
-            except Exception:  # noqa
+            except Exception:
                 # Catch this so a busted plugin doesn't take down the CLI.
                 # Handled by registering a dummy command that does nothing
                 # other than explain the error.
@@ -63,8 +60,7 @@ def decorator(group):
 
 
 def from_entry_point(entry_point_group):
-    """
-    A decorator to register external CLI commands to an instance of
+    """A decorator to register external CLI commands to an instance of
     `click.Group()`.
 
     Parameters
@@ -72,7 +68,7 @@ def from_entry_point(entry_point_group):
     entry_point_group : list
         A list producing one `pkg_resources.EntryPoint()` per iteration.
 
-    Returns
+    Returns:
     -------
     click.Group()
     """
@@ -95,7 +91,7 @@ def decorator(group):
                 orig_help = cmd.help or ""
                 new_help = f"(P) {orig_help}\n\nPlugin loaded from package: {dist_name}"
                 cmd.help = new_help
-            except Exception:  # noqa
+            except Exception:
                 # Catch this so a busted plugin doesn't take down the CLI.
                 # Handled by registering a dummy command that does nothing
                 # other than explain the error.
@@ -107,8 +103,7 @@ def decorator(group):
 
 
 class BrokenCommand(click.Command):
-    """
-    Rather than completely crash the CLI when a broken plugin is loaded, this
+    """Rather than completely crash the CLI when a broken plugin is loaded, this
     class provides a modified help message informing the user that the plugin
     is broken, and they should contact the owner. If the user executes the
     plugin or specifies `--help` a traceback is reported showing the exception
@@ -116,18 +111,16 @@ class provides a modified help message informing the user that the plugin
     """
 
     def __init__(self, name):
+        """Define the special help messages after instantiating a `click.Command()`.
         """
-        Define the special help messages after instantiating a `click.Command()`.
-        """
-
         click.Command.__init__(self, name)
 
-        util_name = os.path.basename(sys.argv and sys.argv[0] or __file__)
+        util_name = os.path.basename((sys.argv and sys.argv[0]) or __file__)
 
-        if os.environ.get('CLICK_PLUGINS_HONESTLY'):  # pragma no cover
-            icon = u'\U0001F4A9'
+        if os.environ.get("CLICK_PLUGINS_HONESTLY"):  # pragma no cover
+            icon = "\U0001F4A9"
         else:
-            icon = u'\u2020'
+            icon = "\u2020"
 
         self.help = (
             "\nWarning: entry point could not be loaded. Contact "
@@ -138,11 +131,8 @@ def __init__(self, name):
             % (util_name, self.name))
 
     def invoke(self, ctx):
-
+        """Print the traceback instead of doing nothing.
         """
-        Print the traceback instead of doing nothing.
-        """
-
         click.echo(self.help, color=ctx.color)
         ctx.exit(1)
 
diff --git a/src/audible_cli/utils.py b/src/audible_cli/utils.py
index 4f529c5e..158f9f49 100644
--- a/src/audible_cli/utils.py
+++ b/src/audible_cli/utils.py
@@ -4,17 +4,16 @@
 import pathlib
 from datetime import UTC, datetime
 from difflib import SequenceMatcher
-from typing import List, Optional, Union
 
 import aiofiles
 import click
 import httpx
 import tqdm
-from PIL import Image
 from audible import Authenticator
 from audible.client import raise_for_status
 from audible.login import default_login_url_callback
-from click import echo, secho, prompt
+from click import echo, prompt, secho
+from PIL import Image
 
 from .constants import DEFAULT_AUTH_FILE_ENCRYPTION
 
@@ -89,7 +88,6 @@ def convert(self, value, param, ctx):
 
 def prompt_captcha_callback(captcha_url: str) -> str:
     """Helper function for handling captcha."""
-
     echo("Captcha found")
     if click.confirm("Open Captcha with default image viewer", default=True):
         captcha = httpx.get(captcha_url).content
@@ -109,7 +107,6 @@ def prompt_captcha_callback(captcha_url: str) -> str:
 
 def prompt_otp_callback() -> str:
     """Helper function for handling 2-factor authentication."""
-
     echo("2FA is activated for this account.")
     guess = prompt("Please enter OTP Code")
     return str(guess).strip().lower()
@@ -132,11 +129,11 @@ def full_response_callback(resp: httpx.Response) -> httpx.Response:
 
 
 def build_auth_file(
-        filename: Union[str, pathlib.Path],
-        username: Optional[str],
-        password: Optional[str],
+        filename: str | pathlib.Path,
+        username: str | None,
+        password: str | None,
         country_code: str,
-        file_password: Optional[str] = None,
+        file_password: str | None = None,
         external_login: bool = False,
         with_username: bool = False
 ) -> None:
@@ -230,11 +227,11 @@ def update(self, *args, **kwargs):
 class Downloader:
     def __init__(
             self,
-            url: Union[httpx.URL, str],
-            file: Union[pathlib.Path, str],
+            url: httpx.URL | str,
+            file: pathlib.Path | str,
             client,
             overwrite_existing: bool,
-            content_type: Optional[Union[List[str], str]] = None
+            content_type: list[str] | str | None = None
     ) -> None:
         self._url = url
         self._file = pathlib.Path(file).resolve()
@@ -367,7 +364,7 @@ async def run(self, stream: bool = True, pb: bool = True):
 def export_to_csv(
     file: pathlib.Path,
     data: list,
-    headers: Union[list, tuple],
+    headers: list | tuple,
     dialect: str
 ) -> None:
     with file.open("w", encoding="utf-8", newline="") as f:
diff --git a/utils/update_chapter_titles.py b/utils/update_chapter_titles.py
index ba6da27d..d02582dc 100644
--- a/utils/update_chapter_titles.py
+++ b/utils/update_chapter_titles.py
@@ -1,5 +1,4 @@
-"""
-This script replaces the chapter titles from a ffmetadata file with the one
+"""This script replaces the chapter titles from a ffmetadata file with the one
 extracted from an API metadata/voucher file
 
 Example:
@@ -165,7 +164,7 @@ def update_chapters_from_api_meta(self, api_meta, separate_branding=True):
             # This happens on some of my books
             # but runtime is identical +- few ms
             echo("Missmatch between chapter numbers.")
-            click.confirm('Do you want to continue?', abort=True)
+            click.confirm("Do you want to continue?", abort=True)
 
         echo(f"Found {self.count_chapters()} chapters to prepare.")