pypetkitapi 0.5.2__tar.gz → 0.5.4__tar.gz

{pypetkitapi-0.5.2 → pypetkitapi-0.5.4}/PKG-INFO

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

{pypetkitapi-0.5.2 → pypetkitapi-0.5.4}/pypetkitapi/client.py

@@ -280,7 +280,7 @@ class PetKitClient:
         self,
         device_id: int,
         action: StrEnum,
-        setting: dict | StrEnum | None = None,
+        setting: dict | None = None,
     ) -> None:
         """Control the device using the PetKit API."""
         device = self.device_list.get(device_id)
@@ -333,7 +333,7 @@ class PetKitClient:
             headers=headers,
         )
         if res in (SUCCESS_KEY, RES_KEY):
-            # TODO : Manage to get the response from manul feeding
+            # TODO : Manage to get the response from manual feeding
             _LOGGER.info("Command executed successfully")
         else:
             _LOGGER.error("Command execution failed")

{pypetkitapi-0.5.2 → pypetkitapi-0.5.4}/pypetkitapi/command.py

@@ -3,7 +3,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass, field
 import datetime
-from enum import StrEnum
+from enum import IntEnum, StrEnum
 import json
 
 from pypetkitapi.const import (
@@ -62,27 +62,22 @@ class FountainCommand(StrEnum):
     CONTROL_DEVICE = "control_device"
 
 
-class LitterBoxCommand(StrEnum):
+class LBCommand(IntEnum):
     """LitterBoxCommand"""
 
-    LIGHT_ON = "light_on"
-    ODOR_REMOVAL = "start_odor"
-    PAUSE_CLEAN = "stop_clean"
-    POWER = "power"
-    RESET_DEODOR = "reset_deodorizer"
-    RESUME_CLEAN = "continue_clean"
-    START_CLEAN = "start_clean"
-    START_MAINTENANCE = "start_maintenance"
-    EXIT_MAINTENANCE = "exit_maintenance"
-    PAUSE_MAINTENANCE_EXIT = "pause_maintenance_exit"
-    RESUME_MAINTENANCE_EXIT = "resume_maintenance_exit"
-    DUMP_LITTER = "dump_litter"
-    PAUSE_LITTER_DUMP = "pause_litter_dump"
-    RESUME_LITTER_DUMP = "resume_litter_dump"
-    RESET_MAX_DEODOR = "reset_max_deodorizer"
-
-
-class LitterBoxCommandKey(StrEnum):
+    CLEANING = 0
+    DUMPING = 1
+    ODOR_REMOVAL = 2
+    RESETTING = 3
+    LEVELING = 4
+    CALIBRATING = 5
+    RESET_DEODOR = 6
+    LIGHT = 7
+    RESET_MAX_DEODOR = 8
+    MAINTENANCE = 9
+
+
+class LBAction(StrEnum):
     """LitterBoxCommandKey"""
 
     CONTINUE = "continue_action"
@@ -92,70 +87,6 @@ class LitterBoxCommandKey(StrEnum):
     STOP = "stop_action"
 
 
-class LitterBoxCommandType(StrEnum):
-    """LitterBoxCommandType"""
-
-    CONTINUE = "continue"
-    END = "end"
-    POWER = "power"
-    START = "start"
-    STOP = "stop"
-
-
-LB_CMD_TO_KEY = {
-    LitterBoxCommand.LIGHT_ON: LitterBoxCommandKey.START,
-    LitterBoxCommand.POWER: LitterBoxCommandKey.POWER,
-    LitterBoxCommand.START_CLEAN: LitterBoxCommandKey.START,
-    LitterBoxCommand.PAUSE_CLEAN: LitterBoxCommandKey.STOP,
-    LitterBoxCommand.RESUME_CLEAN: LitterBoxCommandKey.CONTINUE,
-    LitterBoxCommand.ODOR_REMOVAL: LitterBoxCommandKey.START,
-    LitterBoxCommand.RESET_DEODOR: LitterBoxCommandKey.START,
-    LitterBoxCommand.START_MAINTENANCE: LitterBoxCommandKey.START,
-    LitterBoxCommand.EXIT_MAINTENANCE: LitterBoxCommandKey.END,
-    LitterBoxCommand.PAUSE_MAINTENANCE_EXIT: LitterBoxCommandKey.STOP,
-    LitterBoxCommand.RESUME_MAINTENANCE_EXIT: LitterBoxCommandKey.CONTINUE,
-    LitterBoxCommand.DUMP_LITTER: LitterBoxCommandKey.START,
-    LitterBoxCommand.PAUSE_LITTER_DUMP: LitterBoxCommandKey.STOP,
-    LitterBoxCommand.RESUME_LITTER_DUMP: LitterBoxCommandKey.CONTINUE,
-    LitterBoxCommand.RESET_MAX_DEODOR: LitterBoxCommandKey.START,
-}
-
-LB_CMD_TO_TYPE = {
-    LitterBoxCommand.LIGHT_ON: LitterBoxCommandType.START,
-    LitterBoxCommand.POWER: LitterBoxCommandType.POWER,
-    LitterBoxCommand.START_CLEAN: LitterBoxCommandType.START,
-    LitterBoxCommand.PAUSE_CLEAN: LitterBoxCommandType.STOP,
-    LitterBoxCommand.RESUME_CLEAN: LitterBoxCommandType.CONTINUE,
-    LitterBoxCommand.ODOR_REMOVAL: LitterBoxCommandType.START,
-    LitterBoxCommand.RESET_DEODOR: LitterBoxCommandType.START,
-    LitterBoxCommand.START_MAINTENANCE: LitterBoxCommandType.START,
-    LitterBoxCommand.EXIT_MAINTENANCE: LitterBoxCommandType.END,
-    LitterBoxCommand.PAUSE_MAINTENANCE_EXIT: LitterBoxCommandType.STOP,
-    LitterBoxCommand.RESUME_MAINTENANCE_EXIT: LitterBoxCommandType.CONTINUE,
-    LitterBoxCommand.DUMP_LITTER: LitterBoxCommandType.START,
-    LitterBoxCommand.PAUSE_LITTER_DUMP: LitterBoxCommandType.STOP,
-    LitterBoxCommand.RESUME_LITTER_DUMP: LitterBoxCommandType.CONTINUE,
-    LitterBoxCommand.RESET_MAX_DEODOR: LitterBoxCommandType.START,
-}
-
-LB_CMD_TO_VALUE = {
-    LitterBoxCommand.LIGHT_ON: 7,
-    LitterBoxCommand.START_CLEAN: 0,
-    LitterBoxCommand.PAUSE_CLEAN: 0,
-    LitterBoxCommand.RESUME_CLEAN: 0,
-    LitterBoxCommand.ODOR_REMOVAL: 2,
-    LitterBoxCommand.RESET_DEODOR: 6,
-    LitterBoxCommand.START_MAINTENANCE: 9,
-    LitterBoxCommand.EXIT_MAINTENANCE: 9,
-    LitterBoxCommand.PAUSE_MAINTENANCE_EXIT: 9,
-    LitterBoxCommand.RESUME_MAINTENANCE_EXIT: 9,
-    LitterBoxCommand.DUMP_LITTER: 1,
-    LitterBoxCommand.PAUSE_LITTER_DUMP: 1,
-    LitterBoxCommand.RESUME_LITTER_DUMP: 1,
-    LitterBoxCommand.RESET_MAX_DEODOR: 8,
-}
-
-
 class FountainAction(StrEnum):
     """Fountain Action"""
 
@@ -317,8 +248,8 @@ ACTIONS_MAP = {
         endpoint=PetkitEndpoint.CONTROL_DEVICE,
         params=lambda device, command: {
             "id": device.id,
-            "kv": json.dumps({LB_CMD_TO_KEY[command]: LB_CMD_TO_VALUE[command]}),
-            "type": LB_CMD_TO_TYPE[command],
+            "kv": json.dumps(command),
+            "type": list(command.keys())[0].split("_")[0],
         },
         supported_device=[T3, T4, T5, T6],
     ),

{pypetkitapi-0.5.2 → pypetkitapi-0.5.4}/pyproject.toml

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

{pypetkitapi-0.5.2 → pypetkitapi-0.5.4}/pypetkitapi/litter_container.py

@@ -82,6 +82,17 @@ class SettingsLitter(BaseModel):
     wander_detection: int | None = Field(None, alias="wanderDetection")
 
 
+class WorkState(BaseModel):
+    """Dataclass for work state data."""
+
+    safe_warn: int | None = Field(None, alias="safeWarn")
+    stop_time: int | None = Field(None, alias="stopTime")
+    work_mode: int | None = Field(None, alias="workMode")
+    work_process: int | None = Field(None, alias="workProcess")
+    work_reason: int | None = Field(None, alias="workReason")
+    pet_in_time: int | None = Field(None, alias="petInTime")
+
+
 class StateLitter(BaseModel):
     """Dataclass for state.
     -> LitterData subclass.
@@ -128,17 +139,7 @@ class StateLitter(BaseModel):
     seal_door_state: int | None = Field(None, alias="sealDoorState")
     top_ins: int | None = Field(None, alias="topIns")
     wander_time: int | None = Field(None, alias="wanderTime")
-
-
-class WorkState(BaseModel):
-    """Dataclass for work state data."""
-
-    safe_warn: int | None = Field(None, alias="safeWarn")
-    stop_time: int | None = Field(None, alias="stopTime")
-    work_mode: int | None = Field(None, alias="workMode")
-    work_process: int | None = Field(None, alias="workProcess")
-    work_reason: int | None = Field(None, alias="workReason")
-    pet_in_time: int | None = Field(None, alias="petInTime")
+    work_state: WorkState | None = Field(None, alias="workState")
 
 
 class Litter(BaseModel):
@@ -182,7 +183,6 @@ 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")
-    work_state: WorkState | None = Field(None, alias="workState")
 
     @classmethod
     def get_endpoint(cls, device_type: str) -> str: