valetudo-map-parser 0.1.10rc7__py3-none-any.whl → 0.1.11b1__py3-none-any.whl

valetudo_map_parser/rand256_handler.py

@@ -2,7 +2,7 @@
 Image Handler Module for Valetudo Re Vacuums.
 It returns the PIL PNG image frame relative to the Map Data extrapolated from the vacuum json.
 It also returns calibration, rooms data to the card and other images information to the camera.
-Version: 0.1.9.a6
+Version: 0.1.10
 """
 
 from __future__ import annotations
@@ -11,22 +11,22 @@ import uuid
 from typing import Any
 
 import numpy as np
+from mvcrender.autocrop import AutoCrop
 
 from .config.async_utils import AsyncPIL
-
-from mvcrender.autocrop import AutoCrop
 from .config.drawable_elements import DrawableElement
 from .config.types import (
     COLORS,
     DEFAULT_IMAGE_SIZE,
     DEFAULT_PIXEL_SIZE,
+    LOGGER,
     Colors,
+    Destinations,
     JsonType,
     PilPNG,
     RobotPosition,
     RoomsProperties,
     RoomStore,
-    LOGGER,
 )
 from .config.utils import (
     BaseHandler,
@@ -55,11 +55,10 @@ class ReImageHandler(BaseHandler, AutoCrop):
         self.data = RandImageData  # Image Data
 
         # Initialize drawing configuration using the shared utility function
-        self.drawing_config, self.draw, self.enhanced_draw = initialize_drawing_config(
-            self
-        )
+        self.drawing_config, self.draw = initialize_drawing_config(self)
         self.go_to = None  # Go to position data
         self.img_base_layer = None  # Base image layer
+        self.img_work_layer = None  # Persistent working buffer (reused across frames)
         self.img_rotate = shared_data.image_rotate  # Image rotation
         self.room_propriety = None  # Room propriety data
         self.active_zones = None  # Active zones
@@ -70,7 +69,9 @@ class ReImageHandler(BaseHandler, AutoCrop):
         )  # Room data handler
 
     async def extract_room_properties(
-        self, json_data: JsonType, destinations: JsonType
+        self,
+        json_data: JsonType,
+        destinations: Destinations | None = None,
     ) -> RoomsProperties:
         """Extract the room properties."""
         # unsorted_id = RandImageData.get_rrm_segments_ids(json_data)
@@ -85,9 +86,10 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     json_data, size_x, size_y, top, left, True
                 )
 
-            dest_json = destinations
-            zones_data = dict(dest_json).get("zones", [])
-            points_data = dict(dest_json).get("spots", [])
+
+            dest_json = destinations if destinations else {}
+            zones_data = dest_json.get("zones", [])
+            points_data = dest_json.get("spots", [])
 
             # Use the RandRoomsHandler to extract room properties
             room_properties = await self.rooms_handler.async_extract_room_properties(
@@ -96,17 +98,13 @@ class ReImageHandler(BaseHandler, AutoCrop):
 
             # Update self.rooms_pos from room_properties for compatibility with other methods
             self.rooms_pos = []
-            room_ids = []  # Collect room IDs for shared.map_rooms
             for room_id, room_data in room_properties.items():
                 self.rooms_pos.append(
                     {"name": room_data["name"], "outline": room_data["outline"]}
                 )
-                # Store the room number (segment ID) for MQTT active zone mapping
-                room_ids.append(room_data["number"])
-
-            # Update shared.map_rooms with the room IDs for MQTT active zone mapping
-            self.shared.map_rooms = room_ids
 
+            # Update shared.map_rooms with the full room properties (consistent with Hypfer)
+            self.shared.map_rooms = room_properties
             # get the zones and points data
             self.shared.map_pred_zones = await self.async_zone_propriety(zones_data)
             # get the points data
@@ -115,7 +113,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
             if not (room_properties or self.shared.map_pred_zones):
                 self.rooms_pos = None
 
-            rooms = RoomStore(self.file_name, room_properties)
+            _ = RoomStore(self.file_name, room_properties)
             return room_properties
         except (RuntimeError, ValueError) as e:
             LOGGER.warning(
@@ -123,12 +121,12 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 e,
                 exc_info=True,
             )
-            return None, None, None
+            return None
 
     async def get_image_from_rrm(
         self,
         m_json: JsonType,  # json data
-        destinations: None = None,  # MQTT destinations for labels
+        destinations: Destinations | None = None,  # MQTT destinations for labels
     ) -> PilPNG | None:
         """Generate Images from the json data.
         @param m_json: The JSON data to use to draw the image.
@@ -159,10 +157,24 @@ class ReImageHandler(BaseHandler, AutoCrop):
 
                 # Increment frame number
                 self.frame_number += 1
-                img_np_array = await self.async_copy_array(self.img_base_layer)
                 if self.frame_number > 5:
                     self.frame_number = 0
 
+                # Ensure persistent working buffer exists and matches base (allocate only when needed)
+                if (
+                    self.img_work_layer is None
+                    or self.img_work_layer.shape != self.img_base_layer.shape
+                    or self.img_work_layer.dtype != self.img_base_layer.dtype
+                ):
+                    # Delete old buffer before creating new one to free memory
+                    if self.img_work_layer is not None:
+                        del self.img_work_layer
+                    self.img_work_layer = np.empty_like(self.img_base_layer)
+
+                # Copy the base layer into the persistent working buffer (no new allocation per frame)
+                np.copyto(self.img_work_layer, self.img_base_layer)
+                img_np_array = self.img_work_layer
+
                 # Draw map elements
                 img_np_array = await self._draw_map_elements(
                     img_np_array, m_json, colors, robot_position, robot_position_angle
@@ -170,7 +182,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
 
                 # Return PIL Image using async utilities
                 pil_img = await AsyncPIL.async_fromarray(img_np_array, mode="RGBA")
-                del img_np_array  # free memory
+                # Note: Don't delete img_np_array here as it's the persistent work buffer
                 return await self._finalize_image(pil_img)
 
         except (RuntimeError, RuntimeWarning) as e:
@@ -188,6 +200,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
     async def _setup_robot_and_image(
         self, m_json, size_x, size_y, colors, destinations
     ):
+        """Set up the elements of the map and the image."""
         (
             _,
             robot_position,
@@ -212,12 +225,6 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 )
                 LOGGER.info("%s: Completed base Layers", self.file_name)
 
-                # Update element map for rooms
-                if 0 < room_id <= 15:
-                    # This is a simplification - in a real implementation we would
-                    # need to identify the exact pixels that belong to each room
-                    pass
-
                 if room_id > 0 and not self.room_propriety:
                     self.room_propriety = await self.get_rooms_attributes(destinations)
 
@@ -225,14 +232,23 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 if not self.rooms_pos and not self.room_propriety:
                     self.room_propriety = await self.get_rooms_attributes(destinations)
 
-                # Always check robot position for zooming (fallback)
-                if self.rooms_pos and robot_position and not hasattr(self, "robot_pos"):
+                # Always check robot position for zooming (update if room info is missing)
+                if (
+                    self.rooms_pos
+                    and robot_position
+                    and (self.robot_pos is None or "in_room" not in self.robot_pos)
+                ):
                     self.robot_pos = await self.async_get_robot_in_room(
                         (robot_position[0] * 10),
                         (robot_position[1] * 10),
                         robot_position_angle,
                     )
+                # Delete old base layer before creating new one to free memory
+                if self.img_base_layer is not None:
+                    del self.img_base_layer
                 self.img_base_layer = await self.async_copy_array(img_np_array)
+                # Delete source array after copying to free memory
+                del img_np_array
             else:
                 # If floor is disabled, create an empty image
                 background_color = self.drawing_config.get_property(
@@ -241,7 +257,12 @@ class ReImageHandler(BaseHandler, AutoCrop):
                 img_np_array = await self.draw.create_empty_image(
                     size_x, size_y, background_color
                 )
+                # Delete old base layer before creating new one to free memory
+                if self.img_base_layer is not None:
+                    del self.img_base_layer
                 self.img_base_layer = await self.async_copy_array(img_np_array)
+                # Delete source array after copying to free memory
+                del img_np_array
 
         # Check active zones BEFORE auto-crop to enable proper zoom functionality
         # This needs to run on every frame, not just frame 0
@@ -273,7 +294,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     # Restore original rooms_pos
                     self.rooms_pos = original_rooms_pos
 
-            except Exception as e:
+            except (ValueError, KeyError, TypeError):
                 # Fallback to robot-position-based zoom if room extraction fails
                 if (
                     self.shared.image_auto_zoom
@@ -287,6 +308,7 @@ class ReImageHandler(BaseHandler, AutoCrop):
     async def _draw_map_elements(
         self, img_np_array, m_json, colors, robot_position, robot_position_angle
     ):
+        """Draw map elements on the image."""
         # Draw charger if enabled
         if self.drawing_config.is_enabled(DrawableElement.CHARGER):
             img_np_array, self.charger_pos = await self.imd.async_draw_charger(
@@ -357,22 +379,24 @@ class ReImageHandler(BaseHandler, AutoCrop):
         return img_np_array
 
     async def _finalize_image(self, pil_img):
-        if not self.shared.image_ref_width or not self.shared.image_ref_height:
-            LOGGER.warning(
-                "Image finalization failed: Invalid image dimensions. Returning original image."
-            )
-            return pil_img
+        """Finalize the image by resizing if needed."""
+        if pil_img is None:
+            LOGGER.warning("%s: Image is None. Returning None.", self.file_name)
+            return None
         if self.check_zoom_and_aspect_ratio():
             resize_params = self.prepare_resize_params(pil_img, True)
             pil_img = await self.async_resize_images(resize_params)
+        else:
+            LOGGER.warning(
+                "%s: Invalid image dimensions. Returning original image.",
+                self.file_name,
+            )
         return pil_img
 
     async def get_rooms_attributes(
         self, destinations: JsonType = None
     ) -> tuple[RoomsProperties, Any, Any]:
         """Return the rooms attributes."""
-        if self.room_propriety:
-            return self.room_propriety
         if self.json_data and destinations:
             self.room_propriety = await self.extract_room_properties(
                 self.json_data, destinations
@@ -397,6 +421,12 @@ class ReImageHandler(BaseHandler, AutoCrop):
                     }
                     # Handle active zones
                     self.active_zones = self.shared.rand256_active_zone
+                    LOGGER.debug(
+                        "%s: Robot is in %s room (polygon detection). %s",
+                        self.file_name,
+                        self.robot_in_room["room"],
+                        self.active_zones,
+                    )
                     self.zooming = False
                     if self.active_zones and (
                         self.robot_in_room["id"] in range(len(self.active_zones))

valetudo_map_parser/reimg_draw.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 
 from .config.drawable import Drawable
 from .config.drawable_elements import DrawableElement
-from .config.types import Color, JsonType, NumpyArray, LOGGER
+from .config.types import LOGGER, Color, JsonType, NumpyArray
 from .map_data import ImageData, RandImageData
 
 

valetudo_map_parser/rooms_handler.py

@@ -7,7 +7,6 @@ Version: 0.1.9
 
 from __future__ import annotations
 
-import time
 from typing import Any, Dict, List, Optional, Tuple
 
 import numpy as np
@@ -16,8 +15,7 @@ from scipy.spatial import ConvexHull
 
 from .config.drawable_elements import DrawableElement, DrawingConfig
 from .config.types import LOGGER, RoomsProperties
-
-from .map_data import RandImageData, ImageData
+from .map_data import RandImageData
 
 
 class RoomsHandler:
@@ -163,8 +161,17 @@ class RoomsHandler:
             np.uint8
         )
 
+        # Free intermediate arrays to reduce memory usage
+        del local_mask
+        del struct_elem
+        del eroded
+
         # Extract contour from the mask
         outline = self.convex_hull_outline(mask)
+
+        # Free mask after extracting outline
+        del mask
+
         if not outline:
             return None, None
 
@@ -204,7 +211,6 @@ class RoomsHandler:
         Returns:
             Dictionary of room properties
         """
-        start_total = time.time()
         room_properties = {}
         pixel_size = json_data.get("pixelSize", 5)
         height = json_data["size"]["y"]
@@ -217,9 +223,6 @@ class RoomsHandler:
                 )
                 if room_id is not None and room_data is not None:
                     room_properties[room_id] = room_data
-
-        # Log timing information (kept internal, no debug output)
-        total_time = time.time() - start_total
         return room_properties
 
 
@@ -395,7 +398,6 @@ class RandRoomsHandler:
         Returns:
             Dictionary of room properties
         """
-        start_total = time.time()
         room_properties = {}
 
         # Get basic map information
@@ -463,6 +465,4 @@ class RandRoomsHandler:
 
                 room_properties[room_id] = room_data
 
-        # Log timing information (kept internal, no debug output)
-        total_time = time.time() - start_total
         return room_properties

{valetudo_map_parser-0.1.10rc7.dist-info → valetudo_map_parser-0.1.11b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: valetudo-map-parser
-Version: 0.1.10rc7
+Version: 0.1.11b1
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 License-File: LICENSE
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Dist: Pillow (>=10.3.0)
-Requires-Dist: mvcrender (>=0.0.4)
+Requires-Dist: mvcrender (==0.0.6)
 Requires-Dist: numpy (>=1.26.4)
 Requires-Dist: scipy (>=1.12.0)
 Project-URL: Bug Tracker, https://github.com/sca075/Python-package-valetudo-map-parser/issues

valetudo_map_parser-0.1.11b1.dist-info/RECORD

@@ -0,0 +1,32 @@
+valetudo_map_parser/__init__.py,sha256=l_O2iyvj49KkUtuW7lMIZJcEaV_6_-YFaVZkiVeSh9g,1743
+valetudo_map_parser/config/__init__.py,sha256=DQ9plV3ZF_K25Dp5ZQHPDoG-40dQoJNdNi-dfNeR3Zc,48
+valetudo_map_parser/config/async_utils.py,sha256=e1j9uTtg4dhPVWvB2_XgqaH4aeSjRAPz-puRMbGoOs8,3204
+valetudo_map_parser/config/colors.py,sha256=DMY5aHDS-alW2CZ2j8U7QVGHK_H8M0fBDX2OGuryirc,29914
+valetudo_map_parser/config/drawable.py,sha256=s0bA3yeIXgultFbDD_BXDbzDPMpkGVHzq5IyXnH_sW8,23984
+valetudo_map_parser/config/drawable_elements.py,sha256=_iHdAuzbAoIOeT8JEZrvSu5fVojIdhAyH5ABUVi-x3Y,11496
+valetudo_map_parser/config/fonts/FiraSans.ttf,sha256=Pavz1Iv0WZ-Vz_2S-Z6kJqAU1TEfUqXrXsOvJl6XzZc,440984
+valetudo_map_parser/config/fonts/Inter-VF.ttf,sha256=zzy0OwNm4txt9g4RMrHJpMFXd_DNjlpT4MFRJAA-ntQ,804612
+valetudo_map_parser/config/fonts/Lato-Regular.ttf,sha256=6CVCrtgpP0n8g8Sq6lZrH2tPx6mrXaEeb7m8CXO1Mks,75152
+valetudo_map_parser/config/fonts/MPLUSRegular.ttf,sha256=IGdcNSRP4dDxQskbE3Ybuwz7T0flhCBuzwfhLMcPt9s,3380812
+valetudo_map_parser/config/fonts/NotoKufiArabic-VF.ttf,sha256=NaIy40eLx7d3ts0kuenp0GjWd-YN24J6DpSvX2L3vLA,433800
+valetudo_map_parser/config/fonts/NotoSansCJKhk-VF.ttf,sha256=xIXXLKCJzmWoPEg8HdvxeRgotMjjxF6l6ugGP-IWRJU,36135040
+valetudo_map_parser/config/fonts/NotoSansKhojki.ttf,sha256=XJWzSmpN-Ql6jTfTvFojP_JkCHOztQvixQc1_7hPWrc,107388
+valetudo_map_parser/config/optimized_element_map.py,sha256=52BCnkvVv9bre52LeVIfT8nhnEIpc0TuWTv1xcNu0Rk,15744
+valetudo_map_parser/config/rand256_parser.py,sha256=UZ0UlcNIjDhMpImA_2jSei0HeLftpb9fLDwzliJJpz8,21161
+valetudo_map_parser/config/shared.py,sha256=PyP3IpgrztOM9B-qjNDHKcQL1_No_rAbPhvfuQJXOBE,11829
+valetudo_map_parser/config/status_text/status_text.py,sha256=29E8b3adl_Rr_BH8-J35ia2cOS716sPzVk_cezFiWQ4,4053
+valetudo_map_parser/config/status_text/translations.py,sha256=mmPbJkl_2A59w49wnesQf3ocXqwZxBsrqNX-yt5FSCQ,9132
+valetudo_map_parser/config/types.py,sha256=rYdqOsUX9dtre8M7s8o1S5Ag8Ixvab13Stpk3Hfw_54,18027
+valetudo_map_parser/config/utils.py,sha256=IP64VqYW_oWGAxSXexGHtLGaHTn7r4eICd0JGZDqG9A,35696
+valetudo_map_parser/hypfer_draw.py,sha256=0-ZBCZw9H7G5Mu2cukTdOfbu83tZPL2cTdzPjRXzZsQ,22422
+valetudo_map_parser/hypfer_handler.py,sha256=O2eR4nNbmEkcDc-5EcWCKHLMOQGeQBMAdpClEM1fGnI,20446
+valetudo_map_parser/map_data.py,sha256=1-kxE82o8BfaJojYrD0LXoUAgCNpD6d50yLGc4w7ZWc,27433
+valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+valetudo_map_parser/rand256_handler.py,sha256=z7ofWheIy7UvC120rvhP1nNjWdW9JqCIqnGV3T5OoNs,23048
+valetudo_map_parser/reimg_draw.py,sha256=Pwm_QUHiJd4o657qr-mlsWQ_TtGCBB-ucsA84t-IwOg,12474
+valetudo_map_parser/rooms_handler.py,sha256=ZbSdxG-uwoskYBbzN5zzAqK_lTtrNrcpjZmCVmxFWpw,17364
+valetudo_map_parser-0.1.11b1.dist-info/METADATA,sha256=YyvgIGxYawa9mD6hJ0wWOoChSED2xO3Dh8W4VJmrS2I,3403
+valetudo_map_parser-0.1.11b1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+valetudo_map_parser-0.1.11b1.dist-info/licenses/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.11b1.dist-info/licenses/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.11b1.dist-info/RECORD,,