arthexis 0.1.22__tar.gz → 0.1.24__tar.gz

{arthexis-0.1.22 → arthexis-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.22
+Version: 0.1.24
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -15,7 +15,7 @@ Requires-Dist: amqp==5.3.1
 Requires-Dist: annotated-types==0.7.0
 Requires-Dist: anyio==4.9.0
 Requires-Dist: asgiref==3.10.0
-Requires-Dist: atproto==0.0.62
+Requires-Dist: atproto<0.1.0,>=0.0.63
 Requires-Dist: attrs==25.3.0
 Requires-Dist: autobahn==24.4.2
 Requires-Dist: Automat==25.4.16
@@ -70,8 +70,8 @@ Requires-Dist: psycopg-binary==3.2.12
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1_modules==0.4.2
 Requires-Dist: pycparser==2.22
-Requires-Dist: pydantic==2.11.7
-Requires-Dist: pydantic_core==2.33.2
+Requires-Dist: pydantic==2.12.3
+Requires-Dist: pydantic_core==2.41.4
 Requires-Dist: pyOpenSSL==25.1.0
 Requires-Dist: pyperclip==1.11.0
 Requires-Dist: PySocks==1.7.1
@@ -106,7 +106,7 @@ Requires-Dist: vine==5.1.0
 Requires-Dist: wcwidth==0.2.14
 Requires-Dist: webencodings==0.5.1
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: websockets==13.1
+Requires-Dist: websockets==15.0.1
 Requires-Dist: whitenoise==6.11.0
 Requires-Dist: plyer==2.1.0; sys_platform == "win32"
 Requires-Dist: wsproto==1.2.0
@@ -203,6 +203,7 @@ Terminal nodes can start directly with the scripts below without installing; Con
      - `--constellation` – enables the multi-user orchestration stack.
    - Use `./install.sh --help` to list every available flag if you need to customize the node beyond the role defaults.
    - Upgrade with [`./upgrade.sh`](upgrade.sh).
+   - Consult the [Install & Lifecycle Scripts Manual](docs/development/install-lifecycle-scripts-manual.md) for complete flag descriptions and operational notes.
 
 - **Windows:**
    - Run [`install.bat`](install.bat) to install (Terminal role) and [`upgrade.bat`](upgrade.bat) to upgrade.

{arthexis-0.1.22 → arthexis-0.1.24}/README.md

@@ -88,6 +88,7 @@ Terminal nodes can start directly with the scripts below without installing; Con
      - `--constellation` – enables the multi-user orchestration stack.
    - Use `./install.sh --help` to list every available flag if you need to customize the node beyond the role defaults.
    - Upgrade with [`./upgrade.sh`](upgrade.sh).
+   - Consult the [Install & Lifecycle Scripts Manual](docs/development/install-lifecycle-scripts-manual.md) for complete flag descriptions and operational notes.
 
 - **Windows:**
    - Run [`install.bat`](install.bat) to install (Terminal role) and [`upgrade.bat`](upgrade.bat) to upgrade.

{arthexis-0.1.22 → arthexis-0.1.24}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.22
+Version: 0.1.24
 Summary: Power & Energy Infrastructure
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: GPL-3.0-only
@@ -15,7 +15,7 @@ Requires-Dist: amqp==5.3.1
 Requires-Dist: annotated-types==0.7.0
 Requires-Dist: anyio==4.9.0
 Requires-Dist: asgiref==3.10.0
-Requires-Dist: atproto==0.0.62
+Requires-Dist: atproto<0.1.0,>=0.0.63
 Requires-Dist: attrs==25.3.0
 Requires-Dist: autobahn==24.4.2
 Requires-Dist: Automat==25.4.16
@@ -70,8 +70,8 @@ Requires-Dist: psycopg-binary==3.2.12
 Requires-Dist: pyasn1==0.6.1
 Requires-Dist: pyasn1_modules==0.4.2
 Requires-Dist: pycparser==2.22
-Requires-Dist: pydantic==2.11.7
-Requires-Dist: pydantic_core==2.33.2
+Requires-Dist: pydantic==2.12.3
+Requires-Dist: pydantic_core==2.41.4
 Requires-Dist: pyOpenSSL==25.1.0
 Requires-Dist: pyperclip==1.11.0
 Requires-Dist: PySocks==1.7.1
@@ -106,7 +106,7 @@ Requires-Dist: vine==5.1.0
 Requires-Dist: wcwidth==0.2.14
 Requires-Dist: webencodings==0.5.1
 Requires-Dist: websocket-client==1.8.0
-Requires-Dist: websockets==13.1
+Requires-Dist: websockets==15.0.1
 Requires-Dist: whitenoise==6.11.0
 Requires-Dist: plyer==2.1.0; sys_platform == "win32"
 Requires-Dist: wsproto==1.2.0
@@ -203,6 +203,7 @@ Terminal nodes can start directly with the scripts below without installing; Con
      - `--constellation` – enables the multi-user orchestration stack.
    - Use `./install.sh --help` to list every available flag if you need to customize the node beyond the role defaults.
    - Upgrade with [`./upgrade.sh`](upgrade.sh).
+   - Consult the [Install & Lifecycle Scripts Manual](docs/development/install-lifecycle-scripts-manual.md) for complete flag descriptions and operational notes.
 
 - **Windows:**
    - Run [`install.bat`](install.bat) to install (Terminal role) and [`upgrade.bat`](upgrade.bat) to upgrade.

{arthexis-0.1.22 → arthexis-0.1.24}/arthexis.egg-info/SOURCES.txt

@@ -147,6 +147,7 @@ tests/test_email_outbox_admin.py
 tests/test_email_profiles.py
 tests/test_email_transaction.py
 tests/test_env_refresh_clean.py
+tests/test_env_refresh_dependency_conflict.py
 tests/test_env_refresh_pip.py
 tests/test_env_refresh_unlink.py
 tests/test_experience_admin_group.py
@@ -223,12 +224,14 @@ tests/test_sites_utils.py
 tests/test_social_profile.py
 tests/test_staff_login_net_message.py
 tests/test_staff_required_decorator.py
+tests/test_stop_script.py
 tests/test_suite_gateway.py
 tests/test_switch_role_script.py
 tests/test_system_changelog_report.py
 tests/test_temp_passwords.py
 tests/test_totp_admin.py
 tests/test_totp_backend.py
+tests/test_transaction_meter_readings.py
 tests/test_uninstall_script.py
 tests/test_update_fixtures_command.py
 tests/test_upgrade_report.py

{arthexis-0.1.22 → arthexis-0.1.24}/arthexis.egg-info/requires.txt

@@ -2,7 +2,7 @@ amqp==5.3.1
 annotated-types==0.7.0
 anyio==4.9.0
 asgiref==3.10.0
-atproto==0.0.62
+atproto<0.1.0,>=0.0.63
 attrs==25.3.0
 autobahn==24.4.2
 Automat==25.4.16
@@ -55,8 +55,8 @@ psycopg-binary==3.2.12
 pyasn1==0.6.1
 pyasn1_modules==0.4.2
 pycparser==2.22
-pydantic==2.11.7
-pydantic_core==2.33.2
+pydantic==2.12.3
+pydantic_core==2.41.4
 pyOpenSSL==25.1.0
 pyperclip==1.11.0
 PySocks==1.7.1
@@ -91,7 +91,7 @@ vine==5.1.0
 wcwidth==0.2.14
 webencodings==0.5.1
 websocket-client==1.8.0
-websockets==13.1
+websockets==15.0.1
 whitenoise==6.11.0
 wsproto==1.2.0
 zope.interface==8.0.1

{arthexis-0.1.22 → arthexis-0.1.24}/config/settings.py

@@ -666,4 +666,8 @@ CELERY_BEAT_SCHEDULE = {
         "task": "ocpp.tasks.schedule_daily_charge_point_configuration_checks",
         "schedule": crontab(minute=0, hour=0),
     },
+    "ocpp_remote_sync": {
+        "task": "ocpp.tasks.sync_remote_chargers",
+        "schedule": crontab(minute="*"),
+    },
 }

{arthexis-0.1.22 → arthexis-0.1.24}/core/admin.py

@@ -9,10 +9,13 @@ from django.urls import NoReverseMatch, path, reverse
 from urllib.parse import urlencode, urlparse
 from django.shortcuts import get_object_or_404, redirect, render
 from django.http import (
+    FileResponse,
+    Http404,
     HttpResponse,
     JsonResponse,
     HttpResponseBase,
     HttpResponseRedirect,
+    HttpResponseNotAllowed,
 )
 from django.template.response import TemplateResponse
 from django.conf import settings
@@ -47,6 +50,7 @@ import uuid
 import requests
 import datetime
 from django.db import IntegrityError, transaction
+from django.db.models import Q
 import calendar
 import re
 from django_object_actions import DjangoObjectActions
@@ -60,7 +64,7 @@ from reportlab.graphics.barcode import qr
 from reportlab.graphics.shapes import Drawing
 from reportlab.lib.styles import getSampleStyleSheet
 from reportlab.platypus import Paragraph, SimpleDocTemplate, Spacer, Table, TableStyle
-from ocpp.models import Transaction
+from ocpp.models import Charger, Transaction
 from ocpp.rfid.utils import build_mode_toggle
 from nodes.models import EmailOutbox
 from .github_helper import GitHubRepositoryError, create_repository_for_package
@@ -606,15 +610,18 @@ class PackageAdmin(SaveBeforeChangeAction, EntityModelAdmin):
     change_actions = ["create_repository_action", "prepare_next_release_action"]
 
     def _prepare(self, request, package):
+        if request.method not in {"POST", "GET"}:
+            return HttpResponseNotAllowed(["GET", "POST"])
         from pathlib import Path
         from packaging.version import Version
 
         ver_file = Path("VERSION")
-        repo_version = (
-            Version(ver_file.read_text().strip())
-            if ver_file.exists()
-            else Version("0.0.0")
-        )
+        if ver_file.exists():
+            raw_version = ver_file.read_text().strip()
+            cleaned_version = raw_version.rstrip("+") or "0.0.0"
+            repo_version = Version(cleaned_version)
+        else:
+            repo_version = Version("0.0.0")
 
         pypi_latest = Version("0.0.0")
         try:
@@ -3609,13 +3616,62 @@ class RFIDAdmin(EntityModelAdmin, ImportExportModelAdmin):
         return JsonResponse(result, status=status)
 
 
+class ClientReportRecurrencyFilter(admin.SimpleListFilter):
+    title = "Recurrency"
+    parameter_name = "recurrency"
+
+    def lookups(self, request, model_admin):
+        for value, label in ClientReportSchedule.PERIODICITY_CHOICES:
+            yield (value, label)
+
+    def queryset(self, request, queryset):
+        value = self.value()
+        if not value:
+            return queryset
+        if value == ClientReportSchedule.PERIODICITY_NONE:
+            return queryset.filter(
+                Q(schedule__isnull=True) | Q(schedule__periodicity=value)
+            )
+        return queryset.filter(schedule__periodicity=value)
+
+
 @admin.register(ClientReport)
 class ClientReportAdmin(EntityModelAdmin):
-    list_display = ("created_on", "start_date", "end_date")
+    list_display = (
+        "created_on",
+        "period_range",
+        "owner",
+        "recurrency_display",
+        "total_kw_period_display",
+        "download_link",
+    )
+    list_select_related = ("schedule", "owner")
+    list_filter = ("owner", ClientReportRecurrencyFilter)
     readonly_fields = ("created_on", "data")
 
     change_list_template = "admin/core/clientreport/change_list.html"
 
+    def period_range(self, obj):
+        return str(obj)
+
+    period_range.short_description = "Period"
+
+    def recurrency_display(self, obj):
+        return obj.periodicity_label
+
+    recurrency_display.short_description = "Recurrency"
+
+    def total_kw_period_display(self, obj):
+        return f"{obj.total_kw_period:.2f}"
+
+    total_kw_period_display.short_description = "Total kW (period)"
+
+    def download_link(self, obj):
+        url = reverse("admin:core_clientreport_download", args=[obj.pk])
+        return format_html('<a href="{}">Download</a>', url)
+
+    download_link.short_description = "Download"
+
     class ClientReportForm(forms.Form):
         PERIOD_CHOICES = [
             ("range", "Date range"),
@@ -3651,8 +3707,28 @@ class ClientReportAdmin(EntityModelAdmin):
             label="Month",
             required=False,
             widget=forms.DateInput(attrs={"type": "month"}),
+            input_formats=["%Y-%m"],
             help_text="Generates the report for the calendar month that you select.",
         )
+        language = forms.ChoiceField(
+            label="Report language",
+            choices=settings.LANGUAGES,
+            help_text="Choose the language used for the generated report.",
+        )
+        title = forms.CharField(
+            label="Report title",
+            required=False,
+            max_length=200,
+            help_text="Optional heading that replaces the default report title.",
+        )
+        chargers = forms.ModelMultipleChoiceField(
+            label="Charge points",
+            queryset=Charger.objects.filter(connector_id__isnull=True)
+            .order_by("display_name", "charger_id"),
+            required=False,
+            widget=forms.CheckboxSelectMultiple,
+            help_text="Choose which charge points are included in the report.",
+        )
         owner = forms.ModelChoiceField(
             queryset=get_user_model().objects.all(),
             required=False,
@@ -3670,10 +3746,10 @@ class ClientReportAdmin(EntityModelAdmin):
             initial=ClientReportSchedule.PERIODICITY_NONE,
             help_text="Defines how often the report should be generated automatically.",
         )
-        disable_emails = forms.BooleanField(
-            label="Disable email delivery",
+        enable_emails = forms.BooleanField(
+            label="Enable email delivery",
             required=False,
-            help_text="Generate files without sending emails.",
+            help_text="Send the report via email to the recipients listed above.",
         )
 
         def __init__(self, *args, request=None, **kwargs):
@@ -3685,6 +3761,13 @@ class ClientReportAdmin(EntityModelAdmin):
                 and request.user.is_authenticated
             ):
                 self.fields["owner"].initial = request.user.pk
+            self.fields["chargers"].widget.attrs["class"] = "charger-options"
+            language_initial = ClientReport.default_language()
+            if request:
+                language_initial = ClientReport.normalize_language(
+                    getattr(request, "LANGUAGE_CODE", language_initial)
+                )
+            self.fields["language"].initial = language_initial
 
         def clean(self):
             cleaned = super().clean()
@@ -3729,6 +3812,10 @@ class ClientReportAdmin(EntityModelAdmin):
                 emails.append(candidate)
             return emails
 
+        def clean_title(self):
+            title = self.cleaned_data.get("title")
+            return ClientReport.normalize_title(title)
+
     def get_urls(self):
         urls = super().get_urls()
         custom = [
@@ -3737,6 +3824,16 @@ class ClientReportAdmin(EntityModelAdmin):
                 self.admin_site.admin_view(self.generate_view),
                 name="core_clientreport_generate",
             ),
+            path(
+                "generate/action/",
+                self.admin_site.admin_view(self.generate_report),
+                name="core_clientreport_generate_report",
+            ),
+            path(
+                "download/<int:report_id>/",
+                self.admin_site.admin_view(self.download_view),
+                name="core_clientreport_download",
+            ),
         ]
         return custom + urls
 
@@ -3744,40 +3841,127 @@ class ClientReportAdmin(EntityModelAdmin):
         form = self.ClientReportForm(request.POST or None, request=request)
         report = None
         schedule = None
+        download_url = None
         if request.method == "POST" and form.is_valid():
             owner = form.cleaned_data.get("owner")
             if not owner and request.user.is_authenticated:
                 owner = request.user
+            enable_emails = form.cleaned_data.get("enable_emails", False)
+            disable_emails = not enable_emails
+            recipients = form.cleaned_data.get("destinations") if enable_emails else []
+            chargers = list(form.cleaned_data.get("chargers") or [])
+            language = form.cleaned_data.get("language")
+            title = form.cleaned_data.get("title")
             report = ClientReport.generate(
                 form.cleaned_data["start"],
                 form.cleaned_data["end"],
                 owner=owner,
-                recipients=form.cleaned_data.get("destinations"),
-                disable_emails=form.cleaned_data.get("disable_emails", False),
+                recipients=recipients,
+                disable_emails=disable_emails,
+                chargers=chargers,
+                language=language,
+                title=title,
             )
             report.store_local_copy()
+            if chargers:
+                report.chargers.set(chargers)
+            if enable_emails and recipients:
+                delivered = report.send_delivery(
+                    to=recipients,
+                    cc=[],
+                    outbox=ClientReport.resolve_outbox_for_owner(owner),
+                    reply_to=ClientReport.resolve_reply_to_for_owner(owner),
+                )
+                if delivered:
+                    report.recipients = delivered
+                    report.save(update_fields=["recipients"])
+                    self.message_user(
+                        request,
+                        "Consumer report emailed to the selected recipients.",
+                        messages.SUCCESS,
+                    )
             recurrence = form.cleaned_data.get("recurrence")
             if recurrence and recurrence != ClientReportSchedule.PERIODICITY_NONE:
                 schedule = ClientReportSchedule.objects.create(
                     owner=owner,
                     created_by=request.user if request.user.is_authenticated else None,
                     periodicity=recurrence,
-                    email_recipients=form.cleaned_data.get("destinations", []),
-                    disable_emails=form.cleaned_data.get("disable_emails", False),
+                    email_recipients=recipients,
+                    disable_emails=disable_emails,
+                    language=language,
+                    title=title,
                 )
+                if chargers:
+                    schedule.chargers.set(chargers)
                 report.schedule = schedule
                 report.save(update_fields=["schedule"])
                 self.message_user(
                     request,
-                    "Client report schedule created; future reports will be generated automatically.",
+                    "Consumer report schedule created; future reports will be generated automatically.",
+                    messages.SUCCESS,
+                )
+            if disable_emails:
+                self.message_user(
+                    request,
+                    "Consumer report generated. The download will begin automatically.",
                     messages.SUCCESS,
                 )
+                redirect_url = f"{reverse('admin:core_clientreport_generate')}?download={report.pk}"
+                return HttpResponseRedirect(redirect_url)
+        download_param = request.GET.get("download")
+        if download_param:
+            try:
+                download_report = ClientReport.objects.get(pk=download_param)
+            except ClientReport.DoesNotExist:
+                pass
+            else:
+                download_url = reverse(
+                    "admin:core_clientreport_download", args=[download_report.pk]
+                )
         context = self.admin_site.each_context(request)
-        context.update({"form": form, "report": report, "schedule": schedule})
+        context.update(
+            {
+                "form": form,
+                "report": report,
+                "schedule": schedule,
+                "download_url": download_url,
+                "opts": self.model._meta,
+            }
+        )
         return TemplateResponse(
             request, "admin/core/clientreport/generate.html", context
         )
 
+    def get_changelist_actions(self, request):
+        parent = getattr(super(), "get_changelist_actions", None)
+        actions: list[str] = []
+        if callable(parent):
+            parent_actions = parent(request)
+            if parent_actions:
+                actions.extend(parent_actions)
+        if "generate_report" not in actions:
+            actions.append("generate_report")
+        return actions
+
+    def generate_report(self, request):
+        return HttpResponseRedirect(reverse("admin:core_clientreport_generate"))
+
+    generate_report.label = _("Generate report")
+
+    def download_view(self, request, report_id: int):
+        report = get_object_or_404(ClientReport, pk=report_id)
+        pdf_path = report.ensure_pdf()
+        if not pdf_path.exists():
+            raise Http404("Report file unavailable")
+        end_date = report.end_date
+        if hasattr(end_date, "isoformat"):
+            end_date_str = end_date.isoformat()
+        else:  # pragma: no cover - fallback for unexpected values
+            end_date_str = str(end_date)
+        filename = f"consumer-report-{end_date_str}.pdf"
+        response = FileResponse(pdf_path.open("rb"), content_type="application/pdf")
+        response["Content-Disposition"] = f'attachment; filename="{filename}"'
+        return response
 
 @admin.register(PackageRelease)
 class PackageReleaseAdmin(SaveBeforeChangeAction, EntityModelAdmin):