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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b21
+Version: 0.1.9b23
 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.9b21 → valetudo_map_parser-0.1.9b23}/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.9b21 → valetudo_map_parser-0.1.9b23}/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__)
 
 

{valetudo_map_parser-0.1.9b21 → valetudo_map_parser-0.1.9b23}/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.9b21 → valetudo_map_parser-0.1.9b23}/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.9b21 → valetudo_map_parser-0.1.9b23}/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,15 @@ 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 update_user_colors(self, user_colors):
         """Update the user colors."""

{valetudo_map_parser-0.1.9b21 → valetudo_map_parser-0.1.9b23}/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__)
@@ -587,3 +589,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.9b21 → valetudo_map_parser-0.1.9b23}/SCR/valetudo_map_parser/config/utils.py

@@ -1,13 +1,15 @@
 """Utility code for the valetudo map parser."""
 
-from dataclasses import dataclass
 import hashlib
 import json
+from dataclasses import dataclass
 from logging import getLogger
+from typing import Callable, List, Optional
+
+from PIL import ImageOps
 
-from PIL import ImageOps, Image
+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,12 +501,23 @@ 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
-            )
+            params.crop_size[0], params.crop_size[1] = await params.offset_func(offset)
 
         return ImageOps.pad(params.pil_img, (new_width, new_height))
 
     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(
+        pil_img=pil_img,
+        width=handler.shared.image_ref_width,
+        height=handler.shared.image_ref_height,
+        aspect_ratio=handler.shared.image_aspect_ratio,
+        crop_size=handler.crop_img_size,
+        offset_func=handler.async_map_coordinates_offset,
+        is_rand=rand,
+    )

{valetudo_map_parser-0.1.9b21 → valetudo_map_parser-0.1.9b23}/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.9b21 → valetudo_map_parser-0.1.9b23}/SCR/valetudo_map_parser/hypfer_handler.py

@@ -16,10 +16,11 @@ 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.utils import BaseHandler, ResizeParams
+from .config.utils import BaseHandler, prepare_resize_params
 from .hypfer_draw import ImageDraw as ImDraw
 from .map_data import ImageData
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -247,15 +248,7 @@ class HypferMapImageHandler(BaseHandler):
             del img_np_array
             # reduce the image size if the zoomed image is bigger then the original.
             if self.check_zoom_and_aspect_ratio():
-                resize_params = ResizeParams(
-                    pil_img=pil_img,
-                    width=self.shared.image_ref_width,
-                    height=self.shared.image_ref_height,
-                    aspect_ratio=self.shared.image_aspect_ratio,
-                    crop_size=self.crop_img_size,
-                    offset_func=self.async_map_coordinates_offset,
-                    is_rand=False,
-                )
+                resize_params = prepare_resize_params(self, pil_img, False)
                 resized_image = await self.async_resize_images(resize_params)
                 return resized_image
             _LOGGER.debug("%s: Frame Completed.", self.file_name)

{valetudo_map_parser-0.1.9b21 → valetudo_map_parser-0.1.9b23}/SCR/valetudo_map_parser/rand25_handler.py

@@ -24,10 +24,11 @@ from .config.types import (
     RobotPosition,
     RoomsProperties,
 )
-from .config.utils import BaseHandler, ResizeParams
+from .config.utils import BaseHandler, prepare_resize_params
 from .map_data import RandImageData
 from .reimg_draw import ImageDraw
 
+
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -257,15 +258,7 @@ class ReImageHandler(BaseHandler):
 
     async def _finalize_image(self, pil_img):
         if self.check_zoom_and_aspect_ratio():
-            resize_params = ResizeParams(
-                pil_img=pil_img,
-                width=self.shared.image_ref_width,
-                height=self.shared.image_ref_height,
-                aspect_ratio=self.shared.image_aspect_ratio,
-                crop_size=self.crop_img_size,
-                offset_func=self.async_map_coordinates_offset,
-                is_rand=True,
-            )
+            resize_params = prepare_resize_params(self, pil_img, True)
             pil_img = await self.async_resize_images(resize_params)
         _LOGGER.debug("%s: Frame Completed.", self.file_name)
         return pil_img

{valetudo_map_parser-0.1.9b21 → valetudo_map_parser-0.1.9b23}/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.9b21 → valetudo_map_parser-0.1.9b23}/pyproject.toml

@@ -1,13 +1,12 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.9.b21"
+version = "0.1.9.b23"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"
 readme = "README.md"
 packages = [{include = "valetudo_map_parser", from = "SCR"}]
 
-
 [tool.poetry.urls]
 "Homepage" = "https://github.com/sca075/Python-package-valetudo-map-parser"
 "Repository" = "https://github.com/sca075/Python-package-valetudo-map-parser"
@@ -19,43 +18,32 @@ python = ">=3.12"
 numpy = ">=1.26.4"
 Pillow = ">=10.3.0"
 
-[poetry.group.dev.dependencies]
-black = "*"
-mypy = "*"
+[tool.poetry.group.dev.dependencies]
 ruff = "*"
 isort = "*"
 pylint = "*"
 types-Pillow = "*"
 
-[tool.black]
-line-length = 120
+# Ruff settings
+[tool.ruff.format]
 
+# isort settings (compatible with Ruff)
 [tool.isort]
 profile = "black"
 line_length = 120
-
-[tool.mypy]
-platform = "linux"
-
-check_untyped_defs = true
-disallow_any_generics = true
-disallow_incomplete_defs = true
-disallow_subclassing_any = true
-disallow_untyped_calls = true
-disallow_untyped_defs = true
-disallow_untyped_decorators = true
-no_implicit_optional = true
-no_implicit_reexport = true
-strict_optional = true
-warn_incomplete_stub = true
-warn_no_return = true
-warn_redundant_casts = true
-warn_return_any = true
-warn_unused_configs = true
-warn_unused_ignores = true
-
+known_first_party = ["valetudo_map_parser"]
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+ensure_newline_before_comments = true
+lines_after_imports = 2
+
+# Pylint settings
 [tool.pylint]
-disable = ["C0103", "C0116", "R0902", "R0903", "R0913", "R0914", "W0640"]
+disable = ["C0103", "C0116", "R0902", "R0903", "R0904","R0913",
+     "R0914", "R0917", "R0915", "W0640"]
+
 max-line-length = 120
 
 [build-system]