valetudo-map-parser 0.1.9b22__tar.gz → 0.1.9b24__tar.gz

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/PKG-INFO

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

@@ -16,6 +16,7 @@ from .config.types import (
 from .hypfer_handler import HypferMapImageHandler
 from .rand25_handler import ReImageHandler
 
+
 __all__ = [
     "HypferMapImageHandler",
     "ReImageHandler",

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/auto_crop.py

@@ -10,6 +10,7 @@ from numpy import rot90
 
 from .types import Color, NumpyArray, TrimCropData
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -27,9 +28,6 @@ class AutoCrop:
     def __init__(self, image_handler):
         self.imh = image_handler
         self.file_name = self.imh.file_name
-        # self.path_to_data = self.hass.config.path(
-        #     STORAGE_DIR, CAMERA_STORAGE, f"auto_crop_{self.file_name}.json"
-        # )
 
     def check_trim(
         self, trimmed_height, trimmed_width, margin_size, image_array, file_name, rotate
@@ -70,19 +68,18 @@ class AutoCrop:
             )
         return trimmed_width, trimmed_height
 
-    async def _async_auto_crop_data(self):  # , tdata=None
+    async def _async_auto_crop_data(self, tdata=None):  # , tdata=None
         """Load the auto crop data from the Camera config."""
-        # todo: implement this method but from config data
-        # if not self.imh.auto_crop:
-        #     trims_data = TrimCropData.from_dict(dict(tdata)).to_list()
-        #     (
-        #         self.imh.trim_left,
-        #         self.imh.trim_up,
-        #         self.imh.trim_right,
-        #         self.imh.trim_down,
-        #     ) = trims_data
-        #     self._calculate_trimmed_dimensions()
-        #     return trims_data
+        if not self.imh.auto_crop:
+            trims_data = TrimCropData.from_dict(dict(tdata)).to_list()
+            (
+                self.imh.trim_left,
+                self.imh.trim_up,
+                self.imh.trim_right,
+                self.imh.trim_down,
+            ) = trims_data
+            self._calculate_trimmed_dimensions()
+            return trims_data
         return None
 
     def auto_crop_offset(self):
@@ -96,26 +93,13 @@ class AutoCrop:
     async def _init_auto_crop(self):
         """Initialize the auto crop data."""
         if not self.imh.auto_crop and self.imh.shared.vacuum_state == "docked":
-            self.imh.auto_crop = await self._async_auto_crop_data()
+            self.imh.auto_crop = await self._async_auto_crop_data(self.imh.shared.trims)
             if self.imh.auto_crop:
                 self.auto_crop_offset()
         else:
             self.imh.max_frames = 5
         return self.imh.auto_crop
 
-    # async def _async_save_auto_crop_data(self):
-    #     """Save the auto crop data to the disk."""
-    #     try:
-    #         if not os.path.exists(self.path_to_data):
-    #             data = TrimCropData(
-    #                 self.imh.trim_left,
-    #                 self.imh.trim_up,
-    #                 self.imh.trim_right,
-    #                 self.imh.trim_down,
-    #             ).to_dict()
-    #     except Exception as e:
-    #         _LOGGER.error(f"Failed to save trim data due to an error: {e}")
-
     async def async_image_margins(
         self, image_array: NumpyArray, detect_colour: Color
     ) -> tuple[int, int, int, int]:

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/colors.py

@@ -6,6 +6,7 @@ import logging
 from enum import StrEnum
 from typing import Dict, List, Tuple
 
+
 _LOGGER = logging.getLogger(__name__)
 
 Color = Tuple[int, int, int, int]  # RGBA color definition

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/rand25_parser.py

@@ -10,6 +10,7 @@ import struct
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, TypeVar
 
+
 _CallableT = TypeVar("_CallableT", bound=Callable[..., Any])
 
 

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/shared.py

@@ -6,6 +6,7 @@ Version: v2024.12.0
 
 import asyncio
 import logging
+from typing import Dict, List
 
 from .types import (
     ATTR_CALIBRATION_POINTS,
@@ -36,8 +37,10 @@ from .types import (
     DEFAULT_VALUES,
     CameraModes,
     Colors,
+    TrimsData,
 )
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -99,8 +102,23 @@ class CameraShared:
         self.map_pred_points = None  # Predefined points data
         self.map_new_path = None  # New path data
         self.map_old_path = None  # Old path data
-        self.trim_crop_data = None
         self.user_language = None  # User language
+        self.trim_crop_data = None
+        self.trims: Dict[TrimsData, int] = {
+            TrimsData.TRIM_LEFT: 0,
+            TrimsData.TRIM_UP: 0,
+            TrimsData.TRIM_RIGHT: 0,
+            TrimsData.TRIM_DOWN: 0,
+        }
+        self.skip_room_ids: List[str] = []
+
+    def get_trims_dictionary(self):
+        return {
+            "trim_left": self.trims.get(TrimsData.TRIM_LEFT, 0),
+            "trim_up": self.trims.get(TrimsData.TRIM_UP, 0),
+            "trim_right": self.trims.get(TrimsData.TRIM_RIGHT, 0),
+            "trim_down": self.trims.get(TrimsData.TRIM_DOWN, 0),
+        }
 
     def update_user_colors(self, user_colors):
         """Update the user colors."""
@@ -218,11 +236,24 @@ class CameraSharedManager:
             instance.vacuum_status_position = device_info.get(
                 CONF_VAC_STAT_POS, DEFAULT_VALUES["vac_status_position"]
             )
-
             # If enable_snapshots, check for png in www.
             instance.enable_snapshots = device_info.get(
                 CONF_SNAPSHOTS_ENABLE, DEFAULT_VALUES["enable_www_snapshots"]
             )
+            instance.trims = {
+                TrimsData.TRIM_LEFT: device_info.get(
+                    "trims_data", DEFAULT_VALUES["trims_data"]
+                ).get("trim_left", 0),
+                TrimsData.TRIM_UP: device_info.get(
+                    "trims_data", DEFAULT_VALUES["trims_data"]
+                ).get("trim_up", 0),
+                TrimsData.TRIM_RIGHT: device_info.get(
+                    "trims_data", DEFAULT_VALUES["trims_data"]
+                ).get("trim_right", 0),
+                TrimsData.TRIM_DOWN: device_info.get(
+                    "trims_data", DEFAULT_VALUES["trims_data"]
+                ).get("trim_down", 0),
+            }
 
         except TypeError as ex:
             _LOGGER.error("Shared data can't be initialized due to a TypeError! %s", ex)

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/types.py

@@ -7,11 +7,13 @@ import asyncio
 import json
 import logging
 from dataclasses import dataclass
+from enum import Enum
 from typing import Any, Dict, Tuple, Union
 
 import numpy as np
 from PIL import Image
 
+
 DEFAULT_ROOMS = 1
 
 MY_LOGGER = logging.getLogger(__name__)
@@ -283,6 +285,7 @@ DEFAULT_VALUES = {
     "vac_status_position": True,
     "get_svg_file": False,
     "save_trims": True,
+    "trims_data": {"trim_left": 0, "trim_up": 0, "trim_right": 0, "trim_down": 0},
     "enable_www_snapshots": False,
     "color_charger": [255, 128, 0],
     "color_move": [238, 247, 255],
@@ -344,6 +347,7 @@ KEYS_TO_UPDATE = [
     "offset_bottom",
     "offset_left",
     "offset_right",
+    "trims_data",
     "auto_zoom",
     "zoom_lock_ratio",
     "show_vac_status",
@@ -587,3 +591,12 @@ class CameraModes:
     CAMERA_STANDBY = "camera_standby"
     CAMERA_OFF = False
     CAMERA_ON = True
+
+
+class TrimsData(Enum):
+    """Constants for the trims data."""
+
+    TRIM_LEFT = "trim_left"
+    TRIM_UP = "trim_up"
+    TRIM_RIGHT = "trim_right"
+    TRIM_DOWN = "trim_down"

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/config/utils.py

@@ -4,10 +4,12 @@ import hashlib
 import json
 from dataclasses import dataclass
 from logging import getLogger
+from typing import Callable, List, Optional
 
-from PIL import Image, ImageOps
+from PIL import ImageOps
+
+from .types import ChargerPosition, ImageSize, NumpyArray, PilPNG, RobotPosition
 
-from .types import ChargerPosition, ImageSize, NumpyArray, RobotPosition
 
 _LOGGER = getLogger(__name__)
 
@@ -16,13 +18,13 @@ _LOGGER = getLogger(__name__)
 class ResizeParams:
     """Resize the image to the given dimensions and aspect ratio."""
 
-    pil_img: Image  # PIL image object
+    pil_img: PilPNG
     width: int
     height: int
-    aspect_ratio: str = None
-    crop_size: list = None
-    is_rand: bool = False
-    offset_func: callable = None  # Function reference for offset calculation
+    aspect_ratio: str
+    crop_size: List[int]
+    is_rand: Optional[bool] = False
+    offset_func: Optional[Callable] = None
 
 
 @dataclass
@@ -33,7 +35,7 @@ class OffsetParams:
     hsf: int
     width: int
     height: int
-    rand256: bool = False
+    rand256: Optional[bool] = False
 
 
 class BaseHandler:
@@ -91,7 +93,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_1_1(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 1:1."""
 
@@ -118,7 +120,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_2_1(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 2:1."""
 
@@ -146,7 +148,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_3_2(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 3:2."""
 
@@ -177,7 +179,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_5_4(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 5:4."""
 
@@ -209,7 +211,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_9_16(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 9:16."""
 
@@ -237,7 +239,7 @@ class BaseHandler:
         )
 
     def _set_image_offset_ratio_16_9(
-        self, width: int, height: int, rand256: bool = False
+        self, width: int, height: int, rand256: Optional[bool] = False
     ) -> None:
         """Set the image offset ratio to 16:9."""
 
@@ -298,8 +300,8 @@ class BaseHandler:
 
     @staticmethod
     async def calculate_array_hash(
-        layers: dict, active: list[int] = None
-    ) -> str or None:
+        layers: dict, active: Optional[List[int]]
+    ) -> str | None:
         """Calculate the hash of the image based on layers and active zones."""
         if layers and active:
             data_to_hash = {
@@ -499,7 +501,7 @@ async def async_resize_image(params: ResizeParams):
             str(hsf),
         )
 
-        if params.crop_size is not None:
+        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)
             params.crop_size[0], params.crop_size[1] = await params.offset_func(offset)
 
@@ -507,6 +509,7 @@ async def async_resize_image(params: ResizeParams):
 
     return ImageOps.pad(params.pil_img, (params.width, params.height))
 
+
 def prepare_resize_params(handler, pil_img, rand):
     """Prepare resize parameters for image resizing."""
     return ResizeParams(
@@ -516,5 +519,5 @@ def prepare_resize_params(handler, pil_img, rand):
         aspect_ratio=handler.shared.image_aspect_ratio,
         crop_size=handler.crop_img_size,
         offset_func=handler.async_map_coordinates_offset,
-        is_rand=rand
+        is_rand=rand,
     )

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/hypfer_draw.py

@@ -10,6 +10,7 @@ import logging
 
 from .config.types import Color, JsonType, NumpyArray, RobotPosition
 
+
 _LOGGER = logging.getLogger(__name__)
 
 

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/hypfer_handler.py

@@ -15,11 +15,12 @@ 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, TrimsData
 from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -41,10 +42,18 @@ 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_down = 0  # memory stored trims calculated once.
-        self.trim_left = 0  # memory stored trims calculated once.
-        self.trim_right = 0  # memory stored trims calculated once.
-        self.trim_up = 0  # memory stored trims calculated once.
+        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.
         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.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/rand25_handler.py

@@ -23,11 +23,13 @@ from .config.types import (
     PilPNG,
     RobotPosition,
     RoomsProperties,
+    TrimsData,
 )
 from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -51,10 +53,18 @@ class ReImageHandler(BaseHandler):
         self.room_propriety = None  # Room propriety data
         self.shared = camera_shared  # Shared data
         self.active_zones = None  # Active zones
-        self.trim_down = None  # Trim down
-        self.trim_left = None  # Trim left
-        self.trim_right = None  # Trim right
-        self.trim_up = None  # Trim up
+        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.
         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

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/SCR/valetudo_map_parser/reimg_draw.py

@@ -12,6 +12,7 @@ from .config.drawable import Drawable
 from .config.types import Color, JsonType, NumpyArray
 from .map_data import ImageData, RandImageData
 
+
 _LOGGER = logging.getLogger(__name__)
 
 

{valetudo_map_parser-0.1.9b22 → valetudo_map_parser-0.1.9b24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.9.b22"
+version = "0.1.9.b24"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"
@@ -41,8 +41,9 @@ lines_after_imports = 2
 
 # Pylint settings
 [tool.pylint]
-disable = ["C0103", "C0116", "R0902", "R0903", "R0913",
-    "R0914", "W0640", "R0917", "R0904", "R0915", "W0511"]
+disable = ["C0103", "C0116", "R0902", "R0903", "R0904","R0913",
+     "R0914", "R0917", "R0915", "W0640"]
+
 max-line-length = 120
 
 [build-system]