Fix Facebox face data parsing (#14951)
* Adds parse_faces * Update facebox.py
This commit is contained in:
1 parent
e014a84215
commit
cccd0deb65
2 files changed
+65
-19
No files matched your search
@@ -10,16 +10,22 @@ import logging
|
||||
import requests
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant.const import ATTR_NAME
|
||||
from homeassistant.core import split_entity_id
|
||||
import homeassistant.helpers.config_validation as cv
|
||||
from homeassistant.components.image_processing import (
|
||||
PLATFORM_SCHEMA, ImageProcessingFaceEntity, CONF_SOURCE, CONF_ENTITY_ID,
|
||||
CONF_NAME)
|
||||
PLATFORM_SCHEMA, ImageProcessingFaceEntity, ATTR_CONFIDENCE, CONF_SOURCE,
|
||||
CONF_ENTITY_ID, CONF_NAME)
|
||||
from homeassistant.const import (CONF_IP_ADDRESS, CONF_PORT)
|
||||
|
||||
_LOGGER = logging.getLogger(__name__)
|
||||
|
||||
ATTR_BOUNDING_BOX = 'bounding_box'
|
||||
ATTR_IMAGE_ID = 'image_id'
|
||||
ATTR_MATCHED = 'matched'
|
||||
CLASSIFIER = 'facebox'
|
||||
TIMEOUT = 9
|
||||
|
||||
|
||||
PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
vol.Required(CONF_IP_ADDRESS): cv.string,
|
||||
@@ -30,7 +36,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
|
||||
def encode_image(image):
|
||||
"""base64 encode an image stream."""
|
||||
base64_img = base64.b64encode(image).decode('ascii')
|
||||
return {"base64": base64_img}
|
||||
return base64_img
|
||||
|
||||
|
||||
def get_matched_faces(faces):
|
||||
@@ -39,6 +45,24 @@ def get_matched_faces(faces):
|
||||
for face in faces if face['matched']}
|
||||
|
||||
|
||||
def parse_faces(api_faces):
|
||||
"""Parse the API face data into the format required."""
|
||||
known_faces = []
|
||||
for entry in api_faces:
|
||||
face = {}
|
||||
if entry['matched']: # This data is only in matched faces.
|
||||
face[ATTR_NAME] = entry['name']
|
||||
face[ATTR_IMAGE_ID] = entry['id']
|
||||
else: # Lets be explicit.
|
||||
face[ATTR_NAME] = None
|
||||
face[ATTR_IMAGE_ID] = None
|
||||
face[ATTR_CONFIDENCE] = round(100.0*entry['confidence'], 2)
|
||||
face[ATTR_MATCHED] = entry['matched']
|
||||
face[ATTR_BOUNDING_BOX] = entry['rect']
|
||||
known_faces.append(face)
|
||||
return known_faces
|
||||
|
||||
|
||||
def setup_platform(hass, config, add_devices, discovery_info=None):
|
||||
"""Set up the classifier."""
|
||||
entities = []
|
||||
@@ -74,18 +98,18 @@ class FaceClassifyEntity(ImageProcessingFaceEntity):
|
||||
try:
|
||||
response = requests.post(
|
||||
self._url,
|
||||
json=encode_image(image),
|
||||
timeout=9
|
||||
json={"base64": encode_image(image)},
|
||||
timeout=TIMEOUT
|
||||
).json()
|
||||
except requests.exceptions.ConnectionError:
|
||||
_LOGGER.error("ConnectionError: Is %s running?", CLASSIFIER)
|
||||
response['success'] = False
|
||||
|
||||
if response['success']:
|
||||
faces = response['faces']
|
||||
total = response['facesCount']
|
||||
self.process_faces(faces, total)
|
||||
total_faces = response['facesCount']
|
||||
faces = parse_faces(response['faces'])
|
||||
self._matched = get_matched_faces(faces)
|
||||
self.process_faces(faces, total_faces)
|
||||
|
||||
else:
|
||||
self.total_faces = None
|
||||
|
||||
Reference in new issue
Block a user