arthexis 0.1.8__py3-none-any.whl → 0.1.9__py3-none-any.whl

nodes/utils.py

@@ -14,8 +14,12 @@ SCREENSHOT_DIR = settings.LOG_DIR / "screenshots"
 logger = logging.getLogger(__name__)
 
 
-def capture_screenshot(url: str) -> Path:
-    """Capture a screenshot of ``url`` and save it to :data:`SCREENSHOT_DIR`."""
+def capture_screenshot(url: str, cookies=None) -> Path:
+    """Capture a screenshot of ``url`` and save it to :data:`SCREENSHOT_DIR`.
+
+    ``cookies`` can be an iterable of Selenium cookie mappings which will be
+    applied after the initial navigation and before the screenshot is taken.
+    """
     options = Options()
     options.add_argument("-headless")
     try:
@@ -27,6 +31,13 @@ def capture_screenshot(url: str) -> Path:
                 browser.get(url)
             except WebDriverException as exc:
                 logger.error("Failed to load %s: %s", url, exc)
+            if cookies:
+                for cookie in cookies:
+                    try:
+                        browser.add_cookie(cookie)
+                    except WebDriverException as exc:
+                        logger.error("Failed to apply cookie for %s: %s", url, exc)
+                browser.get(url)
             if not browser.save_screenshot(str(filename)):
                 raise RuntimeError("Screenshot capture failed")
             return filename

nodes/views.py

@@ -6,6 +6,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.shortcuts import get_object_or_404
 from django.conf import settings
 from pathlib import Path
+from django.utils.cache import patch_vary_headers
 
 from utils.api import api_login_required
 
@@ -20,15 +21,16 @@ from .utils import capture_screenshot, save_screenshot
 def node_list(request):
     """Return a JSON list of all known nodes."""
 
-    nodes = list(
-        Node.objects.values(
-            "hostname",
-            "address",
-            "port",
-            "last_seen",
-            "has_lcd_screen",
-        )
-    )
+    nodes = [
+        {
+            "hostname": node.hostname,
+            "address": node.address,
+            "port": node.port,
+            "last_seen": node.last_seen,
+            "features": list(node.features.values_list("slug", flat=True)),
+        }
+        for node in Node.objects.prefetch_related("features")
+    ]
     return JsonResponse({"nodes": nodes})
 
 
@@ -47,7 +49,7 @@ def node_info(request):
         "port": node.port,
         "mac_address": node.mac_address,
         "public_key": node.public_key,
-        "has_lcd_screen": node.has_lcd_screen,
+        "features": list(node.features.values_list("slug", flat=True)),
     }
 
     if token:
@@ -74,19 +76,49 @@ def node_info(request):
     return response
 
 
+def _add_cors_headers(request, response):
+    origin = request.headers.get("Origin")
+    if origin:
+        response["Access-Control-Allow-Origin"] = origin
+        response["Access-Control-Allow-Credentials"] = "true"
+        allow_headers = request.headers.get(
+            "Access-Control-Request-Headers", "Content-Type"
+        )
+        response["Access-Control-Allow-Headers"] = allow_headers
+        response["Access-Control-Allow-Methods"] = "POST, OPTIONS"
+        patch_vary_headers(response, ["Origin"])
+    return response
+
+
 @csrf_exempt
 @api_login_required
 def register_node(request):
     """Register or update a node from POSTed JSON data."""
 
+    if request.method == "OPTIONS":
+        response = JsonResponse({"detail": "ok"})
+        return _add_cors_headers(request, response)
+
     if request.method != "POST":
-        return JsonResponse({"detail": "POST required"}, status=400)
+        response = JsonResponse({"detail": "POST required"}, status=400)
+        return _add_cors_headers(request, response)
 
     try:
         data = json.loads(request.body.decode())
     except json.JSONDecodeError:
         data = request.POST
 
+    if hasattr(data, "getlist"):
+        raw_features = data.getlist("features")
+        if not raw_features:
+            features = None
+        elif len(raw_features) == 1:
+            features = raw_features[0]
+        else:
+            features = raw_features
+    else:
+        features = data.get("features")
+
     hostname = data.get("hostname")
     address = data.get("address")
     port = data.get("port", 8000)
@@ -94,12 +126,12 @@ def register_node(request):
     public_key = data.get("public_key")
     token = data.get("token")
     signature = data.get("signature")
-    has_lcd_screen = data.get("has_lcd_screen")
 
     if not hostname or not address or not mac_address:
-        return JsonResponse(
+        response = JsonResponse(
             {"detail": "hostname, address and mac_address required"}, status=400
         )
+        return _add_cors_headers(request, response)
 
     verified = False
     if public_key and token and signature:
@@ -113,14 +145,14 @@ def register_node(request):
             )
             verified = True
         except Exception:
-            return JsonResponse({"detail": "invalid signature"}, status=403)
+            response = JsonResponse({"detail": "invalid signature"}, status=403)
+            return _add_cors_headers(request, response)
 
     mac_address = mac_address.lower()
     defaults = {
         "hostname": hostname,
         "address": address,
         "port": port,
-        "has_lcd_screen": bool(has_lcd_screen),
     }
     if verified:
         defaults["public_key"] = public_key
@@ -137,15 +169,27 @@ def register_node(request):
         if verified:
             node.public_key = public_key
             update_fields.append("public_key")
-        if has_lcd_screen is not None:
-            node.has_lcd_screen = bool(has_lcd_screen)
-            update_fields.append("has_lcd_screen")
         node.save(update_fields=update_fields)
-        return JsonResponse(
+        if features is not None:
+            if isinstance(features, (str, bytes)):
+                feature_list = [features]
+            else:
+                feature_list = list(features)
+            node.update_manual_features(feature_list)
+        response = JsonResponse(
             {"id": node.id, "detail": f"Node already exists (id: {node.id})"}
         )
+        return _add_cors_headers(request, response)
 
-    return JsonResponse({"id": node.id})
+    if features is not None:
+        if isinstance(features, (str, bytes)):
+            feature_list = [features]
+        else:
+            feature_list = list(features)
+        node.update_manual_features(feature_list)
+
+    response = JsonResponse({"id": node.id})
+    return _add_cors_headers(request, response)
 
 
 @api_login_required
@@ -172,9 +216,7 @@ def public_node_endpoint(request, endpoint):
     - ``POST`` broadcasts the request body as a :class:`NetMessage`.
     """
 
-    node = get_object_or_404(
-        Node, public_endpoint=endpoint, enable_public_api=True
-    )
+    node = get_object_or_404(Node, public_endpoint=endpoint, enable_public_api=True)
 
     if request.method == "GET":
         data = {
@@ -183,6 +225,7 @@ def public_node_endpoint(request, endpoint):
             "port": node.port,
             "badge_color": node.badge_color,
             "last_seen": node.last_seen,
+            "features": list(node.features.values_list("slug", flat=True)),
         }
         return JsonResponse(data)
 

ocpp/admin.py

@@ -1,10 +1,11 @@
-from django.contrib import admin
+from django.contrib import admin, messages
 from django import forms
 
 import asyncio
 from datetime import timedelta
 import json
 
+from django.shortcuts import redirect
 from django.utils import timezone
 from django.urls import path
 from django.http import HttpResponse, HttpResponseRedirect
@@ -13,10 +14,9 @@ from django.template.response import TemplateResponse
 from .models import (
     Charger,
     Simulator,
-    MeterReading,
+    MeterValue,
     Transaction,
     Location,
-    ElectricVehicle,
 )
 from .simulator import ChargePointSimulator
 from . import store
@@ -24,8 +24,7 @@ from .transactions_io import (
     export_transactions,
     import_transactions as import_transactions_data,
 )
-from core.admin import RFIDAdmin
-from .models import RFID
+from core.user_data import EntityModelAdmin
 
 
 class LocationAdminForm(forms.ModelForm):
@@ -39,9 +38,7 @@ class LocationAdminForm(forms.ModelForm):
         }
 
     class Media:
-        css = {
-            "all": ("https://unpkg.com/leaflet@1.9.4/dist/leaflet.css",)
-        }
+        css = {"all": ("https://unpkg.com/leaflet@1.9.4/dist/leaflet.css",)}
         js = (
             "https://unpkg.com/leaflet@1.9.4/dist/leaflet.js",
             "ocpp/charger_map.js",
@@ -60,29 +57,91 @@ class TransactionImportForm(forms.Form):
     file = forms.FileField()
 
 
+class LogViewAdminMixin:
+    """Mixin providing an admin view to display charger or simulator logs."""
+
+    log_type = "charger"
+    log_template_name = "admin/ocpp/log_view.html"
+
+    def get_log_identifier(self, obj):  # pragma: no cover - mixin hook
+        raise NotImplementedError
+
+    def get_log_title(self, obj):
+        return f"Log for {obj}"
+
+    def get_urls(self):
+        urls = super().get_urls()
+        info = self.model._meta.app_label, self.model._meta.model_name
+        custom = [
+            path(
+                "<path:object_id>/log/",
+                self.admin_site.admin_view(self.log_view),
+                name=f"{info[0]}_{info[1]}_log",
+            ),
+        ]
+        return custom + urls
+
+    def log_view(self, request, object_id):
+        obj = self.get_object(request, object_id)
+        if obj is None:
+            self.message_user(request, "Log is not available.", messages.ERROR)
+            return redirect("..")
+        identifier = self.get_log_identifier(obj)
+        log_entries = store.get_logs(identifier, log_type=self.log_type)
+        log_file = store._file_path(identifier, log_type=self.log_type)
+        context = {
+            **self.admin_site.each_context(request),
+            "opts": self.model._meta,
+            "original": obj,
+            "title": self.get_log_title(obj),
+            "log_entries": log_entries,
+            "log_file": str(log_file),
+            "log_identifier": identifier,
+        }
+        return TemplateResponse(request, self.log_template_name, context)
+
+
 @admin.register(Location)
-class LocationAdmin(admin.ModelAdmin):
+class LocationAdmin(EntityModelAdmin):
     form = LocationAdminForm
     list_display = ("name", "latitude", "longitude")
+    change_form_template = "admin/ocpp/location/change_form.html"
 
 
 @admin.register(Charger)
-class ChargerAdmin(admin.ModelAdmin):
+class ChargerAdmin(LogViewAdminMixin, EntityModelAdmin):
     fieldsets = (
         (
             "General",
             {
                 "fields": (
                     "charger_id",
+                    "display_name",
                     "connector_id",
-                    "require_rfid",
+                    "location",
+                    "last_path",
                     "last_heartbeat",
                     "last_meter_values",
-                    "last_path",
-                    "location",
+                    "firmware_status",
+                    "firmware_status_info",
+                    "firmware_timestamp",
+                )
+            },
+        ),
+        (
+            "Diagnostics",
+            {
+                "fields": (
+                    "diagnostics_status",
+                    "diagnostics_timestamp",
+                    "diagnostics_location",
                 )
             },
         ),
+        (
+            "Configuration",
+            {"fields": ("require_rfid",)},
+        ),
         (
             "References",
             {
@@ -90,13 +149,21 @@ class ChargerAdmin(admin.ModelAdmin):
             },
         ),
     )
-    readonly_fields = ("last_heartbeat", "last_meter_values")
+    readonly_fields = (
+        "last_heartbeat",
+        "last_meter_values",
+        "firmware_status",
+        "firmware_status_info",
+        "firmware_timestamp",
+    )
     list_display = (
         "charger_id",
         "connector_id",
         "location_name",
-        "require_rfid",
+        "require_rfid_display",
         "last_heartbeat",
+        "firmware_status",
+        "firmware_timestamp",
         "session_kw",
         "total_kw_display",
         "page_link",
@@ -109,6 +176,12 @@ class ChargerAdmin(admin.ModelAdmin):
     def get_view_on_site_url(self, obj=None):
         return obj.get_absolute_url() if obj else None
 
+    def require_rfid_display(self, obj):
+        return obj.require_rfid
+
+    require_rfid_display.boolean = True
+    require_rfid_display.short_description = "RFID Auth"
+
     def page_link(self, obj):
         from django.utils.html import format_html
 
@@ -116,7 +189,7 @@ class ChargerAdmin(admin.ModelAdmin):
             '<a href="{}" target="_blank">open</a>', obj.get_absolute_url()
         )
 
-    page_link.short_description = "Landing Page"
+    page_link.short_description = "Landing"
 
     def qr_link(self, obj):
         from django.utils.html import format_html
@@ -133,19 +206,25 @@ class ChargerAdmin(admin.ModelAdmin):
         from django.utils.html import format_html
         from django.urls import reverse
 
-        url = reverse("charger-log", args=[obj.charger_id]) + "?type=charger"
+        url = reverse("admin:ocpp_charger_log", args=[obj.pk])
         return format_html('<a href="{}" target="_blank">view</a>', url)
 
     log_link.short_description = "Log"
-    
+
+    def get_log_identifier(self, obj):
+        return store.identity_key(obj.charger_id, obj.connector_id)
+
     def status_link(self, obj):
         from django.utils.html import format_html
         from django.urls import reverse
 
-        url = reverse("charger-status", args=[obj.charger_id])
+        url = reverse(
+            "charger-status-connector",
+            args=[obj.charger_id, obj.connector_slug],
+        )
         return format_html('<a href="{}" target="_blank">status</a>', url)
 
-    status_link.short_description = "Status Page"
+    status_link.short_description = "Status"
 
     def location_name(self, obj):
         return obj.location.name if obj.location else ""
@@ -169,7 +248,7 @@ class ChargerAdmin(admin.ModelAdmin):
     total_kw_display.short_description = "Total kW"
 
     def session_kw(self, obj):
-        tx = store.transactions.get(obj.charger_id)
+        tx = store.get_transaction(obj.charger_id, obj.connector_id)
         if tx:
             return round(tx.kw, 2)
         return 0.0
@@ -178,7 +257,7 @@ class ChargerAdmin(admin.ModelAdmin):
 
 
 @admin.register(Simulator)
-class SimulatorAdmin(admin.ModelAdmin):
+class SimulatorAdmin(LogViewAdminMixin, EntityModelAdmin):
     list_display = (
         "name",
         "cp_path",
@@ -202,12 +281,17 @@ class SimulatorAdmin(admin.ModelAdmin):
     )
     actions = ("start_simulator", "stop_simulator")
 
+    log_type = "simulator"
+
     def running(self, obj):
         return obj.pk in store.simulators
 
     running.boolean = True
 
     def start_simulator(self, request, queryset):
+        from django.urls import reverse
+        from django.utils.html import format_html
+
         for obj in queryset:
             if obj.pk in store.simulators:
                 self.message_user(request, f"{obj.name}: already running")
@@ -217,8 +301,16 @@ class SimulatorAdmin(admin.ModelAdmin):
             started, status, log_file = sim.start()
             if started:
                 store.simulators[obj.pk] = sim
+            log_url = reverse("admin:ocpp_simulator_log", args=[obj.pk])
             self.message_user(
-                request, f"{obj.name}: {status}. Log: {log_file}"
+                request,
+                format_html(
+                    '{}: {}. Log: <code>{}</code> (<a href="{}" target="_blank">View Log</a>)',
+                    obj.name,
+                    status,
+                    log_file,
+                    log_url,
+                ),
             )
 
     start_simulator.short_description = "Start selected simulators"
@@ -239,22 +331,35 @@ class SimulatorAdmin(admin.ModelAdmin):
         from django.utils.html import format_html
         from django.urls import reverse
 
-        url = reverse("charger-log", args=[obj.cp_path]) + "?type=simulator"
+        url = reverse("admin:ocpp_simulator_log", args=[obj.pk])
         return format_html('<a href="{}" target="_blank">view</a>', url)
 
     log_link.short_description = "Log"
 
+    def get_log_identifier(self, obj):
+        return obj.cp_path
 
-class MeterReadingInline(admin.TabularInline):
-    model = MeterReading
+
+class MeterValueInline(admin.TabularInline):
+    model = MeterValue
     extra = 0
-    fields = ("timestamp", "value", "unit", "measurand", "connector_id")
+    fields = (
+        "timestamp",
+        "context",
+        "energy",
+        "voltage",
+        "current_import",
+        "current_offered",
+        "temperature",
+        "soc",
+        "connector_id",
+    )
     readonly_fields = fields
     can_delete = False
 
 
 @admin.register(Transaction)
-class TransactionAdmin(admin.ModelAdmin):
+class TransactionAdmin(EntityModelAdmin):
     change_list_template = "admin/ocpp/transaction/change_list.html"
     list_display = (
         "charger",
@@ -269,7 +374,7 @@ class TransactionAdmin(admin.ModelAdmin):
     readonly_fields = ("kw",)
     list_filter = ("charger", "account")
     date_hierarchy = "start_time"
-    inlines = [MeterReadingInline]
+    inlines = [MeterValueInline]
 
     def get_urls(self):
         urls = super().get_urls()
@@ -301,17 +406,15 @@ class TransactionAdmin(admin.ModelAdmin):
                     json.dumps(data, indent=2, ensure_ascii=False),
                     content_type="application/json",
                 )
-                response[
-                    "Content-Disposition"
-                ] = "attachment; filename=transactions.json"
+                response["Content-Disposition"] = (
+                    "attachment; filename=transactions.json"
+                )
                 return response
         else:
             form = TransactionExportForm()
         context = self.admin_site.each_context(request)
         context["form"] = form
-        return TemplateResponse(
-            request, "admin/ocpp/transaction/export.html", context
-        )
+        return TemplateResponse(request, "admin/ocpp/transaction/export.html", context)
 
     def import_view(self, request):
         if request.method == "POST":
@@ -325,12 +428,10 @@ class TransactionAdmin(admin.ModelAdmin):
             form = TransactionImportForm()
         context = self.admin_site.each_context(request)
         context["form"] = form
-        return TemplateResponse(
-            request, "admin/ocpp/transaction/import.html", context
-        )
+        return TemplateResponse(request, "admin/ocpp/transaction/import.html", context)
 
 
-class MeterReadingDateFilter(admin.SimpleListFilter):
+class MeterValueDateFilter(admin.SimpleListFilter):
     title = "Timestamp"
     parameter_name = "timestamp_range"
 
@@ -361,32 +462,20 @@ class MeterReadingDateFilter(admin.SimpleListFilter):
         return queryset
 
 
-@admin.register(MeterReading)
-class MeterReadingAdmin(admin.ModelAdmin):
+@admin.register(MeterValue)
+class MeterValueAdmin(EntityModelAdmin):
     list_display = (
         "charger",
         "timestamp",
-        "value",
-        "unit",
+        "context",
+        "energy",
+        "voltage",
+        "current_import",
+        "current_offered",
+        "temperature",
+        "soc",
         "connector_id",
         "transaction",
     )
     date_hierarchy = "timestamp"
-    list_filter = ("charger", MeterReadingDateFilter)
-
-
-@admin.register(ElectricVehicle)
-class ElectricVehicleAdmin(admin.ModelAdmin):
-    list_display = ("vin", "license_plate", "brand", "model", "account")
-    search_fields = (
-        "vin",
-        "license_plate",
-        "brand__name",
-        "model__name",
-        "account__name",
-    )
-    fields = ("account", "vin", "license_plate", "brand", "model")
-
-
-admin.site.register(RFID, RFIDAdmin)
-
+    list_filter = ("charger", MeterValueDateFilter)

ocpp/apps.py

@@ -6,7 +6,7 @@ from django.conf import settings
 class OcppConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "ocpp"
-    verbose_name = "3. Protocols"
+    verbose_name = "3. Protocol"
 
     def ready(self):  # pragma: no cover - startup side effects
         control_lock = Path(settings.BASE_DIR) / "locks" / "control.lck"