pypetkitapi 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

pypetkitapi/client.py

@@ -18,6 +18,7 @@ from pypetkitapi.const import (
     ERR_KEY,
     LOGIN_DATA,
     RES_KEY,
+    SUCCESS_KEY,
     Header,
     PetkitEndpoint,
     PetkitURL,
@@ -45,7 +46,7 @@ class PetKitClient:
     _session: SessionInfo | None = None
     _servers_list: list[RegionInfo] = []
     account_data: list[AccountData] = []
-    device_list: list[Feeder | Litter | WaterFountain] = []
+    device_list: dict[int, Feeder | Litter | WaterFountain] = {}
 
     def __init__(
         self,
@@ -100,11 +101,16 @@ class PetKitClient:
         await self._get_api_server_list()
         _LOGGER.debug("Finding region server for region: %s", self.region)
 
+        if self.region == "china":
+            self._base_url = PetkitURL.CHINA_SRV
+            return
+
         regional_server = next(
             (
                 server
                 for server in self._servers_list
                 if server.name.lower() == self.region
+                or server.id.lower() == self.region
             ),
             None,
         )
@@ -263,22 +269,28 @@ class PetKitClient:
         )
         device_data = data_class(**response)
         device_data.device_type = device.device_type  # Add the device_type attribute
-        _LOGGER.debug("Reading device type : %s", device.device_type)
-        self.device_list.append(device_data)
+        _LOGGER.debug(
+            "Reading device type : %s (id=%s)", device.device_type, device.device_id
+        )
+        self.device_list[device.device_id] = device_data
 
     async def send_api_request(
         self,
-        device: Feeder | Litter | WaterFountain,
+        device_id: int,
         action: StrEnum,
         setting: dict | None = None,
     ) -> None:
         """Control the device using the PetKit API."""
+        device = self.device_list.get(device_id)
+        if not device:
+            raise PypetkitError(f"Device with ID {device_id} not found.")
 
         _LOGGER.debug(
-            "Control API: %s %s %s",
+            "Control API device=%s id=%s action=%s param=%s",
+            device.device_type,
+            device_id,
             action,
             setting,
-            device,
         )
 
         if device.device_type:
@@ -312,12 +324,16 @@ class PetKitClient:
             params = action_info.params(device)
 
         prep_req = PrepReq(base_url=self._base_url)
-        await prep_req.request(
+        res = await prep_req.request(
             method=HTTPMethod.POST,
             url=url,
             data=params,
             headers=headers,
         )
+        if res == SUCCESS_KEY:
+            _LOGGER.info("Command executed successfully")
+        else:
+            _LOGGER.error("Command execution failed")
 
 
 class PrepReq:

pypetkitapi/const.py

@@ -35,6 +35,7 @@ class PetkitURL(StrEnum):
     """Petkit URL constants"""
 
     REGION_SRV = "https://passport.petkt.com/v1/regionservers"
+    CHINA_SRV = "https://api.petkit.cn/6/"
 
 
 class Client(StrEnum):

pypetkitapi/containers.py

@@ -26,7 +26,7 @@ class SessionInfo(BaseModel):
     id: str
     user_id: str = Field(alias="userId")
     expires_in: int = Field(alias="expiresIn")
-    region: str
+    region: str | None = None
     created_at: str = Field(alias="createdAt")
 
 

{pypetkitapi-0.2.0.dist-info → pypetkitapi-0.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 0.2.0
+Version: 0.3.0
 Summary: Python client for PetKit API
 Home-page: https://github.com/Jezza34000/pypetkit
 License: MIT
@@ -19,10 +19,6 @@ Description-Content-Type: text/markdown
 
 ---
 
-# WIP - UNDER DEVELOPMENT
-
----
-
 [![PyPI](https://img.shields.io/pypi/v/pypetkitapi.svg)][pypi_]
 [![Python Version](https://img.shields.io/pypi/pyversions/pypetkitapi)][python version]
 
@@ -72,29 +68,29 @@ logging.basicConfig(level=logging.DEBUG)
 
 async def main():
     client = PetKitClient(
-        username="username",  # Your PetKit account username
+        username="username",  # Your PetKit account username or id
         password="password",  # Your PetKit account password
-        region="France",  # Your region
+        region="France",  # Your region or country code (e.g. FR, US, etc.)
         timezone="Europe/Paris",  # Your timezone
     )
 
     # To get the account and devices data attached to the account
     await client.get_devices_data()
+
     # Read the account data
     print(client.account_data)
+
     # Read the devices data
     print(client.device_list)
 
-    # client.device_list[0] is the first device in the list in this example it's a Feeder
-    # Get the Feeder from the device list
-    my_feeder = client.device_list[0]
-
     # Send command to the devices
     ### Example 1 : Turn on the indicator light
-    await client.send_api_request(my_feeder, DeviceCommand.UPDATE_SETTING, {"lightMode": 1})
+    ### Device_ID, Command, Payload
+    await client.send_api_request(012346789, DeviceCommand.UPDATE_SETTING, {"lightMode": 1})
 
     ### Example 2 : Feed the pet
-    await client.send_api_request(my_feeder, FeederCommand.MANUAL_FEED, {"amount": 1})
+    ### Device_ID, Command, Payload
+    await client.send_api_request(0123467, FeederCommand.MANUAL_FEED, {"amount": 1})
 
 
 if __name__ == "__main__":

{pypetkitapi-0.2.0.dist-info → pypetkitapi-0.3.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=tbYTezkPZMDtKCM3M9QjlWK9WzUEDYt5o9w7WjQpsJM,14209
+pypetkitapi/client.py,sha256=yb7RWlr_F1yrmmYRvQNKEt2Zd6PClsctRZYa0nRVtH0,14791
 pypetkitapi/command.py,sha256=ibJ0zenONy-FBvUvyIA_IvUnYEUezLpPxhC_9XZ6SwM,9282
-pypetkitapi/const.py,sha256=49NMRaCGok20P-qfzlL6PH7QN9-QDuAsPh2Fejqf2iE,2945
-pypetkitapi/containers.py,sha256=GQqZKaDgemQM4UDnugWYDP7N01anpJwO4VjQy2Gla3E,3109
+pypetkitapi/const.py,sha256=XKiybtizB115OwVo7l9d2bZyVfkFjYWEtt9mBwYLcDk,2988
+pypetkitapi/containers.py,sha256=XhNbRUztnBpIr9cypDoyE3MHojic831G5GSisK9B7kU,3123
 pypetkitapi/exceptions.py,sha256=f9QY1EME9ha_vJJx4DuL_OBNpoynYVdtMFtVZbdfook,1129
 pypetkitapi/feeder_container.py,sha256=IGXeAEbLkZhOTCzF2MhwqadIAKXg6jHbfU037dt6byY,10985
 pypetkitapi/litter_container.py,sha256=aLAvcB8K_nx7iBRkAarZs-48HAj2NkG7XjJFonWMuME,8948
 pypetkitapi/water_fountain_container.py,sha256=LcCTDjk7eSbnF7e38xev3D5mCv5wwJ6go8WGGBv-CaU,5278
-pypetkitapi-0.2.0.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-0.2.0.dist-info/METADATA,sha256=bQFC9AJGJmBF2TmX2BeytugFr63V4rtlxpzrjQSIhME,3700
-pypetkitapi-0.2.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-0.2.0.dist-info/RECORD,,
+pypetkitapi-0.3.0.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-0.3.0.dist-info/METADATA,sha256=FaCJfahbgxUuDf8kfEeVhwn22vDPWu9bEfvmVRO43sk,3611
+pypetkitapi-0.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-0.3.0.dist-info/RECORD,,