Merge pull request #94 from Thomas55555/return-containers-as-dictionary

return containers as dictionary

example.py

@@ -45,15 +45,16 @@ async def main() -> None:
     aiotainer_api = PortainerClient(AsyncTokenAuth(websession), poll=True)
     await aiotainer_api.connect()
     settings = await aiotainer_api.get_settings()
-    print("SETTINGS")
-    print("::::::::")
     pprint.pprint(settings)
-    for test in aiotainer_api.data.values():
-        for snapshot in test.snapshots:
-            for container in snapshot.docker_snapshot_raw.containers:
-                print(container.names[0].strip("/"), container.state, container.id)
-    a = await aiotainer_api.get_status_specific(2)
-    pprint.pprint(a)
+    for node in aiotainer_api.data:
+        for container_id in (
+            aiotainer_api.data[node].snapshots[-1].docker_snapshot_raw.containers
+        ):
+            pprint.pprint(
+                aiotainer_api.data[node]
+                .snapshots[-1]
+                .docker_snapshot_raw.containers[container_id]
+            )
     await asyncio.sleep(2000)
     await aiotainer_api.close()
     await websession.close()

src/aiotainer/model.py

@@ -64,7 +64,15 @@ class Container(DataClassDictMixin):
 class DockerSnapshotRaw(DataClassDictMixin):
     """Dataclass for raw Docker snapshot data."""
 
-    containers: list[Container] = field(metadata=field_options(alias="Containers"))
+    containers: dict[str, Container] = field(
+        metadata=field_options(
+            alias="Containers",
+            deserialize=lambda containers_list: {
+                container_data["Id"]: Container.from_dict(container_data)
+                for container_data in containers_list
+            },
+        )
+    )
 
 
 @dataclass

src/aiotainer/portainer_settings.py

@@ -139,9 +139,9 @@ class FDOConfiguration(DataClassDictMixin):
 seconds_per_unit = {"s": 1, "m": 60, "h": 3600, "d": 86400, "w": 604800}
 
 
-def convert_to_seconds(s: str) -> int:
-    """Convert string to seconds."""
-    return int(s[:-1]) * seconds_per_unit[s[-1]]
+# def convert_to_seconds(s: str) -> int:
+#     """Convert string to seconds."""
+#     return int(s[:-1]) * seconds_per_unit[s[-1]]
 
 
 @dataclass
@@ -154,9 +154,7 @@ class EdgeConfiguration(DataClassDictMixin):
     ping_interval: int = field(default=0, metadata=field_options(alias="PingInterval"))
     snapshot_interval: int = field(
         default=0,
-        metadata=field_options(
-            alias="SnapshotInterval", deserialize=convert_to_seconds
-        ),
+        metadata=field_options(alias="SnapshotInterval"),
     )
     async_mode: bool = field(default=False, metadata=field_options(alias="AsyncMode"))