valetudo-map-parser 0.1.9b33__py3-none-any.whl → 0.1.9b35__py3-none-any.whl

valetudo_map_parser/config/auto_crop.py

@@ -118,7 +118,9 @@ class AutoCrop:
     async def _init_auto_crop(self):
         """Initialize the auto crop data."""
         _LOGGER.debug("Auto Crop Init data: %s", str(self.auto_crop))
-        _LOGGER.debug("Auto Crop Init trims data: %s", self.handler.shared.trims.to_dict())
+        _LOGGER.debug(
+            "Auto Crop Init trims data: %s", self.handler.shared.trims.to_dict()
+        )
         if not self.auto_crop:  # and self.handler.shared.vacuum_state == "docked":
             self.auto_crop = await self._async_auto_crop_data(self.handler.shared.trims)
             if self.auto_crop:

valetudo_map_parser/config/shared.py

@@ -237,7 +237,9 @@ class CameraSharedManager:
             _LOGGER.debug("Updating shared trims with: %s", trim_data)
             instance.trims = TrimsData.from_dict(trim_data)
 
-            _LOGGER.debug("Shared trims successfully updated: %s", instance.trims.to_dict())
+            _LOGGER.debug(
+                "Shared trims successfully updated: %s", instance.trims.to_dict()
+            )
 
         except TypeError as ex:
             _LOGGER.error("Shared data can't be initialized due to a TypeError! %s", ex)

valetudo_map_parser/config/types.py

@@ -6,8 +6,9 @@ Version 0.0.1
 import asyncio
 import json
 import logging
+import threading
 from dataclasses import asdict, dataclass
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Optional, Tuple, Union
 
 import numpy as np
 from PIL import Image
@@ -74,44 +75,56 @@ class TrimCropData:
         )
 
 
-# pylint: disable=no-member
 class RoomStore:
-    """Store the room data for the vacuum."""
-
-    _instance = None
-    _lock = asyncio.Lock()
+    """
+    Singleton RoomStore per vacuum_id.
+
+    This class stores room data (a dictionary) for each vacuum.
+    Calling RoomStore(vacuum_id, rooms_data) creates a new instance for that vacuum_id if it doesn't exist,
+    or returns the existing one (optionally updating the data if rooms_data is provided).
+    """
+
+    _instances: Dict[str, "RoomStore"] = {}
+    _lock = threading.Lock()
+
+    # Declare instance attributes for static analysis tools like Pylint
+    vacuum_id: str
+    vacuums_data: dict
+
+    def __new__(cls, vacuum_id: str, rooms_data: Optional[dict] = None) -> "RoomStore":
+        with cls._lock:
+            if vacuum_id not in cls._instances:
+                instance = super(RoomStore, cls).__new__(cls)
+                instance.vacuum_id = vacuum_id
+                instance.vacuums_data = rooms_data or {}
+                cls._instances[vacuum_id] = instance
+            else:
+                # Update the instance's data if new rooms_data is provided.
+                if rooms_data is not None:
+                    cls._instances[vacuum_id].vacuums_data = rooms_data
+        return cls._instances[vacuum_id]
+
+    def get_rooms(self) -> dict:
+        """Return the stored rooms data."""
+        return self.vacuums_data
+
+    def set_rooms(self, rooms_data: dict) -> None:
+        """Update the stored rooms data."""
+        self.vacuums_data = rooms_data
+
+    def get_rooms_count(self) -> int:
+        """
+        Return the number of rooms stored for this vacuum.
+        This is simply the number of keys in the vacuums_data dictionary.
+        """
+        if isinstance(self.vacuums_data, dict):
+            return len(self.vacuums_data)
+        return DEFAULT_ROOMS
 
-    def __init__(self):
-        self.vacuums_data = {}
-
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(RoomStore, cls).__new__(cls)
-            cls._instance.vacuums_data = {}
-        return cls._instance
-
-    async def async_set_rooms_data(self, vacuum_id: str, rooms_data: dict) -> None:
-        """Set the room data for the vacuum."""
-        print("Setting room data")
-        async with self._lock:
-            self.vacuums_data[vacuum_id] = rooms_data
-
-    async def async_get_rooms_data(self, vacuum_id: str) -> dict:
-        """Get the room data for a vacuum."""
-        async with self._lock:
-            data = self.vacuums_data.get(vacuum_id, {})
-            if isinstance(data, str):
-                json_data = json.loads(data)
-                return json_data
-            return data
-
-    async def async_get_rooms_count(self, vacuum_id: str) -> int:
-        """Count the number of rooms for a vacuum."""
-        async with self._lock:
-            count = len(self.vacuums_data.get(vacuum_id, {}))
-            if count == 0:
-                return DEFAULT_ROOMS
-            return count
+    @classmethod
+    def get_all_instances(cls) -> Dict[str, "RoomStore"]:
+        """Return all active RoomStore instances (useful for debugging)."""
+        return cls._instances
 
 
 # pylint: disable=no-member
@@ -626,7 +639,7 @@ class TrimsData:
         """Convert TrimData to a dictionary."""
         return asdict(self)
 
-    def clear(self)-> dict:
+    def clear(self) -> dict:
         """Clear all the trims."""
         self.trim_left = 0
         self.trim_up = 0

valetudo_map_parser/hypfer_handler.py

@@ -83,9 +83,10 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                         "y": ((y_min + y_max) // 2),
                     }
         if room_properties:
-            rooms = RoomStore()
-            await rooms.async_set_rooms_data(self.file_name, room_properties)
-            _LOGGER.debug("%s: Rooms data extracted!", self.file_name)
+            rooms = RoomStore(self.file_name, room_properties)
+            _LOGGER.debug(
+                "%s: Rooms data extracted! %s", self.file_name, rooms.get_rooms()
+            )
         else:
             _LOGGER.debug("%s: Rooms data not available!", self.file_name)
             self.rooms_pos = None

valetudo_map_parser/rand25_handler.py

@@ -23,11 +23,11 @@ from .config.types import (
     PilPNG,
     RobotPosition,
     RoomsProperties,
+    RoomStore,
 )
 from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
-from .config.types import RoomStore
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -121,8 +121,8 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     _LOGGER.debug(
                         "%s: Rooms and Zones data not available!", self.file_name
                     )
-                rooms = RoomStore()
-                await rooms.async_set_rooms_data(self.file_name, room_properties)
+                rooms = RoomStore(self.file_name, room_properties)
+                _LOGGER.debug("Rooms Data: %s", rooms.get_rooms())
                 return room_properties, zone_properties, point_properties
         except RuntimeError as e:
             _LOGGER.debug(

{valetudo_map_parser-0.1.9b33.dist-info → valetudo_map_parser-0.1.9b35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b33
+Version: 0.1.9b35
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 Author: Sandro Cantarella

{valetudo_map_parser-0.1.9b33.dist-info → valetudo_map_parser-0.1.9b35.dist-info}/RECORD

@@ -1,21 +1,21 @@
 valetudo_map_parser/__init__.py,sha256=Wmd20bdI1btzMq-0x8NxGYWskTjdUmD-Fem9MTfziwU,810
 valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
-valetudo_map_parser/config/auto_crop.py,sha256=Og2rpK4izwh0aHlyZjw-tgDsQ2wXaIJGYLq1U43SSwc,12472
+valetudo_map_parser/config/auto_crop.py,sha256=gYTSp4XkBTY2ir7wizBqSWdfwoZJV6Rjs5wwGw9N-pY,12494
 valetudo_map_parser/config/colors.py,sha256=IzTT9JvF12YGGJxaTiEJRuwUdCCsFCLzsR9seCDfYWs,6515
 valetudo_map_parser/config/colors_man.py,sha256=9b5c6XmpMzhEiunwfIjVkOk1lDyV-UFoasACdkGXfbo,7833
 valetudo_map_parser/config/drawable.py,sha256=hsrEJCMVOrjs5sJfr26SeqJD0VNlYWwxcVkkHeaxx7U,20356
 valetudo_map_parser/config/rand25_parser.py,sha256=kIayyqVZBfQfAMkiArzqrrj9vqZB3pkgT0Y5ufrQmGA,16448
-valetudo_map_parser/config/shared.py,sha256=LunTeR-qAip0VzGNMtBw665rR6-MrH3rC7U8OExY3bA,10119
-valetudo_map_parser/config/types.py,sha256=Zwg9W4F99M6HjeX8mlC1VSiAOTCAgKdINi3pQZkJlD8,17378
+valetudo_map_parser/config/shared.py,sha256=tZrUDVZ5acyKPuyyp9Zca95SbZfR1Rz2hRAcIEu2LoU,10149
+valetudo_map_parser/config/types.py,sha256=L-7Jhx-nmT6iIP3g4vMt6xmjqF-HTj2ygix_gBLRg5Y,18018
 valetudo_map_parser/config/utils.py,sha256=yPutV-FEQlDB2z3LhOOFznoprHCApF-zrQMiOtkcO-k,19198
 valetudo_map_parser/hypfer_draw.py,sha256=1trtil-CQcDSiAMBWPBmuP5L9MWHGTp5OlY7MX8FgDg,14932
-valetudo_map_parser/hypfer_handler.py,sha256=6bXEUfx1zSzQzWws_p35OrIgg6cQ0EfqhTbrjLWgcHU,12996
+valetudo_map_parser/hypfer_handler.py,sha256=f_1oG69BA94sjcZ8O9Y6A1H-YyEutbvERzqnwgremvg,13001
 valetudo_map_parser/map_data.py,sha256=6FbQfgxFB6E4kcOWokReJOVSekVaE1kStyhTQhAhiOg,19469
 valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-valetudo_map_parser/rand25_handler.py,sha256=UbMAkY1y9FMa11Z9vXF_zaI1EF9EQNGOpQ1jXjvgBq0,15240
+valetudo_map_parser/rand25_handler.py,sha256=GxZ8UDUYEXlQme-m29HZEIstBQL3zDJr5DOsgqBolUk,15235
 valetudo_map_parser/reimg_draw.py,sha256=V0JUASavKVnEtAhv7nOV4pjsRxZrNsjIUtctbKO8wvk,12507
-valetudo_map_parser-0.1.9b33.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b33.dist-info/METADATA,sha256=YXuqWt46jT1RDsUL6N4ZV6K7TxxiySfTg_gSREGKYrU,1029
-valetudo_map_parser-0.1.9b33.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b33.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-valetudo_map_parser-0.1.9b33.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b35.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b35.dist-info/METADATA,sha256=-Sa1QB1XL__hYvO9p65-pDxwgO58MihhsR7sAGebkFU,1029
+valetudo_map_parser-0.1.9b35.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b35.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+valetudo_map_parser-0.1.9b35.dist-info/RECORD,,