rustuya-local 0.1.0.dev10__tar.gz → 0.1.0.dev12__tar.gz

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/CHANGELOG.md

@@ -8,6 +8,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [0.1.0.dev12] — 2026-10-18
+
+### Changed
+- Promote the 0.1 development line to master; preserve the previous 0.0 line on `legacy/0.0.x`.
+- Publish retained IL descriptors at `<prefix>/<id>/descriptor`. Reserve `descriptor` and `reject` as property names.
+  Reconciliation and purge use the new descriptor path; old root topics are left untouched.
+
+## [0.1.0.dev11] — 2026-10-18
+
+### Changed
+- Decide which drivers a reload replaces with tuya-interpreter's public `TuyaDriver.same_config` instead of
+  comparing its version-specific state snapshot; require tuya-interpreter 0.1.0rc2.
+
 ## [0.1.0.dev10] — 2026-10-18
 
 ### Changed

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rustuya-local
-Version: 0.1.0.dev10
+Version: 0.1.0.dev12
 Summary: Local Tuya control: rustuya-bridge -> tuya-interpreter -> IL (ildevice). HA-independent core.
 Project-URL: Homepage, https://github.com/3735943886/rustuya-local
 Project-URL: Repository, https://github.com/3735943886/rustuya-local
@@ -10,7 +10,7 @@ License-File: LICENSE
 Requires-Python: >=3.13
 Requires-Dist: paho-mqtt>=2.0
 Requires-Dist: pyrustuyabridge>=0.4
-Requires-Dist: tuya-interpreter>=0.1.0a2
+Requires-Dist: tuya-interpreter>=0.1.0rc2
 Provides-Extra: fullstack
 Requires-Dist: tuyamock; extra == 'fullstack'
 Provides-Extra: manager

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/custom_components/rustuya/manifest.json

@@ -9,12 +9,12 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/3735943886/rustuya-local/issues",
   "requirements": [
-    "tuya-interpreter>=0.1.0a2",
+    "tuya-interpreter>=0.1.0rc2",
     "paho-mqtt>=2.0",
     "rustuya-manager>=0.2.3",
     "pyrustuyabridge>=0.4",
-    "rustuya-local>=0.1.0.dev10"
+    "rustuya-local>=0.1.0.dev12"
   ],
   "single_config_entry": true,
-  "version": "0.1.0.dev10"
+  "version": "0.1.0.dev12"
 }

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/docs/ARCHITECTURE.md

@@ -34,6 +34,15 @@ ildevice-homeassistant / other IL consumers
 
 HA entity creation belongs to the IL consumer. The base package does not import Home Assistant.
 
+## IL topics
+
+Descriptors are retained at `<prefix>/<id>/descriptor`; property values stay at
+`<prefix>/<id>/<prop>` and commands at `<prefix>/<id>/<prop>/set`.
+`descriptor` and `reject` are reserved property names. Consumers can discover devices by
+subscribing to `<prefix>/+/descriptor`. The consumer must support this descriptor layout.
+Reconciliation and purge identify owned devices only through this descriptor path.
+Other topics, including `<prefix>/<id>`, are ignored and left untouched.
+
 ## Startup and shutdown
 
 `Service.start()` prepares the native library and rules in worker threads, then connects the bridge and IL transports

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/docs/REVIEW.md

@@ -71,7 +71,8 @@ reproduction. README, architecture and migration notes now explain actual preced
 
 ## Remaining maintenance considerations
 
-- `Hub._same` depends on driver state keys `block`, `delta` and `covers`; check compatibility when dependencies change.
+- ~~`Hub._same` depends on driver state keys `block`, `delta` and `covers`.~~ Resolved: the reload comparison uses
+  tuya-interpreter's public `TuyaDriver.same_config`.
 - `manager_registry.ready_registry` patches private manager methods/fields; a public registry contract would reduce coupling.
 - Producer probing is a startup check, not atomic exclusion of two simultaneously starting producers.
 - Bridge status has no request ID; contiguous-page validation cannot perfectly distinguish all other-client responses.

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/docs/ROADMAP.md

@@ -15,7 +15,7 @@ Completed milestones and earlier deployment records are preserved in the [previo
 ## Maintenance
 
 - [x] Replace private manager registry patches and wizard state polling with public async contracts.
-- [ ] Reduce dependence on driver state internals in `Hub._same` through a public contract.
+- [x] Reduce dependence on driver state internals in `Hub._same` through a public contract (`TuyaDriver.same_config`).
 - [ ] Verify Python 3.13 with minimum supported dependency versions. The full CI suite uses 3.14; wheel import/CLI smoke tests pass on 3.13.
 - [ ] Define the supported drop-in OS/architectures and provide platform assets as needed. Each archive includes its build host's native library.
 - [ ] Verify ownership/conflict policy when manual file editing, IL settings saves and automatic pack updates overlap.

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/docs/STATUS.md

@@ -1,6 +1,6 @@
 # Current status
 
-Updated: 2026-10-18. Baseline: `0.1.0.dev10`.
+Updated: 2026-10-18. Baseline: `0.1.0.dev11`.
 The state of deployed servers has not been checked.
 
 ## Implementation
@@ -12,9 +12,9 @@ rule files and settings persistence. It does not create HA entities or publish M
 
 | Component | Declared requirement |
 |---|---|
-| rustuya-local | `0.1.0.dev10` |
+| rustuya-local | `0.1.0.dev11` |
 | Python | Base package `>=3.13`; full tests use 3.14 |
-| tuya-interpreter | `>=0.1.0a2` |
+| tuya-interpreter | `>=0.1.0rc2` |
 | pyrustuyabridge | `>=0.4` |
 | paho-mqtt | `>=2.0` |
 | rustuya-manager | `>=0.2.3` in the manager test extra and HA manifest |

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rustuya-local"
-version = "0.1.0.dev10"
+version = "0.1.0.dev12"
 description = "Local Tuya control: rustuya-bridge -> tuya-interpreter -> IL (ildevice). HA-independent core."
 readme = "README.md"
 requires-python = ">=3.13"
 license = "MIT"
-dependencies = ["tuya-interpreter>=0.1.0a2", "pyrustuyabridge>=0.4", "paho-mqtt>=2.0"]
+dependencies = ["tuya-interpreter>=0.1.0rc2", "pyrustuyabridge>=0.4", "paho-mqtt>=2.0"]
 # rustuya-manager (custom_components/rustuya's config flow) is optional at the package level (the HA manifest
 # pulls it in); declared here too so the venv used for this repo's tests has it. pyrustuyabridge is a base dependency
 # now (not just for the embedded bridge): rustuya-local's own bridge_client uses it to interpret rustuya-bridge's

rustuya_local-0.1.0.dev12/release-notes.md

@@ -0,0 +1,4 @@
+### Changed
+- Promote the 0.1 development line to master; preserve the previous 0.0 line on `legacy/0.0.x`.
+- Publish retained IL descriptors at `<prefix>/<id>/descriptor`. Reserve `descriptor` and `reject` as property names.
+  Reconciliation and purge use the new descriptor path; old root topics are left untouched.

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/src/rustuya_local/host/hub.py

@@ -87,15 +87,6 @@ class Hub:
         if not usable_id(device_id):
             raise ValueError(f'device id {device_id!r} is not usable as an il-mqtt topic level (M-2)')
 
-    @staticmethod
-    def _same(old: TuyaDriver, new: TuyaDriver) -> bool:
-        # Version-specific driver configuration metadata, compared without interpreting Tuya DPs.
-        return (old.rules_id == new.rules_id
-                and old.state['block'] == new.state['block']
-                and old.state['delta'] == new.state['delta']
-                and old.descriptor == new.descriptor
-                and [c['settings'] for c in old.state['covers']] == [c['settings'] for c in new.state['covers']])
-
     def _adopt(self, old: TuyaDriver | None, new: TuyaDriver, seed: Sequence, now: float,
                *, rules: dict) -> list:
         device_id = new.descriptor['id']
@@ -160,7 +151,7 @@ class Hub:
         replacements = {}
         for device_id, new in fresh.items():
             old = self.drivers[device_id]
-            if self._same(old, new):
+            if old.same_config(new):
                 continue
             seed = [Connected()] if old.linked else []
             if old.synced:

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/src/rustuya_local/host/il.py

@@ -72,7 +72,7 @@ class IlTopics:
         self.prefix, self.source = prefix, source
 
     def descriptor(self, device_id: str) -> str:
-        return f"{self.prefix}/{device_id}"
+        return f"{self.prefix}/{device_id}/descriptor"
 
     def state(self, device_id: str, prop: str) -> str:
         return f"{self.prefix}/{device_id}/{prop}"
@@ -106,6 +106,9 @@ class IlTopics:
         actions = []
         for output in outputs:
             if isinstance(output, Descriptor):
+                reserved = {"descriptor", "reject"} & output.desc.get("props", {}).keys()
+                if reserved:
+                    raise ValueError(f"reserved IL property names: {', '.join(sorted(reserved))}")
                 desc = {**output.desc, "source": self.source}
                 actions.append(Publish(IL, self.descriptor(device_id), json.dumps(desc, ensure_ascii=False), True))
             elif isinstance(output, Value):

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/src/rustuya_local/service.py

@@ -360,8 +360,10 @@ class Service:
 def _owned_ids(retained: dict, prefix: str, source: str) -> set[str]:
     ids = set()
     for topic, payload in retained.items():
-        device_id = topic[len(prefix) + 1:]
-        if "/" in device_id or device_id.startswith("_"):
+        if not topic.startswith(f"{prefix}/") or not topic.endswith("/descriptor"):
+            continue
+        device_id = topic[len(prefix) + 1:-len("/descriptor")]
+        if "/" in device_id or not device_id or device_id.startswith("_"):
             continue
         try:
             desc = json.loads(payload)
@@ -373,8 +375,9 @@ def _owned_ids(retained: dict, prefix: str, source: str) -> set[str]:
 
 
 def _device_topics(retained: dict, prefix: str, ids: set[str]) -> list[str]:
-    descriptors = {f"{prefix}/{i}" for i in ids}
-    return sorted((t for t in retained if t[len(prefix) + 1:].split("/", 1)[0] in ids),
+    descriptors = {f"{prefix}/{i}/descriptor" for i in ids}
+    roots = tuple(f"{prefix}/{i}/" for i in ids)
+    return sorted((t for t in retained if t.startswith(roots)),
                   key=lambda t: (t in descriptors, t))
 
 
@@ -382,8 +385,9 @@ async def purge_il(il: Transport, prefix: str, source: str, *, settle: float = 0
     """Take a producer out of IL for good (the integration deleted, not just stopped): every retained topic it left is
     cleared, so IL consumers drop its devices. `stop()` only says `offline`; the descriptors and values stay retained on
     purpose then, since the producer is expected back. What is cleared is found on the broker, not in a Hub: every
-    descriptor `<prefix>/<id>` whose `source` is this one (devices published by an earlier run included), each retained
-    topic below it, and the presence `<prefix>/_producer/<source>`. Returns the device ids taken out.
+    descriptor `<prefix>/<id>/descriptor` whose `source` is this one
+    (devices published by an earlier run included), each retained topic under that device, and the presence
+    `<prefix>/_producer/<source>`. Returns the device ids taken out.
 
     Refuses (`AnotherProducer`) while a producer still answers on that presence: it would publish them all again."""
     presence = IlTopics(prefix, source).presence

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_bridge_registration.py

@@ -32,7 +32,7 @@ async def settle(runner, bridge_client, *buses):
 
 
 def advertised(il):
-    return {t.split("/")[1] for t, m in il.retained.items() if t.count("/") == 1 and not t.startswith("il/_") and m.payload}
+    return {t.split("/")[1] for t, m in il.retained.items() if t.count("/") == 2 and t.endswith("/descriptor") and not t.startswith("il/_") and m.payload}
 
 
 async def reply(bridge, payload):

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_chain_in_process.py

@@ -99,7 +99,7 @@ async def test_devices_can_be_added_and_removed_while_running(chain):
     assert set(model.devices) == {"lamp1", "lamp2"}
     runner.remove_device("lamp2")
     await settle(runner, bridge_client, bridge, il)
-    assert set(model.devices) == {"lamp1"} and "il/lamp2" not in il.retained
+    assert set(model.devices) == {"lamp1"} and "il/lamp2/descriptor" not in il.retained
     assert not [t for t in il.retained if t.startswith("il/lamp2/")]     # M-11: values cleared before the descriptor
 
 

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_chain_mqtt.py

@@ -46,7 +46,7 @@ async def mqtt_chain(broker):
     # leave no retained state behind for the next test
     cleaner = MqttTransport("127.0.0.1", broker, client_id="cleaner")
     await cleaner.connect()
-    for topic in ("il/lamp1", "il/lamp1/available", "il/lamp1/switch_led", "il/lamp1/brightness",
+    for topic in ("il/lamp1/descriptor", "il/lamp1/available", "il/lamp1/switch_led", "il/lamp1/brightness",
                   "il/lamp1/color_temperature", "il/_producer/tuya", "rustuya/error/lamp1", "rustuya/event/state/lamp1"):
         await cleaner.publish(topic, "", 1, True)
     await asyncio.sleep(0.1)

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_daemon.py

@@ -27,7 +27,7 @@ async def test_the_daemon_publishes_devices_and_goes_offline_on_sigterm(broker,
 
     def on_message(message):
         seen[message.topic] = message.payload.decode()
-        if seen.get("ild/_producer/tuya") == "online" and "ild/daemon1" in seen:
+        if seen.get("ild/_producer/tuya") == "online" and "ild/daemon1/descriptor" in seen:
             online.set()
         if seen.get("ild/_producer/tuya") == "offline":
             offline.set()
@@ -42,7 +42,7 @@ async def test_the_daemon_publishes_devices_and_goes_offline_on_sigterm(broker,
         # Startup includes the producer-presence deadline and the missing
         # bridge-config fallback. Wait for readiness, not 100 polling ticks.
         await asyncio.wait_for(online.wait(), 10)
-        assert json.loads(seen["ild/daemon1"])["kind"] == "light"
+        assert json.loads(seen["ild/daemon1/descriptor"])["kind"] == "light"
         proc.send_signal(signal.SIGTERM)
         assert await asyncio.to_thread(proc.wait, 10) == 0
         await asyncio.wait_for(offline.wait(), 10)
@@ -50,7 +50,7 @@ async def test_the_daemon_publishes_devices_and_goes_offline_on_sigterm(broker,
     finally:
         if proc.poll() is None:
             proc.kill()
-        cleaner = ["ild/daemon1", "ild/daemon1/available", "ild/daemon1/switch_led", "ild/daemon1/brightness",
+        cleaner = ["ild/daemon1/descriptor", "ild/daemon1/available", "ild/daemon1/switch_led", "ild/daemon1/brightness",
                    "ild/daemon1/color_temperature", "ild/_producer/tuya"]
         for t in cleaner:
             await watcher.publish(t, "", 1, True)
@@ -82,14 +82,14 @@ async def test_the_daemon_uses_the_bridges_templates_and_follows_the_device_file
         raise AssertionError(what)
 
     try:
-        await until(lambda: "ilw/w1" in seen, "w1 was not published")
+        await until(lambda: "ilw/w1/descriptor" in seen, "w1 was not published")
         await t.publish("rb/error/w1", '{"errorCode":0,"errorMsg":"Connection Successful"}', 1, True)
         await t.publish("rb/ev/state/w1", '{"20":true,"22":1000,"23":0}', 1, True)
         await until(lambda: seen.get("ilw/w1/brightness") == "100", "the state on the bridge's own topic was not followed")
         devfile.write_text(json.dumps([lamp("w1"), lamp("w2")]))               # manager adds a device
-        await until(lambda: "ilw/w2" in seen, "the new device was not picked up")
+        await until(lambda: "ilw/w2/descriptor" in seen, "the new device was not picked up")
         devfile.write_text(json.dumps([lamp("w2")]))                            # and removes one
-        await until(lambda: seen.get("ilw/w1") == "" and seen.get("ilw/w1/brightness") == "", "w1 was not removed")
+        await until(lambda: seen.get("ilw/w1/descriptor") == "" and seen.get("ilw/w1/brightness") == "", "w1 was not removed")
     finally:
         proc.send_signal(signal.SIGTERM)
         proc.wait(10)

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_full_stack.py

@@ -101,7 +101,7 @@ def stack(broker, tmp_path_factory):
                                "devices": "tuyadevices.json", "watch_interval": 0.2}))
     daemon = subprocess.Popen([sys.executable, "-m", "rustuya_local", "run", "--config", str(cfg)],
                               stderr=subprocess.PIPE, text=True)
-    assert wait(lambda: obs.last.get(f"{prefix}/{DEV}"), 20), "the daemon never published the descriptor"
+    assert wait(lambda: obs.last.get(f"{prefix}/{DEV}/descriptor"), 20), "the daemon never published the descriptor"
     st = type("Stack", (), {"obs": obs, "mock": mock, "root": root, "prefix": prefix, "daemon": daemon, "bridge": bridge,
                             "devfile": devfile})
     yield st
@@ -123,7 +123,7 @@ def il(stack, prop):
 
 
 def test_the_device_appears_as_an_il_light_with_its_real_state(stack):
-    desc = json.loads(stack.obs.last[f"{stack.prefix}/{DEV}"])
+    desc = json.loads(stack.obs.last[f"{stack.prefix}/{DEV}/descriptor"])
     assert desc["kind"] == "light" and desc["source"] == "tuya" and desc["props"]["brightness"]["role"] == "brightness"
     assert stack.obs.last[f"{stack.prefix}/_producer/tuya"] == "online"
     assert wait(lambda: il(stack, "available") == "true"), "the device never became available"

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_full_stack_custom_templates.py

@@ -48,7 +48,7 @@ def test_a_custom_event_command_and_payload_template_all_work_together(broker, t
             daemon = subprocess.Popen([sys.executable, "-m", "rustuya_local", "run", "--config", str(cfg)],
                                       stderr=subprocess.PIPE, text=True)
             try:
-                assert wait(lambda: obs.last.get(f"{prefix}/{DEV}"), 20), "the daemon never published the descriptor"
+                assert wait(lambda: obs.last.get(f"{prefix}/{DEV}/descriptor"), 20), "the daemon never published the descriptor"
                 assert wait(lambda: obs.last.get(f"{prefix}/{DEV}/switch_led") == "true"
                             and obs.last.get(f"{prefix}/{DEV}/brightness") == "49", 20), \
                     "state through the custom event/payload templates never reached IL"

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_manager_plugin.py

@@ -42,14 +42,14 @@ async def test_the_plugin_runs_the_service_under_the_manager(broker, tmp_path):
     await answer_status(w, "rmp", ["mp1", "mp2"])
     task = asyncio.ensure_future(reg.services[0]())
     try:
-        await until(lambda: "ilmp/mp1" in seen, "not published")
+        await until(lambda: "ilmp/mp1/descriptor" in seen, "not published")
         assert seen["ilmp/_producer/tuya"] == "online"
         await until(lambda: (state.get_plugin_data("rustuya-local") or {}).get("devices"), "no status", n=300)
         status = state.get_plugin_data("rustuya-local")
         assert [d["id"] for d in status["devices"]] == ["mp1"]
 
         await state.set_cloud({"mp1": Device.from_dict(lamp("mp1")), "mp2": Device.from_dict(lamp("mp2"))})
-        await until(lambda: "ilmp/mp2" in seen, "mp2 not followed")
+        await until(lambda: "ilmp/mp2/descriptor" in seen, "mp2 not followed")
         assert (tmp_path / "rustuya-local" / "custom_converters").is_dir()
     finally:
         task.cancel()
@@ -181,7 +181,7 @@ async def test_a_settings_change_restarts_the_service_and_bad_settings_wait_for_
         assert not task.done()                                    # waits for a fix, no crash-and-retry
         api.save_settings(data, {"il": {"prefix": "ilr1"}, "options": {"pack": False}})
         await plugin.restart()
-        await until(lambda: seen.get("ilr1/_producer/tuya") == "online" and "ilr1/mp1" in seen, "not started")
+        await until(lambda: seen.get("ilr1/_producer/tuya") == "online" and "ilr1/mp1/descriptor" in seen, "not started")
 
         previous = plugin.service
         (data / "settings.json").write_text('{"options":{"pack":"false"}}')
@@ -195,9 +195,9 @@ async def test_a_settings_change_restarts_the_service_and_bad_settings_wait_for_
 
         api.save_settings(data, {"il": {"prefix": "ilr2"}, "options": {"pack": False}})
         await plugin.restart()
-        await until(lambda: seen.get("ilr2/_producer/tuya") == "online" and "ilr2/mp1" in seen, "not restarted")
+        await until(lambda: seen.get("ilr2/_producer/tuya") == "online" and "ilr2/mp1/descriptor" in seen, "not restarted")
         assert seen["ilr1/_producer/tuya"] == ""                # the old namespace was retired
-        assert seen["ilr1/mp1"] == ""
+        assert seen["ilr1/mp1/descriptor"] == ""
     finally:
         task.cancel()
         with pytest.raises(asyncio.CancelledError):
@@ -248,7 +248,7 @@ async def test_another_producer_is_shown_and_the_plugin_starts_once_it_is_gone(b
         task.cancel()
         with pytest.raises(asyncio.CancelledError):
             await task
-    for topic in ("ilo/_producer/tuya", "ilo/mp1"):
+    for topic in ("ilo/_producer/tuya", "ilo/mp1/descriptor"):
         await w.publish(topic, "", 1, True)
     await asyncio.sleep(0.2)
     await w.close()

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_purge.py

@@ -32,15 +32,15 @@ async def _retained(t: InProcessTransport, topic_filter: str) -> dict[str, str]:
 
 async def test_purge_il_clears_one_source_and_leaves_the_others():
     t = InProcessTransport()
-    for topic, payload in {"il/a": _desc("a", "tuya"), "il/a/power": "true", "il/a/brightness": "40",
-                           "il/b": _desc("b", "tuya"), "il/z": _desc("z", "zigbee"), "il/z/power": "false",
+    for topic, payload in {"il/a": _desc("a", "tuya"), "il/a/descriptor": _desc("a", "tuya"), "il/a/power": "true", "il/a/brightness": "40",
+                           "il/b/descriptor": _desc("b", "tuya"), "il/z/descriptor": _desc("z", "zigbee"), "il/z/power": "false",
                            "il/_producer/tuya": "offline", "il/_producer/zigbee": "online"}.items():
         await t.publish(topic, payload, 1, True)
 
     ids = await purge_il(t, "il", "tuya", settle=0.05)
 
     assert ids == ["a", "b"]
-    assert await _retained(t, "il/#") == {"il/z": _desc("z", "zigbee"), "il/z/power": "false",
+    assert await _retained(t, "il/#") == {"il/a": _desc("a", "tuya"), "il/z/descriptor": _desc("z", "zigbee"), "il/z/power": "false",
                                            "il/_producer/zigbee": "online"}
 
 
@@ -51,11 +51,11 @@ async def test_purge_il_refuses_while_the_producer_answers():
     runner = Runner(Hub([], il=IlTopics("il", "tuya")), t)
     await runner.start()
     await runner.drain()
-    await t.publish("il/a", _desc("a", "tuya"), 1, True)
+    await t.publish("il/a/descriptor", _desc("a", "tuya"), 1, True)
     try:
         with pytest.raises(AnotherProducer):
             await purge_il(t, "il", "tuya", settle=0.05)
-        assert "il/a" in await _retained(t, "il/#")
+        assert "il/a/descriptor" in await _retained(t, "il/#")
     finally:
         await runner.stop()
 
@@ -86,7 +86,7 @@ def test_the_purge_command_clears_the_daemons_devices(broker, tmp_path, capsys):
     c.connect("127.0.0.1", broker)
     c.loop_start()
     try:
-        for topic, payload in (("ilp/a", _desc("a", "tuya")), ("ilp/a/power", "true"),
+        for topic, payload in (("ilp/a/descriptor", _desc("a", "tuya")), ("ilp/a/power", "true"),
                                ("ilp/_producer/tuya", "offline")):
             c.publish(topic, payload, 1, True).wait_for_publish(5)
         config = tmp_path / "config.json"

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/e2e/test_service.py

@@ -66,7 +66,7 @@ async def test_devices_the_bridge_holds_reach_il_and_stop_goes_offline(tmp_path,
     await service.start()
     await settle(service, t)
     assert t.wills == [("il/_producer/tuya", "offline", 1, True)]
-    assert "il/lamp1" in t.il.retained and "il/lamp2" not in t.il.retained      # lamp2: not on the bridge
+    assert "il/lamp1/descriptor" in t.il.retained and "il/lamp2/descriptor" not in t.il.retained      # lamp2: not on the bridge
     await service.stop()
     await service.stop()                                                          # idempotent
     assert t.il.retained["il/_producer/tuya"].payload == "offline"
@@ -88,7 +88,7 @@ async def test_an_overrides_directory_is_applied_and_followed(tmp_path, monkeypa
                        hub_options={"overrides": {"lamp1": {"device": {"label": "Inline"}}}})
     await service.start()
     await settle(service, t)
-    desc = json.loads(t.il.retained["il/lamp1"].payload)
+    desc = json.loads(t.il.retained["il/lamp1/descriptor"].payload)
     assert "glow" in desc["props"] and desc["model"] == "Desk lamp" and desc["label"] == "Inline"
 
     await t.bridge.publish("rustuya/error/lamp1", '{"errorCode":0}', 0, True)
@@ -99,7 +99,7 @@ async def test_an_overrides_directory_is_applied_and_followed(tmp_path, monkeypa
     (conv / "10.json").unlink()                                   # followed: the converter goes away
     assert service.override_watcher.check()
     await settle(service, t)
-    assert "glow" not in json.loads(t.il.retained["il/lamp1"].payload)["props"]
+    assert "glow" not in json.loads(t.il.retained["il/lamp1/descriptor"].payload)["props"]
     await service.stop()
 
 
@@ -123,7 +123,7 @@ async def test_a_cover_setting_written_through_il_is_saved_and_applied(tmp_path,
     await t.bridge.publish("rustuya/error/cur1", '{"errorCode":0}', 0, True)
     await t.bridge.publish("rustuya/event/state/cur1", '{"3":30}', 0, True)
     await settle(service, t)
-    props = json.loads(t.il.retained["il/cur1"].payload)["props"]
+    props = json.loads(t.il.retained["il/cur1/descriptor"].payload)["props"]
     assert {"cover_invert_position", "cover_invert_set_position", "cover_state_source"} <= set(props)
     assert "cover_infer_motion" not in props                   # replaced by the state-source selector in 0.3.16
     assert "cover_invert_control" not in props                  # the target position opens and closes it
@@ -151,7 +151,7 @@ async def test_a_cover_setting_written_through_il_is_saved_and_applied(tmp_path,
                       connect_il=t.connect_il)
     await service.start()
     await settle(service, t)
-    assert not [p for p in json.loads(t.il.retained["il/cur1"].payload)["props"] if p.startswith("cover_")]
+    assert not [p for p in json.loads(t.il.retained["il/cur1/descriptor"].payload)["props"] if p.startswith("cover_")]
     await service.stop()
 
 
@@ -282,19 +282,23 @@ async def test_restart_removes_only_old_owned_devices():
     ids = ["lamp1", "lamp2"]
     await _answer_status(t.bridge, ids)
     # Another producer's data must survive reconciliation.
-    await t.il.publish("il/other", '{"source":"other"}', 1, True)
+    await t.il.publish("il/other/descriptor", '{"source":"other"}', 1, True)
     first = Service(Settings(devices=[lamp(i) for i in ids]),
                     connect_bridge=t.connect_bridge, connect_il=t.connect_il)
     await first.start()
     await settle(first, t)
     await first.stop()
+    # Simulate retained descriptors from a producer using the legacy layout.
+    for device_id in ids:
+        await t.il.publish(f"il/{device_id}", json.dumps({"id": device_id, "source": "tuya"}), 1, True)
     ids.remove("lamp2")
     second = Service(Settings(devices=[lamp("lamp1"), lamp("lamp2")]),
                      connect_bridge=t.connect_bridge, connect_il=t.connect_il)
     await second.start()
     await settle(second, t)
-    assert "il/lamp1" in t.il.retained and "il/other" in t.il.retained
-    assert not any(topic == "il/lamp2" or topic.startswith("il/lamp2/") for topic in t.il.retained)
+    assert "il/lamp1/descriptor" in t.il.retained and "il/other/descriptor" in t.il.retained
+    assert "il/lamp1" in t.il.retained and "il/lamp2" in t.il.retained
+    assert not any(topic == "il/lamp2/descriptor" or topic.startswith("il/lamp2/") for topic in t.il.retained)
     await second.stop()
 
 

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/ha/test_init.py

@@ -95,8 +95,8 @@ async def test_setup_publishes_and_unload_goes_offline(hass, broker, tmp_path, s
 
         await until(lambda: "il/_producer/tuya" in watcher.last)
         assert watcher.last["il/_producer/tuya"] == "online"
-        await until(lambda: "il/lamp1" in watcher.last)
-        assert json.loads(watcher.last["il/lamp1"])["kind"] == "light"
+        await until(lambda: "il/lamp1/descriptor" in watcher.last)
+        assert json.loads(watcher.last["il/lamp1/descriptor"])["kind"] == "light"
 
         # the runner asked the bridge for the device's state, exactly as the standalone daemon does
         watcher.publish("rustuya/error/lamp1", '{"errorCode":0,"errorMsg":"Connection Successful"}', retain=True)
@@ -141,7 +141,7 @@ async def test_setup_is_retried_while_another_producer_runs(hass, broker, tmp_pa
     finally:
         await runner.stop()
         await t.publish("il/_producer/tuya", "", 1, True)
-        await t.publish("il/lamp1", "", 1, True)
+        await t.publish("il/lamp1/descriptor", "", 1, True)
         await t.close()
 
 
@@ -191,7 +191,7 @@ async def test_driving_the_first_device_does_no_blocking_io_in_the_event_loop(ha
     try:
         assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
-        await until(lambda: "il/lamp1" in watcher.last)
+        await until(lambda: "il/lamp1/descriptor" in watcher.last)
         assert in_loop == []
         assert await hass.config_entries.async_unload(entry.entry_id)
         await hass.async_block_till_done()
@@ -213,25 +213,25 @@ async def test_deleting_the_entry_takes_its_devices_out_of_il(hass, broker, tmp_
     entry.add_to_hass(hass)
     watcher = Watcher(broker, registered=("lamp1",))
     try:
-        watcher.publish("il/stale1", json.dumps({"il": 1, "id": "stale1", "source": "tuya", "props": {}}), retain=True)
+        watcher.publish("il/stale1/descriptor", json.dumps({"il": 1, "id": "stale1", "source": "tuya", "props": {}}), retain=True)
         watcher.publish("il/stale1/power", "true", retain=True)
-        watcher.publish("il/zb1", json.dumps({"il": 1, "id": "zb1", "source": "zigbee", "props": {}}), retain=True)
+        watcher.publish("il/zb1/descriptor", json.dumps({"il": 1, "id": "zb1", "source": "zigbee", "props": {}}), retain=True)
         watcher.publish("il/zb1/power", "true", retain=True)
         assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
-        await until(lambda: "il/lamp1" in watcher.last)
+        await until(lambda: "il/lamp1/descriptor" in watcher.last)
         watcher.publish("rustuya/event/state/lamp1", '{"20":true,"22":1000,"23":0}', retain=True)
         await until(lambda: watcher.last.get("il/lamp1/brightness") == "100")
 
         await hass.config_entries.async_remove(entry.entry_id)
         await hass.async_block_till_done()
 
-        for topic in ("il/lamp1", "il/lamp1/brightness", "il/stale1", "il/stale1/power", "il/_producer/tuya"):
+        for topic in ("il/lamp1/descriptor", "il/lamp1/brightness", "il/stale1/descriptor", "il/stale1/power", "il/_producer/tuya"):
             try:
                 await until(lambda t=topic: watcher.last.get(t) == "")
             except AssertionError:
                 raise AssertionError((topic, dict(watcher.last)))
-        assert watcher.last["il/zb1/power"] == "true" and json.loads(watcher.last["il/zb1"])["source"] == "zigbee"
+        assert watcher.last["il/zb1/power"] == "true" and json.loads(watcher.last["il/zb1/descriptor"])["source"] == "zigbee"
         # nothing is left retained for it: a fresh subscriber sees none of those topics
         late = Watcher(broker)
         await asyncio.sleep(0.5)
@@ -344,7 +344,7 @@ async def test_send_command_writes_a_raw_dp_and_refuses_a_lock(hass, broker, tmp
     try:
         assert await hass.config_entries.async_setup(entry.entry_id)
         await hass.async_block_till_done()
-        await until(lambda: "il/lamp1" in watcher.last and "il/lock1" in watcher.last)
+        await until(lambda: "il/lamp1/descriptor" in watcher.last and "il/lock1/descriptor" in watcher.last)
 
         await hass.services.async_call(DOMAIN, "send_command", {"device_id": "lamp1", "dp": 20, "value": False},
                                        blocking=True)

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/unit/test_host.py

@@ -75,7 +75,7 @@ async def running():
 async def test_start_publishes_presence_and_descriptors_and_values_flow_both_ways(running):
     il, runner, _, commands = running
     assert il.retained["il/_producer/tuya"].payload == "online"
-    assert json.loads(il.retained["il/lamp1"].payload)["kind"] == "light"
+    assert json.loads(il.retained["il/lamp1/descriptor"].payload)["kind"] == "light"
 
     runner.on_bridge_message("lamp1", Connected())
     runner.on_bridge_message("lamp1", Message("state", {"20": True, "22": 1000, "23": 0}))
@@ -163,7 +163,7 @@ async def test_sync_adds_changes_and_removes_and_clears_before_removing(running)
     assert done == {"added": ["new"], "changed": ["edit"], "removed": ["gone"], "failed": []}
     await runner.drain()
     assert set(hub.records) == {"lamp1", "edit", "new"} and not [t for t in il.retained if t.startswith("il/gone")]
-    assert json.loads(il.retained["il/edit"].payload)["label"] == "Renamed"
+    assert json.loads(il.retained["il/edit/descriptor"].payload)["label"] == "Renamed"
     bad = lamp("bad")
     bad["id"] = "_reserved"
     assert runner.sync_devices([lamp("lamp1"), bad])["failed"] == ["_reserved"]
@@ -175,10 +175,10 @@ async def test_a_device_an_override_refused_is_driven_once_the_overrides_are_fix
     assert runner.sync_devices([lamp("lamp1"), lamp("late")])["failed"] == ["late"]       # it has no dp 99 to rename
     runner.reload({"late": {"dp": {"98": {"code": "gone"}}}})         # still refused
     await runner.drain()
-    assert "late" not in hub.records and "il/late" not in il.retained
+    assert "late" not in hub.records and "il/late/descriptor" not in il.retained
     runner.reload({"late": {"device": {"label": "Late"}}})            # fixed: driven now, without a device-list change
     await runner.drain()
-    assert "late" in hub.records and json.loads(il.retained["il/late"].payload)["label"] == "Late"
+    assert "late" in hub.records and json.loads(il.retained["il/late/descriptor"].payload)["label"] == "Late"
 
 
 async def test_overrides_the_engine_refuses_are_refused_whole_and_the_ones_in_effect_stay(running):
@@ -188,7 +188,7 @@ async def test_overrides_the_engine_refuses_are_refused_whole_and_the_ones_in_ef
     with pytest.raises(OverrideError):                                # any block, even one for no device here
         runner.reload({"lamp1": {"device": {"label": "Other"}}, "late": {"bogus": True}})
     await runner.drain()
-    assert json.loads(il.retained["il/lamp1"].payload)["label"] == "Desk"
+    assert json.loads(il.retained["il/lamp1/descriptor"].payload)["label"] == "Desk"
 
 
 # ---- the device file --------------------------------------------------------------------------------------------------
@@ -299,7 +299,7 @@ async def test_the_override_watcher_reloads_the_hub(running, tmp_path):
     (tmp_path / "a.json").write_text(json.dumps({"overrides": {"p": {"converters": {"declarative": {**LIT, "word": "bright"}}}}}))
     assert watcher.check()
     await runner.drain()
-    desc = json.loads(il.retained["il/lamp1"].payload)
+    desc = json.loads(il.retained["il/lamp1/descriptor"].payload)
     assert "lit" in desc["props"] and desc["label"] == "Desk"
     runner.on_bridge_message("lamp1", Connected())
     runner.on_bridge_message("lamp1", Message("state", {"20": True}))
@@ -309,16 +309,16 @@ async def test_the_override_watcher_reloads_the_hub(running, tmp_path):
     (tmp_path / "a.json").write_text(json.dumps({"overrides": {"p": {"converters": {"nope": {}}}}}))      # refused: left out
     assert watcher.check()
     await runner.drain()
-    assert "lit" not in json.loads(il.retained["il/lamp1"].payload)["props"]
+    assert "lit" not in json.loads(il.retained["il/lamp1/descriptor"].payload)["props"]
     assert [w.split(":")[0] for w in watcher.load().warnings] == ["a.json"]
     (tmp_path / "a.json").write_text(json.dumps({"overrides": {"p": {"converters": {"declarative": LIT}}}}))
     assert watcher.check()
     await runner.drain()
-    assert "lit" in json.loads(il.retained["il/lamp1"].payload)["props"]
+    assert "lit" in json.loads(il.retained["il/lamp1/descriptor"].payload)["props"]
     (tmp_path / "a.json").unlink()
     assert watcher.check()
     await runner.drain()
-    assert "lit" not in json.loads(il.retained["il/lamp1"].payload)["props"]
+    assert "lit" not in json.loads(il.retained["il/lamp1/descriptor"].payload)["props"]
 
 
 # ---- paho against a real broker --------------------------------------------------------------------------------------
@@ -371,7 +371,7 @@ async def test_paho_transport_runs_the_runner_survives_a_dropped_connection_and_
     runner = Runner(hub, il_side, on_bridge_command=commands.append)
     await runner.start()
     try:
-        await until(lambda: seen.get("il/_producer/tuya") == "online" and "il/lamp1" in seen)
+        await until(lambda: seen.get("il/_producer/tuya") == "online" and "il/lamp1/descriptor" in seen)
         runner.on_bridge_message("lamp1", Connected())
         await until(lambda: BridgeCommand("lamp1", "get") in commands)
         runner.on_bridge_message("lamp1", Message("state", {"20": True, "22": 1000, "23": 0}))

{rustuya_local-0.1.0.dev10 → rustuya_local-0.1.0.dev12}/tests/unit/test_hub.py

@@ -15,7 +15,7 @@ def test_bridge_to_il_and_back():
     hub = Hub([light(), curtain()])
     start = topics(hub.start(), "il")
     assert start["il/_producer/tuya"].payload == "online" and start["il/_producer/tuya"].retain
-    assert json.loads(start["il/lamp1"].payload)["kind"] == "light" and start["il/lamp1"].retain
+    assert json.loads(start["il/lamp1/descriptor"].payload)["kind"] == "light" and start["il/lamp1/descriptor"].retain
     assert start["il/lamp1/available"].payload == "false"
 
     # bridge says connected -> a `get` goes back to the bridge
@@ -85,7 +85,7 @@ def test_reload_overrides_republishes_and_clears_removed_props():
     pubs = hub.reload({"cur1": {"props": {"stop": {"hide": True}}, "device": {"label": "Bedroom"}}})
     by = topics(pubs)
     assert by["il/cur1/stop"].payload == "" and by["il/cur1/stop"].retain          # M-11
-    assert json.loads(by["il/cur1"].payload)["label"] == "Bedroom" and "stop" not in json.loads(by["il/cur1"].payload)["props"]
+    assert json.loads(by["il/cur1/descriptor"].payload)["label"] == "Bedroom" and "stop" not in json.loads(by["il/cur1/descriptor"].payload)["props"]
     assert by["il/cur1/position"].payload == "30"                                  # worked out again from the last dps
     assert BridgeCommand("cur1", "get") not in pubs                                # which the host has: nothing to ask
     with pytest.raises(OverrideError):
@@ -114,7 +114,7 @@ def test_a_seeded_device_goes_out_up_with_its_values_and_never_false():
     hub = Hub([])
     out = hub.set_device(light(), [Connected(), Message("state", {"20": True, "22": 1000, "23": 0})])
     order = [p.topic for p in out if isinstance(p, Publish)]
-    assert order[0] == "il/lamp1"                                          # R-2: the descriptor first
+    assert order[0] == "il/lamp1/descriptor"                                          # R-2: the descriptor first
     pubs = topics(out)
     assert pubs["il/lamp1/available"].payload == "true" and pubs["il/lamp1/brightness"].payload == "100"
     assert [p for p in out if isinstance(p, Publish) and p.topic == "il/lamp1/available"] == [pubs["il/lamp1/available"]]
@@ -124,7 +124,7 @@ def test_a_seeded_device_goes_out_up_with_its_values_and_never_false():
     assert topics(linked_only)["il/lamp1/available"].payload == "false" and BridgeCommand("lamp1", "get") in linked_only
     down = Hub([]).set_device(light(), [Disconnected()])
     assert topics(down)["il/lamp1/available"].payload == "false" and BridgeCommand("lamp1", "get") not in down
-    assert next(p.topic for p in down if isinstance(p, Publish)) == "il/lamp1"
+    assert next(p.topic for p in down if isinstance(p, Publish)) == "il/lamp1/descriptor"
     # a sub-device has no link state of its own, only its retained snapshot: up with its values, and no `get`
     sub = Hub([]).set_device(light(), [Message("state", {"20": False, "22": 10, "23": 0})])
     assert topics(sub)["il/lamp1/available"].payload == "true" and not any(isinstance(p, BridgeCommand) for p in sub)
@@ -135,7 +135,7 @@ def test_set_device_adds_replaces_and_remove_clears_first():
     hub.start()
     cid = curtain()["id"]
     added = topics(hub.set_device(curtain()))                      # runtime add: descriptor out, retained
-    assert added[f"il/{cid}"].retain and json.loads(added[f"il/{cid}"].payload)["kind"] == "cover"
+    assert added[f"il/{cid}/descriptor"].retain and json.loads(added[f"il/{cid}/descriptor"].payload)["kind"] == "cover"
     assert cid in hub.drivers
 
     # replacing a known device that lost a property clears that property before the new descriptor (M-11)
@@ -144,12 +144,12 @@ def test_set_device_adds_replaces_and_remove_clears_first():
     small["local_strategy"].pop("23")
     out = hub.set_device(small)
     order = [p.topic for p in out]
-    assert order == ["il/lamp1/color_temperature", "il/lamp1", "il/lamp1/available"]
+    assert order == ["il/lamp1/color_temperature", "il/lamp1/descriptor", "il/lamp1/available"]
     assert out[0].payload == "" and out[0].retain
 
     # removal: every retained value cleared, then the descriptor last, and the device is gone
     out = hub.remove_device("lamp1")
-    assert out[-1].topic == "il/lamp1" and out[-1].payload == "" and out[-1].retain
+    assert out[-1].topic == "il/lamp1/descriptor" and out[-1].payload == "" and out[-1].retain
     assert all(p.payload == "" and p.retain for p in out) and len(out) > 2
     assert hub.on_bridge_message(2, "lamp1", Message("state", {"20": True}), retained=True) == [] and hub.remove_device("lamp1") == []
 

rustuya_local-0.1.0.dev12/tests/unit/test_il_topics.py

@@ -0,0 +1,27 @@
+"""Descriptor routing and reserved transport topics."""
+import pytest
+from tuya_interpreter import Descriptor
+
+from rustuya_local.host.il import IlTopics
+from rustuya_local.service import _device_topics, _owned_ids
+
+
+@pytest.mark.parametrize("prop", ["descriptor", "reject"])
+def test_descriptor_refuses_properties_colliding_with_transport_topics(prop):
+    with pytest.raises(ValueError, match="reserved IL property"):
+        IlTopics().actions("d", [Descriptor({"id": "d", "props": {prop: {"type": "string"}}})])
+
+
+def test_cleanup_only_recognizes_descriptor_topics_under_a_nested_prefix():
+    retained = {
+        "home/il/a": '{"source":"tuya"}',
+        "home/il/a/descriptor": '{"source":"tuya"}',
+        "home/il/a/power": 'true',
+        "home/il/old": '{"source":"tuya"}',
+        "home/il/b/descriptor": '{"source":"other"}',
+        "else/il/a/descriptor": '{"source":"tuya"}',
+    }
+    assert _owned_ids(retained, "home/il", "tuya") == {"a"}
+    assert _device_topics(retained, "home/il", {"a"}) == [
+        "home/il/a/power", "home/il/a/descriptor",
+    ]

rustuya_local-0.1.0.dev10/release-notes.md

@@ -1,9 +0,0 @@
-### Changed
-- Wait for live bridge acknowledgements and the panel's registry refresh instead of sleeping after device commands.
-- Verify embedded bridge startup through a live MQTT config publication, supervise its native async task, and
-  retain ownership when shutdown times out.
-- Wait for producer presence with an event and an explicit timeout instead of repeated short sleeps.
-- Use manager state-change notifications for wizard progress and cloud-fetch completion; remove status polling.
-- Use manager registry readiness instead of patching its private methods; require rustuya-manager 0.2.3.
-- Create session directories with a regular loop instead of a discarded list comprehension.
-- Wait for daemon readiness events in the subprocess test, allowing both startup timeout stages to finish.