pypetkitapi 1.2.0__tar.gz → 1.2.3__tar.gz

{pypetkitapi-1.2.0 → pypetkitapi-1.2.3}/PKG-INFO

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

{pypetkitapi-1.2.0 → pypetkitapi-1.2.3}/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(
@@ -297,6 +295,13 @@ class PetKitClient:
             _LOGGER.error("Unexpected response type: %s", type(response))
             return
 
+        # Add the device type into dataclass
+        if isinstance(device_data, list):
+            for item in device_data:
+                item.device_type = device_type
+        else:
+            device_data.device_type = device_type
+
         if data_class.data_type == DEVICE_DATA:
             self.petkit_entities[device_id] = device_data
             _LOGGER.debug("Device data fetched OK for %s", device_type)

{pypetkitapi-1.2.0 → pypetkitapi-1.2.3}/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-1.2.0 → pypetkitapi-1.2.3}/pypetkitapi/litter_container.py

@@ -147,21 +147,38 @@ class Content(BaseModel):
 
     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 SubContent(BaseModel):
     """Dataclass for sub-content data."""
 
+    aes_key: str | None = Field(None, alias="aesKey")
     content: Content | 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 +187,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
     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")
+    preview: str | None = None
+    related_event: str | None = Field(None, alias="relatedEvent")
+    storage_space: int | None = Field(None, alias="storageSpace")
     sub_content: list[SubContent] | 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")
 

{pypetkitapi-1.2.0 → pypetkitapi-1.2.3}/pyproject.toml

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