http: api: add expand to list devices

Author: rnovatorov

src/enapter/cli/http/api/device_list_command.py

@@ -18,13 +18,41 @@ def register(parent: cli.Subparsers) -> None:
             help="Maximum number of devices to list",
             default=-1,
         )
+        parser.add_argument(
+            "-m",
+            "--manifest",
+            action="store_true",
+            help="Expand device manifest information",
+        )
+        parser.add_argument(
+            "-p",
+            "--properties",
+            action="store_true",
+            help="Expand device properties information",
+        )
+        parser.add_argument(
+            "-c",
+            "--connectivity",
+            action="store_true",
+            help="Expand device connectivity information",
+        )
+        parser.add_argument(
+            "--communication",
+            action="store_true",
+            help="Expand device communication information",
+        )
 
     @staticmethod
     async def run(args: argparse.Namespace) -> None:
         if args.limit == 0:
             return
         async with http.api.Client(http.api.Config.from_env()) as client:
-            async with client.devices.list() as stream:
+            async with client.devices.list(
+                expand_manifest=args.manifest,
+                expand_properties=args.properties,
+                expand_connectivity=args.connectivity,
+                expand_communication=args.communication,
+            ) as stream:
                 count = 0
                 async for device in stream:
                     print(json.dumps(device.to_dto()))

src/enapter/http/api/devices/client.py

@@ -1,4 +1,4 @@
-from typing import Any, AsyncGenerator
+from typing import AsyncGenerator
 
 import httpx
 
@@ -36,19 +36,32 @@ async def get(
             "connectivity": expand_connectivity,
             "communication": expand_communication,
         }
-        params = {"expand": ",".join(k for k, v in expand.items() if v)}
-        response = await self._client.get(url, params=params)
+        expand_string = ",".join(k for k, v in expand.items() if v)
+        response = await self._client.get(url, params={"expand": expand_string})
         api.check_error(response)
         return Device.from_dto(response.json()["device"])
 
     @async_.generator
-    async def list(self) -> AsyncGenerator[Device, None]:
+    async def list(
+        self,
+        expand_manifest: bool = False,
+        expand_properties: bool = False,
+        expand_connectivity: bool = False,
+        expand_communication: bool = False,
+    ) -> AsyncGenerator[Device, None]:
         url = "v3/devices"
+        expand = {
+            "manifest": expand_manifest,
+            "properties": expand_properties,
+            "connectivity": expand_connectivity,
+            "communication": expand_communication,
+        }
+        expand_string = ",".join(k for k, v in expand.items() if v)
         limit = 50
         offset = 0
         while True:
             response = await self._client.get(
-                url, params={"limit": limit, "offset": offset}
+                url, params={"expand": expand_string, "limit": limit, "offset": offset}
             )
             api.check_error(response)
             payload = response.json()