pypetkitapi 1.2.2__py3-none-any.whl → 1.2.4__py3-none-any.whl

pypetkitapi/client.py

@@ -44,9 +44,7 @@ _LOGGER = logging.getLogger(__name__)
 class PetKitClient:
     """Petkit Client"""
 
-    _base_url: str
     _session: SessionInfo | None = None
-    _servers_list: list[RegionInfo] = []
     account_data: list[AccountData] = []
     petkit_entities: dict[int, Feeder | Litter | WaterFountain | Pet] = {}
 
@@ -75,7 +73,7 @@ class PetKitClient:
         _LOGGER.debug("Getting API server list")
 
         if self.region.lower() == "china":
-            self._base_url = PetkitDomain.CHINA_SRV
+            self.req.base_url = PetkitDomain.CHINA_SRV
             return
 
         response = await self.req.request(

pypetkitapi/feeder_container.py

@@ -173,6 +173,7 @@ class EventState(BaseModel):
     completed_at: str | None = Field(None, alias="completedAt")
     err_code: int | None = Field(None, alias="errCode")
     media: int | None = None
+    real_amount: int | None = Field(None, alias="realAmount")
     real_amount1: int | None = Field(None, alias="realAmount1")
     real_amount2: int | None = Field(None, alias="realAmount2")
     result: int | None = None
@@ -183,55 +184,61 @@ class RecordsItems(BaseModel):
     """Dataclass for records items data."""
 
     aes_key: str | None = Field(None, alias="aesKey")
-    duration: int | None = None
-    event_id: str | None = Field(None, alias="eventId")
-    expire: int | None = None
-    mark: int | None = None
-    media_api: str | None = Field(None, alias="mediaApi")
-    start_time: int | None = Field(None, alias="startTime")
-    storage_space: int | None = Field(None, alias="storageSpace")
-    eat_video: int | None = Field(None, alias="eatVideo")
-    is_need_upload_video: int | None = Field(None, alias="isNeedUploadVideo")
-    preview: str | None = None
-    time: int | None = None
-    timestamp: int | None = None
     aes_key1: str | None = Field(None, alias="aesKey1")
     aes_key2: str | None = Field(None, alias="aesKey2")
+    amount: int | None = Field(None, alias="amount")
     amount1: int | None = Field(None, alias="amount1")
     amount2: int | None = Field(None, alias="amount2")
     completed_at: int | None = Field(None, alias="completedAt")
     content: dict[str, Any] | None = None
     desc: str | None = None
     device_id: int | None = Field(None, alias="deviceId")
+    duration: int | None = None
     eat_end_time: int | None = Field(None, alias="eatEndTime")
     eat_start_time: int | None = Field(None, alias="eatStartTime")
+    eat_video: int | None = Field(None, alias="eatVideo")
     empty: int | None = None
     end_time: int | None = Field(None, alias="endTime")
     enum_event_type: str | None = Field(None, alias="enumEventType")
     event: str | None = None
+    event_id: str | None = Field(None, alias="eventId")
     event_type: int | None = Field(None, alias="eventType")
+    expire: int | None = None
     expire1: int | None = Field(None, alias="expire1")
     expire2: int | None = Field(None, alias="expire2")
     id: str | None = None
     is_executed: int | None = Field(None, alias="isExecuted")
+    is_need_upload_video: int | None = Field(None, alias="isNeedUploadVideo")
+    mark: int | None = None
+    media_api: str | None = Field(None, alias="mediaApi")
     media_list: list[Any] | None = Field(None, alias="mediaList")
     name: str | None = None
+    preview: str | None = None
     preview1: str | None = Field(None, alias="preview1")
     preview2: str | None = Field(None, alias="preview2")
     src: int | None = None
+    start_time: int | None = Field(None, alias="startTime")
     state: EventState | None = None
     status: int | None = None
+    storage_space: int | None = Field(None, alias="storageSpace")
+    time: int | None = None
+    timestamp: int | None = None
 
 
 class RecordsType(BaseModel):
     """Dataclass for records type data."""
 
+    add_amount: int | None = Field(None, alias="addAmount")
     add_amount1: int | None = Field(None, alias="addAmount1")
     add_amount2: int | None = Field(None, alias="addAmount2")
     day: int | None = None
     device_id: int | None = Field(None, alias="deviceId")
     eat_count: int | None = Field(None, alias="eatCount")
     items: list[RecordsItems] | None = None
+    plan_amount: int | None = Field(None, alias="planAmount")
+    real_amount: int | None = Field(None, alias="realAmount")
+    amount: int | None = None
+    times: int | None = None
 
 
 class FeederRecord(BaseModel):

pypetkitapi/litter_container.py

@@ -142,26 +142,54 @@ class StateLitter(BaseModel):
     work_state: WorkState | None = Field(None, alias="workState")
 
 
-class Content(BaseModel):
+class ContentSC(BaseModel):
     """Dataclass for content data."""
 
     box: int | None = None
     box_full: bool | None = Field(None, alias="boxFull")
+    err: str | None = None
     litter_percent: int | None = Field(None, alias="litterPercent")
+    mark: int | None = None
+    media: int | None = None
     result: int | None = None
     start_reason: int | None = Field(None, alias="startReason")
     start_time: int | None = Field(None, alias="startTime")
+    upload: int | None = None
+
+
+class LRContent(BaseModel):
+    """Dataclass for pet data."""
+
+    auto_clear: int | None = Field(None, alias="autoClear")
+    interval: int | None = None
+    pet_weight: int | None = Field(None, alias="petWeight")
+    time_in: int | None = Field(None, alias="timeIn")
+    time_out: int | None = Field(None, alias="timeOut")
+    error: int | None = None
 
 
-class SubContent(BaseModel):
+class LRSubContent(BaseModel):
     """Dataclass for sub-content data."""
 
-    content: Content | None = None
+    aes_key: str | None = Field(None, alias="aesKey")
+    content: ContentSC | None = None
     device_id: int | None = Field(None, alias="deviceId")
+    duration: int | None = None
     enum_event_type: str | None = Field(None, alias="enumEventType")
+    event_id: str | None = Field(None, alias="eventId")
     event_type: int | None = Field(None, alias="eventType")
+    expire: int | None = None
+    mark: int | None = None
+    media: int | None = None
+    media_api: str | None = Field(None, alias="mediaApi")
+    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")
+    storage_space: int | None = Field(None, alias="storageSpace")
     sub_content: list[Any] | None = Field(None, alias="subContent")
     timestamp: int | None = None
+    upload: int | None = None
     user_id: str | None = Field(None, alias="userId")
 
 
@@ -170,15 +198,28 @@ class LitterRecord(BaseModel):
 
     data_type: ClassVar[str] = DEVICE_RECORDS
 
+    aes_key: str | None = Field(None, alias="aesKey")
     avatar: str | None = None
-    content: dict[str, Any] | None = None
+    content: LRContent | None = None
     device_id: int | None = Field(None, alias="deviceId")
+    duration: int | None = None
     enum_event_type: str | None = Field(None, alias="enumEventType")
+    event_id: str | None = Field(None, alias="eventId")
     event_type: int | None = Field(None, alias="eventType")
+    expire: int | None = None
+    is_need_upload_video: int | None = Field(None, alias="isNeedUploadVideo")
+    mark: int | None = None
+    media: int | None = None
+    media_api: str | None = Field(None, alias="mediaApi")
     pet_id: str | None = Field(None, alias="petId")
     pet_name: str | None = Field(None, alias="petName")
-    sub_content: list[SubContent] | None = Field(None, alias="subContent")
+    preview: str | None = None
+    related_event: str | None = Field(None, alias="relatedEvent")
+    storage_space: int | None = Field(None, alias="storageSpace")
+    sub_content: list[LRSubContent] | None = Field(None, alias="subContent")
     timestamp: int | None = None
+    toilet_detection: int | None = Field(None, alias="toiletDetection")
+    upload: int | None = None
     user_id: str | None = Field(None, alias="userId")
     device_type: str | None = Field(None, alias="deviceType")
 
@@ -237,7 +278,7 @@ class Litter(BaseModel):
     service_status: int | None = Field(None, alias="serviceStatus")
     total_time: int | None = Field(None, alias="totalTime")
     device_type: str | None = Field(None, alias="deviceType")
-    device_records: LitterRecord | None = None
+    device_records: list[LitterRecord] | None = None
 
     @classmethod
     def get_endpoint(cls, device_type: str) -> str:

{pypetkitapi-1.2.2.dist-info → pypetkitapi-1.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypetkitapi
-Version: 1.2.2
+Version: 1.2.4
 Summary: Python client for PetKit API
 Home-page: https://github.com/Jezza34000/pypetkit
 License: MIT

{pypetkitapi-1.2.2.dist-info → pypetkitapi-1.2.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 pypetkitapi/__init__.py,sha256=eVpyGMD3tkYtiHUkdKEeNSZhQlZ4woI2Y5oVoV7CwXM,61
-pypetkitapi/client.py,sha256=0f8wk5UkOtxr3VSF0yu-iFeetuaT9RLgd0URfypXx9w,16595
+pypetkitapi/client.py,sha256=7-eWcDXxo2OtK_YN-MMmWo7g_O3FisjGJBTxR-FtVEU,16538
 pypetkitapi/command.py,sha256=gw3_J_oZHuuGLk66P8uRSqSrySjYa8ArpKaPHi2ybCw,7155
 pypetkitapi/const.py,sha256=Mxgezd9sy-LtpgjYuVKb9ii9HSUnz8FVyKx1GXbXBAU,3291
 pypetkitapi/containers.py,sha256=m7vzWcJG0U1EPftuBF6OB8eTVRhCoA2DFqekxI6LozI,3428
 pypetkitapi/exceptions.py,sha256=NWmpsI2ewC4HaIeu_uFwCeuPIHIJxZBzjoCP7aNwvhs,1139
-pypetkitapi/feeder_container.py,sha256=zGvMAfB4R0DoSTuw1MDhtehPb9bVcz9kAzNV6zhsA7o,12832
-pypetkitapi/litter_container.py,sha256=WfBOXMTuSjrohZWtGsIYhjqumK1BXzUWoytKFMsmzec,11698
+pypetkitapi/feeder_container.py,sha256=8toLt9YSvEvjNSy9b6jwHSNZxuXP6D1ZnrnUdL78K6s,13190
+pypetkitapi/litter_container.py,sha256=F16kIMlgqk97ewQrqsIPY6NX7qWvfQ2qM4If68Tq5Yg,13414
 pypetkitapi/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pypetkitapi/water_fountain_container.py,sha256=Lr1qc_hh2DKtIQEFMsLGJhRcguGhWn6-bm7UfBMT15A,6626
-pypetkitapi-1.2.2.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
-pypetkitapi-1.2.2.dist-info/METADATA,sha256=929ixuYJI4XdFJPXdz0VzZsXH4-6haZ6db-R3i8_2Sg,4590
-pypetkitapi-1.2.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-pypetkitapi-1.2.2.dist-info/RECORD,,
+pypetkitapi-1.2.4.dist-info/LICENSE,sha256=4FWnKolNLc1e3w6cVlT61YxfPh0DQNeQLN1CepKKSBg,1067
+pypetkitapi-1.2.4.dist-info/METADATA,sha256=NRf9Cu42Kl8Zngxerji1AIppGxN3Pojeq97bTDJGsYc,4590
+pypetkitapi-1.2.4.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+pypetkitapi-1.2.4.dist-info/RECORD,,