arthexis 0.1.21__py3-none-any.whl → 0.1.23__py3-none-any.whl

core/models.py

@@ -15,7 +15,13 @@ from django.apps import apps
 from django.db.models.signals import m2m_changed, post_delete, post_save
 from django.dispatch import receiver
 from django.views.decorators.debug import sensitive_variables
-from datetime import time as datetime_time, timedelta
+from datetime import (
+    time as datetime_time,
+    timedelta,
+    datetime as datetime_datetime,
+    date as datetime_date,
+    timezone as datetime_timezone,
+)
 import logging
 import json
 from django.contrib.contenttypes.models import ContentType
@@ -33,7 +39,8 @@ import uuid
 from pathlib import Path
 from django.core import serializers
 from django.core.management.color import no_style
-from urllib.parse import quote_plus, urlparse
+from urllib.parse import quote, quote_plus, urlparse
+from zoneinfo import ZoneInfo
 from utils import revision as revision_utils
 from typing import Any, Type
 from defusedxml import xmlrpc as defused_xmlrpc
@@ -522,6 +529,10 @@ class User(Entity, AbstractUser):
     def social_profile(self):
         return self._direct_profile("SocialProfile")
 
+    @property
+    def google_calendar_profile(self):
+        return self._direct_profile("GoogleCalendarProfile")
+
 
 class UserPhoneNumber(Entity):
     """Store phone numbers associated with a user."""
@@ -839,6 +850,184 @@ class OpenPayProfile(Profile):
         ]
 
 
+class GoogleCalendarProfile(Profile):
+    """Store Google Calendar configuration for a user or security group."""
+
+    profile_fields = ("calendar_id", "api_key", "display_name", "timezone")
+
+    calendar_id = SigilShortAutoField(max_length=255)
+    api_key = SigilShortAutoField(max_length=255)
+    display_name = models.CharField(max_length=255, blank=True)
+    max_events = models.PositiveIntegerField(
+        default=5,
+        validators=[MinValueValidator(1), MaxValueValidator(20)],
+        help_text=_("Number of upcoming events to display (1-20)."),
+    )
+    timezone = SigilShortAutoField(max_length=100, blank=True)
+
+    GOOGLE_EVENTS_URL = (
+        "https://www.googleapis.com/calendar/v3/calendars/{calendar}/events"
+    )
+    GOOGLE_EMBED_URL = "https://calendar.google.com/calendar/embed?src={calendar}&ctz={tz}"
+
+    class Meta:
+        verbose_name = _("Google Calendar")
+        verbose_name_plural = _("Google Calendars")
+        constraints = [
+            models.CheckConstraint(
+                check=(
+                    (Q(user__isnull=False) & Q(group__isnull=True))
+                    | (Q(user__isnull=True) & Q(group__isnull=False))
+                ),
+                name="googlecalendarprofile_requires_owner",
+            )
+        ]
+
+    def __str__(self):  # pragma: no cover - simple representation
+        label = self.get_display_name()
+        return label or self.resolved_calendar_id()
+
+    def resolved_calendar_id(self) -> str:
+        value = self.resolve_sigils("calendar_id")
+        return value or self.calendar_id or ""
+
+    def resolved_api_key(self) -> str:
+        value = self.resolve_sigils("api_key")
+        return value or self.api_key or ""
+
+    def resolved_timezone(self) -> str:
+        value = self.resolve_sigils("timezone")
+        return value or self.timezone or ""
+
+    def get_timezone(self) -> ZoneInfo:
+        tz_name = self.resolved_timezone() or settings.TIME_ZONE
+        try:
+            return ZoneInfo(tz_name)
+        except Exception:
+            return ZoneInfo("UTC")
+
+    def get_display_name(self) -> str:
+        value = self.resolve_sigils("display_name")
+        if value:
+            return value
+        if self.display_name:
+            return self.display_name
+        return ""
+
+    def build_events_url(self) -> str:
+        calendar = self.resolved_calendar_id().strip()
+        if not calendar:
+            return ""
+        encoded = quote(calendar, safe="@")
+        return self.GOOGLE_EVENTS_URL.format(calendar=encoded)
+
+    def build_calendar_url(self) -> str:
+        calendar = self.resolved_calendar_id().strip()
+        if not calendar:
+            return ""
+        tz = self.get_timezone().key
+        encoded_calendar = quote_plus(calendar)
+        encoded_tz = quote_plus(tz)
+        return self.GOOGLE_EMBED_URL.format(calendar=encoded_calendar, tz=encoded_tz)
+
+    def _parse_event_point(self, data: dict) -> tuple[datetime_datetime | None, bool]:
+        if not isinstance(data, dict):
+            return None, False
+
+        tz_name = data.get("timeZone")
+        default_tz = self.get_timezone()
+        tzinfo = default_tz
+        if tz_name:
+            try:
+                tzinfo = ZoneInfo(tz_name)
+            except Exception:
+                tzinfo = default_tz
+
+        timestamp = data.get("dateTime")
+        if timestamp:
+            dt = parse_datetime(timestamp)
+            if dt is None:
+                try:
+                    dt = datetime_datetime.fromisoformat(
+                        timestamp.replace("Z", "+00:00")
+                    )
+                except ValueError:
+                    dt = None
+            if dt is not None and dt.tzinfo is None:
+                dt = dt.replace(tzinfo=tzinfo)
+            return dt, False
+
+        date_value = data.get("date")
+        if date_value:
+            try:
+                day = datetime_date.fromisoformat(date_value)
+            except ValueError:
+                return None, True
+            dt = datetime_datetime.combine(day, datetime_time.min, tzinfo=tzinfo)
+            return dt, True
+
+        return None, False
+
+    def fetch_events(self, *, max_results: int | None = None) -> list[dict[str, object]]:
+        calendar_id = self.resolved_calendar_id().strip()
+        api_key = self.resolved_api_key().strip()
+        if not calendar_id or not api_key:
+            return []
+
+        url = self.build_events_url()
+        if not url:
+            return []
+
+        now = timezone.now().astimezone(datetime_timezone.utc).replace(microsecond=0)
+        params = {
+            "key": api_key,
+            "singleEvents": "true",
+            "orderBy": "startTime",
+            "timeMin": now.isoformat().replace("+00:00", "Z"),
+            "maxResults": max_results or self.max_events or 5,
+        }
+
+        try:
+            response = requests.get(url, params=params, timeout=10)
+            response.raise_for_status()
+            payload = response.json()
+        except (requests.RequestException, ValueError):
+            logger.warning(
+                "Failed to fetch Google Calendar events for profile %s", self.pk,
+                exc_info=True,
+            )
+            return []
+
+        items = payload.get("items")
+        if not isinstance(items, list):
+            return []
+
+        events: list[dict[str, object]] = []
+        for item in items:
+            if not isinstance(item, dict):
+                continue
+            start, all_day = self._parse_event_point(item.get("start") or {})
+            end, _ = self._parse_event_point(item.get("end") or {})
+            summary = item.get("summary") or ""
+            link = item.get("htmlLink") or ""
+            location = item.get("location") or ""
+            if start is None:
+                continue
+            events.append(
+                {
+                    "summary": summary,
+                    "start": start,
+                    "end": end,
+                    "all_day": all_day,
+                    "html_link": link,
+                    "location": location,
+                }
+            )
+
+        events.sort(key=lambda event: event.get("start") or timezone.now())
+        return events
+
+
 class EmailInbox(Profile):
     """Credentials and configuration for connecting to an email mailbox."""
 
@@ -2757,6 +2946,17 @@ class ClientReportSchedule(Entity):
                                 "application/json",
                             )
                         )
+                    pdf_path = export.get("pdf_path")
+                    if pdf_path:
+                        pdf_file = Path(settings.BASE_DIR) / pdf_path
+                        if pdf_file.exists():
+                            attachments.append(
+                                (
+                                    pdf_file.name,
+                                    pdf_file.read_bytes(),
+                                    "application/pdf",
+                                )
+                            )
                     subject = f"Client report {report.start_date} to {report.end_date}"
                     body = (
                         "Attached is the client report generated for the period "
@@ -2827,11 +3027,11 @@ class ClientReport(Entity):
         recipients: list[str] | None = None,
         disable_emails: bool = False,
     ):
-        rows = cls.build_rows(start_date, end_date)
+        payload = cls.build_rows(start_date, end_date)
         return cls.objects.create(
             start_date=start_date,
             end_date=end_date,
-            data={"rows": rows, "schema": "session-list/v1"},
+            data=payload,
             owner=owner,
             schedule=schedule,
             recipients=list(recipients or []),
@@ -2861,15 +3061,13 @@ class ClientReport(Entity):
             _json.dumps(self.data, indent=2, default=str), encoding="utf-8"
         )
 
-        def _relative(path: Path) -> str:
-            try:
-                return str(path.relative_to(base_dir))
-            except ValueError:
-                return str(path)
+        pdf_path = report_dir / f"{identifier}.pdf"
+        self.render_pdf(pdf_path)
 
         export = {
-            "html_path": _relative(html_path),
-            "json_path": _relative(json_path),
+            "html_path": ClientReport._relative_to_base(html_path, base_dir),
+            "json_path": ClientReport._relative_to_base(json_path, base_dir),
+            "pdf_path": ClientReport._relative_to_base(pdf_path, base_dir),
         }
 
         updated = dict(self.data)
@@ -2880,28 +3078,32 @@ class ClientReport(Entity):
 
     @staticmethod
     def build_rows(start_date=None, end_date=None, *, for_display: bool = False):
-        from ocpp.models import Transaction
+        dataset = ClientReport._build_dataset(start_date, end_date)
+        if for_display:
+            return ClientReport._normalize_dataset_for_display(dataset)
+        return dataset
 
-        qs = Transaction.objects.filter(
-            (Q(rfid__isnull=False) & ~Q(rfid=""))
-            | (Q(vid__isnull=False) & ~Q(vid=""))
-        )
-        if start_date:
-            from datetime import datetime, time, timedelta, timezone as pytimezone
+    @staticmethod
+    def _build_dataset(start_date=None, end_date=None):
+        from datetime import datetime, time, timedelta, timezone as pytimezone
+        from ocpp.models import Charger, Transaction
+
+        qs = Transaction.objects.all()
 
+        start_dt = None
+        end_dt = None
+        if start_date:
             start_dt = datetime.combine(start_date, time.min, tzinfo=pytimezone.utc)
             qs = qs.filter(start_time__gte=start_dt)
         if end_date:
-            from datetime import datetime, time, timedelta, timezone as pytimezone
-
             end_dt = datetime.combine(
                 end_date + timedelta(days=1), time.min, tzinfo=pytimezone.utc
             )
             qs = qs.filter(start_time__lt=end_dt)
 
-        transactions = list(
-            qs.select_related("account").order_by("-start_time", "-pk")
-        )
+        qs = qs.select_related("account", "charger").prefetch_related("meter_values")
+        transactions = list(qs.order_by("start_time", "pk"))
+
         rfid_values = {tx.rfid for tx in transactions if tx.rfid}
         tag_map: dict[str, RFID] = {}
         if rfid_values:
@@ -2912,52 +3114,227 @@ class ClientReport(Entity):
                 )
             }
 
-        rows: list[dict[str, Any]] = []
+        charger_ids = {
+            tx.charger.charger_id
+            for tx in transactions
+            if getattr(tx, "charger", None) and tx.charger.charger_id
+        }
+        aggregator_map: dict[str, Charger] = {}
+        if charger_ids:
+            aggregator_map = {
+                charger.charger_id: charger
+                for charger in Charger.objects.filter(
+                    charger_id__in=charger_ids, connector_id__isnull=True
+                )
+            }
+
+        groups: dict[str, dict[str, Any]] = {}
         for tx in transactions:
-            energy = tx.kw
-            if energy <= 0:
+            charger = getattr(tx, "charger", None)
+            if charger is None:
                 continue
+            base_id = charger.charger_id
+            aggregator = aggregator_map.get(base_id) or charger
+            entry = groups.setdefault(
+                base_id,
+                {"charger": aggregator, "transactions": []},
+            )
+            entry["transactions"].append(tx)
+
+        evcs_entries: list[dict[str, Any]] = []
+        total_all_time = 0.0
+        total_period = 0.0
+
+        def _sort_key(tx):
+            anchor = getattr(tx, "start_time", None)
+            if anchor is None:
+                anchor = datetime.min.replace(tzinfo=pytimezone.utc)
+            return (anchor, tx.pk or 0)
+
+        for base_id, info in sorted(groups.items(), key=lambda item: item[0]):
+            aggregator = info["charger"]
+            txs = sorted(info["transactions"], key=_sort_key)
+            total_kw_all = float(getattr(aggregator, "total_kw", 0.0) or 0.0)
+            total_kw_period = 0.0
+            if hasattr(aggregator, "total_kw_for_range"):
+                total_kw_period = float(
+                    aggregator.total_kw_for_range(start=start_dt, end=end_dt) or 0.0
+                )
+            total_all_time += total_kw_all
+            total_period += total_kw_period
 
-            subject = None
-            if tx.account and getattr(tx.account, "name", None):
-                subject = tx.account.name
-            else:
-                tag = tag_map.get(tx.rfid)
-                if tag:
-                    account = next(iter(tag.energy_accounts.all()), None)
-                    if account:
-                        subject = account.name
-                    else:
-                        subject = str(tag.label_id)
+            session_rows: list[dict[str, Any]] = []
+            for tx in txs:
+                session_kw = float(getattr(tx, "kw", 0.0) or 0.0)
+                if session_kw <= 0:
+                    continue
 
-            if subject is None:
-                subject = tx.rfid or tx.vid
+                start_kwh, end_kwh = ClientReport._resolve_meter_bounds(tx)
 
-            start_value = tx.start_time
-            end_value = tx.stop_time
-            if not for_display:
-                start_value = start_value.isoformat()
-                end_value = end_value.isoformat() if end_value else None
+                connector_number = (
+                    tx.connector_id
+                    if getattr(tx, "connector_id", None) is not None
+                    else getattr(getattr(tx, "charger", None), "connector_id", None)
+                )
 
-            rows.append(
+                rfid_value = (tx.rfid or "").strip()
+                tag = tag_map.get(rfid_value)
+                label = None
+                account_name = (
+                    tx.account.name
+                    if tx.account and getattr(tx.account, "name", None)
+                    else None
+                )
+                if tag:
+                    label = tag.custom_label or str(tag.label_id)
+                    if not account_name:
+                        account = next(iter(tag.energy_accounts.all()), None)
+                        if account and getattr(account, "name", None):
+                            account_name = account.name
+                elif rfid_value:
+                    label = rfid_value
+
+                session_rows.append(
+                    {
+                        "connector": connector_number,
+                        "rfid_label": label,
+                        "account_name": account_name,
+                        "start_kwh": start_kwh,
+                        "end_kwh": end_kwh,
+                        "session_kwh": session_kw,
+                        "start": tx.start_time.isoformat()
+                        if getattr(tx, "start_time", None)
+                        else None,
+                        "end": tx.stop_time.isoformat()
+                        if getattr(tx, "stop_time", None)
+                        else None,
+                    }
+                )
+
+            evcs_entries.append(
                 {
-                    "subject": subject,
-                    "rfid": tx.rfid,
-                    "vid": tx.vid,
-                    "kw": energy,
-                    "start": start_value,
-                    "end": end_value,
+                    "charger_id": aggregator.pk,
+                    "serial_number": aggregator.charger_id,
+                    "display_name": aggregator.display_name
+                    or aggregator.name
+                    or aggregator.charger_id,
+                    "total_kw": total_kw_all,
+                    "total_kw_period": total_kw_period,
+                    "transactions": session_rows,
                 }
             )
 
-        return rows
+        return {
+            "schema": "evcs-session/v1",
+            "evcs": evcs_entries,
+            "totals": {
+                "total_kw": total_all_time,
+                "total_kw_period": total_period,
+            },
+        }
 
-    @property
-    def rows_for_display(self):
-        rows = self.data.get("rows", [])
-        if self.data.get("schema") == "session-list/v1":
+    @staticmethod
+    def _resolve_meter_bounds(tx) -> tuple[float | None, float | None]:
+        def _convert(value):
+            if value in {None, ""}:
+                return None
+            try:
+                return float(value) / 1000.0
+            except (TypeError, ValueError):
+                return None
+
+        start_value = _convert(getattr(tx, "meter_start", None))
+        end_value = _convert(getattr(tx, "meter_stop", None))
+
+        readings_manager = getattr(tx, "meter_values", None)
+        readings = []
+        if readings_manager is not None:
+            readings = [
+                reading
+                for reading in readings_manager.all()
+                if getattr(reading, "energy", None) is not None
+            ]
+        if readings:
+            readings.sort(key=lambda item: item.timestamp)
+            if start_value is None:
+                start_value = float(readings[0].energy or 0)
+            if end_value is None:
+                end_value = float(readings[-1].energy or 0)
+
+        return start_value, end_value
+
+    @staticmethod
+    def _normalize_dataset_for_display(dataset: dict[str, Any]):
+        schema = dataset.get("schema")
+        if schema == "evcs-session/v1":
+            from datetime import datetime
+
+            evcs_entries: list[dict[str, Any]] = []
+            for entry in dataset.get("evcs", []):
+                normalized_rows: list[dict[str, Any]] = []
+                for row in entry.get("transactions", []):
+                    start_val = row.get("start")
+                    end_val = row.get("end")
+
+                    start_dt = None
+                    if start_val:
+                        start_dt = parse_datetime(start_val)
+                        if start_dt and timezone.is_naive(start_dt):
+                            start_dt = timezone.make_aware(start_dt, timezone.utc)
+
+                    end_dt = None
+                    if end_val:
+                        end_dt = parse_datetime(end_val)
+                        if end_dt and timezone.is_naive(end_dt):
+                            end_dt = timezone.make_aware(end_dt, timezone.utc)
+
+                    normalized_rows.append(
+                        {
+                            "connector": row.get("connector"),
+                            "rfid_label": row.get("rfid_label"),
+                            "account_name": row.get("account_name"),
+                            "start_kwh": row.get("start_kwh"),
+                            "end_kwh": row.get("end_kwh"),
+                            "session_kwh": row.get("session_kwh"),
+                            "start": start_dt,
+                            "end": end_dt,
+                        }
+                    )
+
+                normalized_rows.sort(
+                    key=lambda item: (
+                        item["start"]
+                        if item["start"] is not None
+                        else datetime.min.replace(tzinfo=timezone.utc),
+                        item.get("connector") or 0,
+                    )
+                )
+
+                evcs_entries.append(
+                    {
+                        "display_name": entry.get("display_name")
+                        or entry.get("serial_number")
+                        or "Charge Point",
+                        "serial_number": entry.get("serial_number"),
+                        "total_kw": entry.get("total_kw", 0.0),
+                        "total_kw_period": entry.get("total_kw_period", 0.0),
+                        "transactions": normalized_rows,
+                    }
+                )
+
+            totals = dataset.get("totals", {})
+            return {
+                "schema": schema,
+                "evcs": evcs_entries,
+                "totals": {
+                    "total_kw": totals.get("total_kw", 0.0),
+                    "total_kw_period": totals.get("total_kw_period", 0.0),
+                },
+            }
+
+        if schema == "session-list/v1":
             parsed: list[dict[str, Any]] = []
-            for row in rows:
+            for row in dataset.get("rows", []):
                 item = dict(row)
                 start_val = row.get("start")
                 end_val = row.get("end")
@@ -2979,8 +3356,216 @@ class ClientReport(Entity):
                     item["end"] = None
 
                 parsed.append(item)
-            return parsed
-        return rows
+
+            return {"schema": schema, "rows": parsed}
+
+        return {"schema": schema, "rows": dataset.get("rows", [])}
+
+    @property
+    def rows_for_display(self):
+        data = self.data or {}
+        return ClientReport._normalize_dataset_for_display(data)
+
+    @staticmethod
+    def _relative_to_base(path: Path, base_dir: Path) -> str:
+        try:
+            return str(path.relative_to(base_dir))
+        except ValueError:
+            return str(path)
+
+    def render_pdf(self, target: Path):
+        from reportlab.lib import colors
+        from reportlab.lib.pagesizes import landscape, letter
+        from reportlab.lib.styles import getSampleStyleSheet
+        from reportlab.lib.units import inch
+        from reportlab.platypus import (
+            Paragraph,
+            SimpleDocTemplate,
+            Spacer,
+            Table,
+            TableStyle,
+        )
+
+        target_path = Path(target)
+        target_path.parent.mkdir(parents=True, exist_ok=True)
+
+        dataset = self.rows_for_display
+        schema = dataset.get("schema")
+
+        styles = getSampleStyleSheet()
+        title_style = styles["Title"]
+        subtitle_style = styles["Heading2"]
+        normal_style = styles["BodyText"]
+        emphasis_style = styles["Heading3"]
+
+        document = SimpleDocTemplate(
+            str(target_path),
+            pagesize=landscape(letter),
+            leftMargin=0.5 * inch,
+            rightMargin=0.5 * inch,
+            topMargin=0.6 * inch,
+            bottomMargin=0.5 * inch,
+        )
+
+        story: list = []
+        story.append(Paragraph("Consumer Report", title_style))
+        story.append(
+            Paragraph(
+                f"Period: {self.start_date} to {self.end_date}",
+                emphasis_style,
+            )
+        )
+        story.append(Spacer(1, 0.25 * inch))
+
+        if schema == "evcs-session/v1":
+            evcs_entries = dataset.get("evcs", [])
+            if not evcs_entries:
+                story.append(
+                    Paragraph(
+                        "No charging sessions recorded for the selected period.",
+                        normal_style,
+                    )
+                )
+            for index, evcs in enumerate(evcs_entries):
+                if index:
+                    story.append(Spacer(1, 0.2 * inch))
+
+                display_name = evcs.get("display_name") or "Charge Point"
+                serial_number = evcs.get("serial_number")
+                header_text = display_name
+                if serial_number:
+                    header_text = f"{display_name} (Serial: {serial_number})"
+                story.append(Paragraph(header_text, subtitle_style))
+
+                metrics_text = (
+                    f"Total kW (all time): {evcs.get('total_kw', 0.0):.2f} | "
+                    f"Total kW (period): {evcs.get('total_kw_period', 0.0):.2f}"
+                )
+                story.append(Paragraph(metrics_text, normal_style))
+                story.append(Spacer(1, 0.1 * inch))
+
+                transactions = evcs.get("transactions", [])
+                if transactions:
+                    table_data = [
+                        [
+                            "Connector",
+                            "Start kWh",
+                            "End kWh",
+                            "Session kWh",
+                            "Start Time",
+                            "End Time",
+                            "RFID Label",
+                            "Account",
+                        ]
+                    ]
+
+                    def _format_number(value):
+                        return f"{value:.2f}" if value is not None else "—"
+
+                    for row in transactions:
+                        start_dt = row.get("start")
+                        end_dt = row.get("end")
+                        start_display = (
+                            timezone.localtime(start_dt).strftime("%Y-%m-%d %H:%M")
+                            if start_dt
+                            else "—"
+                        )
+                        end_display = (
+                            timezone.localtime(end_dt).strftime("%Y-%m-%d %H:%M")
+                            if end_dt
+                            else "—"
+                        )
+
+                        table_data.append(
+                            [
+                                row.get("connector")
+                                if row.get("connector") is not None
+                                else "—",
+                                _format_number(row.get("start_kwh")),
+                                _format_number(row.get("end_kwh")),
+                                _format_number(row.get("session_kwh")),
+                                start_display,
+                                end_display,
+                                row.get("rfid_label") or "—",
+                                row.get("account_name") or "—",
+                            ]
+                        )
+
+                    table = Table(table_data, repeatRows=1)
+                    table.setStyle(
+                        TableStyle(
+                            [
+                                ("BACKGROUND", (0, 0), (-1, 0), colors.HexColor("#0f172a")),
+                                ("TEXTCOLOR", (0, 0), (-1, 0), colors.white),
+                                ("ALIGN", (0, 0), (-1, 0), "CENTER"),
+                                ("FONTNAME", (0, 0), (-1, 0), "Helvetica-Bold"),
+                                ("FONTSIZE", (0, 0), (-1, 0), 9),
+                                (
+                                    "ROWBACKGROUNDS",
+                                    (0, 1),
+                                    (-1, -1),
+                                    [colors.whitesmoke, colors.HexColor("#eef2ff")],
+                                ),
+                                ("GRID", (0, 0), (-1, -1), 0.25, colors.grey),
+                                ("VALIGN", (0, 1), (-1, -1), "MIDDLE"),
+                            ]
+                        )
+                    )
+                    story.append(table)
+                else:
+                    story.append(
+                        Paragraph(
+                            "No charging sessions recorded for this charge point.",
+                            normal_style,
+                        )
+                    )
+        else:
+            story.append(
+                Paragraph(
+                    "No structured data is available for this report.",
+                    normal_style,
+                )
+            )
+
+        totals = dataset.get("totals") or {}
+        story.append(Spacer(1, 0.3 * inch))
+        story.append(
+            Paragraph(
+                f"Report totals — Total kW (all time): {totals.get('total_kw', 0.0):.2f}",
+                emphasis_style,
+            )
+        )
+        story.append(
+            Paragraph(
+                f"Total kW during period: {totals.get('total_kw_period', 0.0):.2f}",
+                emphasis_style,
+            )
+        )
+
+        document.build(story)
+
+    def ensure_pdf(self) -> Path:
+        base_dir = Path(settings.BASE_DIR)
+        export = dict((self.data or {}).get("export") or {})
+        pdf_relative = export.get("pdf_path")
+        if pdf_relative:
+            candidate = base_dir / pdf_relative
+            if candidate.exists():
+                return candidate
+
+        report_dir = base_dir / "work" / "reports"
+        report_dir.mkdir(parents=True, exist_ok=True)
+        timestamp = timezone.now().strftime("%Y%m%d%H%M%S")
+        identifier = f"client_report_{self.pk}_{timestamp}"
+        pdf_path = report_dir / f"{identifier}.pdf"
+        self.render_pdf(pdf_path)
+
+        export["pdf_path"] = ClientReport._relative_to_base(pdf_path, base_dir)
+        updated = dict(self.data)
+        updated["export"] = export
+        type(self).objects.filter(pk=self.pk).update(data=updated)
+        self.data = updated
+        return pdf_path
 
 
 class BrandManager(EntityManager):
@@ -3433,6 +4018,10 @@ class PackageRelease(Entity):
             if old_name not in expected and old_path.exists():
                 old_path.unlink()
 
+    def delete(self, using=None, keep_parents=False):
+        user_data.delete_user_fixture(self)
+        super().delete(using=using, keep_parents=keep_parents)
+
     def __str__(self) -> str:  # pragma: no cover - trivial
         return f"{self.package.name} {self.version}"
 
@@ -3440,10 +4029,27 @@ class PackageRelease(Entity):
         """Return a :class:`ReleasePackage` built from the package."""
         return self.package.to_package()
 
-    def to_credentials(self) -> Credentials | None:
-        """Return :class:`Credentials` from the associated release manager."""
-        manager = self.release_manager or self.package.release_manager
-        if manager:
+    def to_credentials(
+        self, user: models.Model | None = None
+    ) -> Credentials | None:
+        """Return :class:`Credentials` from available release managers."""
+
+        manager_candidates: list[ReleaseManager] = []
+
+        for candidate in (self.release_manager, self.package.release_manager):
+            if candidate and candidate not in manager_candidates:
+                manager_candidates.append(candidate)
+
+        if user is not None and getattr(user, "is_authenticated", False):
+            try:
+                user_manager = ReleaseManager.objects.get(user=user)
+            except ReleaseManager.DoesNotExist:
+                user_manager = None
+            else:
+                if user_manager not in manager_candidates:
+                    manager_candidates.append(user_manager)
+
+        for manager in manager_candidates:
             creds = manager.to_credentials()
             if creds and creds.has_auth():
                 return creds
@@ -3465,7 +4071,9 @@ class PackageRelease(Entity):
             return manager.github_token
         return os.environ.get("GITHUB_TOKEN")
 
-    def build_publish_targets(self) -> list[RepositoryTarget]:
+    def build_publish_targets(
+        self, user: models.Model | None = None
+    ) -> list[RepositoryTarget]:
         """Return repository targets for publishing this release."""
 
         manager = self.release_manager or self.package.release_manager
@@ -3474,7 +4082,7 @@ class PackageRelease(Entity):
         env_primary = os.environ.get("PYPI_REPOSITORY_URL", "")
         primary_url = env_primary.strip()
 
-        primary_creds = self.to_credentials()
+        primary_creds = self.to_credentials(user=user)
         targets.append(
             RepositoryTarget(
                 name="PyPI",
@@ -3616,6 +4224,8 @@ class PackageRelease(Entity):
         """
 
         version = (version or "").strip()
+        if version.endswith("+"):
+            version = version.rstrip("+")
         revision = (revision or "").strip()
         if not version or not revision:
             return True
@@ -3725,7 +4335,38 @@ class Todo(Entity):
     generated_for_version = models.CharField(max_length=20, blank=True, default="")
     generated_for_revision = models.CharField(max_length=40, blank=True, default="")
     done_on = models.DateTimeField(null=True, blank=True)
+    done_node = models.ForeignKey(
+        "nodes.Node",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="completed_todos",
+        help_text="Node where this TODO was completed.",
+    )
+    done_version = models.CharField(max_length=20, blank=True, default="")
+    done_revision = models.CharField(max_length=40, blank=True, default="")
+    done_username = models.CharField(max_length=150, blank=True, default="")
     on_done_condition = ConditionTextField(blank=True, default="")
+    origin_node = models.ForeignKey(
+        "nodes.Node",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="originated_todos",
+        help_text="Node where this TODO was generated.",
+    )
+    original_user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="originated_todos",
+        help_text="User responsible for creating this TODO.",
+    )
+    original_user_is_authenticated = models.BooleanField(
+        default=False,
+        help_text="Whether the originating user was authenticated during creation.",
+    )
 
     objects = TodoManager()
 
@@ -3766,6 +4407,203 @@ class Todo(Entity):
             return field.evaluate(self)
         return ConditionCheckResult(True, "")
 
+    def save(self, *args, **kwargs):
+        created = self.pk is None
+        tracked_fields = {
+            "done_on",
+            "done_node",
+            "done_node_id",
+            "done_revision",
+            "done_username",
+            "done_version",
+            "is_deleted",
+        }
+        update_fields = kwargs.get("update_fields")
+        monitor_changes = not created and (
+            update_fields is None or tracked_fields.intersection(update_fields)
+        )
+        previous_state = None
+        if monitor_changes:
+            previous_state = (
+                type(self)
+                .all_objects.filter(pk=self.pk)
+                .values(
+                    "done_on",
+                    "done_node_id",
+                    "done_revision",
+                    "done_username",
+                    "done_version",
+                    "is_deleted",
+                )
+                .first()
+            )
+        super().save(*args, **kwargs)
+
+        if created:
+            return
+
+        previous_done_on = previous_state["done_on"] if previous_state else None
+        previous_is_deleted = previous_state["is_deleted"] if previous_state else False
+        previous_done_node = (
+            previous_state["done_node_id"] if previous_state else None
+        )
+        previous_done_revision = (
+            previous_state["done_revision"] if previous_state else ""
+        )
+        previous_done_username = (
+            previous_state["done_username"] if previous_state else ""
+        )
+        previous_done_version = (
+            previous_state["done_version"] if previous_state else ""
+        )
+        if (
+            previous_done_on == self.done_on
+            and previous_is_deleted == self.is_deleted
+            and previous_done_node == getattr(self, "done_node_id", None)
+            and previous_done_revision == self.done_revision
+            and previous_done_username == self.done_username
+            and previous_done_version == self.done_version
+        ):
+            return
+
+        self._update_fixture_state()
+
+    def populate_done_metadata(self, user=None) -> None:
+        """Populate metadata fields for a completed TODO."""
+
+        node = None
+        try:  # pragma: no cover - defensive import guard
+            from nodes.models import Node  # type: ignore
+        except Exception:  # pragma: no cover - when app not ready
+            Node = None
+
+        if Node is not None:
+            try:
+                node = Node.get_local()
+            except Exception:  # pragma: no cover - fallback on errors
+                node = None
+        self.done_node = node if node else None
+
+        version_value = ""
+        revision_value = ""
+        if node is not None:
+            version_value = (node.installed_version or "").strip()
+            revision_value = (node.installed_revision or "").strip()
+
+        if not version_value:
+            version_path = Path(settings.BASE_DIR) / "VERSION"
+            try:
+                version_value = version_path.read_text(encoding="utf-8").strip()
+            except OSError:
+                version_value = ""
+
+        if not revision_value:
+            try:
+                revision_value = revision_utils.get_revision() or ""
+            except Exception:  # pragma: no cover - defensive fallback
+                revision_value = ""
+
+        username_value = ""
+        if user is not None and getattr(user, "is_authenticated", False):
+            try:
+                username_value = user.get_username() or ""
+            except Exception:  # pragma: no cover - fallback to attribute
+                username_value = getattr(user, "username", "") or ""
+
+        self.done_version = version_value
+        self.done_revision = revision_value
+        self.done_username = username_value
+
+    def _update_fixture_state(self) -> None:
+        if not self.is_seed_data:
+            return
+
+        request_text = (self.request or "").strip()
+        if not request_text:
+            return
+
+        slug = self._fixture_slug(request_text)
+        if not slug:
+            return
+
+        base_dir = Path(settings.BASE_DIR)
+        fixture_path = base_dir / "core" / "fixtures" / f"todo__{slug}.json"
+        if not fixture_path.exists():
+            return
+
+        try:
+            with fixture_path.open("r", encoding="utf-8") as handle:
+                data = json.load(handle)
+        except Exception:
+            logger.exception("Failed to read TODO fixture %s", fixture_path)
+            return
+
+        if not isinstance(data, list):
+            return
+
+        updated = False
+        normalized_request = request_text.lower()
+        for item in data:
+            if not isinstance(item, dict):
+                continue
+            fields = item.get("fields")
+            if not isinstance(fields, dict):
+                continue
+            candidate = (fields.get("request") or "").strip().lower()
+            if candidate != normalized_request:
+                continue
+            if self._apply_fixture_fields(fields):
+                updated = True
+
+        if not updated:
+            return
+
+        content = json.dumps(data, indent=2, ensure_ascii=False)
+        if not content.endswith("\n"):
+            content += "\n"
+
+        try:
+            fixture_path.write_text(content, encoding="utf-8")
+        except OSError:
+            logger.exception("Failed to write TODO fixture %s", fixture_path)
+
+    def _apply_fixture_fields(self, fields: dict[str, object]) -> bool:
+        changed = False
+
+        def _assign(key: str, value: object) -> None:
+            nonlocal changed
+            if fields.get(key) != value:
+                fields[key] = value
+                changed = True
+
+        _assign("request", self.request or "")
+        _assign("url", self.url or "")
+        _assign("request_details", self.request_details or "")
+        _assign("done_version", self.done_version or "")
+        _assign("done_revision", self.done_revision or "")
+        _assign("done_username", self.done_username or "")
+
+        if self.done_on:
+            done_value = timezone.localtime(self.done_on)
+            _assign("done_on", done_value.isoformat())
+        else:
+            if fields.get("done_on") is not None:
+                fields["done_on"] = None
+                changed = True
+
+        if self.is_deleted:
+            _assign("is_deleted", True)
+        elif fields.get("is_deleted"):
+            fields["is_deleted"] = False
+            changed = True
+
+        return changed
+
+    @staticmethod
+    def _fixture_slug(value: str) -> str:
+        slug = re.sub(r"[^a-z0-9]+", "_", value.lower()).strip("_")
+        return slug
+
 
 class TOTPDeviceSettings(models.Model):
     """Per-device configuration options for authenticator enrollments."""