pypetkitapi 0.2.1__tar.gz → 0.4.0__tar.gz

{pypetkitapi-0.2.1 → pypetkitapi-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 0.2.1
+Version: 0.4.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.1 → pypetkitapi-0.4.0}/README.md

@@ -2,10 +2,6 @@
 
 ---
 
-# WIP - UNDER DEVELOPMENT
-
----
-
 [![PyPI](https://img.shields.io/pypi/v/pypetkitapi.svg)][pypi_]
 [![Python Version](https://img.shields.io/pypi/pyversions/pypetkitapi)][python version]
 
@@ -55,29 +51,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.1 → pypetkitapi-0.4.0}/pypetkitapi/client.py

@@ -101,18 +101,24 @@ class PetKitClient:
         await self._get_api_server_list()
         _LOGGER.debug("Finding region server for region: %s", self.region)
 
+        # TODO : Improve this
+        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,
         )
 
         if regional_server:
             _LOGGER.debug(
-                "Found server %s for region : %s", regional_server, self.region
+                "Using server %s for region : %s", regional_server, self.region
             )
             self._base_url = regional_server.gateway
             return

{pypetkitapi-0.2.1 → pypetkitapi-0.4.0}/pypetkitapi/command.py

@@ -160,10 +160,10 @@ class CmdData:
 def get_endpoint_manual_feed(device):
     """Get the endpoint for the device"""
     if device.device_type == FEEDER_MINI:
-        return PetkitEndpoint.MINI_MANUAL_FEED
+        return PetkitEndpoint.MANUAL_FEED_MINI
     if device.device_type == FEEDER:
-        return PetkitEndpoint.FRESH_ELEMENT_MANUAL_FEED
-    return PetkitEndpoint.MANUAL_FEED
+        return PetkitEndpoint.MANUAL_FEED_FRESH_ELEMENT
+    return PetkitEndpoint.MANUAL_FEED_DUAL
 
 
 def get_endpoint_reset_desiccant(device):
@@ -195,7 +195,7 @@ ACTIONS_MAP = {
         supported_device=DEVICES_FEEDER,  # TODO: Check if this is correct
     ),
     FeederCommand.MANUAL_FEED_DUAL: CmdData(
-        endpoint=PetkitEndpoint.UPDATE_SETTING,
+        endpoint=PetkitEndpoint.MANUAL_FEED_DUAL,
         params=lambda device, setting: {
             "day": datetime.datetime.now().strftime("%Y%m%d"),
             "deviceId": device.id,
@@ -203,7 +203,7 @@ ACTIONS_MAP = {
             "time": "-1",
             **setting,
         },
-        supported_device=ALL_DEVICES,
+        supported_device=[D4S, D4SH],
     ),
     FeederCommand.CANCEL_MANUAL_FEED: CmdData(
         endpoint=lambda device: (

{pypetkitapi-0.2.1 → pypetkitapi-0.4.0}/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):
@@ -107,6 +108,6 @@ class PetkitEndpoint(StrEnum):
     FRESH_ELEMENT_DESICCANT_RESET = "feeder/desiccant_reset"
     CALL_PET = "callPet"
     CANCEL_FEED = "cancelRealtimeFeed"
-    MINI_MANUAL_FEED = "feedermini/save_dailyfeed"
-    FRESH_ELEMENT_MANUAL_FEED = "feeder/save_dailyfeed"
-    MANUAL_FEED = "saveDailyFeed"
+    MANUAL_FEED_MINI = "feedermini/save_dailyfeed"
+    MANUAL_FEED_FRESH_ELEMENT = "feeder/save_dailyfeed"
+    MANUAL_FEED_DUAL = "saveDailyFeed"

{pypetkitapi-0.2.1 → pypetkitapi-0.4.0}/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.1 → pypetkitapi-0.4.0}/pypetkitapi/exceptions.py

@@ -22,8 +22,8 @@ class PetkitRegionalServerNotFoundError(PypetkitError):
         """Initialize the exception."""
         self.region = region
         self.message = (
-            f"Region you provided: '{region}' was not found in the server list. "
-            f"Are you sure you provided the correct region?"
+            f"Region you provided: '{region}' was not found in the Petkit's server list. "
+            f"Are you sure you provided the correct region ?"
         )
         super().__init__(self.message)
 

{pypetkitapi-0.2.1 → pypetkitapi-0.4.0}/pyproject.toml

@@ -187,7 +187,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "0.2.1"
+version = "0.4.0"
 description = "Python client for PetKit API"
 authors = ["Jezza34000 <info@mail.com>"]
 readme = "README.md"
@@ -204,7 +204,7 @@ black = "^24.10.0"
 ruff = "^0.8.1"
 
 [tool.bumpver]
-current_version = "0.2.1"
+current_version = "0.4.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"