Force alias when importing camera PLATFORM_SCHEMA (#120514)
This commit is contained in:
parent
45dedf73c8
commit
0c0f666a28
11 changed files with 54 additions and 22 deletions
|
@ -14,7 +14,7 @@ import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import ffmpeg
|
from homeassistant.components import ffmpeg
|
||||||
from homeassistant.components.camera import (
|
from homeassistant.components.camera import (
|
||||||
PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA,
|
PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA,
|
||||||
Camera,
|
Camera,
|
||||||
)
|
)
|
||||||
from homeassistant.components.ffmpeg import FFmpegManager, get_ffmpeg_manager
|
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(
|
PLATFORM_SCHEMA: Final = vol.All(
|
||||||
cv.deprecated(CONF_FFMPEG_ARGUMENTS),
|
cv.deprecated(CONF_FFMPEG_ARGUMENTS),
|
||||||
PARENT_PLATFORM_SCHEMA.extend(
|
CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Optional(
|
vol.Optional(
|
||||||
CONF_FFMPEG_ARGUMENTS, default=DEFAULT_FFMPEG_ARGUMENTS
|
CONF_FFMPEG_ARGUMENTS, default=DEFAULT_FFMPEG_ARGUMENTS
|
||||||
|
|
|
@ -5,7 +5,10 @@ from __future__ import annotations
|
||||||
from pyfamilyhublocal import FamilyHubCam
|
from pyfamilyhublocal import FamilyHubCam
|
||||||
import voluptuous as vol
|
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.const import CONF_IP_ADDRESS, CONF_NAME
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
from homeassistant.helpers.aiohttp_client import async_get_clientsession
|
||||||
|
@ -15,7 +18,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
|
||||||
|
|
||||||
DEFAULT_NAME = "FamilyHub Camera"
|
DEFAULT_NAME = "FamilyHub Camera"
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_IP_ADDRESS): cv.string,
|
vol.Required(CONF_IP_ADDRESS): cv.string,
|
||||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
|
|
|
@ -9,7 +9,11 @@ from haffmpeg.camera import CameraMjpeg
|
||||||
from haffmpeg.tools import IMAGE_JPEG
|
from haffmpeg.tools import IMAGE_JPEG
|
||||||
import voluptuous as vol
|
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.const import CONF_NAME
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
|
from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
|
||||||
|
@ -28,7 +32,7 @@ from . import (
|
||||||
DEFAULT_NAME = "FFmpeg"
|
DEFAULT_NAME = "FFmpeg"
|
||||||
DEFAULT_ARGUMENTS = "-pred 1"
|
DEFAULT_ARGUMENTS = "-pred 1"
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_INPUT): cv.string,
|
vol.Required(CONF_INPUT): cv.string,
|
||||||
vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
|
vol.Optional(CONF_EXTRA_ARGUMENTS, default=DEFAULT_ARGUMENTS): cv.string,
|
||||||
|
|
|
@ -8,7 +8,10 @@ import os
|
||||||
|
|
||||||
import voluptuous as vol
|
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.const import ATTR_ENTITY_ID, CONF_FILE_PATH, CONF_NAME
|
||||||
from homeassistant.core import HomeAssistant, ServiceCall
|
from homeassistant.core import HomeAssistant, ServiceCall
|
||||||
from homeassistant.helpers import config_validation as cv
|
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__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_FILE_PATH): cv.string,
|
vol.Required(CONF_FILE_PATH): cv.string,
|
||||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
|
|
|
@ -11,7 +11,7 @@ from PIL import Image
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components.camera import (
|
from homeassistant.components.camera import (
|
||||||
PLATFORM_SCHEMA,
|
PLATFORM_SCHEMA as CAMERA_PLATFORM_SCHEMA,
|
||||||
Camera,
|
Camera,
|
||||||
async_get_image,
|
async_get_image,
|
||||||
async_get_mjpeg_stream,
|
async_get_mjpeg_stream,
|
||||||
|
@ -45,7 +45,7 @@ MODE_CROP = "crop"
|
||||||
DEFAULT_BASENAME = "Camera Proxy"
|
DEFAULT_BASENAME = "Camera Proxy"
|
||||||
DEFAULT_QUALITY = 75
|
DEFAULT_QUALITY = 75
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_ENTITY_ID): cv.entity_id,
|
vol.Required(CONF_ENTITY_ID): cv.entity_id,
|
||||||
vol.Optional(CONF_NAME): cv.string,
|
vol.Optional(CONF_NAME): cv.string,
|
||||||
|
|
|
@ -11,7 +11,12 @@ import aiohttp
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import webhook
|
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.const import CONF_NAME, CONF_TIMEOUT, CONF_WEBHOOK_ID
|
||||||
from homeassistant.core import HomeAssistant, callback
|
from homeassistant.core import HomeAssistant, callback
|
||||||
from homeassistant.helpers import config_validation as cv
|
from homeassistant.helpers import config_validation as cv
|
||||||
|
@ -32,7 +37,7 @@ ATTR_LAST_TRIP = "last_trip"
|
||||||
|
|
||||||
PUSH_CAMERA_DATA = "push_camera"
|
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_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
vol.Optional(CONF_BUFFER_SIZE, default=1): cv.positive_int,
|
vol.Optional(CONF_BUFFER_SIZE, default=1): cv.positive_int,
|
||||||
|
|
|
@ -10,7 +10,11 @@ import requests
|
||||||
from uvcclient import camera as uvc_camera, nvr
|
from uvcclient import camera as uvc_camera, nvr
|
||||||
import voluptuous as vol
|
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.const import CONF_PASSWORD, CONF_PORT, CONF_SSL
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.exceptions import PlatformNotReady
|
from homeassistant.exceptions import PlatformNotReady
|
||||||
|
@ -28,7 +32,7 @@ DEFAULT_PASSWORD = "ubnt"
|
||||||
DEFAULT_PORT = 7080
|
DEFAULT_PORT = 7080
|
||||||
DEFAULT_SSL = False
|
DEFAULT_SSL = False
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_NVR): cv.string,
|
vol.Required(CONF_NVR): cv.string,
|
||||||
vol.Required(CONF_KEY): cv.string,
|
vol.Required(CONF_KEY): cv.string,
|
||||||
|
|
|
@ -5,7 +5,11 @@ from __future__ import annotations
|
||||||
from libpyvivotek import VivotekCamera
|
from libpyvivotek import VivotekCamera
|
||||||
import voluptuous as vol
|
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 (
|
from homeassistant.const import (
|
||||||
CONF_AUTHENTICATION,
|
CONF_AUTHENTICATION,
|
||||||
CONF_IP_ADDRESS,
|
CONF_IP_ADDRESS,
|
||||||
|
@ -32,7 +36,7 @@ DEFAULT_EVENT_0_KEY = "event_i0_enable"
|
||||||
DEFAULT_SECURITY_LEVEL = "admin"
|
DEFAULT_SECURITY_LEVEL = "admin"
|
||||||
DEFAULT_STREAM_SOURCE = "live.sdp"
|
DEFAULT_STREAM_SOURCE = "live.sdp"
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_IP_ADDRESS): cv.string,
|
vol.Required(CONF_IP_ADDRESS): cv.string,
|
||||||
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
|
||||||
|
|
|
@ -7,7 +7,10 @@ import logging
|
||||||
from pyxeoma.xeoma import Xeoma, XeomaError
|
from pyxeoma.xeoma import Xeoma, XeomaError
|
||||||
import voluptuous as vol
|
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.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant
|
||||||
from homeassistant.helpers import config_validation as cv
|
from homeassistant.helpers import config_validation as cv
|
||||||
|
@ -32,7 +35,7 @@ CAMERAS_SCHEMA = vol.Schema(
|
||||||
required=False,
|
required=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_HOST): cv.string,
|
vol.Required(CONF_HOST): cv.string,
|
||||||
vol.Optional(CONF_CAMERAS): vol.Schema(
|
vol.Optional(CONF_CAMERAS): vol.Schema(
|
||||||
|
|
|
@ -9,7 +9,10 @@ from haffmpeg.camera import CameraMjpeg
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import ffmpeg
|
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.components.ffmpeg import get_ffmpeg_manager
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
CONF_HOST,
|
CONF_HOST,
|
||||||
|
@ -40,7 +43,7 @@ CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments"
|
||||||
MODEL_YI = "yi"
|
MODEL_YI = "yi"
|
||||||
MODEL_XIAOFANG = "xiaofang"
|
MODEL_XIAOFANG = "xiaofang"
|
||||||
|
|
||||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
|
PLATFORM_SCHEMA = CAMERA_PLATFORM_SCHEMA.extend(
|
||||||
{
|
{
|
||||||
vol.Required(CONF_NAME): cv.string,
|
vol.Required(CONF_NAME): cv.string,
|
||||||
vol.Required(CONF_HOST): cv.template,
|
vol.Required(CONF_HOST): cv.template,
|
||||||
|
|
|
@ -9,7 +9,10 @@ from haffmpeg.camera import CameraMjpeg
|
||||||
import voluptuous as vol
|
import voluptuous as vol
|
||||||
|
|
||||||
from homeassistant.components import ffmpeg
|
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.components.ffmpeg import get_ffmpeg_manager
|
||||||
from homeassistant.const import (
|
from homeassistant.const import (
|
||||||
CONF_HOST,
|
CONF_HOST,
|
||||||
|
@ -37,7 +40,7 @@ DEFAULT_ARGUMENTS = "-pred 1"
|
||||||
|
|
||||||
CONF_FFMPEG_ARGUMENTS = "ffmpeg_arguments"
|
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_NAME): cv.string,
|
||||||
vol.Required(CONF_HOST): cv.string,
|
vol.Required(CONF_HOST): cv.string,
|
||||||
|
|
Loading…
Add table
Reference in a new issue