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

ocpp/models.py

@@ -1,15 +1,21 @@
+import socket
+from decimal import Decimal, InvalidOperation
+
+from django.conf import settings
+from django.contrib.sites.models import Site
 from django.db import models
-from core.entity import Entity
 from django.urls import reverse
-from django.contrib.sites.models import Site
-from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 
+from core.entity import Entity, EntityManager
+
 from core.models import (
     EnergyAccount,
     Reference,
     RFID as CoreRFID,
     ElectricVehicle as CoreElectricVehicle,
+    Brand as CoreBrand,
+    EVModel as CoreEVModel,
 )
 
 
@@ -17,8 +23,12 @@ class Location(Entity):
     """Physical location shared by chargers."""
 
     name = models.CharField(max_length=200)
-    latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
-    longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
+    latitude = models.DecimalField(
+        max_digits=9, decimal_places=6, null=True, blank=True
+    )
+    longitude = models.DecimalField(
+        max_digits=9, decimal_places=6, null=True, blank=True
+    )
 
     def __str__(self) -> str:  # pragma: no cover - simple representation
         return self.name
@@ -34,12 +44,16 @@ class Charger(Entity):
     charger_id = models.CharField(
         _("Serial Number"),
         max_length=100,
-        unique=True,
         help_text="Unique identifier reported by the charger.",
     )
-    connector_id = models.CharField(
+    display_name = models.CharField(
+        _("Display Name"),
+        max_length=200,
+        blank=True,
+        help_text="Optional friendly name shown on public pages.",
+    )
+    connector_id = models.PositiveIntegerField(
         _("Connector ID"),
-        max_length=10,
         blank=True,
         null=True,
         help_text="Optional connector identifier for multi-connector chargers.",
@@ -49,13 +63,62 @@ class Charger(Entity):
         default=False,
         help_text="Require a valid RFID before starting a charging session.",
     )
+    firmware_status = models.CharField(
+        _("Firmware Status"),
+        max_length=32,
+        blank=True,
+        default="",
+        help_text="Latest firmware status reported by the charger.",
+    )
+    firmware_status_info = models.CharField(
+        _("Firmware Status Details"),
+        max_length=255,
+        blank=True,
+        default="",
+        help_text="Additional information supplied with the firmware status.",
+    )
+    firmware_timestamp = models.DateTimeField(
+        _("Firmware Status Timestamp"),
+        null=True,
+        blank=True,
+        help_text="When the charger reported the current firmware status.",
+    )
     last_heartbeat = models.DateTimeField(null=True, blank=True)
     last_meter_values = models.JSONField(default=dict, blank=True)
-    temperature = models.DecimalField(max_digits=5, decimal_places=1, null=True, blank=True)
+    last_status = models.CharField(max_length=64, blank=True)
+    last_error_code = models.CharField(max_length=64, blank=True)
+    last_status_vendor_info = models.JSONField(null=True, blank=True)
+    last_status_timestamp = models.DateTimeField(null=True, blank=True)
+    temperature = models.DecimalField(
+        max_digits=5, decimal_places=1, null=True, blank=True
+    )
     temperature_unit = models.CharField(max_length=16, blank=True)
-    reference = models.OneToOneField(Reference, null=True, blank=True, on_delete=models.SET_NULL)
+    diagnostics_status = models.CharField(
+        max_length=32,
+        null=True,
+        blank=True,
+        help_text="Most recent diagnostics status reported by the charger.",
+    )
+    diagnostics_timestamp = models.DateTimeField(
+        null=True,
+        blank=True,
+        help_text="Timestamp associated with the latest diagnostics status.",
+    )
+    diagnostics_location = models.CharField(
+        max_length=255,
+        null=True,
+        blank=True,
+        help_text="Location or URI reported for the latest diagnostics upload.",
+    )
+    reference = models.OneToOneField(
+        Reference, null=True, blank=True, on_delete=models.SET_NULL
+    )
     location = models.ForeignKey(
-        Location, null=True, blank=True, on_delete=models.SET_NULL, related_name="chargers"
+        Location,
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        related_name="chargers",
     )
     last_path = models.CharField(max_length=255, blank=True)
 
@@ -65,34 +128,150 @@ class Charger(Entity):
     class Meta:
         verbose_name = _("Charge Point")
         verbose_name_plural = _("Charge Points")
+        constraints = [
+            models.UniqueConstraint(
+                fields=("charger_id", "connector_id"),
+                condition=models.Q(connector_id__isnull=False),
+                name="charger_connector_unique",
+            ),
+            models.UniqueConstraint(
+                fields=("charger_id",),
+                condition=models.Q(connector_id__isnull=True),
+                name="charger_unique_without_connector",
+            ),
+        ]
+
+    AGGREGATE_CONNECTOR_SLUG = "all"
+
+    def identity_tuple(self) -> tuple[str, int | None]:
+        """Return the canonical identity for this charger."""
+
+        return (
+            self.charger_id,
+            self.connector_id if self.connector_id is not None else None,
+        )
+
+    @classmethod
+    def connector_slug_from_value(cls, connector: int | None) -> str:
+        """Return the slug used in URLs for the given connector."""
+
+        return cls.AGGREGATE_CONNECTOR_SLUG if connector is None else str(connector)
+
+    @classmethod
+    def connector_value_from_slug(cls, slug: int | str | None) -> int | None:
+        """Return the connector integer represented by ``slug``."""
+
+        if slug in (None, "", cls.AGGREGATE_CONNECTOR_SLUG):
+            return None
+        if isinstance(slug, int):
+            return slug
+        try:
+            return int(str(slug))
+        except (TypeError, ValueError) as exc:
+            raise ValueError(f"Invalid connector slug: {slug}") from exc
+
+    @property
+    def connector_slug(self) -> str:
+        """Return the slug representing this charger's connector."""
+
+        return type(self).connector_slug_from_value(self.connector_id)
+
+    @property
+    def connector_label(self) -> str:
+        """Return a short human readable label for this connector."""
+
+        if self.connector_id is None:
+            return _("All Connectors")
+
+        special_labels = {
+            1: _("Connector 1 (Left)"),
+            2: _("Connector 2 (Right)"),
+        }
+        if self.connector_id in special_labels:
+            return special_labels[self.connector_id]
+
+        return _("Connector %(number)s") % {"number": self.connector_id}
+
+    def identity_slug(self) -> str:
+        """Return a unique slug for this charger identity."""
+
+        serial, connector = self.identity_tuple()
+        return f"{serial}#{type(self).connector_slug_from_value(connector)}"
 
     def get_absolute_url(self):
-        return reverse("charger-page", args=[self.charger_id])
+        serial, connector = self.identity_tuple()
+        connector_slug = type(self).connector_slug_from_value(connector)
+        if connector_slug == self.AGGREGATE_CONNECTOR_SLUG:
+            return reverse("charger-page", args=[serial])
+        return reverse("charger-page-connector", args=[serial, connector_slug])
+
+    def _fallback_domain(self) -> str:
+        """Return a best-effort hostname when the Sites framework is unset."""
+
+        fallback = getattr(settings, "DEFAULT_SITE_DOMAIN", "") or getattr(
+            settings, "DEFAULT_DOMAIN", ""
+        )
+        if fallback:
+            return fallback.strip()
+
+        for host in getattr(settings, "ALLOWED_HOSTS", []):
+            if not isinstance(host, str):
+                continue
+            host = host.strip()
+            if not host or host.startswith("*") or "/" in host:
+                continue
+            return host
+
+        return socket.gethostname() or "localhost"
 
     def _full_url(self) -> str:
         """Return absolute URL for the charger landing page."""
-        domain = Site.objects.get_current().domain
+
+        try:
+            domain = Site.objects.get_current().domain.strip()
+        except Site.DoesNotExist:
+            domain = ""
+
+        if not domain:
+            domain = self._fallback_domain()
+
         scheme = getattr(settings, "DEFAULT_HTTP_PROTOCOL", "http")
         return f"{scheme}://{domain}{self.get_absolute_url()}"
 
     def save(self, *args, **kwargs):
+        update_fields = kwargs.get("update_fields")
+        if not self.location_id:
+            existing = (
+                type(self)
+                .objects.filter(charger_id=self.charger_id, location__isnull=False)
+                .exclude(pk=self.pk)
+                .select_related("location")
+                .first()
+            )
+            if existing:
+                self.location = existing.location
+            else:
+                location, _ = Location.objects.get_or_create(name=self.charger_id)
+                self.location = location
+            if update_fields is not None:
+                update_list = list(update_fields)
+                if "location" not in update_list:
+                    update_list.append("location")
+                kwargs["update_fields"] = update_list
         super().save(*args, **kwargs)
         ref_value = self._full_url()
         if not self.reference or self.reference.value != ref_value:
-            ref, _ = Reference.objects.get_or_create(
-                value=ref_value, defaults={"alt_text": self.charger_id}
+            self.reference = Reference.objects.create(
+                value=ref_value, alt_text=self.charger_id
             )
-            self.reference = ref
             super().save(update_fields=["reference"])
 
     @property
     def name(self) -> str:
         if self.location:
-            return (
-                f"{self.location.name} #{self.connector_id}"
-                if self.connector_id
-                else self.location.name
-            )
+            if self.connector_id is not None:
+                return f"{self.location.name} #{self.connector_id}"
+            return self.location.name
         return ""
 
     @property
@@ -109,10 +288,49 @@ class Charger(Entity):
         from . import store
 
         total = 0.0
-        tx_active = store.transactions.get(self.charger_id)
+        for charger in self._target_chargers():
+            total += charger._total_kw_single(store)
+        return total
+
+    def _store_keys(self) -> list[str]:
+        """Return keys used for store lookups with fallbacks."""
+
+        from . import store
+
+        base = self.charger_id
+        connector = self.connector_id
+        keys: list[str] = []
+        keys.append(store.identity_key(base, connector))
+        if connector is not None:
+            keys.append(store.identity_key(base, None))
+        keys.append(store.pending_key(base))
+        keys.append(base)
+        seen: set[str] = set()
+        deduped: list[str] = []
+        for key in keys:
+            if key not in seen:
+                seen.add(key)
+                deduped.append(key)
+        return deduped
+
+    def _target_chargers(self):
+        """Return chargers contributing to aggregate operations."""
+
+        qs = type(self).objects.filter(charger_id=self.charger_id)
+        if self.connector_id is None:
+            return qs
+        return qs.filter(pk=self.pk)
+
+    def _total_kw_single(self, store_module) -> float:
+        """Return total kW for this specific charger identity."""
+
+        tx_active = None
+        if self.connector_id is not None:
+            tx_active = store_module.get_transaction(self.charger_id, self.connector_id)
         qs = self.transactions.all()
         if tx_active and tx_active.pk is not None:
             qs = qs.exclude(pk=tx_active.pk)
+        total = 0.0
         for tx in qs:
             kw = tx.kw
             if kw:
@@ -126,24 +344,31 @@ class Charger(Entity):
     def purge(self):
         from . import store
 
-        self.transactions.all().delete()
-        self.meter_readings.all().delete()
-        store.clear_log(self.charger_id, log_type="charger")
-        store.transactions.pop(self.charger_id, None)
-        store.history.pop(self.charger_id, None)
+        for charger in self._target_chargers():
+            charger.transactions.all().delete()
+            charger.meter_values.all().delete()
+            for key in charger._store_keys():
+                store.clear_log(key, log_type="charger")
+                store.transactions.pop(key, None)
+                store.history.pop(key, None)
 
     def delete(self, *args, **kwargs):
         from django.db.models.deletion import ProtectedError
         from . import store
 
-        if (
-            self.transactions.exists()
-            or self.meter_readings.exists()
-            or store.get_logs(self.charger_id, log_type="charger")
-            or store.transactions.get(self.charger_id)
-            or store.history.get(self.charger_id)
-        ):
-            raise ProtectedError("Purge data before deleting charger.", [])
+        for charger in self._target_chargers():
+            has_data = (
+                charger.transactions.exists()
+                or charger.meter_values.exists()
+                or any(
+                    store.get_logs(key, log_type="charger")
+                    for key in charger._store_keys()
+                )
+                or any(store.transactions.get(key) for key in charger._store_keys())
+                or any(store.history.get(key) for key in charger._store_keys())
+            )
+            if has_data:
+                raise ProtectedError("Purge data before deleting charger.", [])
         super().delete(*args, **kwargs)
 
 
@@ -162,8 +387,39 @@ class Transaction(Entity):
         verbose_name=_("RFID"),
     )
     vin = models.CharField(max_length=17, blank=True)
+    connector_id = models.PositiveIntegerField(null=True, blank=True)
     meter_start = models.IntegerField(null=True, blank=True)
     meter_stop = models.IntegerField(null=True, blank=True)
+    voltage_start = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    voltage_stop = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_import_start = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_import_stop = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_offered_start = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_offered_stop = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    temperature_start = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    temperature_stop = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    soc_start = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    soc_stop = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
     start_time = models.DateTimeField()
     stop_time = models.DateTimeField(null=True, blank=True)
 
@@ -177,63 +433,128 @@ class Transaction(Entity):
     @property
     def kw(self) -> float:
         """Return consumed energy in kW for this session."""
-        total = 0.0
-        qs = self.meter_readings.filter(
-            measurand__in=["", "Energy.Active.Import.Register"]
-        ).order_by("timestamp")
-        first = True
-        for reading in qs:
-            try:
-                val = float(reading.value)
-            except (TypeError, ValueError):  # pragma: no cover - unexpected
-                continue
-            if reading.unit != "kW":
-                val = val / 1000.0
-            if first and self.meter_start is not None:
-                total += val - (self.meter_start / 1000.0)
-                first = False
-            else:
-                total += val
-                first = False
-        if total == 0 and self.meter_start is not None and self.meter_stop is not None:
-            total = (self.meter_stop - self.meter_start) / 1000.0
-        if total < 0:
+        start_val = None
+        if self.meter_start is not None:
+            start_val = float(self.meter_start) / 1000.0
+
+        end_val = None
+        if self.meter_stop is not None:
+            end_val = float(self.meter_stop) / 1000.0
+
+        readings = list(
+            self.meter_values.filter(energy__isnull=False).order_by("timestamp")
+        )
+        if readings:
+            if start_val is None:
+                start_val = float(readings[0].energy or 0)
+            # Always use the latest available reading for the end value when a
+            # stop meter has not been recorded yet. This allows active
+            # transactions to report totals using their most recent reading.
+            if end_val is None:
+                end_val = float(readings[-1].energy or 0)
+
+        if start_val is None or end_val is None:
             return 0.0
-        return total
 
+        total = end_val - start_val
+        return max(total, 0.0)
 
-class MeterReading(Entity):
+
+class MeterValue(Entity):
     """Parsed meter values reported by chargers."""
 
     charger = models.ForeignKey(
-        Charger, on_delete=models.CASCADE, related_name="meter_readings"
+        Charger, on_delete=models.CASCADE, related_name="meter_values"
     )
-    connector_id = models.IntegerField(null=True, blank=True)
+    connector_id = models.PositiveIntegerField(null=True, blank=True)
     transaction = models.ForeignKey(
         Transaction,
         on_delete=models.CASCADE,
-        related_name="meter_readings",
+        related_name="meter_values",
         null=True,
         blank=True,
     )
     timestamp = models.DateTimeField()
-    measurand = models.CharField(max_length=100, blank=True)
-    value = models.DecimalField(max_digits=12, decimal_places=3)
-    unit = models.CharField(max_length=16, blank=True)
+    context = models.CharField(max_length=32, blank=True)
+    energy = models.DecimalField(max_digits=12, decimal_places=3, null=True, blank=True)
+    voltage = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_import = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    current_offered = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    temperature = models.DecimalField(
+        max_digits=12, decimal_places=3, null=True, blank=True
+    )
+    soc = models.DecimalField(max_digits=12, decimal_places=3, null=True, blank=True)
 
     def __str__(self) -> str:  # pragma: no cover - simple representation
-        return f"{self.charger} {self.measurand} {self.value}{self.unit}".strip()
+        return f"{self.charger} {self.timestamp}"
+
+    @property
+    def value(self):
+        return self.energy
+
+    @value.setter
+    def value(self, new_value):
+        self.energy = new_value
+
+    class Meta:
+        verbose_name = _("Meter Value")
+        verbose_name_plural = _("Meter Values")
+
+
+class MeterReadingManager(EntityManager):
+    def _normalize_kwargs(self, kwargs: dict) -> dict:
+        normalized = dict(kwargs)
+        value = normalized.pop("value", None)
+        unit = normalized.pop("unit", None)
+        if value is not None:
+            energy = value
+            try:
+                energy = Decimal(value)
+            except (InvalidOperation, TypeError, ValueError):
+                energy = None
+            if energy is not None:
+                unit_normalized = (unit or "").lower()
+                if unit_normalized in {"w", "wh"}:
+                    energy = energy / Decimal("1000")
+                normalized.setdefault("energy", energy)
+        normalized.pop("measurand", None)
+        return normalized
+
+    def create(self, **kwargs):
+        return super().create(**self._normalize_kwargs(kwargs))
+
+    def get_or_create(self, defaults=None, **kwargs):
+        if defaults:
+            defaults = self._normalize_kwargs(defaults)
+        return super().get_or_create(
+            defaults=defaults, **self._normalize_kwargs(kwargs)
+        )
+
+
+class MeterReading(MeterValue):
+    """Proxy model for backwards compatibility."""
+
+    objects = MeterReadingManager()
 
     class Meta:
-        verbose_name = _("Meter Reading")
-        verbose_name_plural = _("Meter Readings")
+        proxy = True
+        verbose_name = _("Meter Value")
+        verbose_name_plural = _("Meter Values")
 
 
 class Simulator(Entity):
     """Preconfigured simulator that can be started from the admin."""
 
     name = models.CharField(max_length=100, unique=True)
-    cp_path = models.CharField(_("CP Path"), max_length=100)
+    cp_path = models.CharField(
+        _("Serial Number"), max_length=100, help_text=_("Charge Point WS path")
+    )
     host = models.CharField(max_length=100, default="127.0.0.1")
     ws_port = models.IntegerField(_("WS Port"), default=8000)
     rfid = models.CharField(
@@ -242,6 +563,8 @@ class Simulator(Entity):
         verbose_name=_("RFID"),
     )
     vin = models.CharField(max_length=17, blank=True)
+    serial_number = models.CharField(_("Serial Number"), max_length=100, blank=True)
+    connector_id = models.IntegerField(_("Connector ID"), default=1)
     duration = models.IntegerField(default=600)
     interval = models.FloatField(default=5.0)
     pre_charge_delay = models.FloatField(_("Delay"), default=10.0)
@@ -266,6 +589,8 @@ class Simulator(Entity):
             rfid=self.rfid,
             vin=self.vin,
             cp_path=self.cp_path,
+            serial_number=self.serial_number,
+            connector_id=self.connector_id,
             duration=self.duration,
             interval=self.interval,
             pre_charge_delay=self.pre_charge_delay,
@@ -298,3 +623,18 @@ class ElectricVehicle(CoreElectricVehicle):
         verbose_name = _("Electric Vehicle")
         verbose_name_plural = _("Electric Vehicles")
 
+
+class Brand(CoreBrand):
+    class Meta:
+        proxy = True
+        app_label = "ocpp"
+        verbose_name = CoreBrand._meta.verbose_name
+        verbose_name_plural = CoreBrand._meta.verbose_name_plural
+
+
+class EVModel(CoreEVModel):
+    class Meta:
+        proxy = True
+        app_label = "ocpp"
+        verbose_name = CoreEVModel._meta.verbose_name
+        verbose_name_plural = CoreEVModel._meta.verbose_name_plural

ocpp/simulator.py

@@ -31,6 +31,8 @@ class SimulatorConfig:
     repeat: bool = False
     username: Optional[str] = None
     password: Optional[str] = None
+    serial_number: str = ""
+    connector_id: int = 1
 
 
 class ChargePointSimulator:
@@ -113,6 +115,7 @@ class ChargePointSimulator:
                     {
                         "chargePointModel": "Simulator",
                         "chargePointVendor": "SimVendor",
+                        "serialNumber": cfg.serial_number,
                     },
                 ]
             )
@@ -145,7 +148,7 @@ class ChargePointSimulator:
                                 "status",
                                 "StatusNotification",
                                 {
-                                    "connectorId": 1,
+                                    "connectorId": cfg.connector_id,
                                     "errorCode": "NoError",
                                     "status": "Available",
                                 },
@@ -162,10 +165,12 @@ class ChargePointSimulator:
                                 "meter",
                                 "MeterValues",
                                 {
-                                    "connectorId": 1,
+                                    "connectorId": cfg.connector_id,
                                     "meterValue": [
                                         {
-                                            "timestamp": time.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                                            "timestamp": time.strftime(
+                                                "%Y-%m-%dT%H:%M:%SZ"
+                                            ),
                                             "sampledValue": [
                                                 {
                                                     "value": "0",
@@ -190,7 +195,7 @@ class ChargePointSimulator:
                         "start",
                         "StartTransaction",
                         {
-                            "connectorId": 1,
+                            "connectorId": cfg.connector_id,
                             "idTag": cfg.rfid,
                             "meterStart": meter_start,
                             "vin": cfg.vin,
@@ -224,11 +229,13 @@ class ChargePointSimulator:
                             "meter",
                             "MeterValues",
                             {
-                                "connectorId": 1,
+                                "connectorId": cfg.connector_id,
                                 "transactionId": tx_id,
                                 "meterValue": [
                                     {
-                                        "timestamp": time.strftime("%Y-%m-%dT%H:%M:%SZ"),
+                                        "timestamp": time.strftime(
+                                            "%Y-%m-%dT%H:%M:%SZ"
+                                        ),
                                         "sampledValue": [
                                             {
                                                 "value": f"{meter_kw:.3f}",