Parse MOPComplete XML when starting the MopClient

src/yaroc/clients/mop.py

@@ -40,8 +40,12 @@ class MopClient:
     STAT_OOC = 15
     STAT_DNS = 20
 
-    def __init__(self, api_key: str):
+    def __init__(self, api_key: str, mop_xml: str | None):
         self.api_key = api_key
+        if isinstance(mop_xml, str):
+            self.results = MopClient.results_from_file(mop_xml)
+        else:
+            self.results = []
 
     @staticmethod
     def _parse_int(s: str | None) -> int | None:
@@ -135,7 +139,8 @@ async def loop(self):
         async with self.session:
             await asyncio.sleep(1000000)
 
-    def results_from_file(self, filename: str) -> List[MeosResult]:
+    @staticmethod
+    def results_from_file(filename: str) -> List[MeosResult]:
         xml = ET.parse(filename)
         return MopClient._results_from_meos_xml(xml.getroot())
 
@@ -153,7 +158,7 @@ async def send_result(self, result: MeosResult):
             else:
                 logging.error("Sending unsuccessful: {} {}", response, await response.text())
 
-    async def results(self, address: str, port: int) -> List[MeosResult]:
+    async def fetch_results(self, address: str, port: int) -> List[MeosResult]:
         async with self.session.get(f"http://{address}:{port}/meos?difference=zero") as response:
             assert response.status == 200
             xml = ET.XML(response.text)

src/yaroc/utils/container.py

@@ -8,9 +8,9 @@
 from dependency_injector.wiring import Provide, inject
 
 from ..clients.client import Client
+from ..clients.mop import MopClient
 from ..clients.mqtt import MqttClient, SIM7020MqttClient
 from ..clients.roc import RocClient
-from ..clients.mop import MopClient
 from ..clients.sirap import SirapClient
 from ..utils.async_serial import AsyncATCom
 from ..utils.si import FakeSiManager, UdevSiManager
@@ -59,7 +59,7 @@ class Container(containers.DeclarativeContainer):
         sirap=providers.Factory(
             SirapClient, config.client.sirap.ip, config.client.sirap.port, loop
         ),
-        mop=providers.Factory(MopClient, config.client.mop.api_key),
+        mop=providers.Factory(MopClient, config.client.mop.api_key, config.client.mop.mop_xml),
         mqtt=providers.Factory(MqttClient),
         roc=providers.Factory(RocClient),
         sim7020=providers.Factory(SIM7020MqttClient, async_at=async_at, retry_loop=loop),

tests/test_mop.py

@@ -2,7 +2,7 @@
 import xml.etree.ElementTree as ET
 from datetime import timedelta
 
-from yaroc.clients.mop import MopClient, MeosCategory, MeosCompetitor, MeosResult
+from yaroc.clients.mop import MeosCategory, MeosCompetitor, MeosResult, MopClient
 
 TEST_XML = """<?xml version="1.0" encoding="UTF-8"?>
 <MOPComplete xmlns="http://www.melin.nu/mop" nextdifference="1377871">