edupsyadmin 8.2.0__tar.gz → 8.2.1__tar.gz

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 8.2.1 (2026-03-08)
+
+### Refactor
+
+- add ClientData TypedDict and enhance type hinting
+
 ## 8.2.0 (2026-03-08)
 
 ### Feat

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: edupsyadmin
-Version: 8.2.0
+Version: 8.2.1
 Summary: edupsyadmin provides tools to help school psychologists with their documentation
 Author: Lukas Liebermann
 License: MIT

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "edupsyadmin"
-version = "8.2.0"
+version = "8.2.1"
 authors = [{ name = "Lukas Liebermann" }]
 description = "edupsyadmin provides tools to help school psychologists with their documentation"
 readme = "README.md"

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/__version__.py

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

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/add_convenience_data.py

@@ -1,9 +1,10 @@
 from datetime import date
 from importlib.resources import files
-from typing import Any
+from typing import Any, cast
 
 from dateutil.parser import parse
 
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.config import config
 from edupsyadmin.core.logger import logger
 from edupsyadmin.utils.academic_year import (
@@ -49,7 +50,7 @@ def _date_to_german_string(isodate: date | str | None) -> str:
     if (isodate is None) or (isodate == ""):
         return ""
     try:
-        return parse(isodate, dayfirst=False).strftime("%d.%m.%Y")
+        return parse(str(isodate), dayfirst=False).strftime("%d.%m.%Y")
     except ValueError:
         logger.error(f"'{isodate}' could not be parsed as a date")
         raise
@@ -58,7 +59,7 @@ def _date_to_german_string(isodate: date | str | None) -> str:
         raise
 
 
-def _add_client_address(data: dict[str, Any]) -> None:
+def _add_client_address(data: ClientData) -> None:
     """Add client's name and address to data."""
     first_name = data.get("first_name_encr", "")
     last_name = data.get("last_name_encr", "")
@@ -74,7 +75,7 @@ def _add_client_address(data: dict[str, Any]) -> None:
         logger.debug(f"Couldn't add home address because of missing data: {e}")
 
 
-def _add_school_psychologist_address(data: dict[str, Any]) -> None:
+def _add_school_psychologist_address(data: ClientData) -> None:
     """Add school psychologist's address from config to data."""
     data["schoolpsy_name"] = config.schoolpsy.schoolpsy_name
     data["schoolpsy_street"] = config.schoolpsy.schoolpsy_street
@@ -85,7 +86,7 @@ def _add_school_psychologist_address(data: dict[str, Any]) -> None:
     data["schoolpsy_addr_s_wname"] = data["schoolpsy_addr_m_wname"].replace("\n", ", ")
 
 
-def _add_school_address(data: dict[str, Any]) -> None:
+def _add_school_address(data: ClientData) -> None:
     """Add school address from config to data."""
     school_key = data.get("school")
     if not school_key:
@@ -102,7 +103,7 @@ def _add_school_address(data: dict[str, Any]) -> None:
     data["school_addr_s_wname"] = data["school_addr_m_wname"].replace("\n", ", ")
 
 
-def _add_lrst_diagnosis(data: dict[str, Any]) -> None:
+def _add_lrst_diagnosis(data: ClientData) -> None:
     """Add long version of LRSt diagnosis to data."""
     diagnosis = data.get("lrst_diagnosis_encr")
     if not diagnosis:
@@ -122,23 +123,23 @@ def _add_lrst_diagnosis(data: dict[str, Any]) -> None:
         )
 
 
-def _add_dates(data: dict[str, Any]) -> None:
+def _add_dates(data: ClientData) -> None:
     """Add various formatted dates to data."""
     data["today_date"] = date.today()
-    dates_to_convert = [
-        "birthday_encr",
-        "today_date",
-        "lrst_last_test_date_encr",
-        "document_shredding_date",
+    dates_to_convert: list[tuple[str, str]] = [
+        ("birthday_encr", "birthday_encr_de"),
+        ("today_date", "today_date_de"),
+        ("lrst_last_test_date_encr", "lrst_last_test_date_encr_de"),
+        ("document_shredding_date", "document_shredding_date_de"),
     ]
-    for idate in dates_to_convert:
-        gdate = idate + "_de"
-        data[gdate] = _date_to_german_string(data.get(idate))
+    for idate, gdate in dates_to_convert:
+        # TypedDict doesn't support dynamic key access with variables
+        cast(Any, data)[gdate] = _date_to_german_string(data.get(cast(Any, idate)))
 
     data["school_year"] = get_this_academic_year_string()
 
 
-def _add_nta_schoolyear(data: dict[str, Any]) -> None:
+def _add_nta_schoolyear(data: ClientData) -> None:
     """Add NTA/NOS end schoolyear to data."""
     if (
         data.get("nta_nos_end")
@@ -147,12 +148,13 @@ def _add_nta_schoolyear(data: dict[str, Any]) -> None:
     ):
         data["nta_nos_end_schoolyear"] = get_academic_year_string(
             get_estimated_end_of_academic_year(
-                grade_current=data["class_int"], grade_target=data["nta_nos_end_grade"]
+                grade_current=cast(int, data["class_int"]),
+                grade_target=cast(int, data["nta_nos_end_grade"]),
             )
         )
 
 
-def _convert_lrst_test_by(data: dict[str, Any]) -> None:
+def _convert_lrst_test_by(data: ClientData) -> None:
     """Convert lrst_last_test_by_encr to numerical value for forms."""
     test_by = data.get("lrst_last_test_by_encr")
     if not test_by:
@@ -176,7 +178,7 @@ def _convert_lrst_test_by(data: dict[str, Any]) -> None:
         )
 
 
-def add_convenience_data(data: dict[str, Any]) -> dict[str, Any]:
+def add_convenience_data(data: ClientData) -> ClientData:
     """
     Füge Daten hinzu, die sich aus einem Eintrag in einer `Client`-Datenbank,
     der Konfigurationsdatei und einer Datei zu den Schulfächern (optional)

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/cft_report.py

@@ -5,6 +5,7 @@ from edupsyadmin.api.managers import ClientsManager
 
 # TODO: Remove FPDF dependency?
 from edupsyadmin.api.reports import Report, normal_distribution_plot
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.utils.convert_measures import iq_to_t, iq_to_z
 from edupsyadmin.utils.datediff import mydatediff
 
@@ -34,10 +35,11 @@ def create_report(
     clients_manager = ClientsManager(
         database_url=database_url,
     )
-    client_dict = clients_manager.get_decrypted_client(client_id)
+    client_dict: ClientData = clients_manager.get_decrypted_client(client_id)
 
     testdate = datetime.strptime(test_date, "%Y-%m-%d").date()
-    birthday = datetime.strptime(client_dict["birthday_encr"], "%Y-%m-%d").date()
+    birthday_str = client_dict.get("birthday_encr", "")
+    birthday = datetime.strptime(birthday_str, "%Y-%m-%d").date()
 
     age_str = f"Alter: {mydatediff(birthday, testdate)}"
     text = []
@@ -110,7 +112,7 @@ def create_report(
     heading = f"CFT 20-R (Testdatum: {testdate}; Code: {client_id})"
     report = Report(heading, text, fn_plot)
     report.print_page()
-    report.output(directory / Path(f"{client_id}_Auswertung.pdf"))
+    report.output(str(directory / Path(f"{client_id}_Auswertung.pdf")))
 
     # remove the plot png
     fn_plot.unlink()

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/display_client_details.py

@@ -1,16 +1,16 @@
-from typing import Any
-
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
+from edupsyadmin.api.types import ClientData
+
 
-def display_client_details(client_data: dict[str, Any]) -> None:
+def display_client_details(client_data: ClientData) -> None:
     """Displays client details in a formatted way using rich."""
     console = Console()
 
     # Helper to print a table for a group of fields
-    def print_group_table(data: dict, title: str, fields: list[str]) -> None:
+    def print_group_table(data: ClientData, title: str, fields: list[str]) -> None:
         table = Table(show_header=False, box=None, padding=(0, 1))
         table.add_column(style="cyan")
         table.add_column()

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/fill_form.py

@@ -7,10 +7,11 @@ from typing import Any
 
 from liquid import Template, exceptions
 
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.logger import logger
 
 
-def _modify_bool_and_none_for_pdf_form(data: dict[str, Any]) -> dict[str, Any]:
+def _modify_bool_and_none_for_pdf_form(data: ClientData) -> dict[str, Any]:
     """
     Replace every boolean True with 'Yes' and False with 'Off', which are the
     values checkboxes accept in most PDF forms. Replace None with empty
@@ -20,7 +21,7 @@ def _modify_bool_and_none_for_pdf_form(data: dict[str, Any]) -> dict[str, Any]:
     :return: a modified dictionary where booleans are replaced
         with string values and None values are replaced with an empty string
     """
-    updated_data = {}
+    updated_data: dict[str, Any] = {}
     logger.debug("Replacing True with 'Yes' and False with 'Off'")
     for key, value in data.items():
         if isinstance(value, bool):
@@ -32,7 +33,7 @@ def _modify_bool_and_none_for_pdf_form(data: dict[str, Any]) -> dict[str, Any]:
     return updated_data
 
 
-def write_form_pdf(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
+def write_form_pdf(fn: Path, out_fn: Path, data: ClientData) -> None:
     """
     Fill a pdf form with data using pypdf.
 
@@ -57,7 +58,7 @@ def write_form_pdf(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
         if not fields:
             logger.debug(f"The file {fn} is not a form.")
         else:
-            logger.debug("\nForm fields:\n{fields.keys()}")
+            logger.debug(f"\nForm fields:\n{fields.keys()}")
             logger.debug(f"\nData keys:\n{data_wo_bool.keys()}")
             comb_key_fields = product(range(len(reader.pages)), fields.keys())
             for i, key in comb_key_fields:
@@ -77,7 +78,7 @@ def write_form_pdf(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
         writer.write(output_stream)
 
 
-def write_form_pdf2(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
+def write_form_pdf2(fn: Path, out_fn: Path, data: ClientData) -> None:
     """
     Fill a pdf form with data using fillpdf.
 
@@ -101,7 +102,7 @@ def write_form_pdf2(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
         shutil.copyfile(fn, out_fn)
 
 
-def write_form_md(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
+def write_form_md(fn: Path, out_fn: Path, data: ClientData) -> None:
     """
     Render a liquid template with data passed to the function.
 
@@ -127,7 +128,7 @@ def write_form_md(fn: Path, out_fn: Path, data: dict[str, Any]) -> None:
 
 
 def fill_form(
-    client_data: dict[str, Any],
+    client_data: ClientData,
     form_paths: Sequence[str | os.PathLike[str]],
     out_dir: str | os.PathLike[str] = ".",
     use_fillpdf: bool = True,
@@ -150,7 +151,7 @@ def fill_form(
             raise FileNotFoundError(
                 f"The template file does not exist: {fp}; cwd is: {Path.cwd()}"
             )
-        out_fp = Path(out_dir, f"{client_data['client_id']}_{fp.name}")
+        out_fp = Path(out_dir, f"{client_data.get('client_id')}_{fp.name}")
         logger.info(f"Writing to {out_fp.resolve()}")
         if fp.suffix == ".md":
             write_form_md(fp, out_fp, client_data)

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/lgvt.py

@@ -3,10 +3,12 @@ import math
 import os
 from datetime import date, datetime
 from pathlib import Path
+from typing import Any, cast
 
 import pandas as pd
 
 from edupsyadmin.api.managers import ClientsManager
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.config import config
 from edupsyadmin.utils.convert_measures import percentile_to_t
 
@@ -122,10 +124,14 @@ def mk_report(
     t_day = datetime.strptime(test_date, "%Y-%m-%d").date()
 
     clients_manager = ClientsManager(database_url=database_url)
-    client_dict = clients_manager.get_decrypted_client(client_id)
-
-    name = client_dict["first_name_encr"] + " " + client_dict["last_name_encr"]
-    schoolyear = client_dict["class_int"]
+    client_dict: ClientData = clients_manager.get_decrypted_client(client_id)
+
+    name = (
+        client_dict.get("first_name_encr", "")
+        + " "
+        + client_dict.get("last_name_encr", "")
+    )
+    schoolyear = int(cast(Any, client_dict.get("class_int", 0)))
 
     results = get_indeces(fn_csv, name, schoolyear, t_day, version)
 

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/api/managers.py

@@ -1,11 +1,12 @@
 import logging  # just for interaction with the sqlalchemy logger
 from datetime import datetime
-from typing import Any
+from typing import Any, cast
 
 import pandas as pd
 from sqlalchemy import create_engine, inspect, or_, select
 from sqlalchemy.orm import sessionmaker
 
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.config import config
 from edupsyadmin.core.logger import logger
 from edupsyadmin.db import clients as clients_db
@@ -50,14 +51,15 @@ class ClientsManager:
             logger.info(f"added client: {new_client}")
             return new_client.client_id
 
-    def get_decrypted_client(self, client_id: int) -> dict[str, Any]:
+    def get_decrypted_client(self, client_id: int) -> ClientData:
         logger.debug(f"trying to access client (client_id = {client_id})")
         with self.Session() as session:
             client = session.get(clients_db.Client, client_id)
             if client is None:
                 raise ClientNotFoundError(client_id)
             # Create a clean dictionary using the cached mapper
-            return {c.key: getattr(client, c.key) for c in self._mapper.column_attrs}
+            data = {c.key: getattr(client, c.key) for c in self._mapper.column_attrs}
+            return cast(ClientData, data)
 
     def get_clients_overview(
         self,
@@ -129,8 +131,11 @@ class ClientsManager:
         with self.Session() as session:
             stmt = select(clients_db.Client)
             clients = session.scalars(stmt).all()
-            data = [
-                {c.key: getattr(client, c.key) for c in self._mapper.column_attrs}
+            data: list[ClientData] = [
+                cast(
+                    ClientData,
+                    {c.key: getattr(client, c.key) for c in self._mapper.column_attrs},
+                )
                 for client in clients
             ]
             return pd.DataFrame(data)

edupsyadmin-8.2.1/src/edupsyadmin/api/types.py

@@ -0,0 +1,81 @@
+from datetime import date, datetime
+from typing import TypedDict
+
+
+class ClientData(TypedDict, total=False):
+    # Base fields from Client model
+    client_id: int
+    first_name_encr: str
+    last_name_encr: str
+    gender_encr: str
+    birthday_encr: str
+    street_encr: str
+    city_encr: str
+    parent_encr: str
+    telephone1_encr: str
+    telephone2_encr: str
+    email_encr: str
+    notes_encr: str
+    keyword_taet_encr: str
+    lrst_diagnosis_encr: str
+    lrst_last_test_date_encr: str
+    lrst_last_test_by_encr: str
+    school: str
+    entry_date: date | None
+    class_name: str | None
+    class_int: int | None
+    estimated_graduation_date: date | None
+    document_shredding_date: date | None
+    datetime_created: datetime
+    datetime_lastmodified: datetime
+    notenschutz: bool
+    nos_rs: bool
+    nos_rs_ausn: bool
+    nos_rs_ausn_faecher: str | None
+    nos_les: bool
+    nos_other: bool
+    nos_other_details: str | None
+    nachteilsausgleich: bool
+    nta_zeitv: bool
+    nta_zeitv_vieltext: int | None
+    nta_zeitv_wenigtext: int | None
+    nta_font: bool
+    nta_aufg: bool
+    nta_struktur: bool
+    nta_arbeitsm: bool
+    nta_ersgew: bool
+    nta_vorlesen: bool
+    nta_other: bool
+    nta_other_details: str | None
+    nta_nos_notes: str | None
+    nta_nos_end: bool
+    nta_nos_end_grade: int | None
+    min_sessions: int
+    n_sessions: int
+    case_active: bool
+
+    # Convenience fields added by add_convenience_data
+    name: str
+    addr_s_nname: str
+    addr_m_wname: str
+    schoolpsy_name: str
+    schoolpsy_street: str
+    schoolpsy_city: str
+    schoolpsy_addr_m_wname: str
+    schoolpsy_addr_s_wname: str
+    school_name: str
+    school_street: str
+    school_city: str
+    school_head_w_school: str
+    school_addr_m_wname: str
+    school_addr_s_wname: str
+    lrst_diagnosis_long: str
+    today_date: date
+    birthday_encr_de: str
+    today_date_de: str
+    lrst_last_test_date_encr_de: str
+    document_shredding_date_de: str
+    school_year: str
+    nta_nos_end_schoolyear: str
+    lrst_schpsy: int
+    school_subjects: str

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/db/clients.py

@@ -369,7 +369,7 @@ class Client(Base):
     ) -> None:
         client_id_int_or_none = to_int_or_none(client_id)
         if client_id_int_or_none is not None:
-            self.client_id = client_id
+            self.client_id = client_id_int_or_none
         self.first_name_encr = first_name_encr
         self.last_name_encr = last_name_encr
         self.gender_encr = (

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/clients_overview.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import ClassVar
 
 import pandas as pd

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/dialogs.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from textual.app import ComposeResult
 from textual.containers import Grid
 from textual.screen import ModalScreen

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/edit_client.py

@@ -1,5 +1,5 @@
-from datetime import date
-from typing import Any, ClassVar
+from datetime import date, datetime
+from typing import Any, ClassVar, cast
 
 from textual import on
 from textual.app import ComposeResult
@@ -18,6 +18,7 @@ from textual.widgets import (
 )
 from textual.widgets._select import NoSelection
 
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.config import config
 from edupsyadmin.db.clients import LRST_DIAG, LRST_TEST_BY, Client
 from edupsyadmin.utils.python_type import get_python_type
@@ -64,15 +65,13 @@ LRST_FIELDS = [
 DATE_REGEX = r"\d{4}-[0-1]\d-[0-3]\d"
 
 
-def _to_str_or_bool(value: None | date | bool | str | int | float) -> str | bool | None:
+def _to_str_or_bool(value: object) -> str | bool | None:
     if value is None:
         return None
-    if isinstance(value, date):
-        return value.isoformat()
-    if isinstance(value, bool | str):  # check this before checking if int!
+    if isinstance(value, bool):
         return value
-    if isinstance(value, int | float):
-        return str(value)
+    if isinstance(value, (date, datetime)):
+        return value.isoformat()
     return str(value)
 
 
@@ -284,7 +283,7 @@ class EditClient(Container):
         yield RichLog(classes="log", id="edit-client-log")
 
     def _normalize_original_data(
-        self, data: dict[str, Any]
+        self, data: ClientData
     ) -> dict[str, str | bool | None]:
         return {k: _to_str_or_bool(v) for k, v in data.items()}
 
@@ -394,7 +393,7 @@ class EditClient(Container):
         widget.tooltip = tooltip
         return widget
 
-    def update_client(self, client_id: int | None, data: dict[str, Any] | None) -> None:
+    def update_client(self, client_id: int | None, data: ClientData | None) -> None:
         self.client_id = client_id
         data = data or _get_empty_client_dict()
 
@@ -519,12 +518,12 @@ class EditClient(Container):
 
 
 # TODO: make defaults configurable
-def _get_empty_client_dict() -> dict[str, str | bool | int]:
+def _get_empty_client_dict() -> ClientData:
     defaults = {
         "min_sessions": 45,
         "n_session": 1,
     }
-    empty_client_dict: dict[str, str | bool | int] = {}
+    empty_client_dict: dict[str, Any] = {}
     for db_column in Client.__table__.columns:
         field_type = get_python_type(db_column.type)
         name = db_column.name
@@ -535,4 +534,4 @@ def _get_empty_client_dict() -> dict[str, str | bool | int]:
             empty_client_dict[name] = False
         else:
             empty_client_dict[name] = ""
-    return empty_client_dict
+    return cast(ClientData, empty_client_dict)

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/edupsyadmintui.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, Any, ClassVar
 
 from textual import work
@@ -10,6 +8,7 @@ from textual.message import Message
 from textual.widgets import Footer, Header, LoadingIndicator
 
 from edupsyadmin.api.fill_form import fill_form
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.tui.clients_overview import ClientsOverview
 from edupsyadmin.tui.edit_client import EditClient
 from edupsyadmin.tui.fill_form_widget import FillForm, FillFormScreen
@@ -206,7 +205,7 @@ class EdupsyadminTui(App[None]):
             if message.client_id is not None and message.client_data is not None:
                 edit_client_widget.update_client(message.client_id, message.client_data)
             else:
-                edit_client_widget.update_client(None, {})
+                edit_client_widget.update_client(None, None)
             self.notify("Daten erfolgreich gespeichert.", severity="information")
 
     async def on_edit_client_cancel_edit(self, message: EditClient.CancelEdit) -> None:
@@ -214,7 +213,7 @@ class EdupsyadminTui(App[None]):
             return
 
         edit_client_widget = self.query_one(EditClient)
-        edit_client_widget.update_client(None, {})
+        edit_client_widget.update_client(None, None)
         self.notify("Bearbeitung abgebrochen.", severity="information")
 
     async def on_fill_form_start_fill(self, message: FillForm.StartFill) -> None:
@@ -295,7 +294,7 @@ class EdupsyadminTui(App[None]):
         def __init__(
             self,
             client_id: int,
-            client_data: dict[str, Any] | None,
+            client_data: ClientData | None,
             error: Exception | None = None,
         ) -> None:
             self.client_id = client_id
@@ -307,7 +306,7 @@ class EdupsyadminTui(App[None]):
         def __init__(
             self,
             client_id: int | None = None,
-            client_data: dict[str, Any] | None = None,
+            client_data: ClientData | None = None,
             error: Exception | None = None,
         ) -> None:
             self.client_id = client_id

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/fill_form_app.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, ClassVar
 
 from textual import work

{edupsyadmin-8.2.0 → edupsyadmin-8.2.1}/src/edupsyadmin/tui/fill_form_widget.py

@@ -1,7 +1,5 @@
-from __future__ import annotations
-
 from pathlib import Path
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING
 
 from rich.text import Text
 from textual import on
@@ -21,6 +19,7 @@ from textual.widgets import (
     Static,
 )
 
+from edupsyadmin.api.types import ClientData
 from edupsyadmin.core.config import config
 
 if TYPE_CHECKING:
@@ -164,7 +163,7 @@ class FillForm(Widget):
             event.input.value = str(current_path)
 
     # TODO: improve confusing function name
-    def update_client(self, client_id: int, client_data: dict[str, Any]) -> None:
+    def update_client(self, client_id: int, client_data: ClientData) -> None:
         """Update the widget with data for a specific client."""
         self.client_id = client_id
         info = self.query_one("#client-info", Static)
@@ -177,7 +176,7 @@ class FillForm(Widget):
 
     # TODO: improve confusing function name
     # TODO: remove redundancy
-    def update_clients(self, clients_data: dict[int, dict[str, Any]]) -> None:
+    def update_clients(self, clients_data: dict[int, ClientData]) -> None:
         """Update the widget with data for multiple clients."""
         self.client_ids = list(clients_data.keys())
         info = self.query_one("#client-info", Static)
@@ -257,7 +256,7 @@ class FillFormScreen(Screen):
 
     def on_mount(self) -> None:
         """Load the client data and update the FillForm widget."""
-        clients_data = {}
+        clients_data: dict[int, ClientData] = {}
         for client_id in self.client_ids:
             clients_data[client_id] = self.clients_manager.get_decrypted_client(
                 client_id