edupsyadmin 9.1.0__tar.gz → 9.2.0__tar.gz

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/.github/workflows/coverage.yml

@@ -9,12 +9,16 @@ on:
 jobs:
   coverage:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v2
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
 
       - name: Install poppler and fonts
         run: sudo apt-get update && sudo apt-get install -y --no-install-recommends poppler-utils fonts-liberation poppler-data
@@ -26,6 +30,6 @@ jobs:
         run: uv run pytest --cov --cov-branch --cov-report=xml
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/.github/workflows/publish.yml

@@ -8,17 +8,23 @@ jobs:
   run:
     name: "Build and publish release"
     runs-on: ubuntu-latest
-    
+    permissions:
+      contents: read
+      id-token: write
+
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          persist-credentials: false
 
       - name: "Install uv"
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@20cfd1bf945f4377ade1205e4dbc17946fc9a30d # v10.0.1
 
-      - name: "Set up Python"
-        uses: actions/setup-python@v5
         with:
-          python-version-file: ".python-version"
+          enable-cache: false
+
+      - name: "Set up Python"
+        run: uv python install
 
       - name: "Build"
         run: uv build

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/.pre-commit-config.yaml

@@ -9,7 +9,7 @@ repos:
     -   id: mixed-line-ending
         args: ['--fix=lf']
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.15.20
+  rev: v0.16.6
   hooks:
     - id: ruff-check
       args: [ "--config=pyproject.toml", "--fix" ]
@@ -19,11 +19,11 @@ repos:
   hooks:
     - id: gitleaks
 - repo: https://github.com/commitizen-tools/commitizen
-  rev: v4.16.4
+  rev: v4.18.0
   hooks:
     - id: commitizen
 - repo: https://github.com/rstcheck/rstcheck
-  rev: v6.2.5
+  rev: v6.3.0
   hooks:
     - id: rstcheck
       additional_dependencies: ['rstcheck[sphinx,toml]']
@@ -33,7 +33,7 @@ repos:
     - id: sphinx-lint
       args: ["--enable=all"]
 - repo: https://github.com/rvben/rumdl-pre-commit
-  rev: v0.2.24
+  rev: v0.2.68
   hooks:
     - id: rumdl-fmt  # Auto-format and fail if issues remain
 - repo: local
@@ -46,6 +46,10 @@ repos:
       args: [--python=.venv/]
       pass_filenames: true
 - repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.25.1"
+  rev: "v2.29.3"
   hooks:
     - id: pyproject-fmt
+- repo: https://github.com/zizmorcore/zizmor-pre-commit
+  rev: v1.30.0
+  hooks:
+  - id: zizmor

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 9.2.0 (2026-09-09)
+
+### Feat
+
+- **tui**: add suggester to taet_key entry
+
+### Refactor
+
+- address ruff errors
+- move all imports to the top
+
 ## 9.1.0 (2026-07-06)
 
 ### Feat

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: edupsyadmin
-Version: 9.1.0
+Version: 9.2.0
 Summary: edupsyadmin provides tools to help school psychologists with their documentation
 Project-URL: documentation, https://edupsyadmin.readthedocs.io
 Project-URL: homepage, https://github.com/LKirst/edupsyadmin.git

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/docs/conf.py

@@ -3,18 +3,18 @@
 # For the full list of built-in configuration values, see the documentation:
 # https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-import os
 import sys
 from datetime import datetime
+from pathlib import Path
 
-sys.path.insert(0, os.path.abspath(".."))
+sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
 
 # -- Project information -----------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
 
 project = "edupsyadmin"
 author = "Lukas Liebermann"
-copyright = f"{datetime.now().year}, {author}"
+project_copyright = f"{datetime.now().year}, {author}"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ requires = [ "hatchling" ]
 
 [project]
 name = "edupsyadmin"
-version = "9.1.0"
+version = "9.2.0"
 description = "edupsyadmin provides tools to help school psychologists with their documentation"
 readme = "README.md"
 license = { text = "MIT" }
@@ -70,27 +70,41 @@ exclude-newer = "3d"
 [tool.ruff]
 lint.select = [
   "A",
-  "ARG",  # flake8-unused-arguments – flag unused, shadowed or *args/**kwargs
-  "B",
-  "C4",   # flake8-comprehensions – point out sub-optimal list/dict/set comps
-  "C901", # checks for functions with a high McCabe complexity
-  "COM",  # flake8-commas
-  "E",
-  "F",
-  "FURB", # refurb - modernizing Python codebases
-  "I",
-  "ISC",  # flake8-implicit-str-concat - implicitly string concatenation
-  "N",
-  "PERF", # perflint - a linter for performance anti-patterns
-  "PTH",  # flake8-use-pathlib - find use of function that could be replaced by pathlib
-  "RET",  # flake8-return – keep return statements consistent and meaningful
-  "RUF",  # Ruff-native extras – small bug-catchers & style nits not in other sets "UP",
-  "SIM",  # flake8-simplify – suggest clearer, shorter boolean / loop logic
-  "TID",  # flake8-tidy-imports – ban unused or overly-relative imports
-  "UP",   # pyupgrade – rewrite to modern Python syntax (f-strings, walrus, etc.)
-  "W",
+  "ARG",    # flake8-unused-arguments – flag unused, shadowed or *args/**kwargs
+  "ASYNC",  # flake8-async
+  "B",      # flake8-bugbear
+  "BLE001", # flake8-blind-except
+  "C4",     # flake8-comprehensions – point out sub-optimal list/dict/set comps
+  "C901",   # checks for functions with a high McCabe complexity
+  "COM",    # flake8-commas
+  "D419",   # pydocstyle
+  "E",      # pycodestyle - error
+  "F",      # pyflakes
+  "FURB",   # refurb - modernizing Python codebases
+  "I",      # isort
+  "ISC",    # flake8-implicit-str-concat - implicitly string concatenation
+  "N",      # pap8-naming
+  "PERF",   # perflint - a linter for performance anti-patterns
+  "PGH",    # pygrep-hooks
+  "PIE",    # flake8-pie
+  "PLC",    # pylint - convention
+  "PLE",    # pylint - error
+  "PLR",    # pylint - refactor
+  "PLW",    # pylint - warning
+  "PTH",    # flake8-use-pathlib - find use of function that could be replaced by pathlib
+  "PYI",    # flake8-pyi - a linter that provides specializsations for type hinting stub files
+  "RET",    # flake8-return – keep return statements consistent and meaningful
+  "RUF",    # Ruff-native extras – small bug-catchers & style nits not in other sets "UP",
+  "S102",   # Use of exec detected
+  "S110",   # try-except-pass detected, consider logging the exception
+  "S112",   # try-except-continue detected, consider logging the exception
+  "SIM",    # flake8-simplify – suggest clearer, shorter boolean / loop logic
+  "TID",    # flake8-tidy-imports – ban unused or overly-relative imports
+  "TRY",    # tryceratops
+  "UP",     # pyupgrade – rewrite to modern Python syntax (f-strings, walrus, etc.)
+  "W",      # pycodestyle - warning
 ]
-lint.ignore = [ "COM812" ]
+lint.ignore = [ "COM812", "PLR09", "TRY003" ]
 lint.per-file-ignores."src/edupsyadmin/tui/*" = [ "A002", "ARG" ]
 lint.per-file-ignores."test/*" = [ "ARG" ]
 lint.flake8-tidy-imports.ban-relative-imports = "all"

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/__version__.py

@@ -18,4 +18,4 @@ and backwards compatibility is not guaranteed for minor versions.
 
 __all__ = ["__version__"]
 
-__version__ = "9.1.0"
+__version__ = "9.2.0"

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/alembic/env.py

@@ -3,6 +3,7 @@ from logging.config import fileConfig
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
+from edupsyadmin.core.paths import DEFAULT_DB_URL
 from edupsyadmin.db import Base
 
 # this is the Alembic Config object, which provides
@@ -40,8 +41,6 @@ def run_migrations_offline() -> None:
     """
     url = config.get_main_option("sqlalchemy.url")
     if not url:
-        from edupsyadmin.core.paths import DEFAULT_DB_URL
-
         x_args = context.get_x_argument(as_dictionary=True)
         url = x_args.get("db_url") or DEFAULT_DB_URL
 
@@ -68,8 +67,6 @@ def run_migrations_online() -> None:
     # If the URL is not in the config file, try to get it from the command line
     # (passed via -x db_url=...) or fallback to the default database URL.
     if not section.get("sqlalchemy.url"):
-        from edupsyadmin.core.paths import DEFAULT_DB_URL
-
         x_args = context.get_x_argument(as_dictionary=True)
         section["sqlalchemy.url"] = x_args.get("db_url") or DEFAULT_DB_URL
 

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/fill_form.py

@@ -349,7 +349,7 @@ def batch_fill_forms(
             results.append(
                 {"client_id": client_id, "success": True, "error": None},
             )
-        except Exception as e:
+        except Exception as e:  # noqa: BLE001
             results.append(
                 {"client_id": client_id, "success": False, "error": e},
             )

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/flatten_pdf.py

@@ -2,8 +2,12 @@
 """CLI tool for flattening PDF forms."""
 
 import argparse
+import getpass
 from pathlib import Path
 
+from pypdf import PdfReader
+from pypdf.errors import PyPdfError
+
 from edupsyadmin.api.flattening import (
     DEFAULT_PREFIX,
     InvalidPDFError,
@@ -44,21 +48,17 @@ def main() -> None:
 
     password = args.password
     if not password:
-        from pypdf import PdfReader
-
         for p in args.inpaths:
             p_path = Path(p)
             if p_path.exists() and p_path.suffix.lower() == ".pdf":
                 try:
                     reader = PdfReader(str(p_path))
                     if reader.is_encrypted:
-                        import getpass
-
                         password = getpass.getpass(
                             f"Passwort für verschlüsselte PDF '{p_path.name}': ",
                         )
                         break
-                except Exception:
+                except PyPdfError, OSError, ValueError:
                     continue
 
     try:

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/flattening/base.py

@@ -4,8 +4,6 @@
 class InvalidPDFError(Exception):
     """Raised when the input file is not a valid PDF."""
 
-    pass
-
 
 DEFAULT_PREFIX = "print_"
 

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/flattening/pypdf_backend.py

@@ -28,8 +28,10 @@ import re
 from dataclasses import dataclass
 from pathlib import Path
 from textwrap import wrap
+from typing import Final
 
 from pypdf import PdfReader, PdfWriter
+from pypdf.errors import PyPdfError
 from pypdf.generic import (
     ArrayObject,
     DecodedStreamObject,
@@ -44,6 +46,9 @@ from pypdf.generic import (
     StreamObject,
 )
 
+RECT_NUM_COORDINATES: Final[int] = 4
+MAX_PRINTABLE_ASCII: Final[int] = 126
+
 _Rect = tuple[float, float, float, float]  # x0, y0, x1, y1
 
 # Matches the font-setting operator in a /DA string, e.g. "/Helv 12 Tf"
@@ -146,7 +151,7 @@ def _rect_to_floats(rect_obj: object) -> _Rect:
             float(rect_obj.right),
             float(rect_obj.top),
         )
-    if isinstance(rect_obj, ArrayObject) and len(rect_obj) == 4:
+    if isinstance(rect_obj, ArrayObject) and len(rect_obj) == RECT_NUM_COORDINATES:
         floats = [float(v) for v in rect_obj]
         return (floats[0], floats[1], floats[2], floats[3])
     raise ValueError(f"Cannot parse rectangle: {rect_obj!r}")
@@ -272,7 +277,7 @@ def _ap_stream_bytes_and_resources(
 
     try:  # because of the checks above, I know that n_obj is a  stream object
         data = n_obj.get_data()  # ty: ignore[unresolved-attribute]
-    except Exception:
+    except PyPdfError, TypeError, ValueError, KeyError, AttributeError:
         return None
 
     if _is_empty_stream(data):
@@ -351,7 +356,7 @@ def _escape_pdf_string(text: str) -> str:
             result.append("\\r")
         elif char == "\n":
             result.append("\\n")
-        elif ord(char) > 126:
+        elif ord(char) > MAX_PRINTABLE_ASCII:
             # Octal escape for WinAnsi (cp1252).
             try:
                 # Most standard fonts use an encoding close to CP1252.

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/lgvt.py

@@ -4,6 +4,7 @@ import math
 import os
 from datetime import datetime
 from pathlib import Path
+from typing import Final
 
 from edupsyadmin.api.managers import ClientsManager
 from edupsyadmin.api.reports import (
@@ -19,6 +20,8 @@ from edupsyadmin.utils.datediff import mydatediff
 from edupsyadmin.utils.path_utils import normalize_path
 from edupsyadmin.utils.rounding import round_half_up
 
+MAX_KORREKTUR_SCHOOLYEAR: Final[int] = 11
+
 
 def askyn(prompt: str) -> int:
     s_yes = {"yes", "ye", "y"}
@@ -202,7 +205,7 @@ def mk_report(
     lv_rw = correct_answ * 2 - incorrect_answ
     lgs_rw = words_until_last_item + words_after_last_item
 
-    if schoolyear < 11:
+    if schoolyear < MAX_KORREKTUR_SCHOOLYEAR:
         lv_korr_faktor = float(input("Korrekturfaktor LV:"))
         lv_rw_korr_floor = math.floor(lv_rw * lv_korr_faktor)
         lv_rw_korr_ceil = math.ceil(lv_rw * lv_korr_faktor)

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/migration.py

@@ -33,14 +33,13 @@ def upgrade_db(database_url: str, salt_path: Path | None = None) -> None:
     A backup is only created if a migration is actually required.
     """
     logger.info("Checking for database migrations...")
-    try:
-        # Use importlib.resources to access packaged data
-        pkg_path = resources.files("edupsyadmin")
-        alembic_ini_path = pkg_path.joinpath("alembic.ini")
+    pkg_path = resources.files("edupsyadmin")
+    alembic_ini_path = pkg_path.joinpath("alembic.ini")
 
-        if not alembic_ini_path.is_file():
-            raise MigrationError(f"Alembic config not found at {alembic_ini_path}")
+    if not alembic_ini_path.is_file():
+        raise MigrationError(f"Alembic config not found at {alembic_ini_path}")
 
+    try:
         alembic_script_location = pkg_path.joinpath("alembic")
 
         alembic_cfg = Config(str(alembic_ini_path))
@@ -212,13 +211,15 @@ def _verify_migration(db_session: Session, expected_count: int) -> None:
     try:
         stmt = select(Client)
         clients = list(db_session.scalars(stmt))
+    except Exception as e:
+        raise MigrationError(f"Verification failed: {e}") from e
 
-        if len(clients) != expected_count:
-            raise MigrationError(
-                f"Client count mismatch: expected {expected_count}, "
-                f"found {len(clients)}",
-            )
+    if len(clients) != expected_count:
+        raise MigrationError(
+            f"Client count mismatch: expected {expected_count}, found {len(clients)}",
+        )
 
+    try:
         sample_size = min(10, len(clients))
         for client in clients[:sample_size]:
             _ = client.first_name_encr

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/reports.py

@@ -123,7 +123,6 @@ class BasePDFReport:
 
     def _draw_header(self, canvas: Canvas) -> None:
         """Draw the header (to be overridden if needed)."""
-        pass
 
     def _scale_image(self, img: Image, available_width: float) -> Image:
         """

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/api/taetigkeitsbericht_from_db.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from datetime import date
 from pathlib import Path
-from typing import Any
+from typing import Any, Final
 
 import pandas as pd
 
@@ -9,6 +9,9 @@ from edupsyadmin.api.managers import ClientsManager
 from edupsyadmin.api.reports import TaetigkeitsberichtReport
 from edupsyadmin.core.config import config
 
+SESSION_BRACKET_HIGH: Final[int] = 3
+SESSION_BRACKET_LOW: Final[int] = 2
+
 pd.set_option("display.precision", 1)
 
 
@@ -57,8 +60,12 @@ def add_categories_to_df(
         mask = df[cat].notna()
         cat_sessions = df.loc[mask, "n_sessions"]
 
-        summary.loc["count_mt3_sessions", cat] = (cat_sessions > 3).sum()
-        summary.loc["count_2to3_sessions", cat] = cat_sessions.between(2, 3).sum()
+        summary.loc["count_mt3_sessions", cat] = (
+            cat_sessions > SESSION_BRACKET_HIGH
+        ).sum()
+        summary.loc["count_2to3_sessions", cat] = cat_sessions.between(
+            SESSION_BRACKET_LOW, SESSION_BRACKET_HIGH
+        ).sum()
         summary.loc["count_1_session", cat] = (cat_sessions == 1).sum()
 
     return df, summary

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/__init__.py

@@ -19,6 +19,7 @@ from edupsyadmin.core.paths import (
     DEFAULT_DB_URL,
     DEFAULT_SALT_PATH,
 )
+from edupsyadmin.utils.path_utils import normalize_path
 
 __all__ = ("main",)
 
@@ -137,8 +138,6 @@ def _args(argv: list[str] | None) -> argparse.Namespace:
         parser.print_help()
         raise SystemExit(1)
 
-    from edupsyadmin.utils.path_utils import normalize_path
-
     # don't specify this as an argument default or else it will always be
     # included in the list.
     if not args.config_path:
@@ -247,8 +246,6 @@ def main(argv: list[str] | None = None) -> int:
     """
     args = _args(argv)
 
-    from edupsyadmin.utils.path_utils import normalize_path
-
     # Migrate versioned paths to stable paths if necessary
     if args.database_url.startswith("sqlite:///"):
         db_path = normalize_path(args.database_url.removeprefix("sqlite:///"))

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/commands/create_documentation.py

@@ -1,3 +1,4 @@
+import getpass
 import textwrap
 from argparse import ArgumentParser, Namespace
 from pathlib import Path
@@ -37,8 +38,6 @@ COMMAND_EPILOG = textwrap.dedent(
 
 def add_arguments(parser: ArgumentParser) -> None:
     """CLI adaptor for the create-documentation command."""
-    from edupsyadmin.utils.path_utils import normalize_path
-
     parser.set_defaults(command=execute)
     parser.add_argument(
         "--tui",
@@ -99,8 +98,6 @@ def _get_pdf_password(args: Namespace) -> str | None:
     if args.password:
         return args.password
     if not args.tui:
-        import getpass
-
         return getpass.getpass("Passwort für die PDF-Verschlüsselung: ")
     return None
 

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/commands/flatten_pdfs.py

@@ -1,7 +1,12 @@
+import getpass
 import textwrap
 from argparse import ArgumentParser, Namespace
 
+from pypdf import PdfReader
+from pypdf.errors import PyPdfError
+
 from edupsyadmin.cli.utils import lazy_import
+from edupsyadmin.utils.path_utils import normalize_path
 
 COMMAND_DESCRIPTION = "Flatten pdf forms"
 COMMAND_HELP = "Flatten pdf forms"
@@ -18,8 +23,6 @@ COMMAND_EPILOG = textwrap.dedent(
 
 def add_arguments(parser: ArgumentParser) -> None:
     """CLI adaptor for the flatten-pdfs command."""
-    from edupsyadmin.utils.path_utils import normalize_path
-
     parser.set_defaults(command=execute)
     parser.add_argument("form_paths", nargs="+", type=normalize_path)
     parser.add_argument(
@@ -33,7 +36,6 @@ def add_arguments(parser: ArgumentParser) -> None:
 
 def execute(args: Namespace) -> None:
     """Execute the flatten-pdfs command."""
-    from pypdf import PdfReader
 
     password = args.password
     if not password:
@@ -43,13 +45,11 @@ def execute(args: Namespace) -> None:
                 try:
                     reader = PdfReader(str(p))
                     if reader.is_encrypted:
-                        import getpass
-
                         password = getpass.getpass(
                             f"Passwort für verschlüsselte PDF '{p.name}': ",
                         )
                         break
-                except Exception:
+                except PyPdfError, OSError, ValueError:
                     continue
 
     flatten_pdfs = lazy_import("edupsyadmin.api.flatten_pdf").flatten_pdfs

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/commands/get_clients.py

@@ -7,6 +7,7 @@ from rich.table import Table
 
 from edupsyadmin.cli.utils import lazy_import
 from edupsyadmin.core.logger import logger
+from edupsyadmin.utils.path_utils import normalize_path
 
 COMMAND_DESCRIPTION = "Show clients overview or single client"
 COMMAND_HELP = "Show clients overview or single client"
@@ -32,7 +33,6 @@ COMMAND_EPILOG = textwrap.dedent(
 
 def add_arguments(parser: ArgumentParser) -> None:
     """CLI adaptor for the get-clients command."""
-    from edupsyadmin.utils.path_utils import normalize_path
 
     parser.set_defaults(command=execute)
     parser.add_argument(

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/commands/new_client.py

@@ -5,9 +5,13 @@ from datetime import datetime
 from inspect import signature
 from typing import TYPE_CHECKING
 
+from sqlalchemy import inspect as sa_inspect
+
 from edupsyadmin.cli.utils import lazy_import
 from edupsyadmin.core.config import config
 from edupsyadmin.core.logger import logger
+from edupsyadmin.db import clients
+from edupsyadmin.utils.path_utils import normalize_path
 
 if TYPE_CHECKING:
     from edupsyadmin.api.managers import ClientsManager
@@ -49,7 +53,6 @@ def _enter_client_csv(
     return: client_id
     """
     pd = lazy_import("pandas")
-    from edupsyadmin.db import clients
 
     client_cls = clients.Client
 
@@ -135,8 +138,6 @@ def _enter_client_csv(
         school = next(iter(config.school.keys()))
     client_data["school"] = school
 
-    from sqlalchemy import inspect as sa_inspect
-
     # Filter data to only include valid columns for the Client model
     valid_keys = {c.key for c in sa_inspect(client_cls).column_attrs}
     init_sig = signature(client_cls.__init__)
@@ -199,8 +200,6 @@ def execute(args: Namespace) -> None:
     )
 
     if args.csv:
-        from edupsyadmin.utils.path_utils import normalize_path
-
         if args.name is None:
             raise ValueError("Pass a name to read a client from a csv.")
 

{edupsyadmin-9.1.0 → edupsyadmin-9.2.0}/src/edupsyadmin/cli/commands/rotate_key.py

@@ -4,6 +4,11 @@ from argparse import ArgumentParser, Namespace
 
 from edupsyadmin.api.exceptions import MigrationError
 from edupsyadmin.cli.utils import lazy_import
+from edupsyadmin.core.encrypt import (
+    delete_legacy_key_from_keyring,
+    get_keys_from_keyring,
+    set_keys_in_keyring,
+)
 from edupsyadmin.core.logger import logger
 
 COMMAND_DESCRIPTION = textwrap.dedent(
@@ -72,12 +77,6 @@ def execute(args: Namespace) -> None:
             .lower()
         )
         if cleanup_response in ("yes", "y"):
-            from edupsyadmin.core.encrypt import (
-                delete_legacy_key_from_keyring,
-                get_keys_from_keyring,
-                set_keys_in_keyring,
-            )
-
             delete_legacy_key_from_keyring(args.app_uid, args.app_username)
 
             # Also clean up versioned keys: only keep the newest primary key
@@ -93,7 +92,7 @@ def execute(args: Namespace) -> None:
         print(f"\nERROR: {e}")
         print("The database has been rolled back to its previous state.")
         sys.exit(1)
-    except Exception as e:
+    except Exception as e:  # noqa: BLE001
         logger.critical(f"An unexpected error occurred during re-encryption: {e}")
         print(f"\nCRITICAL ERROR: {e}")
         print("Please restore your database from a backup.")