Merge pull request #270 from quartiq/py-client

py: fix json loads on get/clear

py/miniconf-mqtt/miniconf/async_.py

@@ -195,7 +195,9 @@ async def get(self, path: str, **kwargs):
         Args:
             path: The path to get. Must be a leaf node.
         """
-        return await self._do(topic=f"{self.prefix}/settings{path}", **kwargs)
+        return json.loads(
+            await self._do(topic=f"{self.prefix}/settings{path}", **kwargs)
+        )
 
     async def clear(self, path: str, response=True, **kwargs):
         """Clear retained value from a path.
@@ -205,11 +207,13 @@ async def clear(self, path: str, response=True, **kwargs):
         Args:
             path: The path to clear. Must be a leaf node.
         """
-        return await self._do(
-            f"{self.prefix}/settings{path}",
-            retain=True,
-            response=response,
-            **kwargs,
+        return json.loads(
+            await self._do(
+                f"{self.prefix}/settings{path}",
+                retain=True,
+                response=response,
+                **kwargs,
+            )
         )
 
 
@@ -406,8 +410,8 @@ async def _handle_commands(interface, commands, retain):
                 path, value = arg.split("=", 1)
                 path = current.normalize(path)
                 if not value:
-                    await interface.clear(path)
-                    print(f"CLEAR '{path}'")
+                    value = await interface.clear(path)
+                    print(f"CLEAR {path}={value}")
                 else:
                     await interface.set(path, json.loads(value), retain)
                     print(f"{path}={value}")

py/miniconf-mqtt/miniconf/sync.py

@@ -173,7 +173,7 @@ def get(self, path: str, **kwargs):
         Args:
             path: The path to get. Must be a leaf node.
         """
-        return self._do(topic=f"{self.prefix}/settings{path}", **kwargs)
+        return json.loads(self._do(topic=f"{self.prefix}/settings{path}", **kwargs))
 
     def clear(self, path: str, response=True, **kwargs):
         """Clear retained value from a path.
@@ -183,11 +183,13 @@ def clear(self, path: str, response=True, **kwargs):
         Args:
             path: The path to clear. Must be a leaf node.
         """
-        return self._do(
-            f"{self.prefix}/settings{path}",
-            retain=True,
-            response=response,
-            **kwargs,
+        return json.loads(
+            self._do(
+                f"{self.prefix}/settings{path}",
+                retain=True,
+                response=response,
+                **kwargs,
+            )
         )
 
 
@@ -306,8 +308,8 @@ def _handle_commands(interface, commands, retain):
                 path, value = arg.split("=", 1)
                 path = current.normalize(path)
                 if not value:
-                    interface.clear(path)
-                    print(f"CLEAR '{path}'")
+                    value = interface.clear(path)
+                    print(f"CLEAR {path}={value}")
                 else:
                     interface.set(path, json.loads(value), retain)
                     print(f"{path}={value}")

py/miniconf-mqtt/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "miniconf-mqtt"
 # Note: keep this in sync with Cargo.toml
-version = "0.18.0"
+version = "0.18.2"
 description = "Utilities for configuring Miniconf-configurable devices"
 authors = [
     { name = "Ryan Summers", email = "[email protected]" },