smartbox 2.5.0__tar.gz → 2.5.2__tar.gz

{smartbox-2.5.0 → smartbox-2.5.2}/.github/workflows/publish-to-pypi.yml

@@ -28,4 +28,4 @@ jobs:
       - name: Build a binary wheel and a source tarball
         run: uv build
       - name: Publish 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1.13
+        uses: pypa/gh-action-pypi-publish@release/v1.14

{smartbox-2.5.0 → smartbox-2.5.2}/.github/workflows/python-package.yml

@@ -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.2
+        uses: codecov/codecov-action@v6.0.0
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

{smartbox-2.5.0 → smartbox-2.5.2}/.gitignore

@@ -48,7 +48,7 @@ htmlcov/
 .nox/
 .coverage
 .coverage.*
-.cache
+.*cache*
 nosetests.xml
 coverage.xml
 *.cover
@@ -72,4 +72,4 @@ venv.bak/
 junit.xml
 .DS_Store
 
-*.code-workspace
+*.code-workspace

{smartbox-2.5.0 → smartbox-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smartbox
-Version: 2.5.0
+Version: 2.5.2
 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
@@ -14,7 +14,7 @@ Requires-Python: >=3.14.2
 Requires-Dist: aiohttp
 Requires-Dist: asyncclick
 Requires-Dist: jq
-Requires-Dist: pydantic==2.12.2
+Requires-Dist: pydantic
 Requires-Dist: python-socketio
 Requires-Dist: requests
 Requires-Dist: websocket-client

{smartbox-2.5.0 → smartbox-2.5.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "smartbox"
-version = "2.5.0"
+version = "2.5.2"
 requires-python = ">=3.14.2"
 authors = [
   { name="Alberto Tudela", email="ajtudela@gmail.com" },
@@ -21,7 +21,7 @@ dependencies = [
     "aiohttp",
     "asyncclick",
     "jq",
-    "pydantic==2.12.2",
+    "pydantic",
     "python-socketio",
     "requests",
     "websocket-client",

{smartbox-2.5.0 → smartbox-2.5.2}/src/smartbox/session.py

@@ -27,6 +27,7 @@ from smartbox.models import (
     Nodes,
     NodeSetup,
     NodeStatus,
+    NodeVersion,
     Samples,
     SmartboxNodeType,
     Token,
@@ -539,6 +540,25 @@ class AsyncSmartboxSession(AsyncSession):
             path=f"devs/{device_id}/{_node.type}/{_node.addr}/setup",
         )
 
+    async def get_node_version(
+        self,
+        device_id: str,
+        node: dict[str, Any],
+    ) -> dict[str, Any] | NodeVersion:
+        """Get a node setup."""
+        _node: Node = Node.model_validate(node)
+        response = await self._api_request(
+            f"devs/{device_id}/{_node.type}/{_node.addr}/version",
+        )
+        _LOGGER.debug("(%s) Version config data %s", _node.type, response)
+        if self.raw_response is True:
+            return response
+        try:
+            return NodeVersion.model_validate(response)
+        except ValidationError:
+            _LOGGER.exception("Version config validation error %s", response)
+            raise
+
 
 class Session:
     """For retro compatibility, this class is a sync which called the async."""

smartbox-2.5.2/tests/fixtures/devs/device1/acm/1/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "1.1",
+  "fw_version": "2.3.1",
+  "uid": "AABBCCDDEEFF0022",
+  "pid": "ACM-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device1/htr/0/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "1.0",
+  "fw_version": "2.3.1",
+  "uid": "AABBCCDDEEFF0011",
+  "pid": "HTR-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device1/pmo/3/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "1.0",
+  "fw_version": "2.1.0",
+  "uid": "003E003F0D47373436363733",
+  "pid": "PMO-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/0/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AABB",
+  "pid": "HTR_MOD-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/1/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AABC",
+  "pid": "HTR_MOD-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/2/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AABD",
+  "pid": "HTR_MOD-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/3/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AABE",
+  "pid": "HTR_MOD-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/4/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AABF",
+  "pid": "HTR_MOD-001"
+}

smartbox-2.5.2/tests/fixtures/devs/device2/htr_mod/5/version.json

@@ -0,0 +1,6 @@
+{
+  "hw_version": "2.0",
+  "fw_version": "3.1.0",
+  "uid": "CCDDEE001122AAC0",
+  "pid": "HTR_MOD-001"
+}

{smartbox-2.5.0 → smartbox-2.5.2}/tests/test_session.py

@@ -192,8 +192,8 @@ async def test_get_node_samples_default_times(async_smartbox_session):
         called_start = int(match.group(1))
         called_end = int(match.group(2))
 
-        assert abs(called_start - (now - 3600)) <= 5
-        assert abs(called_end - (now + 3600)) <= 5
+        assert abs(called_start - (now - 3600)) <= 20
+        assert abs(called_end - (now + 3600)) <= 20
 
 
 @pytest.mark.asyncio
@@ -1383,6 +1383,50 @@ async def test_get_node_setup(async_smartbox_session, caplog):
                 async_smartbox_session.raw_response = True
 
 
+@pytest.mark.asyncio
+async def test_get_node_version(async_smartbox_session, caplog):
+    for mock_device in await async_smartbox_session.get_devices():
+        mock_device_id = mock_device["dev_id"]
+        for mock_node in await async_smartbox_session.get_nodes(mock_device_id):
+            with patch.object(
+                async_smartbox_session,
+                "_api_request",
+                new_callable=AsyncMock,
+            ) as mock_api_request:
+                url = f"devs/{mock_device_id}/{mock_node['type']}/{mock_node['addr']}/version"
+                mock_api_request.return_value = await fake_get_request(
+                    mock_api_request,
+                    url,
+                )
+
+                async_smartbox_session.raw_response = True
+                version = await async_smartbox_session.get_node_version(
+                    device_id=mock_device_id,
+                    node=mock_node,
+                )
+                assert version == mock_api_request.return_value
+                mock_api_request.assert_called_with(url)
+
+                async_smartbox_session.raw_response = False
+                version_model = await async_smartbox_session.get_node_version(
+                    device_id=mock_device_id,
+                    node=mock_node,
+                )
+                assert version_model.fw_version == version["fw_version"]
+                assert version_model.hw_version == version["hw_version"]
+                assert version_model.uid == version["uid"]
+                assert version_model.pid == version["pid"]
+
+                with pytest.raises(ValidationError):
+                    mock_api_request.return_value = {"fw_version": "1.0.0"}
+                    await async_smartbox_session.get_node_version(
+                        device_id=mock_device_id,
+                        node=mock_node,
+                    )
+                assert "Version config validation error" in caplog.text
+                async_smartbox_session.raw_response = True
+
+
 @pytest.mark.asyncio
 async def test_get_homes(async_smartbox_session):
     with patch.object(