arthexis 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

nodes/utils.py

@@ -2,6 +2,8 @@ from datetime import datetime
 from pathlib import Path
 import hashlib
 import logging
+import shutil
+import subprocess
 
 from django.conf import settings
 from selenium import webdriver
@@ -11,6 +13,7 @@ from selenium.common.exceptions import WebDriverException
 from .models import ContentSample
 
 SCREENSHOT_DIR = settings.LOG_DIR / "screenshots"
+CAMERA_DIR = settings.LOG_DIR / "camera"
 logger = logging.getLogger(__name__)
 
 
@@ -46,6 +49,35 @@ def capture_screenshot(url: str, cookies=None) -> Path:
         raise RuntimeError(f"Screenshot capture failed: {exc}") from exc
 
 
+def capture_rpi_snapshot(timeout: int = 10) -> Path:
+    """Capture a snapshot using the Raspberry Pi camera stack."""
+
+    tool_path = shutil.which("rpicam-still")
+    if not tool_path:
+        raise RuntimeError("rpicam-still is not available")
+    CAMERA_DIR.mkdir(parents=True, exist_ok=True)
+    filename = CAMERA_DIR / f"{datetime.utcnow():%Y%m%d%H%M%S}.jpg"
+    try:
+        result = subprocess.run(
+            [tool_path, "-o", str(filename), "-t", "1"],
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=timeout,
+        )
+    except Exception as exc:  # pragma: no cover - depends on camera stack
+        logger.error("Failed to invoke %s: %s", tool_path, exc)
+        raise RuntimeError(f"Snapshot capture failed: {exc}") from exc
+    if result.returncode != 0:
+        error = (result.stderr or result.stdout or "Snapshot capture failed").strip()
+        logger.error("rpicam-still exited with %s: %s", result.returncode, error)
+        raise RuntimeError(error)
+    if not filename.exists():
+        logger.error("Snapshot file %s was not created", filename)
+        raise RuntimeError("Snapshot capture failed")
+    return filename
+
+
 def save_screenshot(path: Path, node=None, method: str = "", transaction_uuid=None):
     """Save screenshot file info if not already recorded.
 

nodes/views.py

@@ -204,6 +204,15 @@ def register_node(request):
     signature = data.get("signature")
     installed_version = data.get("installed_version")
     installed_revision = data.get("installed_revision")
+    relation_present = False
+    if hasattr(data, "getlist"):
+        relation_present = "current_relation" in data
+    else:
+        relation_present = "current_relation" in data
+    raw_relation = data.get("current_relation")
+    relation_value = (
+        Node.normalize_relation(raw_relation) if relation_present else None
+    )
 
     if not hostname or not address or not mac_address:
         response = JsonResponse(
@@ -242,6 +251,8 @@ def register_node(request):
         defaults["installed_version"] = str(installed_version)[:20]
     if installed_revision is not None:
         defaults["installed_revision"] = str(installed_revision)[:40]
+    if relation_value is not None:
+        defaults["current_relation"] = relation_value
 
     node, created = Node.objects.get_or_create(
         mac_address=mac_address,
@@ -265,6 +276,9 @@ def register_node(request):
             node.installed_revision = str(installed_revision)[:40]
             if "installed_revision" not in update_fields:
                 update_fields.append("installed_revision")
+        if relation_value is not None and node.current_relation != relation_value:
+            node.current_relation = relation_value
+            update_fields.append("current_relation")
         node.save(update_fields=update_fields)
         current_version = (node.installed_version or "").strip()
         current_revision = (node.installed_revision or "").strip()

ocpp/admin.py

@@ -11,12 +11,16 @@ from django.urls import path
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template.response import TemplateResponse
 
+import uuid
+from asgiref.sync import async_to_sync
+
 from .models import (
     Charger,
     Simulator,
     MeterValue,
     Transaction,
     Location,
+    DataTransferMessage,
 )
 from .simulator import ChargePointSimulator
 from . import store
@@ -108,6 +112,44 @@ class LocationAdmin(EntityModelAdmin):
     change_form_template = "admin/ocpp/location/change_form.html"
 
 
+@admin.register(DataTransferMessage)
+class DataTransferMessageAdmin(admin.ModelAdmin):
+    list_display = (
+        "charger",
+        "connector_id",
+        "direction",
+        "vendor_id",
+        "message_id",
+        "status",
+        "created_at",
+        "responded_at",
+    )
+    list_filter = ("direction", "status")
+    search_fields = (
+        "charger__charger_id",
+        "ocpp_message_id",
+        "vendor_id",
+        "message_id",
+    )
+    readonly_fields = (
+        "charger",
+        "connector_id",
+        "direction",
+        "ocpp_message_id",
+        "vendor_id",
+        "message_id",
+        "payload",
+        "status",
+        "response_data",
+        "error_code",
+        "error_description",
+        "error_details",
+        "responded_at",
+        "created_at",
+        "updated_at",
+    )
+
+
 @admin.register(Charger)
 class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     fieldsets = (
@@ -122,6 +164,13 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                     "last_path",
                     "last_heartbeat",
                     "last_meter_values",
+                )
+            },
+        ),
+        (
+            "Firmware",
+            {
+                "fields": (
                     "firmware_status",
                     "firmware_status_info",
                     "firmware_timestamp",
@@ -138,6 +187,20 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                 )
             },
         ),
+        (
+            "Availability",
+            {
+                "fields": (
+                    "availability_state",
+                    "availability_state_updated_at",
+                    "availability_requested_state",
+                    "availability_requested_at",
+                    "availability_request_status",
+                    "availability_request_status_at",
+                    "availability_request_details",
+                )
+            },
+        ),
         (
             "Configuration",
             {"fields": ("public_display", "require_rfid")},
@@ -148,6 +211,13 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
                 "fields": ("reference",),
             },
         ),
+        (
+            "Owner",
+            {
+                "fields": ("owner_users", "owner_groups"),
+                "classes": ("collapse",),
+            },
+        ),
     )
     readonly_fields = (
         "last_heartbeat",
@@ -155,16 +225,21 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
         "firmware_status",
         "firmware_status_info",
         "firmware_timestamp",
+        "availability_state",
+        "availability_state_updated_at",
+        "availability_requested_state",
+        "availability_requested_at",
+        "availability_request_status",
+        "availability_request_status_at",
+        "availability_request_details",
     )
     list_display = (
         "charger_id",
-        "connector_id",
+        "connector_number",
         "location_name",
         "require_rfid_display",
         "public_display",
         "last_heartbeat",
-        "firmware_status",
-        "firmware_timestamp",
         "session_kw",
         "total_kw_display",
         "page_link",
@@ -172,7 +247,16 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
         "status_link",
     )
     search_fields = ("charger_id", "connector_id", "location__name")
-    actions = ["purge_data", "delete_selected"]
+    filter_horizontal = ("owner_users", "owner_groups")
+    actions = [
+        "purge_data",
+        "fetch_cp_configuration",
+        "change_availability_operative",
+        "change_availability_inoperative",
+        "set_availability_state_operative",
+        "set_availability_state_inoperative",
+        "delete_selected",
+    ]
 
     def get_view_on_site_url(self, obj=None):
         return obj.get_absolute_url() if obj else None
@@ -215,6 +299,12 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     def get_log_identifier(self, obj):
         return store.identity_key(obj.charger_id, obj.connector_id)
 
+    def connector_number(self, obj):
+        return obj.connector_id if obj.connector_id is not None else ""
+
+    connector_number.short_description = "#"
+    connector_number.admin_order_field = "connector_id"
+
     def status_link(self, obj):
         from django.utils.html import format_html
         from django.urls import reverse
@@ -223,7 +313,8 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
             "charger-status-connector",
             args=[obj.charger_id, obj.connector_slug],
         )
-        return format_html('<a href="{}" target="_blank">status</a>', url)
+        label = (obj.last_status or "status").strip() or "status"
+        return format_html('<a href="{}" target="_blank">{}</a>', url, label)
 
     status_link.short_description = "Status"
 
@@ -239,6 +330,151 @@ class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
 
     purge_data.short_description = "Purge data"
 
+    @admin.action(description="Fetch CP configuration")
+    def fetch_cp_configuration(self, request, queryset):
+        fetched = 0
+        for charger in queryset:
+            connector_value = charger.connector_id
+            ws = store.get_connection(charger.charger_id, connector_value)
+            if ws is None:
+                self.message_user(
+                    request,
+                    f"{charger}: no active connection",
+                    level=messages.ERROR,
+                )
+                continue
+            message_id = uuid.uuid4().hex
+            payload = {}
+            msg = json.dumps([2, message_id, "GetConfiguration", payload])
+            try:
+                async_to_sync(ws.send)(msg)
+            except Exception as exc:  # pragma: no cover - network error
+                self.message_user(
+                    request,
+                    f"{charger}: failed to send GetConfiguration ({exc})",
+                    level=messages.ERROR,
+                )
+                continue
+            log_key = store.identity_key(charger.charger_id, connector_value)
+            store.add_log(log_key, f"< {msg}", log_type="charger")
+            store.register_pending_call(
+                message_id,
+                {
+                    "action": "GetConfiguration",
+                    "charger_id": charger.charger_id,
+                    "connector_id": connector_value,
+                    "log_key": log_key,
+                    "requested_at": timezone.now(),
+                },
+            )
+            store.schedule_call_timeout(
+                message_id,
+                timeout=5.0,
+                action="GetConfiguration",
+                log_key=log_key,
+                message=(
+                    "GetConfiguration timed out: charger did not respond"
+                    " (operation may not be supported)"
+                ),
+            )
+            fetched += 1
+        if fetched:
+            self.message_user(
+                request,
+                f"Requested configuration from {fetched} charger(s)",
+            )
+
+    def _dispatch_change_availability(self, request, queryset, availability_type: str):
+        sent = 0
+        for charger in queryset:
+            connector_value = charger.connector_id
+            ws = store.get_connection(charger.charger_id, connector_value)
+            if ws is None:
+                self.message_user(
+                    request,
+                    f"{charger}: no active connection",
+                    level=messages.ERROR,
+                )
+                continue
+            connector_id = connector_value if connector_value is not None else 0
+            message_id = uuid.uuid4().hex
+            payload = {"connectorId": connector_id, "type": availability_type}
+            msg = json.dumps([2, message_id, "ChangeAvailability", payload])
+            try:
+                async_to_sync(ws.send)(msg)
+            except Exception as exc:  # pragma: no cover - network error
+                self.message_user(
+                    request,
+                    f"{charger}: failed to send ChangeAvailability ({exc})",
+                    level=messages.ERROR,
+                )
+                continue
+            log_key = store.identity_key(charger.charger_id, connector_value)
+            store.add_log(log_key, f"< {msg}", log_type="charger")
+            timestamp = timezone.now()
+            store.register_pending_call(
+                message_id,
+                {
+                    "action": "ChangeAvailability",
+                    "charger_id": charger.charger_id,
+                    "connector_id": connector_value,
+                    "availability_type": availability_type,
+                    "requested_at": timestamp,
+                },
+            )
+            updates = {
+                "availability_requested_state": availability_type,
+                "availability_requested_at": timestamp,
+                "availability_request_status": "",
+                "availability_request_status_at": None,
+                "availability_request_details": "",
+            }
+            Charger.objects.filter(pk=charger.pk).update(**updates)
+            for field, value in updates.items():
+                setattr(charger, field, value)
+            sent += 1
+        if sent:
+            self.message_user(
+                request,
+                f"Sent ChangeAvailability ({availability_type}) to {sent} charger(s)",
+            )
+
+    @admin.action(description="Set availability to Operative")
+    def change_availability_operative(self, request, queryset):
+        self._dispatch_change_availability(request, queryset, "Operative")
+
+    @admin.action(description="Set availability to Inoperative")
+    def change_availability_inoperative(self, request, queryset):
+        self._dispatch_change_availability(request, queryset, "Inoperative")
+
+    def _set_availability_state(
+        self, request, queryset, availability_state: str
+    ) -> None:
+        timestamp = timezone.now()
+        updated = 0
+        for charger in queryset:
+            updates = {
+                "availability_state": availability_state,
+                "availability_state_updated_at": timestamp,
+            }
+            Charger.objects.filter(pk=charger.pk).update(**updates)
+            for field, value in updates.items():
+                setattr(charger, field, value)
+            updated += 1
+        if updated:
+            self.message_user(
+                request,
+                f"Updated availability to {availability_state} for {updated} charger(s)",
+            )
+
+    @admin.action(description="Mark availability as Operative")
+    def set_availability_state_operative(self, request, queryset):
+        self._set_availability_state(request, queryset, "Operative")
+
+    @admin.action(description="Mark availability as Inoperative")
+    def set_availability_state_inoperative(self, request, queryset):
+        self._set_availability_state(request, queryset, "Inoperative")
+
     def delete_queryset(self, request, queryset):
         for obj in queryset:
             obj.delete()
@@ -270,15 +506,36 @@ class SimulatorAdmin(LogViewAdminMixin, EntityModelAdmin):
         "running",
         "log_link",
     )
-    fields = (
-        "name",
-        "cp_path",
-        ("host", "ws_port"),
-        "rfid",
-        ("duration", "interval", "pre_charge_delay"),
-        "kw_max",
-        ("repeat", "door_open"),
-        ("username", "password"),
+    fieldsets = (
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "cp_path",
+                    ("host", "ws_port"),
+                    "rfid",
+                    ("duration", "interval", "pre_charge_delay"),
+                    "kw_max",
+                    ("repeat", "door_open"),
+                    ("username", "password"),
+                )
+            },
+        ),
+        (
+            "Configuration",
+            {
+                "fields": (
+                    "configuration_keys",
+                    "configuration_unknown_keys",
+                ),
+                "classes": ("collapse",),
+                "description": (
+                    "Provide JSON lists for configurationKey entries and "
+                    "unknownKey values returned by GetConfiguration."
+                ),
+            },
+        ),
     )
     actions = ("start_simulator", "stop_simulator", "send_open_door")
 
@@ -382,7 +639,13 @@ class SimulatorAdmin(LogViewAdminMixin, EntityModelAdmin):
                 if sim:
                     await sim.stop()
 
-        asyncio.get_event_loop().create_task(_stop(list(queryset)))
+        objs = list(queryset)
+        try:
+            loop = asyncio.get_running_loop()
+        except RuntimeError:
+            asyncio.run(_stop(objs))
+        else:
+            loop.create_task(_stop(objs))
         self.message_user(request, "Stopping simulators")
 
     stop_simulator.short_description = "Stop selected simulators"