From 0c0f666a283a093538f77ffe629f73d0b1e18e57 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:03:13 +0200 Subject: [PATCH] Force alias when importing camera PLATFORM_SCHEMA (#120514) --- homeassistant/components/canary/camera.py | 4 ++-- homeassistant/components/familyhub/camera.py | 7 +++++-- homeassistant/components/ffmpeg/camera.py | 8 ++++++-- homeassistant/components/local_file/camera.py | 7 +++++-- homeassistant/components/proxy/camera.py | 4 ++-- homeassistant/components/push/camera.py | 9 +++++++-- homeassistant/components/uvc/camera.py | 8 ++++++-- homeassistant/components/vivotek/camera.py | 8 ++++++-- homeassistant/components/xeoma/camera.py | 7 +++++-- homeassistant/components/xiaomi/camera.py | 7 +++++-- homeassistant/components/yi/camera.py | 7 +++++-- 11 files changed, 54 insertions(+), 22 deletions(-) diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py index e081d24e06a..a56d1ebc3de 100644 --- a/homeassistant/components/canary/camera.py +++ b/homeassistant/components/canary/camera.py @@ -14,7 +14,7 @@ import voluptuous as vol from homeassistant.components import ffmpeg from homeassistant.components.camera import ( - PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA, + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, Camera, ) from homeassistant.components.ffmpeg import FFmpegManager, get_ffmpeg_manager @@ -40,7 +40,7 @@ FORCE_CAMERA_REFRESH_INTERVAL: Final = timedelta(minutes=15) PLATFORM_SCHEMA: Final = vol.All( cv.deprecated(CONF_FFMPEG_ARGUMENTS), - PARENT_PLATFORM_SCHEMA.extend( + CAMERA_PLATFORM_SCHEMA.extend( { vol.Optional( CONF_FFMPEG_ARGUMENTS, default=DEFAULT_FFMPEG_ARGUMENTS diff --git a/homeassistant/components/familyhub/camera.py b/homeassistant/components/familyhub/camera.py index da6f82cf56b..462983278b0 100644 --- a/homeassistant/components/familyhub/camera.py +++ b/homeassistant/components/familyhub/camera.py @@ -5,7 +5,10 @@ from __future__ import annotations from pyfamilyhublocal import FamilyHubCam import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, +) from homeassistant.const import CONF_IP_ADDRESS, CONF_NAME from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_get_clientsession @@ -15,7 +18,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType DEFAULT_NAME = "FamilyHub Camera" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_IP_ADDRESS): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, diff --git a/homeassistant/components/ffmpeg/camera.py b/homeassistant/components/ffmpeg/camera.py index c0ce4ad9746..2c46c4c29d1 100644 --- a/homeassistant/components/ffmpeg/camera.py +++ b/homeassistant/components/ffmpeg/camera.py @@ -9,7 +9,11 @@ from haffmpeg.camera import CameraMjpeg from haffmpeg.tools import IMAGE_JPEG import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera, CameraEntityFeature +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, + CameraEntityFeature, +) from homeassistant.const import CONF_NAME from homeassistant.core import HomeAssistant from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream @@ -28,7 +32,7 @@ from . import ( DEFAULT_NAME = "FFmpeg" DEFAULT_ARGUMENTS = "-pred 1" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_INPUT): cv.string, vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string, diff --git a/homeassistant/components/local_file/camera.py b/homeassistant/components/local_file/camera.py index 72fe1a88b86..1306751f1a9 100644 --- a/homeassistant/components/local_file/camera.py +++ b/homeassistant/components/local_file/camera.py @@ -8,7 +8,10 @@ import os import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, +) from homeassistant.const import ATTR_ENTITY_ID, CONF_FILE_PATH, CONF_NAME from homeassistant.core import HomeAssistant, ServiceCall from homeassistant.helpers import config_validation as cv @@ -19,7 +22,7 @@ from .const import DATA_LOCAL_FILE, DEFAULT_NAME, DOMAIN, SERVICE_UPDATE_FILE_PA _LOGGER = logging.getLogger(__name__) -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_FILE_PATH): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, diff --git a/homeassistant/components/proxy/camera.py b/homeassistant/components/proxy/camera.py index 5cd72b05871..e5e3d01591a 100644 --- a/homeassistant/components/proxy/camera.py +++ b/homeassistant/components/proxy/camera.py @@ -11,7 +11,7 @@ from PIL import Image import voluptuous as vol from homeassistant.components.camera import ( - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, Camera, async_get_image, async_get_mjpeg_stream, @@ -45,7 +45,7 @@ MODE_CROP = "crop" DEFAULT_BASENAME = "Camera Proxy" DEFAULT_QUALITY = 75 -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_ENTITY_ID): cv.entity_id, vol.Optional(CONF_NAME): cv.string, diff --git a/homeassistant/components/push/camera.py b/homeassistant/components/push/camera.py index 8744ce8c2a1..1a37a10bf4f 100644 --- a/homeassistant/components/push/camera.py +++ b/homeassistant/components/push/camera.py @@ -11,7 +11,12 @@ import aiohttp import voluptuous as vol from homeassistant.components import webhook -from homeassistant.components.camera import DOMAIN, PLATFORM_SCHEMA, STATE_IDLE, Camera +from homeassistant.components.camera import ( + DOMAIN, + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + STATE_IDLE, + Camera, +) from homeassistant.const import CONF_NAME, CONF_TIMEOUT, CONF_WEBHOOK_ID from homeassistant.core import HomeAssistant, callback from homeassistant.helpers import config_validation as cv @@ -32,7 +37,7 @@ ATTR_LAST_TRIP = "last_trip" PUSH_CAMERA_DATA = "push_camera" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, vol.Optional(CONF_BUFFER_SIZE, default=1): cv.positive_int, diff --git a/homeassistant/components/uvc/camera.py b/homeassistant/components/uvc/camera.py index 3162fc67566..cd9594c7d31 100644 --- a/homeassistant/components/uvc/camera.py +++ b/homeassistant/components/uvc/camera.py @@ -10,7 +10,11 @@ import requests from uvcclient import camera as uvc_camera, nvr import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera, CameraEntityFeature +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, + CameraEntityFeature, +) from homeassistant.const import CONF_PASSWORD, CONF_PORT, CONF_SSL from homeassistant.core import HomeAssistant from homeassistant.exceptions import PlatformNotReady @@ -28,7 +32,7 @@ DEFAULT_PASSWORD = "ubnt" DEFAULT_PORT = 7080 DEFAULT_SSL = False -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_NVR): cv.string, vol.Required(CONF_KEY): cv.string, diff --git a/homeassistant/components/vivotek/camera.py b/homeassistant/components/vivotek/camera.py index 8719d55ec29..a8bf652e963 100644 --- a/homeassistant/components/vivotek/camera.py +++ b/homeassistant/components/vivotek/camera.py @@ -5,7 +5,11 @@ from __future__ import annotations from libpyvivotek import VivotekCamera import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera, CameraEntityFeature +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, + CameraEntityFeature, +) from homeassistant.const import ( CONF_AUTHENTICATION, CONF_IP_ADDRESS, @@ -32,7 +36,7 @@ DEFAULT_EVENT_0_KEY = "event_i0_enable" DEFAULT_SECURITY_LEVEL = "admin" DEFAULT_STREAM_SOURCE = "live.sdp" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_IP_ADDRESS): cv.string, vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string, diff --git a/homeassistant/components/xeoma/camera.py b/homeassistant/components/xeoma/camera.py index 7d6abde8535..0c19e126fa7 100644 --- a/homeassistant/components/xeoma/camera.py +++ b/homeassistant/components/xeoma/camera.py @@ -7,7 +7,10 @@ import logging from pyxeoma.xeoma import Xeoma, XeomaError import voluptuous as vol -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, +) from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME from homeassistant.core import HomeAssistant from homeassistant.helpers import config_validation as cv @@ -32,7 +35,7 @@ CAMERAS_SCHEMA = vol.Schema( required=False, ) -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_HOST): cv.string, vol.Optional(CONF_CAMERAS): vol.Schema( diff --git a/homeassistant/components/xiaomi/camera.py b/homeassistant/components/xiaomi/camera.py index f3e850a7839..323a0f8a157 100644 --- a/homeassistant/components/xiaomi/camera.py +++ b/homeassistant/components/xiaomi/camera.py @@ -9,7 +9,10 @@ from haffmpeg.camera import CameraMjpeg import voluptuous as vol from homeassistant.components import ffmpeg -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, +) from homeassistant.components.ffmpeg import get_ffmpeg_manager from homeassistant.const import ( CONF_HOST, @@ -40,7 +43,7 @@ CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments" MODEL_YI = "yi" MODEL_XIAOFANG = "xiaofang" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_NAME): cv.string, vol.Required(CONF_HOST): cv.template, diff --git a/homeassistant/components/yi/camera.py b/homeassistant/components/yi/camera.py index f512d31cb6b..b2fac03954d 100644 --- a/homeassistant/components/yi/camera.py +++ b/homeassistant/components/yi/camera.py @@ -9,7 +9,10 @@ from haffmpeg.camera import CameraMjpeg import voluptuous as vol from homeassistant.components import ffmpeg -from homeassistant.components.camera import PLATFORM_SCHEMA, Camera +from homeassistant.components.camera import ( + PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA, + Camera, +) from homeassistant.components.ffmpeg import get_ffmpeg_manager from homeassistant.const import ( CONF_HOST, @@ -37,7 +40,7 @@ DEFAULT_ARGUMENTS = "-pred 1" CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend( { vol.Required(CONF_NAME): cv.string, vol.Required(CONF_HOST): cv.string,