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

ocpp/evcs.py

@@ -186,6 +186,8 @@ async def simulate_cp(
     interval: float = 5.0,
     username: Optional[str] = None,
     password: Optional[str] = None,
+    *,
+    sim_state: SimulatorState | None = None,
 ) -> None:
     """Simulate one charge point session.
 
@@ -206,7 +208,7 @@ async def simulate_cp(
         b64 = base64.b64encode(userpass.encode("utf-8")).decode("ascii")
         headers["Authorization"] = f"Basic {b64}"
 
-    state = _simulators.get(cp_idx + 1, _simulators[1])
+    state = sim_state or _simulators.get(cp_idx + 1, _simulators[1])
 
     loop_count = 0
     while loop_count < session_count and state.running:
@@ -247,99 +249,6 @@ async def simulate_cp(
             stop_event = asyncio.Event()
             reset_event = asyncio.Event()
 
-            async def listen():
-                try:
-                    while True:
-                        raw = await _recv()
-                        try:
-                            msg = json.loads(raw)
-                        except json.JSONDecodeError:
-                            continue
-
-                        if isinstance(msg, list) and msg and msg[0] == 2:
-                            msg_id, action = msg[1], msg[2]
-                            await _send([3, msg_id, {}])
-                            if action == "RemoteStopTransaction":
-                                state.last_message = "RemoteStopTransaction"
-                                stop_event.set()
-                            elif action == "Reset":
-                                state.last_message = "Reset"
-                                reset_event.set()
-                                stop_event.set()
-                except websockets.ConnectionClosed:
-                    stop_event.set()
-
-                # boot notification / authorise
-                await _send(
-                    [
-                        2,
-                        "boot",
-                        "BootNotification",
-                        {
-                            "chargePointModel": "Simulator",
-                            "chargePointVendor": "SimVendor",
-                            "serialNumber": serial_number,
-                        },
-                    ]
-                )
-                state.last_message = "BootNotification"
-                await _recv()
-                await _send([2, "auth", "Authorize", {"idTag": rfid}])
-                state.last_message = "Authorize"
-                await _recv()
-
-                state.phase = "Available"
-
-                meter_start = random.randint(1000, 2000)
-                actual_duration = random.uniform(duration * 0.75, duration * 1.25)
-                steps = max(1, int(actual_duration / interval))
-                step_min = max(1, int((kw_min * 1000) / steps))
-                step_max = max(1, int((kw_max * 1000) / steps))
-
-                # optional pre‑charge delay while still sending heartbeats
-                if pre_charge_delay > 0:
-                    start_delay = time.monotonic()
-                    next_meter = meter_start
-                    last_mv = time.monotonic()
-                    while time.monotonic() - start_delay < pre_charge_delay:
-                        await _send([2, "hb", "Heartbeat", {}])
-                        state.last_message = "Heartbeat"
-                        await _recv()
-                        await asyncio.sleep(5)
-                        if time.monotonic() - last_mv >= 30:
-                            idle_step = max(2, int(step_max / 100))
-                            next_meter += random.randint(0, idle_step)
-                            next_kw = next_meter / 1000.0
-                            await _send(
-                                [
-                                    2,
-                                    "meter",
-                                    "MeterValues",
-                                    {
-                                        "connectorId": connector_id,
-                                        "meterValue": [
-                                            {
-                                                "timestamp": time.strftime(
-                                                    "%Y-%m-%dT%H:%M:%S"
-                                                )
-                                                + "Z",
-                                                "sampledValue": [
-                                                    {
-                                                        "value": f"{next_kw:.3f}",
-                                                        "measurand": "Energy.Active.Import.Register",
-                                                        "unit": "kW",
-                                                        "context": "Sample.Clock",
-                                                    }
-                                                ],
-                                            }
-                                        ],
-                                    },
-                                ]
-                            )
-                            state.last_message = "MeterValues"
-                            await _recv()
-                            last_mv = time.monotonic()
-
             async def listen():
                 try:
                     while True:
@@ -663,6 +572,7 @@ def simulate(
                 interval,
                 username,
                 password,
+                sim_state=state,
             )
 
         def run_thread(idx: int) -> None:
@@ -685,6 +595,7 @@ def simulate(
                     interval,
                     username,
                     password,
+                    sim_state=state,
                 )
             )
 
@@ -737,6 +648,7 @@ def simulate(
                 interval,
                 username,
                 password,
+                sim_state=state,
             )
         )
     else:
@@ -764,6 +676,7 @@ def simulate(
                     username,
                     password,
                 ),
+                kwargs={"sim_state": state},
                 daemon=True,
             )
             t.start()

ocpp/models.py

@@ -628,6 +628,8 @@ class Transaction(Entity):
     )
     start_time = models.DateTimeField()
     stop_time = models.DateTimeField(null=True, blank=True)
+    received_start_time = models.DateTimeField(null=True, blank=True)
+    received_stop_time = models.DateTimeField(null=True, blank=True)
 
     def __str__(self) -> str:  # pragma: no cover - simple representation
         return f"{self.charger}:{self.pk}"

ocpp/routing.py

@@ -4,6 +4,8 @@ from . import consumers
 
 websocket_urlpatterns = [
     re_path(r"^ws/sink/$", consumers.SinkConsumer.as_asgi()),
-    # Accept connections at any path; the last segment is the charger ID
-    re_path(r"^(?:.*/)?(?P<cid>[^/]+)/?$", consumers.CSMSConsumer.as_asgi()),
+    # Accept connections at any path; the last segment is the charger ID.
+    # Some charge points omit the final segment and only provide the
+    # identifier via query parameters, so allow an empty match here.
+    re_path(r"^(?:.*/)?(?P<cid>[^/]*)/?$", consumers.CSMSConsumer.as_asgi()),
 ]

ocpp/simulator.py

@@ -302,18 +302,39 @@ class ChargePointSimulator:
     async def _handle_csms_call(self, msg, send, recv) -> bool:
         if not isinstance(msg, list) or not msg or msg[0] != 2:
             return False
+        message_id = msg[1] if len(msg) > 1 else ""
+        if not isinstance(message_id, str):
+            message_id = str(message_id)
         action = msg[2]
         payload = msg[3] if len(msg) > 3 else {}
         if action == "ChangeAvailability":
-            await self._handle_change_availability(msg[1], payload, send, recv)
+            await self._handle_change_availability(message_id, payload, send, recv)
             return True
         if action == "GetConfiguration":
-            await self._handle_get_configuration(msg[1], payload, send)
+            await self._handle_get_configuration(message_id, payload, send)
             return True
         if action == "TriggerMessage":
-            await self._handle_trigger_message(msg[1], payload, send, recv)
+            await self._handle_trigger_message(message_id, payload, send, recv)
             return True
-        return False
+        cfg = self.config
+        action_name = str(action)
+        store.add_log(
+            cfg.cp_path,
+            f"Received unsupported action '{action_name}', replying with CallError",
+            log_type="simulator",
+        )
+        await send(
+            json.dumps(
+                [
+                    4,
+                    message_id,
+                    "NotSupported",
+                    f"Simulator does not implement {action_name}",
+                    {},
+                ]
+            )
+        )
+        return True
 
     async def _handle_get_configuration(self, message_id: str, payload, send) -> None:
         cfg = self.config
@@ -523,11 +544,11 @@ class ChargePointSimulator:
                                     ],
                                 },
                             ]
+                        )
                     )
-                )
-                await recv()
-                await self._maybe_send_door_event(send, recv)
-                await asyncio.sleep(cfg.interval)
+                    await recv()
+                    await self._maybe_send_door_event(send, recv)
+                    await asyncio.sleep(cfg.interval)
 
             if not await self._wait_until_operative(send, recv):
                 return

ocpp/status_display.py

@@ -0,0 +1,26 @@
+"""Shared status display constants for charger views and admin."""
+
+from __future__ import annotations
+
+from django.utils.translation import gettext_lazy as _
+
+
+# Map of normalized OCPP status values to human readable labels and colors.
+STATUS_BADGE_MAP: dict[str, tuple[str, str]] = {
+    "available": (_("Available"), "#0d6efd"),
+    "preparing": (_("Preparing"), "#0d6efd"),
+    "charging": (_("Charging"), "#198754"),
+    "suspendedevse": (_("Suspended (EVSE)"), "#fd7e14"),
+    "suspendedev": (_("Suspended (EV)"), "#fd7e14"),
+    "finishing": (_("Finishing"), "#20c997"),
+    "faulted": (_("Faulted"), "#dc3545"),
+    "unavailable": (_("Unavailable"), "#6c757d"),
+    "reserved": (_("Reserved"), "#6f42c1"),
+    "occupied": (_("Occupied"), "#0dcaf0"),
+    "outofservice": (_("Out of Service"), "#6c757d"),
+}
+
+
+# Error codes that indicate "no error" according to the OCPP specification.
+ERROR_OK_VALUES = {"", "noerror", "no_error"}
+