Merge pull request #133 from natekspencer/dev

Add ability to reboot camera and adjust how stream source is retrieved

Author: natekspencer

custom_components/vivint/button.py

@@ -1,8 +1,14 @@
 """Support for Vivint buttons."""
+
 from __future__ import annotations
 
 from vivintpy.devices.alarm_panel import AlarmPanel
+from vivintpy.devices.camera import Camera as VivintCamera
 from vivintpy.entity import UPDATE
+from vivintpy.enums import (
+    CapabilityCategoryType as Category,
+    CapabilityType as Capability,
+)
 
 from homeassistant.components.button import (
     ButtonDeviceClass,
@@ -14,9 +20,9 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .hub import VivintBaseEntity, VivintHub
+from .hub import VivintBaseEntity, VivintHub, has_capability
 
-HUB_REBOOT_ENTITY = ButtonEntityDescription(
+REBOOT_ENTITY = ButtonEntityDescription(
     key="reboot", device_class=ButtonDeviceClass.RESTART
 )
 
@@ -30,24 +36,36 @@ async def async_setup_entry(
     hub: VivintHub = hass.data[DOMAIN][entry.entry_id]
     entities = [
         VivintButtonEntity(
-            device=alarm_panel, hub=hub, entity_description=HUB_REBOOT_ENTITY
+            device=alarm_panel, hub=hub, entity_description=REBOOT_ENTITY
         )
         for system in hub.account.systems
         if system.is_admin
         for alarm_panel in system.alarm_panels
     ]
+    entities.extend(
+        VivintButtonEntity(device=device, hub=hub, entity_description=REBOOT_ENTITY)
+        for system in hub.account.systems
+        for alarm_panel in system.alarm_panels
+        for device in alarm_panel.devices
+        if isinstance(device, VivintCamera)
+        and has_capability(device, Category.CAMERA, Capability.REBOOT_CAMERA)
+    )
     async_add_entities(entities)
 
 
 class VivintButtonEntity(VivintBaseEntity, ButtonEntity):
     """A class that describes device button entities."""
 
-    device: AlarmPanel
+    device: AlarmPanel | VivintCamera
 
     @property
     def available(self) -> bool:
         """Return if entity is available."""
-        return super().available and self.device._AlarmPanel__panel.data["can_reboot"]
+        if isinstance(self.device, AlarmPanel):
+            return (
+                super().available and self.device._AlarmPanel__panel.data["can_reboot"]
+            )
+        return super().available
 
     async def async_press(self) -> None:
         """Handle the button press."""
@@ -56,8 +74,9 @@ async def async_press(self) -> None:
     async def async_added_to_hass(self) -> None:
         """Set up a listener for the entity."""
         await super().async_added_to_hass()
-        self.async_on_remove(
-            self.device._AlarmPanel__panel.on(
-                UPDATE, lambda _: self.async_write_ha_state()
+        if isinstance(self.device, AlarmPanel):
+            self.async_on_remove(
+                self.device._AlarmPanel__panel.on(
+                    UPDATE, lambda _: self.async_write_ha_state()
+                )
             )
-        )

custom_components/vivint/camera.py

@@ -1,4 +1,5 @@
 """Support for Vivint cameras."""
+
 from __future__ import annotations
 
 import logging
@@ -21,7 +22,7 @@
     DEFAULT_RTSP_URL_LOGGING,
     DOMAIN,
     RTSP_STREAM_DIRECT,
-    RTSP_STREAM_EXTERNAL,
+    RTSP_STREAM_INTERNAL,
 )
 from .hub import VivintEntity, VivintHub
 
@@ -103,7 +104,6 @@ def __init__(
 
         self.__hd_stream = hd_stream
         self.__rtsp_stream = rtsp_stream
-        self.__stream_source = None
         self.__last_image = None
 
     @property
@@ -113,15 +113,13 @@ def unique_id(self) -> str:
 
     async def stream_source(self) -> str | None:
         """Return the source of the stream."""
-        if not self.__stream_source:
-            self.__stream_source = (
-                await self.device.get_direct_rtsp_url(hd=self.__hd_stream)
-                if self.__rtsp_stream == RTSP_STREAM_DIRECT
-                else None
-            ) or await self.device.get_rtsp_url(
-                internal=self.__rtsp_stream != RTSP_STREAM_EXTERNAL, hd=self.__hd_stream
+        await self.device.alarm_panel.get_panel_credentials()
+        url = self.device.get_rtsp_access_url(self.__rtsp_stream, self.__hd_stream)
+        if not url and self.__rtsp_stream == RTSP_STREAM_DIRECT:
+            url = self.device.get_rtsp_access_url(
+                RTSP_STREAM_INTERNAL, self.__hd_stream
             )
-        return self.__stream_source
+        return url
 
     async def async_camera_image(
         self, width: int | None = None, height: int | None = None

custom_components/vivint/hub.py

@@ -1,4 +1,5 @@
 """A wrapper 'hub' for the Vivint API and base entity for common attributes."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
@@ -15,6 +16,11 @@
 from vivintpy.devices import VivintDevice
 from vivintpy.devices.alarm_panel import AlarmPanel
 from vivintpy.entity import UPDATE
+from vivintpy.enums import (
+    CapabilityCategoryType as Category,
+    CapabilityType as Capability,
+    FeatureType as Feature,
+)
 from vivintpy.exceptions import (
     VivintSkyApiAuthenticationError,
     VivintSkyApiError,
@@ -47,6 +53,18 @@ def get_device_id(device: VivintDevice) -> tuple[str, str]:
     )
 
 
+def has_capability(device: VivintDevice, category: Category, capability: Capability):
+    """Check if a device has a capability."""
+    if capability in (device.capabilities or {}).get(category, []):
+        return True
+    return False
+
+
+def has_feature(device: VivintDevice, feature: Feature):
+    """Check if a device has a feature."""
+    return feature in (device.features or [])
+
+
 class VivintHub:
     """A Vivint hub wrapper class."""
 
@@ -173,9 +191,11 @@ def __init__(
             manufacturer=device.manufacturer,
             model=device.model,
             sw_version=device.software_version,
-            via_device=None
-            if isinstance(device, AlarmPanel)
-            else get_device_id(device.alarm_panel),
+            via_device=(
+                None
+                if isinstance(device, AlarmPanel)
+                else get_device_id(device.alarm_panel)
+            ),
         )
 
     async def async_added_to_hass(self) -> None:
@@ -204,9 +224,11 @@ def __init__(self, device: VivintDevice, hub: VivintHub) -> None:
             manufacturer=device.manufacturer,
             model=device.model,
             sw_version=device.software_version,
-            via_device=None
-            if isinstance(device, AlarmPanel)
-            else get_device_id(device.alarm_panel),
+            via_device=(
+                None
+                if isinstance(device, AlarmPanel)
+                else get_device_id(device.alarm_panel)
+            ),
         )
 
     async def async_added_to_hass(self) -> None:

custom_components/vivint/manifest.json

@@ -9,7 +9,7 @@
   "iot_class": "cloud_push",
   "issue_tracker": "https://github.com/natekspencer/hacs-vivint/issues",
   "loggers": ["custom_components.vivint", "vivintpy"],
-  "requirements": ["vivintpy==2023.3.8"],
+  "requirements": ["vivintpy==2023.4.0"],
   "version": "0.0.0",
   "zeroconf": ["_vivint-ODC300._tcp.local.", "_vivint-DBC350._tcp.local."]
 }

custom_components/vivint/switch.py

@@ -1,11 +1,11 @@
 """Support for Vivint switches."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any
 
-from vivintpy.devices import VivintDevice
 from vivintpy.devices.camera import Camera
 from vivintpy.devices.switch import BinarySwitch
 from vivintpy.enums import (
@@ -21,19 +21,7 @@
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
-from .hub import VivintBaseEntity, VivintHub
-
-
-def has_capability(device: VivintDevice, category: Category, capability: Capability):
-    """Check if a device has a capability."""
-    if capability in (device.capabilities or {}).get(category, []):
-        return True
-    return False
-
-
-def has_feature(device: VivintDevice, feature: Feature):
-    """Check if a device has a feature."""
-    return feature in (device.features or [])
+from .hub import VivintBaseEntity, VivintHub, has_capability, has_feature
 
 
 async def async_setup_entry(