rustuya-local 0.1.0.dev2__tar.gz → 0.1.0.dev3__tar.gz

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/CHANGELOG.md

@@ -8,6 +8,15 @@ stable release.
 
 ## [Unreleased]
 
+## [0.1.0.dev3] — 2026-10-11
+
+### Changed
+- Require tuya2ildevice 0.4.0.dev4 in the package and Home Assistant integration.
+- Load bundled official rules from `rules/builtin/`, exclude the manifest from rule layers, and apply user files after official rules regardless of filename.
+- Fetch the complete official pack into `rules/builtin/` inside the overrides directory and watch it for live reloads.
+- Retire unedited files owned by the old flat override pack while preserving user edits.
+- Include the official rule layers and manifest in the manager drop-in archive.
+
 ## [0.1.0.dev2] — 2026-10-11
 
 ### Fixed

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: rustuya-local
-Version: 0.1.0.dev2
+Version: 0.1.0.dev3
 Summary: Local Tuya control: rustuya-bridge -> tuya2ildevice -> 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: tuya2ildevice>=0.4.0.dev3
+Requires-Dist: tuya2ildevice>=0.4.0.dev4
 Provides-Extra: fullstack
 Requires-Dist: tuyamock; extra == 'fullstack'
 Provides-Extra: manager
@@ -103,9 +103,10 @@ config; integration: `<config>/rustuya_converters`; manager plugin: its data dir
 - Converters are JSON programs under `converters.declarative`; Python code plugins are not loaded.
 
 See tuya2ildevice's README ("User overrides") for the format. A curated set ships in tuya2ildevice, and fixes published
-between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/pack)) are copied
-into the directory at start and daily, as `00_pack_*` files that your own files refine. Turn that off with `"pack":
-false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
+between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/builtin)) are copied
+into `rules/builtin/` inside the overrides directory at start and daily. These include `00-default.json`; your own
+files are applied after all official rules. The bundled defaults update with tuya2ildevice, even when pack sync is off.
+Turn online updates off with `"pack": false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
 put there, and leaves a file alone once you edit it.
 
 ### Cover settings

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/README.md

@@ -77,9 +77,10 @@ config; integration: `<config>/rustuya_converters`; manager plugin: its data dir
 - Converters are JSON programs under `converters.declarative`; Python code plugins are not loaded.
 
 See tuya2ildevice's README ("User overrides") for the format. A curated set ships in tuya2ildevice, and fixes published
-between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/pack)) are copied
-into the directory at start and daily, as `00_pack_*` files that your own files refine. Turn that off with `"pack":
-false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
+between its releases (its [override pack](https://github.com/3735943886/tuya2ildevice/tree/master/rules/builtin)) are copied
+into `rules/builtin/` inside the overrides directory at start and daily. These include `00-default.json`; your own
+files are applied after all official rules. The bundled defaults update with tuya2ildevice, even when pack sync is off.
+Turn online updates off with `"pack": false` (daemon), the Rustuya panel's *Options* (integration), or the plugin tab. The pack only replaces or removes the files it
 put there, and leaves a file alone once you edit it.
 
 ### Cover settings

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/custom_components/rustuya/manifest.json

@@ -9,12 +9,12 @@
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/3735943886/rustuya-local/issues",
   "requirements": [
-    "tuya2ildevice>=0.4.0.dev3",
+    "tuya2ildevice>=0.4.0.dev4",
     "paho-mqtt>=2.0",
     "rustuya-manager>=0.2.2",
     "pyrustuyabridge>=0.4",
-    "rustuya-local>=0.1.0.dev2"
+    "rustuya-local>=0.1.0.dev3"
   ],
   "single_config_entry": true,
-  "version": "0.1.0.dev2"
+  "version": "0.1.0.dev3"
 }

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/docs/MIGRATING.md

@@ -69,8 +69,8 @@ rustuya-manager plugin. It is retired. Its replacement is two pieces:
    - `converters.cover_motion` and a cover's `infer_motion` are read as the cover's `state_source` (`inferred`, or
      `none` for `infer_motion: false`), and a `cover_motion` `settle` as the cover's `settle`; its other keys are
      dropped with a warning. `zz_settings.json` is rewritten in the new form the next time a setting is saved.
-   - Leave the old pack (`00_default.json`, `00_curtain.py`, `.rustuya_pack.json`) out. Fixes arrive as `00_pack_*`
-     files by themselves.
+   - Leave the old pack (`00_default.json`, `00_curtain.py`, `.rustuya_pack.json`) out. Official rules ship with tuya2ildevice; online updates arrive under
+     `rules/builtin/` automatically. User files are applied after all official rules.
 
    Changes to the directory are picked up while running, no restart needed.
 

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rustuya-local"
-version = "0.1.0.dev2"
+version = "0.1.0.dev3"
 description = "Local Tuya control: rustuya-bridge -> tuya2ildevice -> IL (ildevice). HA-independent core."
 readme = "README.md"
 requires-python = ">=3.13"
 license = "MIT"
-dependencies = ["tuya2ildevice>=0.4.0.dev3", "pyrustuyabridge>=0.4", "paho-mqtt>=2.0"]
+dependencies = ["tuya2ildevice>=0.4.0.dev4", "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.dev3/release-notes.md

@@ -0,0 +1,6 @@
+### Changed
+- Require tuya2ildevice 0.4.0.dev4 in the package and Home Assistant integration.
+- Load bundled official rules from `rules/builtin/`, exclude the manifest from rule layers, and apply user files after official rules regardless of filename.
+- Fetch the complete official pack into `rules/builtin/` inside the overrides directory and watch it for live reloads.
+- Retire unedited files owned by the old flat override pack while preserving user edits.
+- Include the official rule layers and manifest in the manager drop-in archive.

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/scripts/build_dropin.py

@@ -58,7 +58,10 @@ def _members() -> list[tuple[str, Path]]:
             members = dict(out)
             members.setdefault(f"{prefix}/{native.name}", native)
             for layer in rule_files(rule_paths()[:1]):          # the rule layers a wheel bundles, nothing else
-                members.setdefault(f"{prefix}/rules/{layer.name}", layer)
+                members.setdefault(f"{prefix}/rules/builtin/{layer.name}", layer)
+            manifest = rule_paths()[0] / 'manifest.json'
+            if manifest.is_file():
+                members.setdefault(f"{prefix}/rules/builtin/manifest.json", manifest)
             out = list(members.items())
     return sorted(out)
 

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/src/rustuya_local/host/overrides.py

@@ -95,12 +95,12 @@ class OverrideWatcher:
 
     def _stat(self) -> Any:
         stamp = []
-        for p in rule_files([self.path]):
+        for p in rule_files([self.path, self.path / 'rules' / 'builtin']):
             try:
                 st = p.stat()
             except OSError:
                 continue
-            stamp.append((p.name, st.st_mtime_ns, st.st_size))
+            stamp.append((str(p), st.st_mtime_ns, st.st_size))
         return tuple(stamp)
 
     def check(self) -> bool:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/src/rustuya_local/host/pack.py

@@ -1,8 +1,8 @@
-"""The override pack: fixes for non-standard devices published on tuya2ildevice's `master` (`rules/pack/`) and copied into
+"""The override pack: fixes for non-standard devices published on tuya2ildevice's `master` (`rules/builtin/`) and copied into
 the host's rule directory, so a fix reaches users without a release. `OverrideWatcher` then loads the copied files
 like the user's own. The files are rule layers (JSON); fetching them is the host's, the engine only merges them.
 
-`pack/manifest.json` lists the files with their SHA-256 (built by `scripts/build_pack.py`):
+`builtin/manifest.json` lists the files with their SHA-256 (built by `scripts/build_pack.py`):
 
     {"version": 1, "files": [{"name": "00_pack_abc.json", "sha256": "...", "requires": 1, "until": 3}]}
 
@@ -38,7 +38,7 @@ from .overrides import SETTINGS_FILE
 _LOGGER = logging.getLogger(__name__)
 
 LEVEL = 4                                         # 2: `cover` settings; 3: `delta`; 4: rule-layer files (tuya2ildevice 0.4)
-BASE_URL = "https://raw.githubusercontent.com/3735943886/tuya2ildevice/master/rules/pack/"
+BASE_URL = "https://raw.githubusercontent.com/3735943886/tuya2ildevice/master/rules/builtin/"
 MANIFEST = "manifest.json"
 LEDGER = ".tuya2ildevice_pack.json"
 MAX_BYTES = 1024 * 1024
@@ -129,7 +129,7 @@ def _wanted(doc: dict[str, Any]) -> dict[str, str]:
             continue
         if entry.get("requires", 0) > LEVEL or entry.get("until", LEVEL + 1) <= LEVEL:
             continue
-        if name == SETTINGS_FILE:                 # the host's own settings: never the pack's
+        if name in (SETTINGS_FILE, MANIFEST):                 # the host's own settings: never the pack's
             _LOGGER.warning("pack: %s is the host's settings file, not taken from the pack", name)
             continue
         out[name] = sha.lower()

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/src/rustuya_local/host/rules.py

@@ -64,8 +64,8 @@ def _upgrade_layer(data, where):
 
 def rule_paths(paths=(), *, bundled_path=None):
     package = Path(tuya2ildevice.__file__).resolve().parent
-    bundled = package / 'rules'
-    checkout = package.parents[1] / 'rules'
+    bundled = package / 'rules' / 'builtin'
+    checkout = package.parents[1] / 'rules' / 'builtin'
     location = bundled_path or (bundled if bundled.is_dir() else checkout)
     return [Path(location), *map(Path, paths)]
 
@@ -73,14 +73,16 @@ def rule_paths(paths=(), *, bundled_path=None):
 def rule_files(locations):
     files = []
     for location in map(Path, locations):
-        if location.is_file():
+        if location.is_file() and location.name != 'manifest.json':
             files.append(location)
         elif location.is_dir():
-            files.extend(p for p in location.iterdir() if p.is_file() and p.suffix == '.json' and p.name[0] not in '._')
+            files.extend(p for p in location.iterdir()
+                         if p.is_file() and p.suffix == '.json' and p.name[0] not in '._'
+                         and p.name != 'manifest.json')
     return sorted(files, key=lambda p: os.fsencode(p.name))
 
 
-def merge_rule_files(locations, *, tolerant=False):
+def merge_rule_files(locations, *, tolerant=False, base=None):
     layers, warnings = [], []
     files = rule_files(locations)
     for path in files:
@@ -91,7 +93,7 @@ def merge_rule_files(locations, *, tolerant=False):
             if not tolerant:
                 raise ValueError(f'{path}: {error}') from error
             warnings.append(f'{path.name}: {error}')
-    result = merge_rules(layers, tolerant=tolerant)
+    result = merge_rules(layers, base=base, tolerant=tolerant)
     names = {str(p): p.name for p in files}
     for warning in result['warnings']:
         source, _, message = warning.partition(': ')
@@ -99,12 +101,23 @@ def merge_rule_files(locations, *, tolerant=False):
     return {**result, 'warnings': warnings}
 
 
+def _load_rules(paths=(), *, bundled_path=None, tolerant=False):
+    locations = rule_paths(paths, bundled_path=bundled_path)
+    official = merge_rule_files(locations[:1])
+    # Downloaded official rules refine the bundled pack; user files always run last.
+    downloaded = [Path(p) / 'rules' / 'builtin' for p in paths if Path(p).is_dir()]
+    official = merge_rule_files(downloaded, base=official['rules'], tolerant=tolerant)
+    result = merge_rule_files(locations[1:], base=official['rules'], tolerant=tolerant)
+    result['warnings'] = official['warnings'] + result['warnings']
+    return result
+
+
 def load_rules(paths=(), *, bundled_path=None):
-    return merge_rule_files(rule_paths(paths, bundled_path=bundled_path))['rules']
+    return _load_rules(paths, bundled_path=bundled_path)['rules']
 
 
 def load_rules_tolerant(paths=(), *, bundled_path=None):
-    return merge_rule_files(rule_paths(paths, bundled_path=bundled_path), tolerant=True)
+    return _load_rules(paths, bundled_path=bundled_path, tolerant=True)
 
 
 @functools.cache

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/src/rustuya_local/service.py

@@ -16,7 +16,7 @@ integration, the rustuya-manager plugin or a daemon) serves them, since every de
 `online` that nobody answers for (a Last Will lost with the broker, or a producer on tuya2ildevice < 0.3.5) does not
 stop the start.
 
-With `pack` on, the override pack (tuya2ildevice's `rules/pack/`) is copied into the overrides directory in the background at
+With `pack` on, the override pack (tuya2ildevice's `rules/builtin/`) is copied into the overrides directory in the background at
 start and every `pack_interval` seconds; the directory watcher loads what it brings.
 
 A device's settings (a cover's direction toggles, tuya2ildevice's `device_settings`) are IL properties like any other;
@@ -249,7 +249,12 @@ class Service:
         while True:
             self._pack_now.clear()
             try:
-                result = await run_in_thread(pack.sync, directory, base_url=url)
+                # Retire unedited files owned by the old flat pack, preserving user files.
+                retired = await run_in_thread(pack.sync, directory, manifest={'files': []})
+                result = await run_in_thread(pack.sync, directory / 'rules' / 'builtin', base_url=url)
+                result.removed.extend(retired.removed)
+                result.kept.extend(retired.kept)
+                result.failed.extend(retired.failed)
                 self.pack_status = {"at": time.time(), **result.as_dict()}
             except pack.PackError as e:
                 _LOGGER.warning("override pack: %s", e)

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/tests/e2e/test_service.py

@@ -201,7 +201,14 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
     monkeypatch.setattr(bc.BridgeClient, "start", lambda self, timeout=0.05: orig(self, timeout))
     served, conv = tmp_path / "served", tmp_path / "conv"
     served.mkdir()
-    fix = json.dumps({"lamp1": {"label": "Packed"}})
+    conv.mkdir()
+    (conv / '00_pack_old.json').write_text('{}')
+    (conv / '00_pack_edited.json').write_text('{"overrides": {}}')
+    (conv / '.tuya2ildevice_pack.json').write_text(json.dumps({'files': {
+        '00_pack_old.json': hashlib.sha256(b'{}').hexdigest(),
+        '00_pack_edited.json': hashlib.sha256(b'{}').hexdigest(),
+    }}))
+    fix = json.dumps({"overrides": {"lamp1": {"device": {"label": "Packed"}}}})
     (served / "00_pack_lamp.json").write_text(fix)
     (served / "manifest.json").write_text(json.dumps({"version": 1, "files": [
         {"name": "00_pack_lamp.json", "sha256": hashlib.sha256(fix.encode()).hexdigest()}]}))
@@ -212,8 +219,10 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
         if service.pack_status:
             break
         await asyncio.sleep(0.02)
-    assert service.pack_status["added"] == ["00_pack_lamp.json"] and (conv / "00_pack_lamp.json").is_file()
-    (conv / "00_pack_lamp.json").unlink()
+    assert service.pack_status["added"] == ["00_pack_lamp.json"] and (conv / "rules" / "builtin" / "00_pack_lamp.json").is_file()
+    assert not (conv / '00_pack_old.json').exists()
+    assert (conv / '00_pack_edited.json').read_text() == '{"overrides": {}}'
+    (conv / "rules" / "builtin" / "00_pack_lamp.json").unlink()
     first, service.pack_status = service.pack_status, None
     assert service.sync_pack_now()                                      # not a day later: now
     for _ in range(100):
@@ -230,7 +239,7 @@ async def test_the_override_pack_is_synced_in_the_background(tmp_path, monkeypat
         if service.pack_status:
             break
         await asyncio.sleep(0.02)
-    assert "error" in service.pack_status and (conv / "00_pack_lamp.json").is_file()
+    assert "error" in service.pack_status and (conv / "rules" / "builtin" / "00_pack_lamp.json").is_file()
     await service.stop()
 
 
@@ -333,9 +342,11 @@ async def test_stop_waits_for_an_override_pack_write_in_progress(tmp_path, monke
     entered = asyncio.Event()
     release = threading.Event()
     loop = asyncio.get_running_loop()
-    path = tmp_path / 'conv' / '00_pack_test.json'
+    path = tmp_path / 'conv' / 'rules' / 'builtin' / '00_pack_test.json'
 
-    def blocked_sync(directory, *, base_url):
+    def blocked_sync(directory, *, base_url=pack.BASE_URL, manifest=None):
+        if manifest is not None:
+            return pack.SyncResult()
         loop.call_soon_threadsafe(entered.set)
         if not release.wait(5):
             raise TimeoutError('test did not release pack sync')
@@ -346,7 +357,7 @@ async def test_stop_waits_for_an_override_pack_write_in_progress(tmp_path, monke
     monkeypatch.setattr(pack, 'sync', blocked_sync)
     t = Transports()
     await t.bridge.publish('rustuya/bridge/config', '{}', 1, True)
-    service = _service(t, tmp_path, overrides_path=path.parent, pack=True)
+    service = _service(t, tmp_path, overrides_path=tmp_path / 'conv', pack=True)
     await service.start()
     stopping = None
     try:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/tests/unit/test_dropin.py

@@ -21,7 +21,7 @@ def test_one_package_with_tuya2ildevice_inside(tmp_path):
     for needed in ("rustuya_local/__init__.py", "rustuya_local/manager_plugin/static/index.js",
                    "rustuya_local/_vendor/tuya2ildevice/__init__.py", "rustuya_local/_vendor/tuya2ildevice/native.py"):
         assert needed in names
-    assert "rustuya_local/_vendor/tuya2ildevice/rules/00-default.json" in names
+    assert "rustuya_local/_vendor/tuya2ildevice/rules/builtin/00-default.json" in names
     assert any(n.startswith("rustuya_local/_vendor/tuya2ildevice/") and n.endswith((".so", ".dll", ".dylib"))
                for n in names)
     assert not any("__pycache__" in n or n.startswith("rustuya_local/_vendor/paho") for n in names)

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/tests/unit/test_pack.py

@@ -10,7 +10,7 @@ import pytest
 from rustuya_local.host import load_overrides, pack
 from rustuya_local.host.pack import LEDGER, PackError, read_ledger, sync
 
-PUBLISHED = Path(__file__).resolve().parents[3] / "tuya2ildevice" / "rules" / "pack"       # the sibling checkout
+PUBLISHED = Path(__file__).resolve().parents[3] / "tuya2ildevice" / "rules" / "builtin"       # the sibling checkout
 
 
 def sha(text: str) -> str:

{rustuya_local-0.1.0.dev2 → rustuya_local-0.1.0.dev3}/tests/unit/test_rule_files.py

@@ -53,7 +53,7 @@ def test_watcher_reloads_global_rules_and_restores_defaults_after_removal(tmp_pa
 
 
 
-def test_host_uses_global_filename_order_for_rule_layers(tmp_path):
+def test_host_applies_user_layers_after_bundled_rules(tmp_path):
     write(tmp_path / '000_before_base.json', {'maps': {'switch_on': {'probe': True}}})
     write(tmp_path / '10_after_base.json', {'overrides': {'p': {'device': {'label': 'user'}}}})
     loaded = load_overrides(tmp_path)
@@ -168,3 +168,29 @@ def test_failed_adoption_releases_the_candidate_and_keeps_the_existing_drivers(m
         assert candidate not in _pack_users and not unregister_rules(candidate)
     finally:
         hub.close()
+
+
+def test_official_manifest_is_not_a_rule_and_user_files_run_last(tmp_path):
+    builtin = tmp_path / 'rules' / 'builtin'
+    builtin.mkdir(parents=True)
+    write(builtin / 'manifest.json', {'version': 1, 'files': []})
+    write(builtin / '99_official.json', {'overrides': {'p': {'device': {'label': 'official'}}}})
+    write(tmp_path / '000_user.json', {'overrides': {'p': {'device': {'label': 'user'}}}})
+    loaded = load_overrides(tmp_path)
+    assert not loaded.warnings
+    assert TuyaDriver(DEVICE, rules=loaded.rules).descriptor['label'] == 'user'
+
+
+def test_watcher_follows_downloaded_official_rules(tmp_path):
+    builtin = tmp_path / 'rules' / 'builtin'
+    builtin.mkdir(parents=True)
+    watcher = OverrideWatcher(tmp_path, None)
+    assert watcher.check()
+    path = builtin / '10_official.json'
+    write(path, {'overrides': {'p': {'device': {'label': 'downloaded'}}}})
+    assert watcher.check()
+    assert watcher.load().overrides['p']['device']['label'] == 'downloaded'
+    assert not watcher.check()
+    path.unlink()
+    assert watcher.check()
+    assert watcher.load().overrides.get('p', {}).get('device', {}).get('label') != 'downloaded'

rustuya_local-0.1.0.dev2/release-notes.md

@@ -1,11 +0,0 @@
-### Fixed
-- Serialize device setting saves and override reloads so simultaneous commands preserve every device's settings,
-  including when a save is cancelled during file work.
-- Release a Hub's native rule pack on service shutdown, failed construction, and failed rule replacement; retain
-  shared packs until their last owner releases them.
-- Remove Runner reconnect callbacks and subscriptions on shutdown or failed startup, and await background cleanup.
-- Retry transient override-loading failures and read watched device files off the event loop.
-
-### Changed
-- Share atomic file replacement across settings, converter files and the override pack, using unique temporary files.
-- Refresh the roadmap and document the cover motion-source selector and position-source settings.