jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-29 20:48:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade numpy to 1.14.0 (#11542)

Browse Source
This commit is contained in:
Fabian Affolter
2018-01-09 15:30:00 +01:00
committed by Pascal Vizeli
parent 13effee679
commit 8b267e3faf
4 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/image_processing/opencv.py
View File

@@ -8,16 +8,15 @@ from datetime import timedelta
import logging
import requests
import voluptuous as vol
from homeassistant.core import split_entity_id
from homeassistant.components.image_processing import (
CONF_SOURCE, CONF_ENTITY_ID, CONF_NAME, PLATFORM_SCHEMA,
CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE, PLATFORM_SCHEMA,
ImageProcessingEntity)
from homeassistant.core import split_entity_id
import homeassistant.helpers.config_validation as cv
REQUIREMENTS = ['numpy==1.13.3']
REQUIREMENTS = ['numpy==1.14.0']
_LOGGER = logging.getLogger(__name__)
@@ -73,7 +72,7 @@ def _create_processor_from_config(hass, camera_entity, config):
def _get_default_classifier(dest_path):
"""Download the default OpenCV classifier."""
_LOGGER.info('Downloading default classifier')
_LOGGER.info("Downloading default classifier")
req = requests.get(CASCADE_URL, stream=True)
with open(dest_path, 'wb') as fil:
for chunk in req.iter_content(chunk_size=1024):
@@ -84,14 +83,13 @@ def _get_default_classifier(dest_path):
def setup_platform(hass, config, add_devices, discovery_info=None):
"""Set up the OpenCV image processing platform."""
try:
# Verify opencv python package is preinstalled
# Verify that the OpenCV python package is pre-installed
# pylint: disable=unused-import,unused-variable
import cv2 # noqa
except ImportError:
_LOGGER.error("No opencv library found! " +
"Install or compile for your system " +
"following instructions here: " +
"http://opencv.org/releases.html")
_LOGGER.error(
"No OpenCV library found! Install or compile for your system "
"following instructions here: http://opencv.org/releases.html")
return
entities = []
@@ -105,8 +103,7 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
for camera in config[CONF_SOURCE]:
entities.append(OpenCVImageProcessor(
hass, camera[CONF_ENTITY_ID], camera.get(CONF_NAME),
config[CONF_CLASSIFIER]
))
config[CONF_CLASSIFIER]))
add_devices(entities)
@@ -121,8 +118,7 @@ class OpenCVImageProcessor(ImageProcessingEntity):
if name:
self._name = name
else:
self._name = "OpenCV {0}".format(
split_entity_id(camera_entity)[1])
self._name = "OpenCV {0}".format(split_entity_id(camera_entity)[1])
self._classifiers = classifiers
self._matches = {}
self._total_matches = 0
@@ -157,8 +153,8 @@ class OpenCVImageProcessor(ImageProcessingEntity):
import numpy
# pylint: disable=no-member
cv_image = cv2.imdecode(numpy.asarray(bytearray(image)),
cv2.IMREAD_UNCHANGED)
cv_image = cv2.imdecode(
numpy.asarray(bytearray(image)), cv2.IMREAD_UNCHANGED)
for name, classifier in self._classifiers.items():
scale = DEFAULT_SCALE