Skip to content

WIP Adds facebox_face_detect#14279

Closed
robmarkcole wants to merge 85 commits intohome-assistant:devfrom
robmarkcole:facebox-detect
Closed

WIP Adds facebox_face_detect#14279
robmarkcole wants to merge 85 commits intohome-assistant:devfrom
robmarkcole:facebox-detect

Conversation

@robmarkcole
Copy link
Copy Markdown
Contributor

@robmarkcole robmarkcole commented May 4, 2018

Replaces #14248

Description:

Adds component for face detection (number of faces) using facebox. Run facebox with:

MB_KEY="INSERT-YOUR-KEY-HERE"

docker run -p 8080:8080 -e "MB_KEY=$MB_KEY" -e "MB_FACEBOX_DISABLE_RECOGNITION=true" machinebox/facebox

Pull request in home-assistant.github.io with documentation (if applicable): home-assistant/home-assistant.github.io#<5300>

Example entry for configuration.yaml (if applicable):

image_processing:
  - platform: facebox_face_detect
    ip_address: 192.168.0.1
    port: 8080
    source:
      - entity_id: camera.local_file

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • New dependencies have been added to the REQUIREMENTS variable ([example][ex-requir]).
  • New dependencies are only imported inside functions that use them ([example][ex-import]).
  • New dependencies have been added to requirements_all.txt by running script/gen_requirements_all.py.
  • New files were added to .coveragerc.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.

dlbroadfoot and others added 30 commits April 17, 2018 22:34
* Fixed bug -  unable to set base readaonly property

* PR fixes

* Added line
)

* Fix so it is possible to ignore discovered config entry handlers

* Improve efficiency
* Fix race condition for component loaded before listening

* async/await syntax
* Broadlink switch, fixes issue #13799

* slugify
* Bumped pypollencom to 1.1.2

* Updated requirements_all.txt
* Order the output of the automation editor

* Lint
* Catch exception for KeyError
* Use get and added test
* Handle HomeKit configuration failure more cleanly

Add support for handling cases where HomeKit configuration fails, and give
the user more information about what to do.

* Don't consume the exception for a homekit.UnknownError

If we get an UnknownError then we should alert the user but also still
generate the backtrace so there's actually something for them to file in
a bug report.
rsmeral and others added 11 commits May 5, 2018 17:06
* Setup all-linking service

* Remove extra line

* Remove linefeed and tab escape chars

* Add services delete_all_link, load_all_link_database and print_all_link_database

* Check if reload is set

* Confirm entity is InsteonPLMEntity before attempting to load or print ALDB

* Debug load and print ALDB

* Debug print aldb

* Debug print_aldb

* Get entity via platform

* Track Insteon entities in component

* Store entity list in hass.data

* Add entity to hass.data

* Add ref to hass in InsteonPLMEntity

* Pass hass correctly to InsteonPLMBinarySensor

* Fix reference to ALDBStatus.PARTIAL

* Print ALDB record as string

* Get ALDB record from memory address

* Reformat ALDB log output

* Add print_im_aldb service

* Remove reference to self in print_aldb_to_log

* Remove reference to self in print_aldb_to_log

* Fix spelling issue with load_all_link_database service

* Bump insteonplm to 0.9.1

* Changes from code review

* Code review changes

* Fix syntax error

* Correct reference to cv.boolean and update requirements

* Update requirements

* Fix flake8 errors

* Reload as boolean test

* Remove hass from entity init
# Conflicts:
#	homeassistant/components/image_processing/facebox_face_detect.py
@robmarkcole
Copy link
Copy Markdown
Contributor Author

I've followed the dev instructions (to the best of my understanding)but I still repeatedly run into this issue of conflict and hundreds of other files being modified. Is there a bullet proof approach to avoid this?

@MartinHjelmare
Copy link
Copy Markdown
Member

I often use the git rebase --onto command to make sure my branch is rebased on top of the tip of the target branch.

git rebase --onto dev LAST_COMMIT_BEFORE_YOUR_BRANCH YOUR_BRANCH

@robmarkcole
Copy link
Copy Markdown
Contributor Author

Thanks for the advice @MartinHjelmare
Is there a way to repair this branch?

@MartinHjelmare
Copy link
Copy Markdown
Member

Make sure you backup your changed code somehow first. Then you can try this:
https://stackoverflow.com/questions/134882/undoing-a-git-rebase

Disclaimer: I haven't tried it myself.

@robmarkcole
Copy link
Copy Markdown
Contributor Author

This branch is a mess so I'm going to create a fresh one & PR

@robmarkcole robmarkcole closed this May 6, 2018
@robmarkcole robmarkcole mentioned this pull request May 6, 2018
8 tasks
@home-assistant home-assistant locked and limited conversation to collaborators Sep 5, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.