chawin.chen
commited on
Commit
·
265ee8f
1
Parent(s):
e94063b
fix
Browse files- face_analyzer.py +6 -6
- start_local.sh +1 -1
face_analyzer.py
CHANGED
|
@@ -582,14 +582,14 @@ class EnhancedFaceAnalyzer:
|
|
| 582 |
if gender_confidence >= 1:
|
| 583 |
gender_confidence = 0.9999
|
| 584 |
age = beauty_gender_result["age"]
|
| 585 |
-
# 使用DeepFace获取年龄/情绪(以及可选的性别回退信息)
|
| 586 |
-
age_emotion_result = self._predict_age_emotion_with_deepface(
|
| 587 |
-
face_image
|
| 588 |
-
)
|
| 589 |
|
| 590 |
# 如果HowCuteAmI的年龄置信度低于阈值,则使用DeepFace的年龄
|
| 591 |
agec = config.AGE_CONFIDENCE
|
| 592 |
if howcuteami_age_confidence < agec:
|
|
|
|
|
|
|
|
|
|
|
|
|
| 593 |
deep_age = age_emotion_result["age"]
|
| 594 |
logger.info(
|
| 595 |
f"HowCuteAmI age confidence ({howcuteami_age_confidence}) below {agec}, value=({age}); using DeepFace for age prediction, value={deep_age}"
|
|
@@ -621,8 +621,8 @@ class EnhancedFaceAnalyzer:
|
|
| 621 |
"beauty_raw_score": beauty_gender_result["beauty_raw_score"],
|
| 622 |
"age": beauty_gender_result["age"],
|
| 623 |
"age_confidence": beauty_gender_result["age_confidence"],
|
| 624 |
-
"emotion":
|
| 625 |
-
"emotion_analysis":
|
| 626 |
"model_used": "hybrid",
|
| 627 |
"age_model_used": "HowCuteAmI",
|
| 628 |
"gender_model_used": "HowCuteAmI",
|
|
|
|
| 582 |
if gender_confidence >= 1:
|
| 583 |
gender_confidence = 0.9999
|
| 584 |
age = beauty_gender_result["age"]
|
|
|
|
|
|
|
|
|
|
|
|
|
| 585 |
|
| 586 |
# 如果HowCuteAmI的年龄置信度低于阈值,则使用DeepFace的年龄
|
| 587 |
agec = config.AGE_CONFIDENCE
|
| 588 |
if howcuteami_age_confidence < agec:
|
| 589 |
+
# 使用DeepFace获取年龄/情绪(以及可选的性别回退信息)
|
| 590 |
+
age_emotion_result = self._predict_age_emotion_with_deepface(
|
| 591 |
+
face_image
|
| 592 |
+
)
|
| 593 |
deep_age = age_emotion_result["age"]
|
| 594 |
logger.info(
|
| 595 |
f"HowCuteAmI age confidence ({howcuteami_age_confidence}) below {agec}, value=({age}); using DeepFace for age prediction, value={deep_age}"
|
|
|
|
| 621 |
"beauty_raw_score": beauty_gender_result["beauty_raw_score"],
|
| 622 |
"age": beauty_gender_result["age"],
|
| 623 |
"age_confidence": beauty_gender_result["age_confidence"],
|
| 624 |
+
"emotion": None,
|
| 625 |
+
"emotion_analysis": None,
|
| 626 |
"model_used": "hybrid",
|
| 627 |
"age_model_used": "HowCuteAmI",
|
| 628 |
"gender_model_used": "HowCuteAmI",
|
start_local.sh
CHANGED
|
@@ -10,7 +10,7 @@ export CELEBRITY_SOURCE_DIR=/opt/data/chinese_celeb_dataset
|
|
| 10 |
|
| 11 |
export GENDER_CONFIDENCE=1
|
| 12 |
export UPSCALE_SIZE=2
|
| 13 |
-
export AGE_CONFIDENCE=0.
|
| 14 |
export DRAW_SCORE=true
|
| 15 |
export FACE_CONFIDENCE=0.7
|
| 16 |
|
|
|
|
| 10 |
|
| 11 |
export GENDER_CONFIDENCE=1
|
| 12 |
export UPSCALE_SIZE=2
|
| 13 |
+
export AGE_CONFIDENCE=0.1
|
| 14 |
export DRAW_SCORE=true
|
| 15 |
export FACE_CONFIDENCE=0.7
|
| 16 |
|