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

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

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

@@ -8,7 +8,7 @@ import logging
 import numpy as np
 from numpy import rot90
 
-from .types import Color, NumpyArray, TrimCropData
+from .types import Color, NumpyArray, TrimCropData, TrimsData
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -28,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
@@ -71,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: TrimsData = 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_dict())).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):
@@ -97,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.9b23 → valetudo_map_parser-0.1.9b25}/SCR/valetudo_map_parser/config/shared.py

@@ -104,12 +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: Dict[TrimsData, int] = {
-            TrimsData.TRIM_LEFT: 0,
-            TrimsData.TRIM_UP: 0,
-            TrimsData.TRIM_RIGHT: 0,
-            TrimsData.TRIM_DOWN: 0,
-        }
+        self.trims = TrimsData  # Trims data
         self.skip_room_ids: List[str] = []
 
     def update_user_colors(self, user_colors):
@@ -228,11 +223,13 @@ 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.from_dict(
+                device_info.get("trims_data", DEFAULT_VALUES["trims_data"])
+            )
 
         except TypeError as ex:
             _LOGGER.error("Shared data can't be initialized due to a TypeError! %s", ex)

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

@@ -6,7 +6,7 @@ Version 0.0.1
 import asyncio
 import json
 import logging
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 from enum import Enum
 from typing import Any, Dict, Tuple, Union
 
@@ -285,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],
@@ -346,6 +347,7 @@ KEYS_TO_UPDATE = [
     "offset_bottom",
     "offset_left",
     "offset_right",
+    "trims_data",
     "auto_zoom",
     "zoom_lock_ratio",
     "show_vac_status",
@@ -591,10 +593,30 @@ class CameraModes:
     CAMERA_ON = True
 
 
-class TrimsData(Enum):
-    """Constants for the trims data."""
+@dataclass
+class TrimsData:
+    """Dataclass to store and manage trims data."""
+
+    trim_left: int = 0
+    trim_up: int = 0
+    trim_right: int = 0
+    trim_down: int = 0
 
-    TRIM_LEFT = "trim_left"
-    TRIM_UP = "trim_up"
-    TRIM_RIGHT = "trim_right"
-    TRIM_DOWN = "trim_down"
+    @classmethod
+    def from_json(cls, json_data: str):
+        """Create a TrimsConfig instance from a JSON string."""
+        data = json.loads(json_data)
+        return cls(
+            trim_left=data.get("trim_left", 0),
+            trim_up=data.get("trim_up", 0),
+            trim_right=data.get("trim_right", 0),
+            trim_down=data.get("trim_down", 0),
+        )
+
+    def to_json(self) -> str:
+        """Convert TrimsConfig instance to a JSON string."""
+        return json.dumps(asdict(self))
+
+    def to_dict(self) -> dict:
+        """Convert TrimsConfig instance to a dictionary."""
+        return asdict(self)

{valetudo_map_parser-0.1.9b23 → valetudo_map_parser-0.1.9b25}/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, TrimsData
 from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
@@ -42,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.9b23 → valetudo_map_parser-0.1.9b25}/SCR/valetudo_map_parser/rand25_handler.py

@@ -23,6 +23,7 @@ from .config.types import (
     PilPNG,
     RobotPosition,
     RoomsProperties,
+    TrimsData,
 )
 from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
@@ -52,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.9b23 → valetudo_map_parser-0.1.9b25}/pyproject.toml

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