arthexis 0.1.19__py3-none-any.whl → 0.1.20__py3-none-any.whl

ocpp/urls.py

@@ -3,8 +3,8 @@ from django.urls import include, path
 from . import views
 
 urlpatterns = [
-    path("", views.dashboard, name="ocpp-dashboard"),
-    path("simulator/", views.cp_simulator, name="cp-simulator"),
+    path("cpms/dashboard/", views.dashboard, name="ocpp-dashboard"),
+    path("evcs/simulator/", views.cp_simulator, name="cp-simulator"),
     path("chargers/", views.charger_list, name="charger-list"),
     path("chargers/<str:cid>/", views.charger_detail, name="charger-detail"),
     path(
@@ -46,5 +46,5 @@ urlpatterns = [
         views.charger_status,
         name="charger-status-connector",
     ),
-    path("rfid/", include("ocpp.rfid.urls")),
+    path("rfid/validator/", include("ocpp.rfid.urls")),
 ]

ocpp/views.py

@@ -224,24 +224,75 @@ def _transaction_rfid_details(
     if not tx_obj:
         return None
     rfid_value = getattr(tx_obj, "rfid", None)
-    if not rfid_value:
-        return None
-    normalized = str(rfid_value).strip()
-    if not normalized:
+    normalized = str(rfid_value or "").strip().upper()
+    cache_key = normalized
+    if normalized:
+        if cache is not None and cache_key in cache:
+            return cache[cache_key]
+        tag = (
+            RFID.matching_queryset(normalized)
+            .only("pk", "label_id", "custom_label")
+            .first()
+        )
+        rfid_url = None
+        label_value = None
+        canonical_value = normalized
+        if tag:
+            try:
+                rfid_url = reverse("admin:core_rfid_change", args=[tag.pk])
+            except NoReverseMatch:  # pragma: no cover - admin may be disabled
+                rfid_url = None
+            custom_label = (tag.custom_label or "").strip()
+            if custom_label:
+                label_value = custom_label
+            elif tag.label_id is not None:
+                label_value = str(tag.label_id)
+            canonical_value = tag.rfid or canonical_value
+        display_value = label_value or canonical_value
+        details = {
+            "value": display_value,
+            "url": rfid_url,
+            "uid": canonical_value,
+            "type": "rfid",
+            "display_label": gettext("RFID"),
+        }
+        if label_value:
+            details["label"] = label_value
+        if cache is not None:
+            cache[cache_key] = details
+        return details
+
+    identifier_value = getattr(tx_obj, "vehicle_identifier", None)
+    normalized_identifier = str(identifier_value or "").strip()
+    if not normalized_identifier:
+        vid_value = getattr(tx_obj, "vid", None)
+        vin_value = getattr(tx_obj, "vin", None)
+        normalized_identifier = str(vid_value or vin_value or "").strip()
+    if not normalized_identifier:
         return None
-    normalized = normalized.upper()
-    if cache is not None and normalized in cache:
-        return cache[normalized]
-    tag = RFID.objects.filter(rfid=normalized).only("pk").first()
-    rfid_url = None
-    if tag:
-        try:
-            rfid_url = reverse("admin:core_rfid_change", args=[tag.pk])
-        except NoReverseMatch:  # pragma: no cover - admin may be disabled
-            rfid_url = None
-    details = {"value": normalized, "url": rfid_url}
+    source = getattr(tx_obj, "vehicle_identifier_source", "") or "vid"
+    if source not in {"vid", "vin"}:
+        vid_raw = getattr(tx_obj, "vid", None)
+        vin_raw = getattr(tx_obj, "vin", None)
+        if str(vid_raw or "").strip():
+            source = "vid"
+        elif str(vin_raw or "").strip():
+            source = "vin"
+        else:
+            source = "vid"
+    cache_key = f"{source}:{normalized_identifier}"
+    if cache is not None and cache_key in cache:
+        return cache[cache_key]
+    label = gettext("VID") if source == "vid" else gettext("VIN")
+    details = {
+        "value": normalized_identifier,
+        "url": None,
+        "uid": None,
+        "type": source,
+        "display_label": label,
+    }
     if cache is not None:
-        cache[normalized] = details
+        cache[cache_key] = details
     return details
 
 
@@ -509,8 +560,12 @@ def charger_list(request):
                 "meterStart": tx_obj.meter_start,
                 "startTime": tx_obj.start_time.isoformat(),
             }
-            if tx_obj.vin:
-                tx_data["vin"] = tx_obj.vin
+            identifier = str(getattr(tx_obj, "vehicle_identifier", "") or "").strip()
+            if identifier:
+                tx_data["vid"] = identifier
+            legacy_vin = str(getattr(tx_obj, "vin", "") or "").strip()
+            if legacy_vin:
+                tx_data["vin"] = legacy_vin
             if tx_obj.meter_stop is not None:
                 tx_data["meterStop"] = tx_obj.meter_stop
             if tx_obj.stop_time is not None:
@@ -525,8 +580,12 @@ def charger_list(request):
                 "meterStart": session_tx.meter_start,
                 "startTime": session_tx.start_time.isoformat(),
             }
-            if session_tx.vin:
-                active_payload["vin"] = session_tx.vin
+            identifier = str(getattr(session_tx, "vehicle_identifier", "") or "").strip()
+            if identifier:
+                active_payload["vid"] = identifier
+            legacy_vin = str(getattr(session_tx, "vin", "") or "").strip()
+            if legacy_vin:
+                active_payload["vin"] = legacy_vin
             if session_tx.meter_stop is not None:
                 active_payload["meterStop"] = session_tx.meter_stop
             if session_tx.stop_time is not None:
@@ -606,8 +665,12 @@ def charger_detail(request, cid, connector=None):
             "meterStart": tx_obj.meter_start,
             "startTime": tx_obj.start_time.isoformat(),
         }
-        if tx_obj.vin:
-            tx_data["vin"] = tx_obj.vin
+        identifier = str(getattr(tx_obj, "vehicle_identifier", "") or "").strip()
+        if identifier:
+            tx_data["vid"] = identifier
+        legacy_vin = str(getattr(tx_obj, "vin", "") or "").strip()
+        if legacy_vin:
+            tx_data["vin"] = legacy_vin
         if tx_obj.meter_stop is not None:
             tx_data["meterStop"] = tx_obj.meter_stop
         if tx_obj.stop_time is not None:
@@ -623,8 +686,12 @@ def charger_detail(request, cid, connector=None):
             "meterStart": session_tx.meter_start,
             "startTime": session_tx.start_time.isoformat(),
         }
-        if session_tx.vin:
-            payload["vin"] = session_tx.vin
+        identifier = str(getattr(session_tx, "vehicle_identifier", "") or "").strip()
+        if identifier:
+            payload["vid"] = identifier
+        legacy_vin = str(getattr(session_tx, "vin", "") or "").strip()
+        if legacy_vin:
+            payload["vin"] = legacy_vin
         if session_tx.meter_stop is not None:
             payload["meterStop"] = session_tx.meter_stop
         if session_tx.stop_time is not None:
@@ -679,12 +746,12 @@ def dashboard(request):
     node = Node.get_local()
     role = node.role if node else None
     role_name = role.name if role else ""
-    allow_anonymous_roles = {"Constellation", "Satellite"}
+    allow_anonymous_roles = {"Watchtower", "Constellation", "Satellite"}
     if not request.user.is_authenticated and role_name not in allow_anonymous_roles:
         return redirect_to_login(
             request.get_full_path(), login_url=reverse("pages:login")
         )
-    is_constellation = role_name == "Constellation"
+    is_watchtower = role_name in {"Watchtower", "Constellation"}
     chargers = []
     for charger in _visible_chargers(request.user):
         tx_obj = store.get_transaction(charger.charger_id, charger.connector_id)
@@ -701,7 +768,7 @@ def dashboard(request):
     ws_url = f"{scheme}://{host}/ocpp/<CHARGE_POINT_ID>/"
     context = {
         "chargers": chargers,
-        "show_demo_notice": is_constellation,
+        "show_demo_notice": is_watchtower,
         "demo_ws_url": ws_url,
         "ws_rate_limit": store.MAX_CONNECTIONS_PER_IP,
     }
@@ -1049,7 +1116,10 @@ def charger_status(request, cid, connector=None):
                         "connector_id": connector_id,
                     }
                 )
-    overview = _connector_overview(charger, request.user)
+    rfid_cache: dict[str, dict[str, str | None]] = {}
+    overview = _connector_overview(
+        charger, request.user, rfid_cache=rfid_cache
+    )
     connector_links = [
         {
             "slug": item["slug"],
@@ -1090,12 +1160,15 @@ def charger_status(request, cid, connector=None):
     action_url = _reverse_connector_url("charger-action", cid, connector_slug)
     chart_should_animate = bool(has_active_session and not past_session)
 
+    tx_rfid_details = _transaction_rfid_details(tx_obj, cache=rfid_cache)
+
     return render(
         request,
         "ocpp/charger_status.html",
         {
             "charger": charger,
             "tx": tx_obj,
+            "tx_rfid_details": tx_rfid_details,
             "state": state,
             "color": color,
             "transactions": transactions,

pages/context_processors.py

@@ -11,7 +11,8 @@ from .models import Module
 _FAVICON_DIR = Path(settings.BASE_DIR) / "pages" / "fixtures" / "data"
 _FAVICON_FILENAMES = {
     "default": "favicon.txt",
-    "Constellation": "favicon_constellation.txt",
+    "Watchtower": "favicon_watchtower.txt",
+    "Constellation": "favicon_watchtower.txt",
     "Control": "favicon_control.txt",
     "Satellite": "favicon_satellite.txt",
 }
@@ -72,19 +73,24 @@ def nav_links(request):
             required_groups = getattr(
                 view_func, "required_security_groups", frozenset()
             )
+            blocked_reason = None
             if required_groups:
                 requires_login = True
-                setattr(landing, "requires_login", True)
                 if not user_is_authenticated:
-                    continue
-                if not user_is_superuser and not (
+                    blocked_reason = "login"
+                elif not user_is_superuser and not (
                     user_group_names & set(required_groups)
                 ):
-                    continue
+                    blocked_reason = "permission"
             elif requires_login and not user_is_authenticated:
-                setattr(landing, "requires_login", True)
-            if staff_only and not request.user.is_staff:
-                continue
+                blocked_reason = "login"
+
+            if staff_only and not getattr(request.user, "is_staff", False):
+                if blocked_reason != "login":
+                    blocked_reason = "permission"
+
+            landing.nav_is_locked = bool(blocked_reason)
+            landing.nav_lock_reason = blocked_reason
             landings.append(landing)
         if landings:
             normalized_module_path = module.path.rstrip("/") or "/"
@@ -100,7 +106,7 @@ def nav_links(request):
                     landings = [landings[0]]
             app_name = getattr(module.application, "name", "").lower()
             if app_name == "awg":
-                module.menu = "Calculate"
+                module.menu = "Calculators"
             elif module.path.rstrip("/").lower() == "/man":
                 module.menu = "Manual"
             module.enabled_landings = landings

pages/defaults.py

@@ -7,7 +7,7 @@ DEFAULT_APPLICATION_DESCRIPTIONS: Dict[str, str] = {
     "awg": "Power, Energy and Cost calculations.",
     "core": "Support for Business Processes and monetization.",
     "ocpp": "Compatibility with Standards and Good Practices.",
-    "nodes": "System and Node-level operations,",
+    "nodes": "System and Node-level operations.",
     "pages": "User QA, Continuity Design and Chaos Testing.",
     "teams": "Identity, Entitlements and Access Controls.",
 }

pages/module_defaults.py

@@ -10,15 +10,15 @@ LandingDefinition = tuple[str, str]
 
 
 ROLE_MODULE_DEFAULTS: Mapping[str, tuple[ModuleDefinition, ...]] = {
-    "Constellation": (
+    "Watchtower": (
         {
             "application": "ocpp",
             "path": "/ocpp/",
             "menu": "Chargers",
             "landings": (
-                ("/ocpp/", "CPMS Online Dashboard"),
-                ("/ocpp/simulator/", "Charge Point Simulator"),
-                ("/ocpp/rfid/", "RFID Tag Validator"),
+                ("/ocpp/cpms/dashboard/", "CPMS Online Dashboard"),
+                ("/ocpp/evcs/simulator/", "Charge Point Simulator"),
+                ("/ocpp/rfid/validator/", "RFID Tag Validator"),
             ),
         },
         {
@@ -26,7 +26,7 @@ ROLE_MODULE_DEFAULTS: Mapping[str, tuple[ModuleDefinition, ...]] = {
             "path": "/awg/",
             "menu": "",
             "landings": (
-                ("/awg/", "AWG Calculator"),
+                ("/awg/", "AWG Cable Calculator"),
                 ("/awg/energy-tariff/", "Energy Tariff Calculator"),
             ),
         },