connection.py: fix device_query api to return dict

Signed-off-by: Lukas Rusak <lorusak@gmail.com>

libeagle/connection.py

@@ -136,7 +136,7 @@ async def device_details(self, address) -> dict:
 
         return details
 
-    async def device_query(self, address, component_name=None, variable_name=None) -> list[dict]:
+    async def device_query(self, address, component_name=None, variable_name=None) -> dict:
         """
         Returns the device query for a given hardware address, name, and variable
 
@@ -180,25 +180,31 @@ async def device_query(self, address, component_name=None, variable_name=None) -
 
         self.logger.debug(f"return data: {etree.tostring(xml).decode()}")
 
-        data = []
+        query = {"Components": []}
 
-        components = xml.find("Components")
-        for component in components.iter("Component"):
+        device_details = xml.find("DeviceDetails")
+        for detail in device_details.iter():
+            query[detail.tag] = detail.text
+
+        for component in xml.findall("Component"):
 
             component_data = {}
 
             for detail in component.iter():
+
                 if detail.tag == "Variables":
-                    component_data["Variables"] = {}
+                    component_data["Variables"] = []
 
                     for variable in detail.iter("Variable"):
                         key = variable.findtext("Name")
                         value = variable.findtext("Value")
                         component_data["Variables"][key] = value
+                else:
+                    component_data[detail.tag] = detail.text
 
-            data.append(component_data)
+                query["Components"].append(component_data)
 
-        return data
+        return query
 
     async def _doRequest(self, values) -> bytes:
         async with self.session.post("/cgi-bin/post_manager", data=values) as response:

tests/test_eagle200.py

@@ -52,8 +52,11 @@ async def test_eagle200(self):
                     )
 
                     assert len(query) > 0
+                    assert "Name" in query
+                    assert "HardwareAddress" in query
+                    assert "Components" in query
 
-                    for component in query:
+                    for component in query["Components"]:
 
                         assert "Variables" in component
                         assert "zigbee:InstantaneousDemand" in component["Variables"]
@@ -65,8 +68,11 @@ async def test_eagle200(self):
                 query = await conn.device_query(device["HardwareAddress"])
 
                 assert len(query) > 0
+                assert "Name" in query
+                assert "HardwareAddress" in query
+                assert "Components" in query
 
-                for component in query:
+                for component in query["Components"]:
 
                     assert "Variables" in component
                     assert "zigbee:Message" in component["Variables"]