pypetkitapi 1.17.1__tar.gz → 1.18.0__tar.gz

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

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

{pypetkitapi-1.17.1 → 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.17.1"
+__version__ = "1.18.0"
 
 __all__ = [
     "CTW3",

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

@@ -126,7 +126,7 @@ class RecordType(StrEnum):
     MOVE = "move"
     PET = "pet"
     TOILETING = "toileting"
-    WASTE = "waste"
+    WASTE = "waste_check"
     DISH_BEFORE = "dish_before"
     DISH_AFTER = "dish_after"
 

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

@@ -226,7 +226,7 @@ class ShitPictures(BaseModel):
     LitterRecord -> ShitPictures
     """
 
-    created_at: str | None = Field(None, alias="createdAt")
+    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")
@@ -251,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_pictures: ShitPictures | None = None
+    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
@@ -283,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.17.1 → pypetkitapi-1.18.0}/pypetkitapi/media.py

@@ -453,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.17.1 → pypetkitapi-1.18.0}/pyproject.toml

@@ -187,7 +187,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pypetkitapi"
-version = "1.17.1"
+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.17.1"
+current_version = "1.18.0"
 version_pattern = "MAJOR.MINOR.PATCH"
 commit_message = "bump version {old_version} -> {new_version}"
 tag_message = "{new_version}"