wyzeapy 0.5.23__py3-none-any.whl → 0.5.25__py3-none-any.whl

wyzeapy/const.py

@@ -15,6 +15,9 @@ PHONE_ID = str(uuid.uuid4())
 APP_INFO = 'wyze_android_2.19.14'  # Required for the thermostat
 SC = "9f275790cab94a72bd206c8876429f3c"
 SV = "9d74946e652647e9b6c9d59326aef104"
+CLIENT_VER = "2"
+SOURCE = "ios/WZCameraSDK"
+APP_PLATFORM = "ios"
 
 # Crypto secrets
 OLIVE_SIGNING_SECRET = 'wyze_app_secret_key_132'  # Required for the thermostat

wyzeapy/exceptions.py

@@ -26,8 +26,7 @@ class LoginError(Exception):
 
 
 class UnknownApiError(Exception):
-    def __init__(self, response_json: Dict[str, Any]):
-        super(UnknownApiError, self).__init__(str(response_json))
+    pass
 
 
 class TwoFactorAuthenticationEnabled(Exception):

wyzeapy/payload_factory.py

@@ -72,3 +72,499 @@ def olive_create_hms_patch_payload(hms_id: str) -> Dict[str, Any]:
     return {
         "hms_id": hms_id
     }
+
+
+def devicemgmt_create_capabilities_payload(type: str, value: str):
+    match type:
+        case "floodlight":
+            return {
+                "iid": 4,
+                "name": "floodlight",
+                "properties": [
+                    {
+                        "prop": "on",
+                        "value": value
+                    }
+                ]
+            }
+        case "spotlight":
+            return {
+                "iid": 5,
+                "name": "spotlight",
+                "properties": [
+                    {
+                        "prop": "on",
+                        "value": value
+                    }
+                ]
+            }
+        case "power":
+            return {
+                "functions": [
+                    {
+                        "in": {
+                            "wakeup-live-view": "1"
+                        },
+                        "name": value
+                    }
+                ],
+                "iid": 1,
+                "name": "iot-device"
+            }
+        case "siren":
+            return {
+                "functions": [
+                    {
+                        "in": {},
+                        "name": value
+                    }
+                ],
+                "name": "siren"
+            }
+        case _:
+            raise NotImplementedError(f"No action of type ({type}) has been implemented.")
+
+
+def devicemgmt_get_iot_props_list(model: str):
+    match model:
+        case "LD_CFP": # Floodlight Pro
+            return [
+                {
+                    "iid": 2,
+                    "name": "camera",
+                    "properties": [
+                        "motion-detect",
+                        "resolution",
+                        "bit-rate",
+                        "live-stream-mode",
+                        "recording-mode",
+                        "frame-rate",
+                        "night-shot",
+                        "night-shot-state",
+                        "rotate-angle",
+                        "time-watermark",
+                        "logo-watermark",
+                        "recording-trigger-source",
+                        "recording-content-type",
+                        "motion-push",
+                        "speaker",
+                        "microphone",
+                        "unusual-sound-push",
+                        "flip",
+                        "motion-detect-recording",
+                        "cool-down-interval",
+                        "infrared-mode",
+                        "sound-collection-on",
+                        "live-stream-protocol",
+                        "ai-push",
+                        "voice-template",
+                        "motion-category"
+                    ]
+                },
+                {
+                    "iid": 3,
+                    "name": "device-info",
+                    "properties": [
+                        "device-id",
+                        "device-model",
+                        "firmware-ver",
+                        "mac",
+                        "timezone",
+                        "lat",
+                        "ip",
+                        "lon",
+                        "hardware-ver",
+                        "public-ip"
+                    ]
+                },
+                {
+                    "iid": 1,
+                    "name": "iot-device",
+                    "properties": [
+                        "iot-state",
+                        "iot-power",
+                        "push-switch"
+                    ]
+                },
+                {
+                    "iid": 9,
+                    "name": "camera-ai",
+                    "properties": [
+                        "smart-detection-type",
+                        "on"
+                    ]
+                },
+                {
+                    "iid": 4,
+                    "name": "floodlight",
+                    "properties": [
+                        "on",
+                        "enabled",
+                        "mode",
+                        "trigger-source",
+                        "brightness",
+                        "light-on-duration",
+                        "voice-template",
+                        "motion-warning-switch",
+                        "motion-activate-light-switch",
+                        "motion-activate-light-schedule",
+                        "motion-activate-brightness",
+                        "ambient-light-switch",
+                        "ambient-light-schedule",
+                        "ambient-light-brightness",
+                        "motion-tag",
+                        "light-model",
+                        "flash-with-siren"
+                    ]
+                },
+                {
+                    "iid": 11,
+                    "name": "indicator-light",
+                    "properties": [
+                        "on",
+                        "mode",
+                        "brightness",
+                        "color",
+                        "color-temperature"
+                    ]
+                },
+                {
+                    "iid": 8,
+                    "name": "memory-card-management",
+                    "properties": [
+                        "storage-used-space",
+                        "storage-total-space",
+                        "storage-status",
+                        "sd-card-playback-enabled"
+                    ]
+                },
+                {
+                    "iid": 6,
+                    "name": "motion-detection",
+                    "properties": [
+                        "sensitivity-motion",
+                        "on",
+                        "motion-zone",
+                        "motion-zone-selected-block",
+                        "motion-zone-block-size",
+                        "motion-tag",
+                        "edge-detection-type",
+                        "motion-warning-switch",
+                        "motion-warning-tone",
+                        "motion-warning-interval",
+                        "motion-warning-schedule",
+                        "motion-warning-sound",
+                        "motion-warning-trigger-setting"
+                    ]
+                },
+                {
+                    "iid": 7,
+                    "name": "siren",
+                    "properties": [
+                        "state"
+                    ]
+                },
+                {
+                    "iid": 5,
+                    "name": "wifi",
+                    "properties": [
+                        "on",
+                        "signal-strength",
+                        "wifi-ssid",
+                        "wifi-encrypted-password"
+                    ]
+                }
+            ]
+        case "AN_RSCW": # Battery Cam pro
+            return [
+                {
+                    "iid": 2,
+                    "name": "camera",
+                    "properties": [
+                        "motion-detect",
+                        "resolution",
+                        "bit-rate",
+                        "live-stream-mode",
+                        "recording-mode",
+                        "frame-rate",
+                        "night-shot",
+                        "night-shot-state",
+                        "time-watermark",
+                        "logo-watermark",
+                        "cool-down-interval",
+                        "recording-content-type",
+                        "video-length-limit",
+                        "motion-push",
+                        "speaker",
+                        "unusual-sound-push",
+                        "microphone",
+                        "infrared-mode",
+                        "motion-detect-recording",
+                        "live-stream-protocol",
+                        "recording-resolution",
+                        "recording-start-time",
+                        "recording-schedule-duration",
+                        "voice-template",
+                        "rotate-angle",
+                        "sound-collection-on",
+                        "ai-push"
+                    ]
+                },
+                {
+                    "iid": 3,
+                    "name": "device-info",
+                    "properties": [
+                        "device-id",
+                        "device-model",
+                        "firmware-ver",
+                        "mac",
+                        "timezone",
+                        "lat",
+                        "ip",
+                        "lon",
+                        "company-code",
+                        "device-setting-channel",
+                        "network-connection-mode",
+                        "hardware-ver",
+                        "public-ip"
+                    ]
+                },
+                {
+                    "iid": 1,
+                    "name": "iot-device",
+                    "properties": [
+                        "iot-state",
+                        "iot-power",
+                        "push-switch",
+                        "mqtt-check"
+                    ]
+                },
+                {
+                    "iid": 7,
+                    "name": "battery",
+                    "properties": [
+                        "battery-level",
+                        "low-battery-push",
+                        "power-source",
+                        "charging-status",
+                        "power-saving"
+                    ]
+                },
+                {
+                    "iid": 12,
+                    "name": "camera-ai",
+                    "properties": [
+                        "smart-detection-type",
+                        "on"
+                    ]
+                },
+                {
+                    "iid": 8,
+                    "name": "indicator-light",
+                    "properties": [
+                        "on",
+                        "mode"
+                    ]
+                },
+                {
+                    "iid": 6,
+                    "name": "memory-card-management",
+                    "properties": [
+                        "storage-used-space",
+                        "storage-total-space",
+                        "storage-status",
+                        "sd-card-playback-enabled"
+                    ]
+                },
+                {
+                    "iid": 11,
+                    "name": "motion-detection",
+                    "properties": [
+                        "sensitivity-motion",
+                        "on",
+                        "area-length",
+                        "motion-zone",
+                        "motion-zone-block-size",
+                        "motion-zone-selected-block",
+                        "edge-detection-type",
+                        "motion-tag"
+                    ]
+                },
+                {
+                    "iid": 4,
+                    "name": "siren",
+                    "properties": [
+                        "state",
+                        "siren-on-ts"
+                    ]
+                },
+                {
+                    "iid": 14,
+                    "name": "solar-panel",
+                    "properties": [
+                        "enabled",
+                        "on"
+                    ]
+                },
+                {
+                    "iid": 5,
+                    "name": "spotlight",
+                    "properties": [
+                        "on",
+                        "enabled",
+                        "brightness",
+                        "motion-activate-light-switch",
+                        "sunset-to-sunrise",
+                        "motion-activate-light-schedule",
+                        "trigger-source"
+                    ]
+                },
+                {
+                    "iid": 9,
+                    "name": "wifi",
+                    "properties": [
+                        "on",
+                        "signal-strength",
+                        "wifi-ssid",
+                        "wifi-encrypted-password"
+                    ]
+                }
+            ]
+        case "GW_GC1": # OG
+            return [
+                {
+                    "iid": 2,
+                    "name": "camera",
+                    "properties": [
+                        "motion-detect",
+                        "resolution",
+                        "bit-rate",
+                        "live-stream-mode",
+                        "recording-mode",
+                        "frame-rate",
+                        "night-shot",
+                        "night-shot-state",
+                        "time-watermark",
+                        "logo-watermark",
+                        "cool-down-interval",
+                        "recording-content-type",
+                        "video-length-limit",
+                        "motion-push",
+                        "speaker",
+                        "unusual-sound-push",
+                        "microphone",
+                        "infrared-mode",
+                        "motion-detect-recording",
+                        "live-stream-protocol",
+                        "recording-resolution",
+                        "recording-start-time",
+                        "recording-schedule-duration",
+                        "voice-template",
+                        "rotate-angle",
+                        "sound-collection-on",
+                        "ai-push"
+                    ]
+                },
+                {
+                    "iid": 3,
+                    "name": "device-info",
+                    "properties": [
+                        "device-id",
+                        "device-model",
+                        "firmware-ver",
+                        "mac",
+                        "timezone",
+                        "lat",
+                        "ip",
+                        "lon",
+                        "company-code",
+                        "device-setting-channel",
+                        "network-connection-mode",
+                        "hardware-ver",
+                        "public-ip"
+                    ]
+                },
+                {
+                    "iid": 1,
+                    "name": "iot-device",
+                    "properties": [
+                        "iot-state",
+                        "iot-power",
+                        "push-switch",
+                        "mqtt-check"
+                    ]
+                },
+                {
+                    "iid": 12,
+                    "name": "camera-ai",
+                    "properties": [
+                        "smart-detection-type",
+                        "on"
+                    ]
+                },
+                {
+                    "iid": 8,
+                    "name": "indicator-light",
+                    "properties": [
+                        "on",
+                        "mode"
+                    ]
+                },
+                {
+                    "iid": 6,
+                    "name": "memory-card-management",
+                    "properties": [
+                        "storage-used-space",
+                        "storage-total-space",
+                        "storage-status",
+                        "sd-card-playback-enabled"
+                    ]
+                },
+                {
+                    "iid": 11,
+                    "name": "motion-detection",
+                    "properties": [
+                        "sensitivity-motion",
+                        "on",
+                        "area-length",
+                        "motion-zone",
+                        "motion-zone-block-size",
+                        "motion-zone-selected-block",
+                        "edge-detection-type",
+                        "motion-tag"
+                    ]
+                },
+                {
+                    "iid": 4,
+                    "name": "siren",
+                    "properties": [
+                        "state",
+                        "siren-on-ts"
+                    ]
+                },
+                {
+                    "iid": 5,
+                    "name": "spotlight",
+                    "properties": [
+                        "on",
+                        "enabled",
+                        "brightness",
+                        "motion-activate-light-switch",
+                        "sunset-to-sunrise",
+                        "motion-activate-light-schedule",
+                        "trigger-source"
+                    ]
+                },
+                {
+                    "iid": 9,
+                    "name": "wifi",
+                    "properties": [
+                        "on",
+                        "signal-strength",
+                        "wifi-ssid",
+                        "wifi-encrypted-password"
+                    ]
+                }
+            ]
+        case _:
+            raise NotImplementedError(f"No iot props for model ({model}) have been defined.")

wyzeapy/services/base_service.py

@@ -12,14 +12,14 @@ from typing import List, Tuple, Any, Dict, Optional
 import aiohttp
 
 from .update_manager import DeviceUpdater, UpdateManager
-from ..const import PHONE_SYSTEM_TYPE, APP_VERSION, APP_VER, PHONE_ID, APP_NAME, OLIVE_APP_ID, APP_INFO, SC, SV
+from ..const import PHONE_SYSTEM_TYPE, APP_VERSION, APP_VER, PHONE_ID, APP_NAME, OLIVE_APP_ID, APP_INFO, SC, SV, APP_PLATFORM, SOURCE
 from ..crypto import olive_create_signature
 from ..payload_factory import olive_create_hms_patch_payload, olive_create_hms_payload, \
     olive_create_hms_get_payload, ford_create_payload, olive_create_get_payload, olive_create_post_payload, \
-    olive_create_user_info_payload
-from ..types import PropertyIDs, Device
+    olive_create_user_info_payload, devicemgmt_create_capabilities_payload, devicemgmt_get_iot_props_list
+from ..types import PropertyIDs, Device, DeviceMgmtToggleType
 from ..utils import check_for_errors_standard, check_for_errors_hms, check_for_errors_lock, \
-    check_for_errors_iot, wyze_encrypt
+    check_for_errors_iot, wyze_encrypt, check_for_errors_devicemgmt
 from ..wyze_auth_lib import WyzeAuthLib
 
 _LOGGER = logging.getLogger(__name__)
@@ -326,6 +326,121 @@ class BaseService:
                                                   json=payload)
 
         check_for_errors_standard(self, response_json)
+    
+    async def _run_action_devicemgmt(self, device: Device, type: str, value: str) -> None:
+        """
+        Wraps the devicemgmt-service-beta.wyze.com/device-management/api/action/run_action endpoint
+
+        :param device: The device for which to run the action
+        :param state: on or off
+        :return:
+        """
+
+        await self._auth_lib.refresh_if_should()
+
+        capabilities = devicemgmt_create_capabilities_payload(type, value)
+
+        payload = {
+            "capabilities": [
+                capabilities
+            ],
+            "nonce": int(time.time() * 1000),
+            "targetInfo": {
+                "id": device.mac,
+                "productModel": device.product_model,
+                "type": "DEVICE"
+            },
+            "transactionId": "0a5b20591fedd4du1b93f90743ba0csd" # OG cam needs this (doesn't matter what the value is)
+        }
+
+        headers = {
+            "authorization": self._auth_lib.token.access_token,
+        }
+
+        response_json = await self._auth_lib.post("https://devicemgmt-service-beta.wyze.com/device-management/api/action/run_action",
+                                                  json=payload, headers=headers)
+
+        check_for_errors_iot(self, response_json)
+    
+    async def _set_toggle(self, device: Device, toggleType: DeviceMgmtToggleType, state: str) -> None:
+        """
+        Wraps the ai-subscription-service-beta.wyzecam.com/v4/subscription-service/toggle-management endpoint
+
+        :param device: The device for which to get the state
+        :param toggleType: Enum for the toggle type
+        :param state: String state to set for the toggle
+        """
+
+        await self._auth_lib.refresh_if_should()
+
+        payload = {
+            "data": [
+                {
+                    "device_firmware": "1234567890",
+                    "device_id": device.mac,
+                    "device_model": device.product_model,
+                    "page_id": [
+                        toggleType.pageId
+                    ],
+                    "toggle_update": [
+                        {
+                            "toggle_id": toggleType.toggleId,
+                            "toggle_status": state
+                        }
+                    ]
+                }
+            ],
+            "nonce": str(int(time.time() * 1000))
+        }
+
+
+        signature = olive_create_signature(payload, self._auth_lib.token.access_token)
+        headers = {
+            "access_token": self._auth_lib.token.access_token,
+            "timestamp": str(int(time.time() * 1000)),
+            "appid": OLIVE_APP_ID,
+            "source": SOURCE,
+            "signature2": signature,
+            "appplatform": APP_PLATFORM,
+            "appversion": APP_VERSION,
+            "requestid": "35374158s4s313b9a2be7c057f2da5d1"
+        }
+
+        response_json = await self._auth_lib.put("https://ai-subscription-service-beta.wyzecam.com/v4/subscription-service/toggle-management",
+                                                  json=payload, headers=headers)
+        
+        check_for_errors_devicemgmt(self, response_json)
+    
+    async def _get_iot_prop_devicemgmt(self, device: Device) -> Dict[str, Any]:
+        """
+        Wraps the devicemgmt-service-beta.wyze.com/device-management/api/device-property/get_iot_prop endpoint
+
+        :param device: The device for which to get the state
+        :return:
+        """
+
+        await self._auth_lib.refresh_if_should()
+
+        payload = {
+            "capabilities": devicemgmt_get_iot_props_list(device.product_model),
+            "nonce": int(time.time() * 1000),
+            "targetInfo": {
+                "id": device.mac,
+                "productModel": device.product_model,
+                "type": "DEVICE"
+            }
+        }
+
+        headers = {
+            "authorization": self._auth_lib.token.access_token,
+        }
+
+        response_json = await self._auth_lib.post("https://devicemgmt-service-beta.wyze.com/device-management/api/device-property/get_iot_prop",
+                                                  json=payload, headers=headers)
+        
+        check_for_errors_iot(self, response_json)
+
+        return response_json
 
     async def _set_property(self, device: Device, pid: str, pvalue: str) -> None:
         """

wyzeapy/services/camera_service.py

@@ -14,11 +14,14 @@ from aiohttp import ClientOSError, ContentTypeError
 from ..exceptions import UnknownApiError
 from .base_service import BaseService
 from .update_manager import DeviceUpdater
-from ..types import Device, DeviceTypes, Event, PropertyIDs
+from ..types import Device, DeviceTypes, Event, PropertyIDs, DeviceMgmtToggleProps
 from ..utils import return_event_for_device, create_pid_pair
 
 _LOGGER = logging.getLogger(__name__)
 
+# NOTE: Make sure to also define props in devicemgmt_create_capabilities_payload()
+DEVICEMGMT_API_MODELS = ["LD_CFP", "AN_RSCW", "GW_GC1"] # Floodlight pro, battery cam pro, and OG use a diffrent api (devicemgmt)
+
 
 class Camera(Device):
     def __init__(self, dictionary: Dict[Any, Any]):
@@ -50,20 +53,35 @@ class CameraService(BaseService):
             camera.last_event_ts = event.event_ts
 
         # Update camera state
-        state_response: List[Tuple[PropertyIDs, Any]] = await self._get_property_list(camera)
-        for property, value in state_response:
-            if property is PropertyIDs.AVAILABLE:
-                camera.available = value == "1"
-            if property is PropertyIDs.ON:
-                camera.on = value == "1"
-            if property is PropertyIDs.CAMERA_SIREN:
-                camera.siren = value == "1"
-            if property is PropertyIDs.FLOOD_LIGHT:
-                camera.floodlight = value == "1"
-            if property is PropertyIDs.NOTIFICATION:
-                camera.notify = value == "1"
-            if property is PropertyIDs.MOTION_DETECTION:
-                camera.motion = value == "1"
+        if (camera.product_model in DEVICEMGMT_API_MODELS): # New api
+            state_response: Dict[str, Any] = await self._get_iot_prop_devicemgmt(camera)
+            for propCategory in state_response['data']['capabilities']:
+                if propCategory['name'] == "camera":
+                    camera.motion = propCategory['properties']['motion-detect-recording']
+                if propCategory['name'] == "floodlight" or propCategory['name'] == "spotlight":
+                    camera.floodlight = propCategory['properties']['on']
+                if propCategory['name'] == "siren":
+                    camera.siren = propCategory['properties']['state']
+                if propCategory['name'] == "iot-device":
+                    camera.notify = propCategory['properties']['push-switch']
+                    camera.on = propCategory['properties']['iot-power']
+                    camera.available = propCategory['properties']['iot-state']
+
+        else: # All other cam types (old api?)
+            state_response: List[Tuple[PropertyIDs, Any]] = await self._get_property_list(camera)
+            for property, value in state_response:
+                if property is PropertyIDs.AVAILABLE:
+                    camera.available = value == "1"
+                if property is PropertyIDs.ON:
+                    camera.on = value == "1"
+                if property is PropertyIDs.CAMERA_SIREN:
+                    camera.siren = value == "1"
+                if property is PropertyIDs.FLOOD_LIGHT:
+                    camera.floodlight = value == "1"
+                if property is PropertyIDs.NOTIFICATION:
+                    camera.notify = value == "1"
+                if property is PropertyIDs.MOTION_DETECTION:
+                    camera.motion = value == "1"
 
         return camera
 
@@ -102,35 +120,53 @@ class CameraService(BaseService):
         return [Camera(camera.raw_dict) for camera in cameras]
 
     async def turn_on(self, camera: Camera):
-        await self._run_action(camera, "power_on")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "power", "wakeup") # Some camera models use a diffrent api
+        else: await self._run_action(camera, "power_on")
 
     async def turn_off(self, camera: Camera):
-        await self._run_action(camera, "power_off")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "power", "sleep") # Some camera models use a diffrent api
+        else: await self._run_action(camera, "power_off")
 
     async def siren_on(self, camera: Camera):
-        await self._run_action(camera, "siren_on")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "siren", "siren-on") # Some camera models use a diffrent api
+        else: await self._run_action(camera, "siren_on")
 
     async def siren_off(self, camera: Camera):
-        await self._run_action(camera, "siren_off")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "siren", "siren-off") # Some camera models use a diffrent api
+        else: await self._run_action(camera, "siren_off")
 
+    # Also controls lamp socket and BCP spotlight
     async def floodlight_on(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.FLOOD_LIGHT.value, "1")
+        if (camera.product_model == "AN_RSCW"): await self._run_action_devicemgmt(camera, "spotlight", "1") # Battery cam pro integrated spotlight is controllable
+        elif (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "floodlight", "1") # Some camera models use a diffrent api
+        else: await self._set_property(camera, PropertyIDs.FLOOD_LIGHT.value, "1")
 
+    # Also controls lamp socket and BCP spotlight
     async def floodlight_off(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.FLOOD_LIGHT.value, "2")
+        if (camera.product_model == "AN_RSCW"): await self._run_action_devicemgmt(camera, "spotlight", "0") # Battery cam pro integrated spotlight is controllable
+        elif (camera.product_model in DEVICEMGMT_API_MODELS): await self._run_action_devicemgmt(camera, "floodlight", "0") # Some camera models use a diffrent api
+        else: await self._set_property(camera, PropertyIDs.FLOOD_LIGHT.value, "2")
         
     async def turn_on_notifications(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.NOTIFICATION.value, "1")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._set_toggle(camera, DeviceMgmtToggleProps.NOTIFICATION_TOGGLE.value, "1")
+        else: await self._set_property(camera, PropertyIDs.NOTIFICATION.value, "1")
 
     async def turn_off_notifications(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.NOTIFICATION.value, "0")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._set_toggle(camera, DeviceMgmtToggleProps.NOTIFICATION_TOGGLE.value, "0")
+        else: await self._set_property(camera, PropertyIDs.NOTIFICATION.value, "0")
 
     # Both properties need to be set on newer cams, older cameras seem to only react
     # to the first property but it doesnt hurt to set both
     async def turn_on_motion_detection(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.MOTION_DETECTION.value, "1")
-        await self._set_property(camera, PropertyIDs.MOTION_DETECTION_TOGGLE.value, "1")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._set_toggle(camera, DeviceMgmtToggleProps.EVENT_RECORDING_TOGGLE.value, "1")
+        elif (camera.product_model in ["WVOD1", "HL_WCO2"]): await self._set_property_list(camera, [create_pid_pair(PropertyIDs.WCO_MOTION_DETECTION, "1")])
+        else:
+            await self._set_property(camera, PropertyIDs.MOTION_DETECTION.value, "1")
+            await self._set_property(camera, PropertyIDs.MOTION_DETECTION_TOGGLE.value, "1")
 
     async def turn_off_motion_detection(self, camera: Camera):
-        await self._set_property(camera, PropertyIDs.MOTION_DETECTION.value, "0")
-        await self._set_property(camera, PropertyIDs.MOTION_DETECTION_TOGGLE.value, "0")
+        if (camera.product_model in DEVICEMGMT_API_MODELS): await self._set_toggle(camera, DeviceMgmtToggleProps.EVENT_RECORDING_TOGGLE.value, "0")
+        elif (camera.product_model in ["WVOD1", "HL_WCO2"]): await self._set_property_list(camera, [create_pid_pair(PropertyIDs.WCO_MOTION_DETECTION, "0")])
+        else:
+            await self._set_property(camera, PropertyIDs.MOTION_DETECTION.value, "0")
+            await self._set_property(camera, PropertyIDs.MOTION_DETECTION_TOGGLE.value, "0")

wyzeapy/services/wall_switch_service.py

@@ -74,7 +74,6 @@ class WallSwitchService(BaseService):
         return [WallSwitch(switch.raw_dict) for switch in switches]
 
     async def turn_on(self, switch: WallSwitch):
-        logging.warn("%s", switch.single_press_type)
         if switch.single_press_type == SinglePressType.IOT:
             await self.iot_on(switch)
         else:

wyzeapy/types.py

@@ -102,10 +102,11 @@ class PropertyIDs(Enum):
     CONTACT_STATE = "P1301"
     MOTION_STATE = "P1302"
     CAMERA_SIREN = "P1049"
-    FLOOD_LIGHT = "P1056"
+    FLOOD_LIGHT = "P1056" # Also lamp socket on v3/v4 with lamp socket accessory
     SUN_MATCH = "P1528"
     MOTION_DETECTION = "P1047"  # Current Motion Detection State of the Camera
     MOTION_DETECTION_TOGGLE = "P1001"  # This toggles Camera Motion Detection On/Off
+    WCO_MOTION_DETECTION = "P1029" # Wyze cam outdoor requires both P1047 and P1029 to be set.  P1029 is set via set_property_list
 
 
 class WallSwitchProps(Enum):
@@ -207,10 +208,13 @@ class HMSStatus(Enum):
     AWAY = 'away'
 
 
+class DeviceMgmtToggleType:
+    def __init__(self, pageId, toggleId):
+        self.pageId = pageId
+        self.toggleId = toggleId
 
 
-
-
-
-
+class DeviceMgmtToggleProps(Enum):
+    EVENT_RECORDING_TOGGLE = DeviceMgmtToggleType("cam_event_recording", "ge.motion_detect_recording")
+    NOTIFICATION_TOGGLE = DeviceMgmtToggleType("cam_device_notify", "ge.push_switch")
 

wyzeapy/utils.py

@@ -73,22 +73,23 @@ def create_password(password: str) -> str:
 
 
 def check_for_errors_standard(service, response_json: Dict[str, Any]) -> None:
-    if response_json['code'] != ResponseCodes.SUCCESS.value:
-        if response_json['code'] == ResponseCodes.PARAMETER_ERROR.value:
-            raise ParameterError(response_json)
-        elif response_json['code'] == ResponseCodes.ACCESS_TOKEN_ERROR.value:
+    response_code = response_json['code']
+    if response_code != ResponseCodes.SUCCESS.value:
+        if response_code == ResponseCodes.PARAMETER_ERROR.value:
+            raise ParameterError(response_code, response_json['msg'])
+        elif response_code == ResponseCodes.ACCESS_TOKEN_ERROR.value:
             service._auth_lib.token.expired = True
-            raise AccessTokenError("Access Token expired, attempting to refresh")
-        elif response_json['code'] == ResponseCodes.DEVICE_OFFLINE.value:
+            raise AccessTokenError(response_code, "Access Token expired, attempting to refresh")
+        elif response_code == ResponseCodes.DEVICE_OFFLINE.value:
             return
         else:
-            raise UnknownApiError(response_json)
+            raise UnknownApiError(response_code, response_json['msg'])
 
 
 def check_for_errors_lock(service, response_json: Dict[str, Any]) -> None:
     if response_json['ErrNo'] != 0:
         if response_json.get('code') == ResponseCodes.PARAMETER_ERROR.value:
-            raise ParameterError
+            raise ParameterError(response_json)
         elif response_json.get('code') == ResponseCodes.ACCESS_TOKEN_ERROR.value:
             service._auth_lib.token.expired = True
             raise AccessTokenError("Access Token expired, attempting to refresh")
@@ -96,6 +97,15 @@ def check_for_errors_lock(service, response_json: Dict[str, Any]) -> None:
             raise UnknownApiError(response_json)
 
 
+def check_for_errors_devicemgmt(service, response_json: Dict[Any, Any]) -> None:
+    if response_json['status'] != 200:
+        if "InvalidTokenError>" in response_json['response']['errors'][0]['message']:
+            service._auth_lib.token.expired = True
+            raise AccessTokenError("Access Token expired, attempting to refresh")
+        else:
+            raise UnknownApiError(response_json)
+
+
 def check_for_errors_iot(service, response_json: Dict[Any, Any]) -> None:
     if response_json['code'] != 1:
         if str(response_json['code']) == ResponseCodes.ACCESS_TOKEN_ERROR.value:

wyzeapy/wyze_auth_lib.py

@@ -267,6 +267,23 @@ class WyzeAuthLib:
             except ContentTypeError:
                 _LOGGER.debug(f"Response: {response}")
             return await response.json()
+    
+    async def put(self, url, json=None, headers=None, data=None) -> Dict[Any, Any]:
+        async with ClientSession(connector=TCPConnector(ttl_dns_cache=(30 * 60))) as _session:
+            response = await _session.put(url, json=json, headers=headers, data=data)
+            # Relocated these below as the sanitization seems to modify the data before it goes to the post.
+            _LOGGER.debug("Request:")
+            _LOGGER.debug(f"url: {url}")
+            _LOGGER.debug(f"json: {self.sanitize(json)}")
+            _LOGGER.debug(f"headers: {self.sanitize(headers)}")
+            _LOGGER.debug(f"data: {self.sanitize(data)}")
+            # Log the response.json() if it exists, if not log the response.
+            try:
+                response_json = await response.json()
+                _LOGGER.debug(f"Response Json: {self.sanitize(response_json)}")
+            except ContentTypeError:
+                _LOGGER.debug(f"Response: {response}")
+            return await response.json()
 
     async def get(self, url, headers=None, params=None) -> Dict[Any, Any]:
         async with ClientSession(connector=TCPConnector(ttl_dns_cache=(30 * 60))) as _session:

{wyzeapy-0.5.23.dist-info → wyzeapy-0.5.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wyzeapy
-Version: 0.5.23
+Version: 0.5.25
 Summary: A library for interacting with Wyze devices
 License: GPL-3.0-only
 Author: Katie Mulliken
@@ -10,6 +10,6 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: aiodns (>=3.0.0,<4.0.0)
-Requires-Dist: aiohttp (>=3.7,<4.0)
-Requires-Dist: pycryptodome (>=3.12.0,<4.0.0)
+Requires-Dist: aiodns (>=3.2.0,<4.0.0)
+Requires-Dist: aiohttp (>=3.10.8,<4.0.0)
+Requires-Dist: pycryptodome (>=3.21.0,<4.0.0)

wyzeapy-0.5.25.dist-info/RECORD

@@ -0,0 +1,23 @@
+wyzeapy/__init__.py,sha256=GqTfzIPOJLdexQMtjvUsDR60oPB-rJGVSK_93FcCSuw,8918
+wyzeapy/const.py,sha256=dm8-tXt_Tl75QXwr_DFfS6nQxQD8lkepWU7RveFVFkI,1054
+wyzeapy/crypto.py,sha256=EI9WkKq4jS0nZS5CIEOSYD_9WtM7kEzrhqEg6YdPUIo,1342
+wyzeapy/exceptions.py,sha256=BVRF7GMMC2T_ZSfGoIVHQsEjVQ3URd5xT6OYqfNxkY0,759
+wyzeapy/payload_factory.py,sha256=PtnxN9awH4Wh7FPXrGhfHvyGPPYLLZc4XQ2ldZIZZjk,18897
+wyzeapy/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wyzeapy/services/base_service.py,sha256=6wRppqI5WD0KRHQiCek39PRNh6Ze7dd2bLN1nz5-uMI,28140
+wyzeapy/services/bulb_service.py,sha256=n2Pvuunz5d7Iv275vDQjKxByowBDkVoVrztBLyDAOZE,6840
+wyzeapy/services/camera_service.py,sha256=mco8YvhybiNUifBaMIf8oTGKc12D73EEAPydtB8ZhQA,9379
+wyzeapy/services/hms_service.py,sha256=3Fhqlmk96dm8LFajjW6P40DCIYMudfN3YIDoVIonqGw,2459
+wyzeapy/services/lock_service.py,sha256=cQ3A8nuovqPoofVBoo4dnnP-3GAkrf5Kgn0dPJWyhc0,1780
+wyzeapy/services/sensor_service.py,sha256=xI--Zr4Dm6DuZrV5pNxBVA1C6rrfhG4T0AFkvXCxVP8,3252
+wyzeapy/services/switch_service.py,sha256=8LGZ1MloLGEXLVy8PaUwfoEzCXdwefLIyGUc2aJ4yPc,2205
+wyzeapy/services/thermostat_service.py,sha256=3yJ8Jx7WPROTkiD2868QrfALFR1QB6_JI4LqcMzOOVc,5228
+wyzeapy/services/update_manager.py,sha256=036ClmJMFzXjD03mfg5DIyjB3xwqHoWkmpU2tcquc5Q,6132
+wyzeapy/services/wall_switch_service.py,sha256=gc6RDDJ5mceiKQUUs0n1wUKM2Y9Hj4_V2SLX9PxRa0g,4262
+wyzeapy/types.py,sha256=22v06L9tugwo2BS-lzM7fRbQHkk4a_FQhzTNlpA7tPA,6366
+wyzeapy/utils.py,sha256=vxwshLArRvP7g3qpFBdFcXBCM2741ItNSSsfdeHD5GU,4755
+wyzeapy/wyze_auth_lib.py,sha256=ERDuTQiTpbcNH5-Z38dGFTbLynvkejghp_eCYtb7OQQ,13712
+wyzeapy-0.5.25.dist-info/LICENSES/GPL-3.0-only.txt,sha256=tqi_Y64slbCqJW7ndGgNe9GPIfRX2nVGb3YQs7FqzE4,34670
+wyzeapy-0.5.25.dist-info/METADATA,sha256=OxS2dfid9lEGAW4xD-NvfvU8EYS8ICcTfC4z3wRsj98,562
+wyzeapy-0.5.25.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+wyzeapy-0.5.25.dist-info/RECORD,,

wyzeapy-0.5.23.dist-info/RECORD

@@ -1,23 +0,0 @@
-wyzeapy/__init__.py,sha256=GqTfzIPOJLdexQMtjvUsDR60oPB-rJGVSK_93FcCSuw,8918
-wyzeapy/const.py,sha256=HqihFV6Hb9yZmUzxrhcrX93cJ2urvtCyUz9s8jP-IVU,989
-wyzeapy/crypto.py,sha256=EI9WkKq4jS0nZS5CIEOSYD_9WtM7kEzrhqEg6YdPUIo,1342
-wyzeapy/exceptions.py,sha256=4eBi7YRWafJlG5M7Cqr_swGKqBggm0Iomf5-Gv6ecgo,871
-wyzeapy/payload_factory.py,sha256=bWRo-xMFfhtxzUcsYd2Eo56MqXmWYuDi8J865Uj_L0E,1920
-wyzeapy/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wyzeapy/services/base_service.py,sha256=37747wJ9_Sy-rQzNetGYlJiGlnv4uWq7DqFCMveaIj8,23794
-wyzeapy/services/bulb_service.py,sha256=n2Pvuunz5d7Iv275vDQjKxByowBDkVoVrztBLyDAOZE,6840
-wyzeapy/services/camera_service.py,sha256=bkvd5Na-mh55xoR0CsTLTHI8685j5EoBKn1H_4mwBO8,5694
-wyzeapy/services/hms_service.py,sha256=3Fhqlmk96dm8LFajjW6P40DCIYMudfN3YIDoVIonqGw,2459
-wyzeapy/services/lock_service.py,sha256=cQ3A8nuovqPoofVBoo4dnnP-3GAkrf5Kgn0dPJWyhc0,1780
-wyzeapy/services/sensor_service.py,sha256=xI--Zr4Dm6DuZrV5pNxBVA1C6rrfhG4T0AFkvXCxVP8,3252
-wyzeapy/services/switch_service.py,sha256=8LGZ1MloLGEXLVy8PaUwfoEzCXdwefLIyGUc2aJ4yPc,2205
-wyzeapy/services/thermostat_service.py,sha256=3yJ8Jx7WPROTkiD2868QrfALFR1QB6_JI4LqcMzOOVc,5228
-wyzeapy/services/update_manager.py,sha256=036ClmJMFzXjD03mfg5DIyjB3xwqHoWkmpU2tcquc5Q,6132
-wyzeapy/services/wall_switch_service.py,sha256=1PmDyKh6WR8ZVVHsj9CAiIDOyG18D0wmH64U2XluT5I,4315
-wyzeapy/types.py,sha256=rUjW2n21ArbxxRpFQGZ5pUIt4bb6JJAkTXElSFHXLiU,5828
-wyzeapy/utils.py,sha256=t2rktlOBXJ5O8YDwVkDwbEpBCwNA7TpiwVVeiDdpzu8,4267
-wyzeapy/wyze_auth_lib.py,sha256=NWlWEMMNeEuCYLo7rxWd1EpJWPsP3huhJatfKTCkKm0,12713
-wyzeapy-0.5.23.dist-info/LICENSES/GPL-3.0-only.txt,sha256=tqi_Y64slbCqJW7ndGgNe9GPIfRX2nVGb3YQs7FqzE4,34670
-wyzeapy-0.5.23.dist-info/METADATA,sha256=0kXEypIc1o-__Yrfu0yj-MI_5-dUvGAUq5GxOWFy-5o,557
-wyzeapy-0.5.23.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-wyzeapy-0.5.23.dist-info/RECORD,,