valetudo-map-parser 0.1.9b25__tar.gz → 0.1.9b27__tar.gz

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/PKG-INFO

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

@@ -29,6 +29,14 @@ class AutoCrop:
         self.imh = image_handler
         self.file_name = self.imh.file_name
 
+    def validate_crop_dimensions(self, shared):
+        """Ensure width and height are valid before processing cropping."""
+        if shared.image_ref_width <= 0 or shared.image_ref_height <= 0:
+            _LOGGER.warning("Auto-crop failed: Invalid dimensions (width=%s, height=%s). Using original image.",
+                            shared.image_ref_width, shared.image_ref_height)
+            return False
+        return True
+
     def check_trim(
         self, trimmed_height, trimmed_width, margin_size, image_array, file_name, rotate
     ):
@@ -201,7 +209,10 @@ class AutoCrop:
         Automatically crops and trims a numpy array and returns the processed image.
         """
         try:
-            await self._init_auto_crop()
+            if self.validate_crop_dimensions(self.imh.shared):
+                await self._init_auto_crop()
+            else:
+                return image_array
             if self.imh.auto_crop is None:
                 _LOGGER.debug("%s: Calculating auto trim box", self.file_name)
                 # Find the coordinates of the first occurrence of a non-background color

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/SCR/valetudo_map_parser/config/shared.py

@@ -6,7 +6,7 @@ Version: v2024.12.0
 
 import asyncio
 import logging
-from typing import Dict, List
+from typing import List
 
 from .types import (
     ATTR_CALIBRATION_POINTS,
@@ -104,7 +104,7 @@ class CameraShared:
         self.map_old_path = None  # Old path data
         self.user_language = None  # User language
         self.trim_crop_data = None
-        self.trims = TrimsData  # Trims data
+        self.trims = TrimsData.from_dict(DEFAULT_VALUES["trims_data"])  # Trims data
         self.skip_room_ids: List[str] = []
 
     def update_user_colors(self, user_colors):

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/SCR/valetudo_map_parser/config/types.py

@@ -7,7 +7,6 @@ import asyncio
 import json
 import logging
 from dataclasses import dataclass, asdict
-from enum import Enum
 from typing import Any, Dict, Tuple, Union
 
 import numpy as np
@@ -617,6 +616,11 @@ class TrimsData:
         """Convert TrimsConfig instance to a JSON string."""
         return json.dumps(asdict(self))
 
+    @classmethod
+    def from_dict(cls, data: dict):
+        """Initialize TrimData from a dictionary."""
+        return cls(**data)
+
     def to_dict(self) -> dict:
-        """Convert TrimsConfig instance to a dictionary."""
+        """Convert TrimData to a dictionary."""
         return asdict(self)

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/SCR/valetudo_map_parser/config/utils.py

@@ -485,8 +485,13 @@ async def async_resize_image(params: ResizeParams):
     """Resize the image to the given dimensions and aspect ratio."""
     if params.aspect_ratio:
         wsf, hsf = [int(x) for x in params.aspect_ratio.split(",")]
-        if wsf == 0 or hsf == 0:
-            return params.pil_img
+
+        if wsf == 0 or hsf == 0 or params.width <= 0 or params.height <= 0:
+            _LOGGER.warning(
+                "Invalid aspect ratio parameters: width=%s, height=%s, wsf=%s, hsf=%s. Returning original image.",
+                params.width, params.height, wsf, hsf)
+            return params.pil_img  # Return original image if invalid
+
         new_aspect_ratio = wsf / hsf
         if params.width / params.height > new_aspect_ratio:
             new_width = int(params.pil_img.height * new_aspect_ratio)
@@ -495,11 +500,7 @@ async def async_resize_image(params: ResizeParams):
             new_width = params.pil_img.width
             new_height = int(params.pil_img.width / new_aspect_ratio)
 
-        _LOGGER.debug(
-            "Image Aspect Ratio: %s, %s",
-            str(wsf),
-            str(hsf),
-        )
+        _LOGGER.debug("Resizing image to aspect ratio: %s, %s", wsf, hsf)
 
         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.9b25 → valetudo_map_parser-0.1.9b27}/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, TrimsData
+from .config.types import COLORS, CalibrationPoints, Colors, RoomsProperties
 from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
@@ -42,18 +42,12 @@ class HypferMapImageHandler(BaseHandler):
         self.img_base_layer = None  # numpy array store the map base layer.
         self.active_zones = None  # vacuum active zones.
         self.svg_wait = False  # SVG image creation wait.
-        self.trim_up = self.shared.trims.get(
-            TrimsData.TRIM_UP, 0
-        )  # memory stored trims calculated once.
-        self.trim_down = self.shared.trims.get(
-            TrimsData.TRIM_DOWN, 0
-        )  # memory stored trims calculated once.
-        self.trim_left = self.shared.trims.get(
-            TrimsData.TRIM_LEFT, 0
-        )  # memory stored trims calculated once.
-        self.trim_right = self.shared.trims.get(
-            TrimsData.TRIM_RIGHT, 0
-        )  # memory stored trims calculated once.
+        trim_data = self.shared.trims.to_dict()  # trims data
+        _LOGGER.debug("Trim Data: %s", str(trim_data))
+        self.trim_up = trim_data.get("trim_up", 0)  # trim up
+        self.trim_down = trim_data.get("trim_down", 0)  # trim down
+        self.trim_left = trim_data.get("trim_left", 0)  # trim left
+        self.trim_right = trim_data.get("trim_right", 0)  # trim right
         self.offset_top = self.shared.offset_top  # offset top
         self.offset_bottom = self.shared.offset_down  # offset bottom
         self.offset_left = self.shared.offset_left  # offset left

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/SCR/valetudo_map_parser/rand25_handler.py

@@ -23,7 +23,6 @@ from .config.types import (
     PilPNG,
     RobotPosition,
     RoomsProperties,
-    TrimsData,
 )
 from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
@@ -53,18 +52,12 @@ class ReImageHandler(BaseHandler):
         self.room_propriety = None  # Room propriety data
         self.shared = camera_shared  # Shared data
         self.active_zones = None  # Active zones
-        self.trim_up = self.shared.trims.get(
-            TrimsData.TRIM_UP, 0
-        )  # memory stored trims calculated once.
-        self.trim_down = self.shared.trims.get(
-            TrimsData.TRIM_DOWN, 0
-        )  # memory stored trims calculated once.
-        self.trim_left = self.shared.trims.get(
-            TrimsData.TRIM_LEFT, 0
-        )  # memory stored trims calculated once.
-        self.trim_right = self.shared.trims.get(
-            TrimsData.TRIM_RIGHT, 0
-        )  # memory stored trims calculated once.
+        trim_data = self.shared.trims.to_dict()  # trims data
+        _LOGGER.debug("Trim Data: %s", trim_data)
+        self.trim_up = trim_data.get("trim_up", 0)  # trim up
+        self.trim_down = trim_data.get("trim_down", 0)  # trim down
+        self.trim_left = trim_data.get("trim_left", 0)  # trim left
+        self.trim_right = trim_data.get("trim_right", 0)  # trim right
         self.file_name = self.shared.file_name  # File name
         self.offset_top = self.shared.offset_top  # offset top
         self.offset_bottom = self.shared.offset_down  # offset bottom
@@ -266,6 +259,9 @@ class ReImageHandler(BaseHandler):
         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
         if self.check_zoom_and_aspect_ratio():
             resize_params = prepare_resize_params(self, pil_img, True)
             pil_img = await self.async_resize_images(resize_params)

{valetudo_map_parser-0.1.9b25 → valetudo_map_parser-0.1.9b27}/pyproject.toml

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