From afbd24adfe05c46a071701b21d0dc08fdaec1854 Mon Sep 17 00:00:00 2001 From: epenet <6771947+epenet@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:29:52 +0200 Subject: [PATCH] Force alias when importing image processing PLATFORM_SCHEMA (#120527) --- .../components/dlib_face_identify/image_processing.py | 4 ++-- homeassistant/components/doods/image_processing.py | 4 ++-- .../components/microsoft_face_detect/image_processing.py | 4 ++-- .../components/microsoft_face_identify/image_processing.py | 6 ++++-- homeassistant/components/openalpr_cloud/image_processing.py | 4 ++-- homeassistant/components/seven_segments/image_processing.py | 4 ++-- homeassistant/components/sighthound/image_processing.py | 4 ++-- homeassistant/components/tensorflow/image_processing.py | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/homeassistant/components/dlib_face_identify/image_processing.py b/homeassistant/components/dlib_face_identify/image_processing.py index ac9e69ec9e1..e17f892a7fe 100644 --- a/homeassistant/components/dlib_face_identify/image_processing.py +++ b/homeassistant/components/dlib_face_identify/image_processing.py @@ -10,7 +10,7 @@ import voluptuous as vol from homeassistant.components.image_processing import ( CONF_CONFIDENCE, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingFaceEntity, ) from homeassistant.const import ATTR_NAME, CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE @@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__) CONF_FACES = "faces" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Required(CONF_FACES): {cv.string: cv.isfile}, vol.Optional(CONF_CONFIDENCE, default=0.6): vol.Coerce(float), diff --git a/homeassistant/components/doods/image_processing.py b/homeassistant/components/doods/image_processing.py index 11985ef4889..7ffb6655bb6 100644 --- a/homeassistant/components/doods/image_processing.py +++ b/homeassistant/components/doods/image_processing.py @@ -13,7 +13,7 @@ import voluptuous as vol from homeassistant.components.image_processing import ( CONF_CONFIDENCE, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingEntity, ) from homeassistant.const import ( @@ -66,7 +66,7 @@ LABEL_SCHEMA = vol.Schema( } ) -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Required(CONF_URL): cv.string, vol.Required(CONF_DETECTOR): cv.string, diff --git a/homeassistant/components/microsoft_face_detect/image_processing.py b/homeassistant/components/microsoft_face_detect/image_processing.py index ef8a4f5df4b..80037a29fa8 100644 --- a/homeassistant/components/microsoft_face_detect/image_processing.py +++ b/homeassistant/components/microsoft_face_detect/image_processing.py @@ -10,7 +10,7 @@ from homeassistant.components.image_processing import ( ATTR_AGE, ATTR_GENDER, ATTR_GLASSES, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingFaceEntity, ) from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE @@ -37,7 +37,7 @@ def validate_attributes(list_attributes): return list_attributes -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Optional(CONF_ATTRIBUTES, default=DEFAULT_ATTRIBUTES): vol.All( cv.ensure_list, validate_attributes diff --git a/homeassistant/components/microsoft_face_identify/image_processing.py b/homeassistant/components/microsoft_face_identify/image_processing.py index d1af1d4a827..03a6ad22fcd 100644 --- a/homeassistant/components/microsoft_face_identify/image_processing.py +++ b/homeassistant/components/microsoft_face_identify/image_processing.py @@ -9,7 +9,7 @@ import voluptuous as vol from homeassistant.components.image_processing import ( ATTR_CONFIDENCE, CONF_CONFIDENCE, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingFaceEntity, ) from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE @@ -24,7 +24,9 @@ _LOGGER = logging.getLogger(__name__) CONF_GROUP = "group" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({vol.Required(CONF_GROUP): cv.slugify}) +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( + {vol.Required(CONF_GROUP): cv.slugify} +) async def async_setup_platform( diff --git a/homeassistant/components/openalpr_cloud/image_processing.py b/homeassistant/components/openalpr_cloud/image_processing.py index 2a8fe328c7d..e8a8d6859c1 100644 --- a/homeassistant/components/openalpr_cloud/image_processing.py +++ b/homeassistant/components/openalpr_cloud/image_processing.py @@ -13,7 +13,7 @@ import voluptuous as vol from homeassistant.components.image_processing import ( ATTR_CONFIDENCE, CONF_CONFIDENCE, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingDeviceClass, ImageProcessingEntity, ) @@ -57,7 +57,7 @@ OPENALPR_REGIONS = [ "vn2", ] -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Required(CONF_API_KEY): cv.string, vol.Required(CONF_REGION): vol.All(vol.Lower, vol.In(OPENALPR_REGIONS)), diff --git a/homeassistant/components/seven_segments/image_processing.py b/homeassistant/components/seven_segments/image_processing.py index 622ceb761a0..7b41a1702c0 100644 --- a/homeassistant/components/seven_segments/image_processing.py +++ b/homeassistant/components/seven_segments/image_processing.py @@ -11,7 +11,7 @@ from PIL import Image import voluptuous as vol from homeassistant.components.image_processing import ( - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingDeviceClass, ImageProcessingEntity, ) @@ -35,7 +35,7 @@ CONF_Y_POS = "y_position" DEFAULT_BINARY = "ssocr" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Optional(CONF_EXTRA_ARGUMENTS, default=""): cv.string, vol.Optional(CONF_DIGITS): cv.positive_int, diff --git a/homeassistant/components/sighthound/image_processing.py b/homeassistant/components/sighthound/image_processing.py index bcfa4bca3c2..706a8dd037a 100644 --- a/homeassistant/components/sighthound/image_processing.py +++ b/homeassistant/components/sighthound/image_processing.py @@ -11,7 +11,7 @@ import simplehound.core as hound import voluptuous as vol from homeassistant.components.image_processing import ( - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingEntity, ) from homeassistant.const import ( @@ -41,7 +41,7 @@ DATETIME_FORMAT = "%Y-%m-%d_%H:%M:%S" DEV = "dev" PROD = "prod" -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Required(CONF_API_KEY): cv.string, vol.Optional(CONF_ACCOUNT_TYPE, default=DEV): vol.In([DEV, PROD]), diff --git a/homeassistant/components/tensorflow/image_processing.py b/homeassistant/components/tensorflow/image_processing.py index c78c2bc2312..85fe6439f1c 100644 --- a/homeassistant/components/tensorflow/image_processing.py +++ b/homeassistant/components/tensorflow/image_processing.py @@ -15,7 +15,7 @@ import voluptuous as vol from homeassistant.components.image_processing import ( CONF_CONFIDENCE, - PLATFORM_SCHEMA, + PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA, ImageProcessingEntity, ) from homeassistant.const import ( @@ -68,7 +68,7 @@ CATEGORY_SCHEMA = vol.Schema( {vol.Required(CONF_CATEGORY): cv.string, vol.Optional(CONF_AREA): AREA_SCHEMA} ) -PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend( +PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend( { vol.Optional(CONF_FILE_OUT, default=[]): vol.All(cv.ensure_list, [cv.template]), vol.Required(CONF_MODEL): vol.Schema(