flespi-sdk 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

flespi_sdk/account.py

@@ -1,5 +1,7 @@
 from aiohttp import ClientSession
 
+from flespi_sdk.exception import FlespiException
+from flespi_sdk.modules.devices import Devices
 from flespi_sdk.modules.metadata import Metadata
 from flespi_sdk.modules.mqtt import MQTT
 from flespi_sdk.modules.realms import Realms
@@ -60,7 +62,10 @@ class Account:
             "/platform/customer", headers=dict(Authorization=f"FlespiToken {token}")
         ) as response:
             if response.status != 200:
-                raise Exception("Failed to get account ID: " + str(response.status))
+                raise FlespiException(
+                    status_code=response.status,
+                    errors=(await response.json())["errors"],
+                )
             response_json = await response.json()
             result = response_json["result"]
             id = result[0]["id"]
@@ -71,7 +76,13 @@ class Account:
             self._init_modules()
 
     def _init_modules(self):
-        self.metadata = Metadata("platform/customer", self.session, self.id)
+        self.metadata = Metadata(
+            item_path="platform/customer",
+            metadata=None,
+            session=self.session,
+            cid=self.id,
+        )
         self.subaccounts = Subaccounts(self.session, self.id)
         self.realms = Realms(self.session, self.id)
         self.mqtt = MQTT(self.session, self.id)
+        self.devices = Devices(self.session, self.id)

flespi_sdk/modules/devices/__init__.py

@@ -0,0 +1,41 @@
+from aiohttp import ClientSession
+from flespi_sdk.modules.devices.device import Device
+from flespi_sdk.modules.flespi_session import FlespiSession
+
+
+class Devices(FlespiSession):
+    def __init__(self, session: ClientSession, cid: int | None = None):
+        super().__init__(session=session, cid=cid)
+
+    async def get(self, id: int, fields: list[str] = []):
+        async with self.session.get(
+            f"/gw/devices/{id}",
+            params=dict(fields=super().prepare_fields(fields)),
+            headers=self.get_headers(),
+        ) as response:
+            result = await self.get_result(response)
+            device = result[0]
+            return Device(
+                id=device["id"],
+                metadata=device["metadata"],
+                fields={field: device[field] for field in fields},
+                session=self.session,
+                cid=self.cid,
+            )
+
+    async def list(self, selector: str = "all", fields: list[str] = []):
+        async with self.session.get(
+            f"/gw/devices/{selector}",
+            headers=self.get_headers(),
+            params=dict(fields=super().prepare_fields(fields)),
+        ) as response:
+            return [
+                Device(
+                    id=device["id"],
+                    metadata=device["metadata"],
+                    fields={field: device[field] for field in fields},
+                    session=self.session,
+                    cid=self.cid,
+                )
+                for device in await self.get_result(response)
+            ]

flespi_sdk/modules/devices/device.py

@@ -0,0 +1,21 @@
+from aiohttp import ClientSession
+from flespi_sdk.modules.item_with_metadata import ItemWithMetadata
+
+
+class Device(ItemWithMetadata):
+    def __init__(
+        self,
+        id: int,
+        metadata: dict,
+        fields: dict,
+        session: ClientSession,
+        cid: int | None,
+    ):
+        super().__init__(
+            id=id,
+            metadata=metadata,
+            fields=fields,
+            item_path=f"gw/devices/{id}",
+            session=session,
+            cid=cid,
+        )

flespi_sdk/modules/flespi_session.py

@@ -24,3 +24,6 @@ class FlespiSession:
         response_json = await response.json()
         result = response_json["result"]
         return result
+
+    def prepare_fields(self, fields: list[str] = []):
+        return ",".join(list(set(["id", "metadata"] + fields)))

flespi_sdk/modules/item_with_metadata.py

@@ -6,17 +6,20 @@ from flespi_sdk.modules.metadata import Metadata
 class ItemWithMetadata(FlespiSession):
     def __init__(
         self,
-        parent_id: int | None,
         id: int,
         item_path: str,
         session: ClientSession,
+        metadata: dict | None = None,
+        fields: dict = {},
         cid: int | None = None,
     ):
         super().__init__(session, cid)
-        self.parent_id = parent_id
         self.id = id
         self.item_path = item_path
-        self.metadata = Metadata(item_path, session, cid)
+        self.initial_fields = fields
+        self.metadata = Metadata(
+            item_path=item_path, metadata=metadata, session=session, cid=cid
+        )
 
     async def get_name(self) -> str:
         """
@@ -29,3 +32,19 @@ class ItemWithMetadata(FlespiSession):
         ) as response:
             result = await self.get_result(response)
             return result[0]["name"]
+
+    def get_initial_fields(self):
+        return self.initial_fields
+
+    async def get_fields(self, fields: list[str]) -> dict:
+        """
+        Get fields for the current device.
+        :return: Dictionary with fields.
+        """
+        async with self.session.get(
+            self.item_path,
+            params=dict(fields=fields),
+            headers=self.get_headers(),
+        ) as response:
+            result = await self.get_result(response)
+            return result[0]

flespi_sdk/modules/metadata/__init__.py

@@ -5,28 +5,39 @@ from flespi_sdk.modules.flespi_session import FlespiSession
 
 class Metadata(FlespiSession):
     def __init__(
-        self, item_path, session: aiohttp.ClientSession, cid: int | None = None
+        self,
+        item_path,
+        metadata: dict | None,
+        session: aiohttp.ClientSession,
+        cid: int | None,
     ):
         super().__init__(session, cid)
         self.item_path = item_path
+        self.metadata_cache = metadata
 
-    async def get(self) -> dict:
+    async def get(self, use_cache: bool = True) -> dict:
         """
         Get metadata for the current account.
         :return: Metadata as a dictionary.
         """
+        if self.metadata_cache and use_cache:
+            return self.metadata_cache
+
         params = {"fields": "metadata"}
         async with self.session.get(
             self.item_path, params=params, headers=self.get_headers()
         ) as response:
             result = await self.get_result(response)
-            return result[0]["metadata"]
+            metadata = result[0]["metadata"]
+            self.metadata_cache = metadata
+            return metadata
 
     async def set(self, metadata: dict) -> None:
         """ "
         "Set metadata for the current account.
         :param metadata: Metadata as a dictionary.
         """
+        self.metadata_cache = None
         async with self.session.put(
             self.item_path,
             json={"metadata": metadata},
@@ -34,13 +45,13 @@ class Metadata(FlespiSession):
         ) as response:
             await self.get_result(response)
 
-    async def get_value(self, key_path: str):
+    async def get_value(self, key_path: str, use_cache: bool = True):
         """
         Get a specific value from the metadata.
         :param key_path: The key path to the value in the metadata.
         :return: The value from the metadata.
         """
-        metadata = await self.get()
+        metadata = await self.get(use_cache=use_cache)
         if not metadata:
             return None
         keys = key_path.split(".")
@@ -58,7 +69,7 @@ class Metadata(FlespiSession):
         :param key_path: The key path to the value in the metadata.
         :param value: The value to set.
         """
-        metadata = await self.get() or {}
+        metadata = await self.get(use_cache=False) or {}
         keys = key_path.split(".")
         metadata_level = metadata
         for key in keys[:-1]:
@@ -73,7 +84,7 @@ class Metadata(FlespiSession):
         Delete a specific key from the metadata.
         :param key_path: The key path to the value in the metadata.
         """
-        metadata = await self.get()
+        metadata = await self.get(use_cache=False)
         if not metadata:
             return
         keys = key_path.split(".")

flespi_sdk/modules/realms/__init__.py

@@ -8,25 +8,36 @@ class Realms(FlespiSession):
     def __init__(self, session: aiohttp.ClientSession, cid: int | None = None):
         super().__init__(session, cid)
 
-    async def get(self, id: int):
+    async def get(self, id: int, fields: list[str] = []):
         async with self.session.get(
-            f"/platform/realms/{id}", headers=self.get_headers()
+            f"/platform/realms/{id}",
+            params=dict(fields=super().prepare_fields(fields)),
+            headers=self.get_headers(),
         ) as response:
             result = await self.get_result(response)
             realm = result[0]
             return Realm(
-                realm_id=realm["id"],
+                id=realm["id"],
+                metadata=realm["metadata"],
+                fields={field: realm[field] for field in fields},
                 session=self.session,
                 cid=self.cid,
             )
 
-    async def list(self, selector: str = "all"):
+    async def list(self, selector: str = "all", fields: list[str] = []):
         async with self.session.get(
             f"/platform/realms/{selector}",
+            params=dict(fields=super().prepare_fields(fields)),
             headers=self.get_headers(),
         ) as response:
             result = await self.get_result(response)
             return [
-                Realm(realm_id=realm["id"], session=self.session, cid=self.cid)
+                Realm(
+                    id=realm["id"],
+                    metadata=realm["metadata"],
+                    fields={field: realm[field] for field in fields},
+                    session=self.session,
+                    cid=self.cid,
+                )
                 for realm in result
             ]

flespi_sdk/modules/realms/realm.py

@@ -11,18 +11,27 @@ class Realm(ItemWithMetadata):
     Represents a realm in the Flespi system.
     """
 
-    def __init__(self, realm_id: int, session: ClientSession, cid: int | None = None):
-        item_path = f"platform/realms/{realm_id}"
+    def __init__(
+        self,
+        id: int,
+        metadata: dict,
+        fields: dict,
+        session: ClientSession,
+        cid: int | None = None,
+    ):
         super().__init__(
-            parent_id=None, id=realm_id, item_path=item_path, session=session, cid=cid
+            id=id,
+            item_path=f"platform/realms/{id}",
+            metadata=metadata,
+            fields=fields,
+            session=session,
+            cid=cid,
         )
         self.users = Users(
-            realm_id=realm_id,
+            realm_id=id,
             client_session=session,
             cid=cid,
         )
 
-        self.home = RealmHome(realm_id=realm_id, session=session, cid=cid)
-        self.token_params = RealmTokenParams(
-            realm_id=realm_id, session=session, cid=cid
-        )
+        self.home = RealmHome(realm_id=id, session=session, cid=cid)
+        self.token_params = RealmTokenParams(realm_id=id, session=session, cid=cid)

flespi_sdk/modules/realms/users/__init__.py

@@ -23,20 +23,29 @@ class Users(FlespiSession):
         super().__init__(client_session, cid)
         self.realm_id = realm_id
 
-    async def get(self, user_id: int) -> User:
+    async def get(self, id: int, fields: list[str] = []) -> User:
         """
         Get a user by ID.
         :param user_id: The ID of the user to retrieve.
         :return: A User object.
         """
         async with self.session.get(
-            f"/platform/realms/{self.realm_id}/users/{user_id}",
+            f"/platform/realms/{self.realm_id}/users/{id}",
+            params=dict(fields=super().prepare_fields(fields)),
             headers=self.get_headers(),
         ) as response:
             result = await self.get_result(response)
-            return User(self.realm_id, result[0]["id"], self.session, self.cid)
+            user = result[0]
+            return User(
+                id=user["id"],
+                realm_id=self.realm_id,
+                metadata=user["metadata"],
+                fields={field: user[field] for field in fields},
+                session=self.session,
+                cid=self.cid,
+            )
 
-    async def list(self, selector: str = "all") -> list[User]:
+    async def list(self, selector: str = "all", fields: list[str] = []) -> list[User]:
         """
         List all users in the realm.
         :param selector: The selector to filter users.
@@ -44,10 +53,18 @@ class Users(FlespiSession):
         """
         async with self.session.get(
             f"/platform/realms/{self.realm_id}/users/{selector}",
+            params=dict(fields=super().prepare_fields(fields)),
             headers=self.get_headers(),
         ) as response:
             result = await self.get_result(response)
             return [
-                User(self.realm_id, user["id"], self.session, self.cid)
+                User(
+                    id=user["id"],
+                    realm_id=self.realm_id,
+                    metadata=user["metadata"],
+                    fields={field: user[field] for field in fields},
+                    session=self.session,
+                    cid=self.cid,
+                )
                 for user in result
             ]

flespi_sdk/modules/realms/users/user.py

@@ -5,8 +5,10 @@ from flespi_sdk.modules.item_with_metadata import ItemWithMetadata
 class User(ItemWithMetadata):
     def __init__(
         self,
+        id: int,
         realm_id: int,
-        user_id: int,
+        metadata: dict,
+        fields: dict,
         session: ClientSession,
         cid: int | None = None,
     ):
@@ -15,11 +17,12 @@ class User(ItemWithMetadata):
 
         :param client: The client instance used to make API requests.
         """
-        item_path = f"platform/realms/{realm_id}/users/{user_id}"
+        self.realm_id = realm_id
         super().__init__(
-            parent_id=realm_id,
-            id=user_id,
-            item_path=item_path,
+            id=id,
+            item_path=f"platform/realms/{realm_id}/users/{id}",
+            metadata=metadata,
+            fields=fields,
             session=session,
             cid=cid,
         )
@@ -37,7 +40,7 @@ class User(ItemWithMetadata):
             raise ValueError("Password must be at least 16 characters long")
 
         async with self.session.put(
-            f"/platform/realms/{self.parent_id}/users/{self.id}",
+            self.item_path,
             json={"password": password},
             headers=self.get_headers(),
         ) as response:

{flespi_sdk-0.1.3.dist-info → flespi_sdk-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flespi-sdk
-Version: 0.1.3
+Version: 0.1.4
 Summary: Add your description here
 Author-email: Sergey Shevchik <sergey.shevchik@gmail.com>
 Requires-Python: >=3.11

flespi_sdk-0.1.4.dist-info/RECORD

@@ -0,0 +1,22 @@
+flespi_sdk/__init__.py,sha256=INx-TmKYpKi9SC0-UMqtqKwnMnHK88oXyvh3tTFY668,1462
+flespi_sdk/account.py,sha256=fotm0kL36R5aHWSs-lh5VkZQKh21TJA4OjckBQgvzto,3103
+flespi_sdk/cli.py,sha256=6OcRQAu-LLFTYGGY_S0SNTXgHlazr3NaMDqPQ7QLg_E,1346
+flespi_sdk/exception.py,sha256=cffPxxMtUCyPO121XBzSzQ2yxUlJ75e18YaD3ikBZlg,356
+flespi_sdk/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flespi_sdk/modules/flespi_session.py,sha256=L4mewq3zpHT5C5xq57kJXGvszfJGARDI0zxfd9jswEY,918
+flespi_sdk/modules/item_with_metadata.py,sha256=7jxVvDMpYinHINgxEzXIvnoYvuCchLMGJQkUAklhX54,1493
+flespi_sdk/modules/items_container.py,sha256=5c8ov35NQ8dVmDGpq68ROaVIj8VtySaE0Rlrk0JUsLc,1440
+flespi_sdk/modules/devices/__init__.py,sha256=OAt-9F5yGcxcdvYi94l30DXpHohLzObtR76fTrCDEuU,1545
+flespi_sdk/modules/devices/device.py,sha256=kvQRGcJaV3Fdy6C6uSMbKDVKBa1dh0LsvcX6KX_rU2U,499
+flespi_sdk/modules/metadata/__init__.py,sha256=5e5svwrt-CY2bHr7dVbxeFJ-fyQMQHAtAQmBNUQC4a4,3173
+flespi_sdk/modules/mqtt/__init__.py,sha256=nLUQxrNpJ2E8l-OGyOAE-dfyOpQ4_-bjC-fkUEj_8As,2714
+flespi_sdk/modules/realms/__init__.py,sha256=cVdYLJF3lMNBWgQxvxGpbI2sNebZeUR1ldQ7ZOx6CJ4,1547
+flespi_sdk/modules/realms/realm.py,sha256=XOogurRt5jXm5srFzWak7asQTFIP3GcZAuXlGm44fE8,1030
+flespi_sdk/modules/realms/realm_home.py,sha256=WICjpFfNqW35iZYzLeWgPgg39ZdBwlI2SUClBWvgxEk,1488
+flespi_sdk/modules/realms/realm_token_params.py,sha256=dCQUAdDtzKoYbvSAatJsAdxomM267sZYC2BuE_O90w8,2835
+flespi_sdk/modules/realms/users/__init__.py,sha256=YpUM5IMIJQo2-0quKZI_ZZTjoYRDsVFj3um9BZR9Qwc,2438
+flespi_sdk/modules/realms/users/user.py,sha256=_BFKKGvv-J-3FD2DBU3uJtZd-yD-40aoFbB0SAcrDwE,1271
+flespi_sdk/modules/subaccounts/__init__.py,sha256=PhS91e9FoV3m6VkfrANoq0_Zf-v139VsShGBXoPaJ-I,1044
+flespi_sdk-0.1.4.dist-info/METADATA,sha256=xNrALQsmqn6gqO-xTIfcSppKiUaSI6lZvZQNkT-HtXc,2267
+flespi_sdk-0.1.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+flespi_sdk-0.1.4.dist-info/RECORD,,

flespi_sdk-0.1.3.dist-info/RECORD

@@ -1,20 +0,0 @@
-flespi_sdk/__init__.py,sha256=INx-TmKYpKi9SC0-UMqtqKwnMnHK88oXyvh3tTFY668,1462
-flespi_sdk/account.py,sha256=tu4JX4Qh8Sf25BbX4RMvXjWs5DJg2W_LeasaBSYzAzo,2774
-flespi_sdk/cli.py,sha256=6OcRQAu-LLFTYGGY_S0SNTXgHlazr3NaMDqPQ7QLg_E,1346
-flespi_sdk/exception.py,sha256=cffPxxMtUCyPO121XBzSzQ2yxUlJ75e18YaD3ikBZlg,356
-flespi_sdk/modules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flespi_sdk/modules/flespi_session.py,sha256=TdYYfLaXpU4eeKODNCtUYvm0-1Ka5V32MRHc7bojUqo,799
-flespi_sdk/modules/item_with_metadata.py,sha256=_J1dvU_aFg6yTeiKFuQPNMFEZnFkP5Li6NePXpyqRzY,906
-flespi_sdk/modules/items_container.py,sha256=5c8ov35NQ8dVmDGpq68ROaVIj8VtySaE0Rlrk0JUsLc,1440
-flespi_sdk/modules/metadata/__init__.py,sha256=3-FNhSeWFQIlUZH8jnCAVbiJvQI7emAz3I8LRB92VPU,2792
-flespi_sdk/modules/mqtt/__init__.py,sha256=nLUQxrNpJ2E8l-OGyOAE-dfyOpQ4_-bjC-fkUEj_8As,2714
-flespi_sdk/modules/realms/__init__.py,sha256=U3nT0Zwz7Y6knmEsL3jDqxwRntM3GgmMqJUERCJJsTs,1063
-flespi_sdk/modules/realms/realm.py,sha256=cXhEnfzSiV1ZMJWTYqG90Whon0-qUYmZ_rEf_xPc7Mw,954
-flespi_sdk/modules/realms/realm_home.py,sha256=WICjpFfNqW35iZYzLeWgPgg39ZdBwlI2SUClBWvgxEk,1488
-flespi_sdk/modules/realms/realm_token_params.py,sha256=dCQUAdDtzKoYbvSAatJsAdxomM267sZYC2BuE_O90w8,2835
-flespi_sdk/modules/realms/users/__init__.py,sha256=hHv5R_eySJ_ioQIfYjYHbnbcMm1NhSKBKBpsNILHfbE,1798
-flespi_sdk/modules/realms/users/user.py,sha256=Y6Z3WZuzyl9-IOvKl4_OkBXBT2nIiq8L_dWF6MhD-IY,1249
-flespi_sdk/modules/subaccounts/__init__.py,sha256=PhS91e9FoV3m6VkfrANoq0_Zf-v139VsShGBXoPaJ-I,1044
-flespi_sdk-0.1.3.dist-info/METADATA,sha256=7chNQ96JQ9T-WiFPWa9QJ5VmU1A_JCX1IGxamif0H1M,2267
-flespi_sdk-0.1.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-flespi_sdk-0.1.3.dist-info/RECORD,,