Skip to content

Room Names added to RoomStore. #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sca075 merged 21 commits into from
Oct 14, 2025
Merged

Room Names added to RoomStore. #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b62ca85
change local _LOGGER to LOGGER and shared.py optimized parsed zone cl…
sca075 Oct 2, 2025
537417c
typing and other parser touches.
sca075 Oct 3, 2025
6dc6b5d
bump mvcrender and change the async to sync usage.
sca075 Oct 3, 2025
d76d7c1
bump mvcrender isort and ruff and replace blending and some drawing f…
sca075 Oct 4, 2025
85f2bdd
Merge branch 'main' into dev
sca075 Oct 4, 2025
3eaa9b9
corrections done
sca075 Oct 5, 2025
14c8b57
Merge remote-tracking branch 'origin/dev' into dev_main
Oct 5, 2025
06508c1
corrections duplicate logger
sca075 Oct 5, 2025
470f31c
removing unused code.
sca075 Oct 7, 2025
e4298db
delete auto_crop.py and color_utils.py as not used anymore
sca075 Oct 7, 2025
b3dd06a
ruff formatted and some mod on drawable.py
sca075 Oct 7, 2025
c9147c7
Merge branch 'main' into dev
sca075 Oct 7, 2025
588b6d8
changes
sca075 Oct 7, 2025
0a29d0c
remove duplicate
sca075 Oct 7, 2025
c88110d
remove potential memory leak from code.
sca075 Oct 8, 2025
c5d704a
drawable.py use now mcvrender for the most.
sca075 Oct 8, 2025
3a5c905
version bump
sca075 Oct 8, 2025
6738b14
test new battery state and add streaming to the data
sca075 Oct 11, 2025
fab2bb6
charging state updated
sca075 Oct 11, 2025
88120ab
added need room_names in RoomStore
sca075 Oct 14, 2025
8f4b91b
Merge branch 'main' into dev
sca075 Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions SCR/valetudo_map_parser/config/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,18 @@ def get_rooms_count(self) -> int:
return count if count > 0 else DEFAULT_ROOMS
return DEFAULT_ROOMS

@property
def room_names(self) -> dict:
"""Return room names in format {'room_0_name': 'SegmentID: RoomName', ...}."""
result = {}
if isinstance(self.vacuums_data, dict):
for idx, (segment_id, room_data) in enumerate(self.vacuums_data.items()):
if idx >= 16: # Max 16 rooms
break
room_name = room_data.get("name", f"Room {segment_id}")
result[f"room_{idx}_name"] = f"{segment_id}: {room_name}"
Comment on lines +131 to +135
Copy link

@coderabbitai coderabbitai bot Oct 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Add defensive check for room_data structure.

If room_data is not a dictionary (e.g., None, string, or other type), line 134 will raise an AttributeError when calling .get(). While the vacuums_data dict is expected to contain dict values, adding a defensive check improves robustness.

Apply this diff to add a type check:

         if isinstance(self.vacuums_data, dict):
             for idx, (segment_id, room_data) in enumerate(self.vacuums_data.items()):
                 if idx >= 16:  # Max 16 rooms
                     break
-                room_name = room_data.get("name", f"Room {segment_id}")
+                if isinstance(room_data, dict):
+                    room_name = room_data.get("name", f"Room {segment_id}")
+                else:
+                    room_name = f"Room {segment_id}"
                 result[f"room_{idx}_name"] = f"{segment_id}: {room_name}"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
for idx, (segment_id, room_data) in enumerate(self.vacuums_data.items()):
if idx >= 16: # Max 16 rooms
break
room_name = room_data.get("name", f"Room {segment_id}")
result[f"room_{idx}_name"] = f"{segment_id}: {room_name}"
if isinstance(self.vacuums_data, dict):
for idx, (segment_id, room_data) in enumerate(self.vacuums_data.items()):
if idx >= 16: # Max 16 rooms
break
if isinstance(room_data, dict):
room_name = room_data.get("name", f"Room {segment_id}")
else:
room_name = f"Room {segment_id}"
result[f"room_{idx}_name"] = f"{segment_id}: {room_name}"
🤖 Prompt for AI Agents 
In SCR/valetudo_map_parser/config/types.py around lines 131 to 135, the loop
assumes room_data is a dict and calls room_data.get(...), which can raise
AttributeError if room_data is None or another type; add a defensive type check
(e.g., if not isinstance(room_data, dict) then treat room_name as a fallback
like str(room_data) or use a default name) before calling .get(), preserve the
existing early-break at 16 rooms, and ensure result[f"room_{idx}_name"] is
always assigned a safe string.

return result

@classmethod
def get_all_instances(cls) -> Dict[str, "RoomStore"]:
return cls._instances
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "valetudo-map-parser"
version = "0.1.11b1"
version = "0.1.11"
description = "A Python library to parse Valetudo map data returning a PIL Image object."
authors = ["Sandro Cantarella <gsca075@gmail.com>"]
license = "Apache-2.0"
Expand Down