valetudo-map-parser 0.1.9b32__tar.gz → 0.1.9b34__tar.gz

{valetudo_map_parser-0.1.9b32 → valetudo_map_parser-0.1.9b34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b32
+Version: 0.1.9b34
 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.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/config/auto_crop.py

@@ -90,6 +90,7 @@ class AutoCrop:
 
     async def _async_auto_crop_data(self, tdata: TrimsData):  # , tdata=None
         """Load the auto crop data from the Camera config."""
+        _LOGGER.debug("Auto Crop data: %s, %s", str(tdata), str(self.auto_crop))
         if not self.auto_crop:
             trims_data = TrimCropData.from_dict(dict(tdata.to_dict())).to_list()
             (
@@ -98,9 +99,12 @@ class AutoCrop:
                 self.trim_right,
                 self.trim_down,
             ) = trims_data
-            self._calculate_trimmed_dimensions()
+            _LOGGER.debug("Auto Crop trims data: %s", trims_data)
+            if trims_data != [0, 0, 0, 0]:
+                self._calculate_trimmed_dimensions()
+            else:
+                trims_data = None
             return trims_data
-        _LOGGER.debug("No Crop data found in the Camera config.")
         return None
 
     def auto_crop_offset(self):
@@ -113,7 +117,9 @@ class AutoCrop:
 
     async def _init_auto_crop(self):
         """Initialize the auto crop data."""
-        if not self.auto_crop and self.handler.shared.vacuum_state == "docked":
+        _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())
+        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:
                 self.auto_crop_offset()

{valetudo_map_parser-0.1.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/config/shared.py

@@ -123,6 +123,10 @@ class CameraShared:
         """Get the rooms colors."""
         return self.rooms_colors
 
+    def reset_trims(self) -> dict:
+        """Reset the trims."""
+        return self.trims.clear()
+
     async def batch_update(self, **kwargs):
         """Batch update multiple attributes."""
         for key, value in kwargs.items():
@@ -172,6 +176,7 @@ class CameraSharedManager:
         self._lock = asyncio.Lock()
         self.file_name = file_name
         self.device_info = device_info
+        self.update_shared_data(device_info)
 
         # Automatically initialize shared data for the instance
         # self._init_shared_data(device_info)
@@ -227,9 +232,12 @@ class CameraSharedManager:
             instance.enable_snapshots = device_info.get(
                 CONF_SNAPSHOTS_ENABLE, DEFAULT_VALUES["enable_www_snapshots"]
             )
-            instance.trims.from_dict(
-                device_info.get("trims_data", DEFAULT_VALUES["trims_data"])
-            )
+            # Ensure trims are updated correctly
+            trim_data = device_info.get("trims_data", DEFAULT_VALUES["trims_data"])
+            _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())
 
         except TypeError as ex:
             _LOGGER.error("Shared data can't be initialized due to a TypeError! %s", ex)

{valetudo_map_parser-0.1.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/config/types.py

@@ -7,7 +7,7 @@ import asyncio
 import json
 import logging
 from dataclasses import asdict, dataclass
-from typing import Any, Dict, Tuple, Union
+from typing import Any, Dict, Tuple, Union, Optional
 
 import numpy as np
 from PIL import Image
@@ -74,43 +74,43 @@ class TrimCropData:
         )
 
 
-# pylint: disable=no-member
 class RoomStore:
-    """Store the room data for the vacuum."""
+    """Singleton RoomStore to store room data per vacuum."""
 
-    _instance = None
-    _lock = asyncio.Lock()
+    _instances: Dict[str, "RoomStore"] = {}  # Stores instances by vacuum ID
+    _lock = asyncio.Lock()  # Ensures thread-safe access
 
-    def __init__(self):
-        self.vacuums_data = {}
+    def __new__(cls, vacuum_id: str, rooms_data: Optional[dict] = None) -> "RoomStore":
+        """Create a new instance or return an existing one."""
+        if vacuum_id not in cls._instances:
+            instance = super().__new__(cls)
+            instance.vacuum_id = vacuum_id
+            instance.vacuums_data = rooms_data or {}  # Store room data
+            cls._instances[vacuum_id] = instance  # Store the instance
+        return cls._instances[vacuum_id]
 
-    def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super(RoomStore, cls).__new__(cls)
-            cls._instance.vacuums_data = {}
-        return cls._instance
+    def __init__(self, vacuum_id: str, rooms_data: Optional[dict] = None):
+        """Initialize the instance."""
+        self.vacuum_id = vacuum_id
+        self.vacuums_data = rooms_data or {}
 
-    async def async_set_rooms_data(self, vacuum_id: str, rooms_data: dict) -> None:
-        """Set the room data for the vacuum."""
-        async with self._lock:
-            self.vacuums_data[vacuum_id] = rooms_data
+    def get_rooms(self) -> dict:
+        """Return the stored rooms data."""
+        return self.vacuums_data
+
+    def set_rooms(self, rooms_data: dict) -> None:
+        """Update the rooms data."""
+        self.vacuums_data = rooms_data
+
+    def get_rooms_count(self) -> int:
+        """Return the number of rooms stored for this vacuum."""
+        return len(self.vacuums_data)
+
+    @classmethod
+    def get_all_instances(cls) -> Dict[str, "RoomStore"]:
+        """Return all active instances (for debugging)."""
+        return cls._instances
 
-    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
 
 
 # pylint: disable=no-member
@@ -624,3 +624,11 @@ class TrimsData:
     def to_dict(self) -> dict:
         """Convert TrimData to a dictionary."""
         return asdict(self)
+
+    def clear(self)-> dict:
+        """Clear all the trims."""
+        self.trim_left = 0
+        self.trim_up = 0
+        self.trim_right = 0
+        self.trim_down = 0
+        return asdict(self)

{valetudo_map_parser-0.1.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/config/utils.py

@@ -58,7 +58,7 @@ class BaseHandler:
         self.crop_img_size = [0, 0]
         self.offset_x = 0
         self.offset_y = 0
-        self.crop_area = [0, 0, 0, 0]
+        self.crop_area = None
         self.zooming = False
         self.async_resize_images = async_resize_image
 
@@ -495,7 +495,10 @@ async def async_resize_image(params: ResizeParams):
                 hsf,
             )
             return params.pil_img  # Return original image if invalid
-
+        if params.width == 0:
+            params.width = params.pil_img.width
+        if params.height == 0:
+            params.height = params.pil_img.height
         new_aspect_ratio = wsf / hsf
         if params.width / params.height > new_aspect_ratio:
             new_width = int(params.pil_img.height * new_aspect_ratio)
@@ -505,6 +508,7 @@ async def async_resize_image(params: ResizeParams):
             new_height = int(params.pil_img.width / new_aspect_ratio)
 
         _LOGGER.debug("Resizing image to aspect ratio: %s, %s", wsf, hsf)
+        _LOGGER.debug("New image size: %s x %s", new_width, new_height)
 
         if (params.crop_size is not None) and (params.offset_func is not None):
             offset = OffsetParams(wsf, hsf, new_width, new_height, params.is_rand)

{valetudo_map_parser-0.1.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/hypfer_handler.py

@@ -15,7 +15,7 @@ from PIL import Image
 from .config.auto_crop import AutoCrop
 from .config.drawable import Drawable
 from .config.shared import CameraShared
-from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties
+from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties, RoomStore
 from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
@@ -83,7 +83,8 @@ class HypferMapImageHandler(BaseHandler, AutoCrop):
                         "y": ((y_min + y_max) // 2),
                     }
         if 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-0.1.9b32 → valetudo_map_parser-0.1.9b34}/SCR/valetudo_map_parser/rand25_handler.py

@@ -27,6 +27,7 @@ from .config.types import (
 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__)
@@ -120,6 +121,8 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     _LOGGER.debug(
                         "%s: Rooms and Zones data not available!", self.file_name
                     )
+                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.9b32 → valetudo_map_parser-0.1.9b34}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.9.b32"
+version = "0.1.9.b34"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"