pypetkitapi 1.17.1__py3-none-any.whl → 1.18.0__py3-none-any.whl

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/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/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/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.dist-info → pypetkitapi-1.18.0.dist-info}/METADATA

@@ -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.dist-info → pypetkitapi-1.18.0.dist-info}/RECORD

@@ -1,19 +1,19 @@
-pypetkitapi/__init__.py,sha256=dOtdPEsQnphXdMIyxsJkgiDAsdcQevSvq7l9MwPRktc,2107
+pypetkitapi/__init__.py,sha256=-K15jZnfHBmYyYERr0dH_NR7gvEB4GW2zxHdTJ1n45k,2107
 pypetkitapi/bluetooth.py,sha256=VNoJ3E9WXzEfqRoWwKiemITKIt9aa9ICRzDvFuJ3PP0,9915
 pypetkitapi/client.py,sha256=D49j-5oks0iJDgQbHKDyapZjhtfCNE7rrowl3yL_YSk,31299
 pypetkitapi/command.py,sha256=zw4h1SCInG2T0-wAA_al59_FTL36TUZldtJkYKw6ATI,7655
-pypetkitapi/const.py,sha256=-IDc9tsxrJkvipYhQYD3saJayuD2d61DkBWwm-Ag30U,4991
+pypetkitapi/const.py,sha256=gnJCsn4LVetsN6LwR2D5tqbxTITiwP4mNc1nSgAD8Qw,4997
 pypetkitapi/containers.py,sha256=MWfSHLU-ZEIf220nv3-96U41PhCl9Gh6ETBV_SYBvV4,6648
 pypetkitapi/exceptions.py,sha256=4BXUyYXLfZjNxdnOGJPjyE9ASIl7JmQphjws87jvHtE,1631
 pypetkitapi/feeder_container.py,sha256=PhidWd5WpsZqtdKZy60PzE67YXgQfApjm8CqvMCHK3U,14743
-pypetkitapi/litter_container.py,sha256=ER3rAedYIk7j6WKEneEYUkEjgx5My6MUp_auN8cMXdM,20843
-pypetkitapi/media.py,sha256=Dzy9I6ih4e7bYd0jRpqdoJ_E_7QKPC7ndnUxQ_YGTAc,28933
+pypetkitapi/litter_container.py,sha256=17Qf23MgdSTgTVjLGAjpiMyClngBemyaHGQN4tDOiJE,20919
+pypetkitapi/media.py,sha256=LyXvzE_n8lupFoLgnuFsRzSPoAx5dZz2zhVyxMUVlnE,30412
 pypetkitapi/purifier_container.py,sha256=NlDZ2eAuD3xnqLGfFzaXErQXBPHjSbUI9tXln5K9mG4,3200
 pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypetkitapi/schedule_container.py,sha256=ycIHeQHkVILDp7ZBjaVdGI_9rhHrgqeKBfvQAX3JMGE,2071
 pypetkitapi/utils.py,sha256=z7325kcJQUburnF28HSXrJMvY_gY9007K73Zwxp-4DQ,743
 pypetkitapi/water_fountain_container.py,sha256=5J0b-fDZYcFLNX2El7fifv8H6JMhBCt-ttxSow1ozRQ,6787
-pypetkitapi-1.17.1.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
-pypetkitapi-1.17.1.dist-info/METADATA,sha256=a0fhcB9ZSCVCaOcpdtxeTAsZiXfs4JkGSb5U8U9Orrs,12977
-pypetkitapi-1.17.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-pypetkitapi-1.17.1.dist-info/RECORD,,
+pypetkitapi-1.18.0.dist-info/LICENSE,sha256=u5jNkZEn6YMrtN4Kr5rU3TcBJ5-eAt0qMx4JDsbsnzM,1074
+pypetkitapi-1.18.0.dist-info/METADATA,sha256=XDXTt_vXjY4uRaK4xNa_jNHGKeA9xv1RpAr-rMTp7fw,12977
+pypetkitapi-1.18.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+pypetkitapi-1.18.0.dist-info/RECORD,,