Merge branch 'main' into l01_new_format

Author: Lash-L

.github/dependabot.yml

@@ -6,7 +6,7 @@ updates:
     schedule:
       interval: "weekly"
 
-  - package-ecosystem: "pip"
+  - package-ecosystem: "uv"
     directory: "/"
     schedule:
       interval: "weekly"

.github/workflows/ci.yml

@@ -49,6 +49,56 @@ jobs:
       - name: Test with Pytest
         run:  uv run pytest --log-cli-level=DEBUG -vv -s
         shell: bash
+
+  build:
+    name: Build Package
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/main'
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.11"
+          activate-environment: true
+      - name: Build package
+        run: uv build
+
+  # Test semantic-release configuration on PR branches
+  test-release:
+    name: Test Semantic Release
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+      - name: Setup Git for Semantic Release Testing
+        run: |
+          # Setup a temp branch to test
+          git checkout -B temp-main-branch
+          git merge ${{ github.event.pull_request.head.sha }} --no-edit
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+      - name: Test Semantic Release (No-op)
+        id: test-release
+        uses: python-semantic-release/python-semantic-release@v10.4.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          changelog: true
+          # Use noop mode to test without making changes
+          no_operation_mode: true
+      - name: Test Semantic Release (Dry Run)
+        id: test-release-dry
+        uses: python-semantic-release/python-semantic-release@v10.4.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          changelog: true
+          # Use dry run mode to test without committing
+          commit: false
+          tag: false
+          push: false
+          vcs_release: false
   release:
     runs-on: ubuntu-latest
     needs:
@@ -79,10 +129,13 @@ jobs:
 
     - name: Publish package distributions to PyPI
       uses: pypa/gh-action-pypi-publish@v1.13.0
-
       # NOTE: DO NOT wrap the conditional in ${{ }} as it will always evaluate to true.
       # See https://github.com/actions/runner/issues/1173
       if: steps.release.outputs.released == 'true'
+      with:
+        packages-dir: dist
+        print-hash: true
+        verbose: true
 
     - name: Publish package distributions to GitHub Releases
       uses: python-semantic-release/publish-action@v10.4.1

.pre-commit-config.yaml

@@ -39,3 +39,9 @@ repos:
             -   id: mypy
                 exclude: cli.py
                 additional_dependencies: [ "types-paho-mqtt" ]
+    -   repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
+        rev: v9.23.0
+        hooks:
+            -   id: commitlint
+                stages: [commit-msg]
+                additional_dependencies: ['@commitlint/config-conventional']

CHANGELOG.md

@@ -2,6 +2,93 @@
 
 <!-- version list -->
 
+## v3.1.2 (2025-10-25)
+
+### Bug Fixes
+
+- Move semantic release build command
+  ([`8ed178d`](https://github.com/Python-roborock/python-roborock/commit/8ed178d9f75245bde3ffcebbf8ef18e171ba563d))
+
+
+## v3.1.1 (2025-10-25)
+
+### Bug Fixes
+
+- Explicitly pip install uv in release
+  ([`4409ee9`](https://github.com/Python-roborock/python-roborock/commit/4409ee90694e9b3389342692f30fbf3706f2f00c))
+
+### Chores
+
+- Add pre commit step for commitlint
+  ([#563](https://github.com/Python-roborock/python-roborock/pull/563),
+  [`14c811f`](https://github.com/Python-roborock/python-roborock/commit/14c811f30f0bb1f574be59e759aecab5ca61cd65))
+
+
+## v3.1.0 (2025-10-25)
+
+### Bug Fixes
+
+- Fix enum names to include `none` states
+  ([#561](https://github.com/Python-roborock/python-roborock/pull/561),
+  [`82f6dc2`](https://github.com/Python-roborock/python-roborock/commit/82f6dc29d55fd4f8565312af3cf60abf8abba56c))
+
+### Chores
+
+- Add a temp main branch for testing
+  ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Build system to make sure it doesn't break
+  ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Fix branches ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Fix changelog ([#552](https://github.com/Python-roborock/python-roborock/pull/552),
+  [`e2073ed`](https://github.com/Python-roborock/python-roborock/commit/e2073edc655c1a91caae5f05e1377aebfad2938e))
+
+- Fix test release ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Get uv release to work properly
+  ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Switch dependabot from pip to uv
+  ([#554](https://github.com/Python-roborock/python-roborock/pull/554),
+  [`9377e9a`](https://github.com/Python-roborock/python-roborock/commit/9377e9ac305f45339b022b5ef8f0c16b58732300))
+
+- Try running a test release on every PR
+  ([#562](https://github.com/Python-roborock/python-roborock/pull/562),
+  [`7592255`](https://github.com/Python-roborock/python-roborock/commit/75922550bad8f5fc4ece1f2f4a6be74ebb3849c2))
+
+- Update snapshot ([#555](https://github.com/Python-roborock/python-roborock/pull/555),
+  [`b45ad3c`](https://github.com/Python-roborock/python-roborock/commit/b45ad3c487b21639a1f2ba148fe69836b11024c4))
+
+- Update spelling from co-pilot suggestion
+  ([#555](https://github.com/Python-roborock/python-roborock/pull/555),
+  [`b45ad3c`](https://github.com/Python-roborock/python-roborock/commit/b45ad3c487b21639a1f2ba148fe69836b11024c4))
+
+- Update test assertion for network info
+  ([#558](https://github.com/Python-roborock/python-roborock/pull/558),
+  [`b34abde`](https://github.com/Python-roborock/python-roborock/commit/b34abde2e3401c463e7fb821bae1cf20a325ec6d))
+
+- **deps**: Bump ruff from 0.14.0 to 0.14.1
+  ([#553](https://github.com/Python-roborock/python-roborock/pull/553),
+  [`df438f7`](https://github.com/Python-roborock/python-roborock/commit/df438f7a293fb0c1f1b3cfaf3691eafaa8a3fd8b))
+
+### Features
+
+- Add a trait for reading NetworkInfo from the device
+  ([#558](https://github.com/Python-roborock/python-roborock/pull/558),
+  [`b34abde`](https://github.com/Python-roborock/python-roborock/commit/b34abde2e3401c463e7fb821bae1cf20a325ec6d))
+
+- Combine the clean record trait with the clean summary
+  ([#555](https://github.com/Python-roborock/python-roborock/pull/555),
+  [`b45ad3c`](https://github.com/Python-roborock/python-roborock/commit/b45ad3c487b21639a1f2ba148fe69836b11024c4))
+
+
 ## v3.0.0 (2025-10-20)
 
 ### Features

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-roborock"
-version = "3.0.0"
+version = "3.1.2"
 description = "A package to control Roborock vacuums."
 authors = [{ name = "humbertogontijo", email = "humbertogontijo@users.noreply.github.com" }, {name="Lash-L"}, {name="allenporter"}]
 requires-python = ">=3.11, <4"
@@ -69,15 +69,18 @@ build-backend = "hatchling.build"
 [tool.semantic_release]
 branch = "main"
 version_toml = ["pyproject.toml:project.version"]
-build_command = """
-    python -m pip install -e '.[build]'
-    uv lock --upgrade-package "$PACKAGE_NAME"
-    git add uv.lock
-    uv build
-"""
+build_command = "pip install uv && uv lock --upgrade-package python-roborock && git add uv.lock && uv build"
 changelog_file = 'CHANGELOG.md'
 commit = true
 
+[tool.semantic_release.branches.main]
+match = "main"
+prerelease = false
+
+[tool.semantic_release.branches.temp-main-branch]
+match = "temp-main-branch"
+prerelease = false
+
 
 [tool.semantic_release.commit_parser_options]
 allowed_tags = [

roborock/cli.py

@@ -731,6 +731,16 @@ async def home(ctx, device_id: str, refresh: bool):
         click.echo("No maps discovered")
 
 
+@session.command()
+@click.option("--device_id", required=True)
+@click.pass_context
+@async_command
+async def network_info(ctx, device_id: str):
+    """Get device network information."""
+    context: RoborockContext = ctx.obj
+    await _display_v1_trait(context, device_id, lambda v1: v1.network_info)
+
+
 @click.command()
 @click.option("--device_id", required=True)
 @click.option("--cmd", required=True)
@@ -979,6 +989,7 @@ def write_markdown_table(product_features: dict[str, dict[str, any]], all_featur
 cli.add_command(dnd)
 cli.add_command(flow_led_status)
 cli.add_command(led_status)
+cli.add_command(network_info)
 
 
 def main():

roborock/data/v1/v1_containers.py

@@ -156,15 +156,15 @@ def square_meter_clean_area(self) -> float | None:
 
     @property
     def error_code_name(self) -> str | None:
-        return self.error_code.name if self.error_code else None
+        return self.error_code.name if self.error_code is not None else None
 
     @property
     def state_name(self) -> str | None:
-        return self.state.name if self.state else None
+        return self.state.name if self.state is not None else None
 
     @property
     def water_box_mode_name(self) -> str | None:
-        return self.water_box_mode.name if self.water_box_mode else None
+        return self.water_box_mode.name if self.water_box_mode is not None else None
 
     @property
     def fan_power_options(self) -> list[str]:
@@ -174,11 +174,11 @@ def fan_power_options(self) -> list[str]:
 
     @property
     def fan_power_name(self) -> str | None:
-        return self.fan_power.name if self.fan_power else None
+        return self.fan_power.name if self.fan_power is not None else None
 
     @property
     def mop_mode_name(self) -> str | None:
-        return self.mop_mode.name if self.mop_mode else None
+        return self.mop_mode.name if self.mop_mode is not None else None
 
     def get_fan_speed_code(self, fan_speed: str) -> int:
         if self.fan_power is None:
@@ -449,6 +449,12 @@ def __repr__(self) -> str:
         return _attr_repr(self)
 
 
+class CleanSummaryWithDetail(CleanSummary):
+    """CleanSummary with the last CleanRecord included."""
+
+    last_clean_record: CleanRecord | None = None
+
+
 @dataclass
 class Consumable(RoborockBase):
     main_brush_work_time: int | None = None

roborock/devices/device_manager.py

@@ -157,6 +157,7 @@ def device_creator(home_data: HomeData, device: HomeDataDevice, product: HomeDat
             case DeviceVersion.V1:
                 channel = create_v1_channel(user_data, mqtt_params, mqtt_session, device, cache)
                 trait = v1.create(
+                    device.duid,
                     product,
                     home_data,
                     channel.rpc_channel,

roborock/devices/traits/v1/__init__.py

@@ -42,7 +42,6 @@
 from roborock.map.map_parser import MapParserConfig
 
 from .child_lock import ChildLockTrait
-from .clean_record import CleanRecordTrait
 from .clean_summary import CleanSummaryTrait
 from .command import CommandTrait
 from .common import V1TraitMixin
@@ -55,6 +54,7 @@
 from .led_status import LedStatusTrait
 from .map_content import MapContentTrait
 from .maps import MapsTrait
+from .network_info import NetworkInfoTrait
 from .rooms import RoomsTrait
 from .smart_wash_params import SmartWashParamsTrait
 from .status import StatusTrait
@@ -70,7 +70,6 @@
     "StatusTrait",
     "DoNotDisturbTrait",
     "CleanSummaryTrait",
-    "CleanRecordTrait",
     "SoundVolumeTrait",
     "MapsTrait",
     "MapContentTrait",
@@ -85,6 +84,7 @@
     "DustCollectionModeTrait",
     "WashTowelModeTrait",
     "SmartWashParamsTrait",
+    "NetworkInfoTrait",
 ]
 
 
@@ -100,14 +100,14 @@ class PropertiesApi(Trait):
     command: CommandTrait
     dnd: DoNotDisturbTrait
     clean_summary: CleanSummaryTrait
-    clean_record: CleanRecordTrait
     sound_volume: SoundVolumeTrait
     rooms: RoomsTrait
     maps: MapsTrait
     map_content: MapContentTrait
     consumables: ConsumableTrait
     home: HomeTrait
     device_features: DeviceFeaturesTrait
+    network_info: NetworkInfoTrait
 
     # Optional features that may not be supported on all devices
     child_lock: ChildLockTrait | None = None
@@ -120,6 +120,7 @@ class PropertiesApi(Trait):
 
     def __init__(
         self,
+        device_uid: str,
         product: HomeDataProduct,
         home_data: HomeData,
         rpc_channel: V1RpcChannel,
@@ -129,20 +130,20 @@ def __init__(
         map_parser_config: MapParserConfig | None = None,
     ) -> None:
         """Initialize the V1TraitProps."""
+        self._device_uid = device_uid
         self._rpc_channel = rpc_channel
         self._mqtt_rpc_channel = mqtt_rpc_channel
         self._map_rpc_channel = map_rpc_channel
         self._cache = cache
 
         self.status = StatusTrait(product)
-        self.clean_summary = CleanSummaryTrait()
-        self.clean_record = CleanRecordTrait(self.clean_summary)
         self.consumables = ConsumableTrait()
         self.rooms = RoomsTrait(home_data)
         self.maps = MapsTrait(self.status)
         self.map_content = MapContentTrait(map_parser_config)
         self.home = HomeTrait(self.status, self.maps, self.rooms, cache)
         self.device_features = DeviceFeaturesTrait(product.product_nickname, cache)
+        self.network_info = NetworkInfoTrait(device_uid, cache)
 
         # Dynamically create any traits that need to be populated
         for item in fields(self):
@@ -248,6 +249,7 @@ async def _set_cached_trait_data(self, name: str, value: Any) -> None:
 
 
 def create(
+    device_uid: str,
     product: HomeDataProduct,
     home_data: HomeData,
     rpc_channel: V1RpcChannel,
@@ -257,4 +259,13 @@ def create(
     map_parser_config: MapParserConfig | None = None,
 ) -> PropertiesApi:
     """Create traits for V1 devices."""
-    return PropertiesApi(product, home_data, rpc_channel, mqtt_rpc_channel, map_rpc_channel, cache, map_parser_config)
+    return PropertiesApi(
+        device_uid,
+        product,
+        home_data,
+        rpc_channel,
+        mqtt_rpc_channel,
+        map_rpc_channel,
+        cache,
+        map_parser_config,
+    )