Skip to content
This repository was archived by the owner on Nov 8, 2021. It is now read-only.

Added recognition_model parameter #71

Open
Jonathan HR (jhrystrom) wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Added recognition_model parameter #71

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6cf07e0
Add new model-option (recognition_2) to detect
jhrystrom Apr 29, 2019
c34906e
Merge pull request #1 from Rysias/Rysias-patch-1
jhrystrom Apr 29, 2019
12c0f67
Add recognition_model to create
jhrystrom Apr 29, 2019
91c38ee
Changed default of recognition_model to 2
jhrystrom Apr 29, 2019
482b4f6
Add return recognitionModel to get
jhrystrom May 1, 2019
d21b9ab
Small fix
jhrystrom May 1, 2019
09a35db
Test of recognition_model
jhrystrom May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion cognitive_face/face.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from . import util


def detect(image, face_id=True, landmarks=False, attributes=''):
def detect(image, face_id=True, landmarks=False, attributes='', recognition_model = 1):
"""Detect human faces in an image and returns face locations, and
optionally with `face_id`s, landmarks, and attributes.

Expand All @@ -23,6 +23,9 @@ def detect(image, face_id=True, landmarks=False, attributes=''):
headPose, smile, facialHair, glasses, emotion, makeup, accessories,
occlusion, blur, exposure, noise. Note that each face attribute
analysis has additional computational and time cost.
recognition_model: [Optional] Choose which model to use. At this moment
there are two possibilites: 1 (the original model) or 2 (the updated
model). Both should be input as an integer.

Returns:
An array of face entries ranked by face rectangle size in descending
Expand All @@ -35,6 +38,8 @@ def detect(image, face_id=True, landmarks=False, attributes=''):
'returnFaceId': face_id and 'true' or 'false',
'returnFaceLandmarks': landmarks and 'true' or 'false',
'returnFaceAttributes': attributes,
'recognitionModel': "recognition_0"+str(recognition_model),
'returnRecognitionModel': 'true'
}

return util.request(
Expand Down