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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b24
+Version: 0.1.9b26
 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.9b24 → valetudo_map_parser-0.1.9b26}/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__)
@@ -68,10 +68,10 @@ class AutoCrop:
             )
         return trimmed_width, trimmed_height
 
-    async def _async_auto_crop_data(self, tdata=None):  # , tdata=None
+    async def _async_auto_crop_data(self, tdata: TrimsData = None):  # , tdata=None
         """Load the auto crop data from the Camera config."""
         if not self.imh.auto_crop:
-            trims_data = TrimCropData.from_dict(dict(tdata)).to_list()
+            trims_data = TrimCropData.from_dict(dict(tdata.to_dict())).to_list()
             (
                 self.imh.trim_left,
                 self.imh.trim_up,

{valetudo_map_parser-0.1.9b24 → valetudo_map_parser-0.1.9b26}/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,22 +104,9 @@ 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.from_dict(DEFAULT_VALUES["trims_data"])  # Trims data
         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."""
         self.user_colors = user_colors
@@ -240,20 +227,9 @@ class CameraSharedManager:
             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),
-            }
+            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.9b24 → valetudo_map_parser-0.1.9b26}/SCR/valetudo_map_parser/config/types.py

@@ -6,8 +6,7 @@ Version 0.0.1
 import asyncio
 import json
 import logging
-from dataclasses import dataclass
-from enum import Enum
+from dataclasses import dataclass, asdict
 from typing import Any, Dict, Tuple, Union
 
 import numpy as np
@@ -593,10 +592,35 @@ 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
+
+    @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),
+        )
 
-    TRIM_LEFT = "trim_left"
-    TRIM_UP = "trim_up"
-    TRIM_RIGHT = "trim_right"
-    TRIM_DOWN = "trim_down"
+    def to_json(self) -> str:
+        """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 TrimData to a dictionary."""
+        return asdict(self)

{valetudo_map_parser-0.1.9b24 → valetudo_map_parser-0.1.9b26}/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,11 @@ 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
+        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.9b24 → valetudo_map_parser-0.1.9b26}/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,11 @@ 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
+        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

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

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