smartbox 2.3.1__tar.gz → 2.4.0__tar.gz

{smartbox-2.3.1 → smartbox-2.4.0}/.github/workflows/publish-to-pypi.yml

@@ -14,7 +14,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Install uv
@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ env.PYTHON_VERSION }}
       - name: Build a binary wheel and a source tarball

{smartbox-2.3.1 → smartbox-2.4.0}/.github/workflows/python-package.yml

@@ -18,13 +18,13 @@ jobs:
       matrix:
         python-version: [3.13, 3.14]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install the project
@@ -40,13 +40,13 @@ jobs:
         python-version: [3.13, 3.14]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install the project
@@ -62,14 +62,14 @@ jobs:
         python-version: [3.13, 3.14]
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install uv
         uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6.0.0
+        uses: actions/setup-python@v6.1.0
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install the project
@@ -77,7 +77,7 @@ jobs:
           uv sync --all-extras --dev
           uv run tox -e py
       - name: "Upload coverage to Codecov"
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

{smartbox-2.3.1 → smartbox-2.4.0}/.pre-commit-config.yaml

@@ -2,13 +2,13 @@ repos:
 
 - repo: https://github.com/astral-sh/uv-pre-commit
   # uv version.
-  rev: 0.5.26
+  rev: 0.9.25
   hooks:
     # Update the uv lockfile
     - id: uv-lock
 
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v5.0.0
+  rev: v6.0.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
@@ -22,7 +22,7 @@ repos:
       - "--indent=4"
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.9.4
+  rev: v0.14.11
   hooks:
     - id: ruff
       args: [--fix, --exit-non-zero-on-fix]

{smartbox-2.3.1 → smartbox-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smartbox
-Version: 2.3.1
+Version: 2.4.0
 Summary: Python API to control heating 'smart boxes'
 Project-URL: Homepage, https://github.com/ajtudela/smartbox
 Project-URL: Issues, https://github.com/ajtudela/smartbox/issues

{smartbox-2.3.1 → smartbox-2.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "smartbox"
-version = "2.3.1"
+version = "2.4.0"
 requires-python = ">=3.13"
 authors = [
   { name="Alberto Tudela", email="ajtudela@gmail.com" },

{smartbox-2.3.1 → smartbox-2.4.0}/src/smartbox/models.py

@@ -83,6 +83,13 @@ class NodeSetup(RootModel[DefaultNodeSetup | PmoSetup]):
         """Get the root model directly."""
         return getattr(self.root, name)
 
+class NodeVersion(BaseModel):
+    """NodeVersion model."""
+    
+    hw_version: str
+    fw_version: str
+    uid: str
+    pid: str
 
 class DefaultNodeStatus(BaseModel):
     """Default Node Status."""
@@ -166,7 +173,6 @@ class Node(BaseModel):
     installed: bool
     lost: bool | None = False
 
-
 class Nodes(BaseModel):
     """Nodes model."""
 

{smartbox-2.3.1 → smartbox-2.4.0}/src/smartbox/reseller.py

@@ -31,6 +31,12 @@ class AvailableResellers:
             api_url="api",
             serial_id=1,
         ),
+        "api-lhz": SmartboxReseller(
+            name="Lucht LHZ",
+            web_url="https://smartcontrol.lucht-lhz.de/",
+            api_url="api-lhz",
+            serial_id=2,
+        ),
         "api-ehc": SmartboxReseller(
             name="Electric Heating Company",
             web_url="https://control.electric-heatingcompany.co.uk/",
@@ -55,6 +61,12 @@ class AvailableResellers:
             api_url="api-climastar",
             serial_id=8,
         ),
+        "api-iheatcontrol": SmartboxReseller(
+            name="iHeat Control",
+            web_url="https://app.iheatcontrol.com/",
+            api_url="api-evconfort",
+            serial_id=9,
+        ),
         "api-hjm": SmartboxReseller(
             name="HJM",
             web_url="https://api.calorhjm.com/",
@@ -107,7 +119,11 @@ class AvailableResellers:
     def reseller(self) -> SmartboxReseller:
         """Get the reseller."""
         reseller = next(
-            (r for r in self.resellers.values() if r.api_url == self._api_url),
+            (
+                value
+                for key, value in self.resellers.items()
+                if key == self._api_url
+            ),
             None,
         )
         if reseller is None:

{smartbox-2.3.1 → smartbox-2.4.0}/src/smartbox/session.py

@@ -192,7 +192,7 @@ class AsyncSession:
                 self.expiry_time,
             )
         except ValidationError as e:
-            msg = "Received invalid auth response"
+            msg = f"Received invalid auth response {response.status} with msg: {response.reason}"
             raise InvalidAuthError(msg) from e
 
     async def check_refresh_auth(self) -> None:

{smartbox-2.3.1 → smartbox-2.4.0}/src/smartbox/update_manager.py

@@ -251,6 +251,33 @@ class UpdateManager:
             update_wrapper,
         )
 
+    def subscribe_to_node_version(
+        self,
+        callback: Callable[[str, int, dict[str, Any]], None],
+    ) -> None:
+        """Subscribe to node version updates."""
+
+        def dev_data_wrapper(data: dict[str, Any]) -> None:
+            (callback(data["type"], int(data["addr"]), data["version"]),)  # type: ignore[func-returns-value]
+
+        self.subscribe_to_dev_data(
+            "(.nodes[] | {addr, type, version})?",
+            dev_data_wrapper,
+        )
+
+        def update_wrapper(
+            data: dict[str, Any],
+            node_type: str,
+            addr: str,
+        ) -> None:
+            (callback(node_type, int(addr), data),)  # type: ignore[func-returns-value]
+
+        self.subscribe_to_updates(
+            r"^/(?P<node_type>[^/]+)/(?P<addr>\d+)/version",
+            self.BODY_PATH,
+            update_wrapper,
+        )
+
     def _dev_data_cb(self, data: dict[str, Any]) -> None:
         for sub in self._dev_data_subscriptions:
             sub.match(data)

{smartbox-2.3.1 → smartbox-2.4.0}/tests/test_reseller.py

@@ -48,10 +48,8 @@ def test_reseller_invalid_data():
 
 @pytest.mark.asyncio
 async def test_all_resellers():
-    for reseller in AvailableResellers.resellers.values():
-        _session = AsyncSmartboxSession(
-            username="", password="", api_name=reseller.api_url
-        )
+    for key in AvailableResellers.resellers:
+        _session = AsyncSmartboxSession(username="", password="", api_name=key)
         check = await _session.health_check()
         assert check is not None
         version = await _session.api_version()

{smartbox-2.3.1 → smartbox-2.4.0}/tests/test_update_manager.py

@@ -224,3 +224,61 @@ def test_update_manager_subscribe_to_device_connected(update_manager):
     update_data = {"path": "/connected", "body": {"connected": True}}
     update_manager._update_cb(update_data)
     callback.assert_called_once_with(update_data["body"]["connected"])
+
+
+
+def test_update_manager_subscribe_to_node_version(update_manager):
+    callback = MagicMock()
+    update_manager.subscribe_to_node_version(callback)
+    assert len(update_manager._dev_data_subscriptions) == 1
+    assert len(update_manager._update_subscriptions) == 1
+
+    # Test dev data callback
+    dev_data = {
+        "nodes": [
+            {
+                "type": "acm",
+                "addr": 2,
+                "version": {
+                    "pid": "081c",
+                    "fw_version": "1.6",
+                    "hw_version": "1.0",
+                    "uid": "test123",
+                },
+            }
+        ],
+    }
+    update_manager._dev_data_cb(dev_data)
+    callback.assert_called_once_with(
+        "acm",
+        2,
+        {
+            "pid": "081c",
+            "fw_version": "1.6",
+            "hw_version": "1.0",
+            "uid": "test123",
+        },
+    )
+
+    # Test update callback
+    callback.reset_mock()
+    update_data = {
+        "path": "/acm/2/version",
+        "body": {
+            "pid": "081c",
+            "fw_version": "1.7",
+            "hw_version": "1.0",
+            "uid": "test123",
+        },
+    }
+    update_manager._update_cb(update_data)
+    callback.assert_called_once_with(
+        "acm",
+        2,
+        {
+            "pid": "081c",
+            "fw_version": "1.7",
+            "hw_version": "1.0",
+            "uid": "test123",
+        },
+    )

{smartbox-2.3.1 → smartbox-2.4.0}/tox.ini

@@ -1,8 +1,6 @@
 [tox]
 envlist =
-
        py313
-
 [testenv]
 deps =
        freezegun