pypetkitapi 1.16.7__tar.gz → 1.18.0__tar.gz

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pypetkitapi
-Version: 1.16.7
+Version: 1.18.0
 Summary: Python client for PetKit API
 License: MIT
 Author: Jezza34000

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/pypetkitapi/__init__.py

@@ -51,7 +51,7 @@ from .media import DownloadDecryptMedia, MediaCloud, MediaFile, MediaManager
 from .purifier_container import Purifier
 from .water_fountain_container import WaterFountain
 
-__version__ = "1.16.7"
+__version__ = "1.18.0"
 
 __all__ = [
     "CTW3",

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/pypetkitapi/const.py

@@ -81,7 +81,7 @@ class Header(StrEnum):
     ACCEPT = "*/*"
     ACCEPT_LANG = "en-US;q=1, it-US;q=0.9"
     ENCODING = "gzip, deflate"
-    API_VERSION = "12.1.0"
+    API_VERSION = "12.4.1"
     CONTENT_TYPE = "application/x-www-form-urlencoded"
     AGENT = "okhttp/3.12.11"
     CLIENT = f"{Client.PLATFORM_TYPE}({Client.OS_VERSION};{Client.MODEL_NAME})"
@@ -126,6 +126,9 @@ class RecordType(StrEnum):
     MOVE = "move"
     PET = "pet"
     TOILETING = "toileting"
+    WASTE = "waste_check"
+    DISH_BEFORE = "dish_before"
+    DISH_AFTER = "dish_after"
 
 
 RecordTypeLST = [
@@ -134,6 +137,9 @@ RecordTypeLST = [
     RecordType.MOVE,
     RecordType.PET,
     RecordType.TOILETING,
+    RecordType.WASTE,
+    RecordType.DISH_BEFORE,
+    RecordType.DISH_AFTER,
 ]
 
 

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/pypetkitapi/litter_container.py

@@ -81,6 +81,7 @@ class SettingsLitter(BaseModel):
     pet_detection: int | None = Field(None, alias="petDetection")
     pet_in_notify: int | None = Field(None, alias="petInNotify")
     pet_notify: int | None = Field(None, alias="petNotify")
+    ph_detection: int | None = Field(None, alias="phDetection")
     pre_live: int | None = Field(None, alias="preLive")
     relate_k3_switch: int | None = Field(None, alias="relateK3Switch")
     sand_saving: int | None = Field(None, alias="sandSaving")
@@ -92,6 +93,7 @@ class SettingsLitter(BaseModel):
     system_sound_enable: int | None = Field(None, alias="systemSoundEnable")
     time_display: int | None = Field(None, alias="timeDisplay")
     toilet_detection: int | None = Field(None, alias="toiletDetection")
+    toilet_light: int | None = Field(None, alias="toiletLight")
     toilet_notify: int | None = Field(None, alias="toiletNotify")
     tone_config: int | None = Field(None, alias="toneConfig")
     tone_mode: int | None = Field(None, alias="toneMode")
@@ -100,6 +102,7 @@ class SettingsLitter(BaseModel):
     underweight: int | None = Field(None, alias="underweight")
     unit: int | None = None
     upload: int | None = None
+    voice: int | None = None
     volume: int | None = None
     wander_detection: int | None = Field(None, alias="wanderDetection")
     weight_popup: int | None = Field(None, alias="weightPopup")
@@ -189,6 +192,7 @@ class ContentSC(BaseModel):
     litter_percent: int | None = Field(None, alias="litterPercent")
     mark: int | None = None
     media: int | None = None
+    ph_reason: int | None = Field(None, alias="phReason")
     result: int | None = None
     start_reason: int | None = Field(None, alias="startReason")
     start_time: int | None = Field(None, alias="startTime")
@@ -217,9 +221,20 @@ class LRContent(BaseModel):
     error: int | None = None
 
 
+class ShitPictures(BaseModel):
+    """Dataclass for sub-content of LitterRecord.
+    LitterRecord -> ShitPictures
+    """
+
+    created_at: str | int | None = Field(None, alias="createdAt")
+    pic_id: str | None = Field(None, alias="picId")
+    shit_aes_key: str | None = Field(None, alias="shitAesKey")
+    shit_picture: str | None = Field(None, alias="shitPicture")
+
+
 class LRSubContent(BaseModel):
     """Subclass of LitterRecord.
-    LitterRecord -> subContent
+    LitterRecord -> List[subContent]
     """
 
     aes_key: str | None = Field(None, alias="aesKey")
@@ -236,7 +251,7 @@ class LRSubContent(BaseModel):
     preview: str | None = None
     related_event: str | None = Field(None, alias="relatedEvent")
     shit_aes_key: str | None = Field(None, alias="shitAesKey")
-    shit_picture: str | None = Field(None, alias="shitPicture")
+    shit_pictures: list[ShitPictures] | None = Field(None, alias="shitPictures")
     storage_space: int | None = Field(None, alias="storageSpace")
     sub_content: list[Any] | None = Field(None, alias="subContent")
     timestamp: int | None = None
@@ -244,16 +259,6 @@ class LRSubContent(BaseModel):
     user_id: str | None = Field(None, alias="userId")
 
 
-class ShitPictures(BaseModel):
-    """Dataclass for sub-content of LitterRecord.
-    LitterRecord -> ShitPictures
-    """
-
-    pic_id: str | None = Field(None, alias="picId")
-    shit_aes_key: str | None = Field(None, alias="shitAesKey")
-    shit_picture: str | None = Field(None, alias="shitPicture")
-
-
 class LitterRecord(BaseModel):
     """Dataclass for feeder record data.
     Litter records (Main class)
@@ -278,7 +283,7 @@ class LitterRecord(BaseModel):
     pet_name: str | None = Field(None, alias="petName")
     preview: str | None = None
     related_event: str | None = Field(None, alias="relatedEvent")
-    shit_pictures: ShitPictures | None = None
+    shit_pictures: list[ShitPictures] | None = Field(None, alias="shitPictures")
     storage_space: int | None = Field(None, alias="storageSpace")
     sub_content: list[LRSubContent] | None = Field(None, alias="subContent")
     timestamp: int | None = None

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/pypetkitapi/media.py

@@ -345,7 +345,7 @@ class MediaManager:
                 continue
 
             date_str = await self.get_date_from_ts(timestamp)
-            filepath = f"{feeder_id}/{date_str}/{record_type.name.lower()}"
+            filepath = f"{feeder_id}/{date_str}"
             media_files.append(
                 MediaCloud(
                     event_id=item.event_id,
@@ -356,11 +356,44 @@ class MediaManager:
                     video=await self.construct_video_url(
                         device_type, item, user_id, cp_sub
                     ),
-                    filepath=filepath,
+                    filepath=f"{filepath}/{record_type.name.lower()}",
                     aes_key=item.aes_key,
                     timestamp=timestamp,
                 )
             )
+
+            # Gather the dish before and after images for EAT records
+            if record_type == RecordType.EAT:
+                if hasattr(item, "preview1") and item.preview1:
+                    # Preview1 is dish before image
+                    media_files.append(
+                        MediaCloud(
+                            event_id=item.event_id,
+                            event_type=RecordType.DISH_BEFORE,
+                            device_id=feeder_id,
+                            user_id=user_id,
+                            image=item.preview1,
+                            video=None,
+                            filepath=f"{filepath}/{RecordType.DISH_BEFORE.name.lower()}",
+                            aes_key=item.aes_key,
+                            timestamp=timestamp,
+                        )
+                    )
+                if hasattr(item, "preview2") and item.preview2:
+                    # Preview2 is dish after image
+                    media_files.append(
+                        MediaCloud(
+                            event_id=item.event_id,
+                            event_type=RecordType.DISH_AFTER,
+                            device_id=feeder_id,
+                            user_id=user_id,
+                            image=item.preview2,
+                            video=None,
+                            filepath=f"{filepath}/{RecordType.DISH_AFTER.name.lower()}",
+                            aes_key=item.aes_key,
+                            timestamp=timestamp,
+                        )
+                    )
         return media_files
 
     async def _process_litter(self, litter: Litter) -> list[MediaCloud]:
@@ -399,11 +432,16 @@ class MediaManager:
             timestamp = record.timestamp or None
             date_str = await self.get_date_from_ts(timestamp)
 
-            filepath = f"{litter_id}/{date_str}/toileting"
+            if getattr(record, "enum_event_type", None) == "pet_detect":
+                event_type = RecordType.PET
+            else:
+                event_type = RecordType.TOILETING
+
+            filepath = f"{litter_id}/{date_str}/{event_type.name.lower()}"
             media_files.append(
                 MediaCloud(
                     event_id=record.event_id,
-                    event_type=RecordType.TOILETING,
+                    event_type=event_type,
                     device_id=litter_id,
                     user_id=user_id,
                     image=record.preview,
@@ -415,6 +453,35 @@ class MediaManager:
                     timestamp=record.timestamp,
                 )
             )
+
+            # Gather Waste images if available
+            if hasattr(record, "sub_content") and record.sub_content:
+                for sub_record in record.sub_content:
+                    if (
+                        hasattr(sub_record, "shit_pictures")
+                        and isinstance(sub_record.shit_pictures, list)
+                        and len(sub_record.shit_pictures) > 2
+                    ):
+                        waste_image_data = sub_record.shit_pictures[2]
+                        if (
+                            waste_image_data.shit_picture
+                            and waste_image_data.shit_aes_key
+                        ):
+                            waste_filepath = f"{litter_id}/{date_str}/{RecordType.WASTE.name.lower()}"
+                            media_files.append(
+                                MediaCloud(
+                                    event_id=record.event_id,
+                                    event_type=RecordType.WASTE,
+                                    device_id=litter_id,
+                                    user_id=user_id,
+                                    image=waste_image_data.shit_picture,
+                                    video=None,
+                                    filepath=waste_filepath,
+                                    aes_key=waste_image_data.shit_aes_key,
+                                    timestamp=record.timestamp,
+                                )
+                            )
+
         return media_files
 
     @staticmethod

{pypetkitapi-1.16.7 → pypetkitapi-1.18.0}/pyproject.toml

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