Spaces:
Running
Running
Update main.py
Browse files
main.py
CHANGED
|
@@ -15,7 +15,8 @@ PY_MODULES = {
|
|
| 15 |
"texture.py": "TextureDetector",
|
| 16 |
"skin_tone.py": "SkinToneDetector",
|
| 17 |
"oiliness.py": "OilinessDetector",
|
| 18 |
-
"wrinkle_unet.py": "WrinkleDetector"
|
|
|
|
| 19 |
}
|
| 20 |
|
| 21 |
def load_model(token):
|
|
@@ -95,6 +96,11 @@ def analyze_skin(image: np.ndarray, analysis_type: str) -> np.ndarray:
|
|
| 95 |
if result.get("detected") is not None:
|
| 96 |
output = detector.draw_json(result)
|
| 97 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 98 |
return output
|
| 99 |
|
| 100 |
|
|
@@ -104,7 +110,7 @@ app = gr.Interface(
|
|
| 104 |
inputs=[
|
| 105 |
gr.Image(type="numpy", label="Upload your face image"),
|
| 106 |
gr.Radio(
|
| 107 |
-
["Dark Circles", "Redness", "Texture", "Skin Tone", "Oiliness", "Wrinkles"],
|
| 108 |
label="Select Skin Analysis Type"
|
| 109 |
),
|
| 110 |
],
|
|
|
|
| 15 |
"texture.py": "TextureDetector",
|
| 16 |
"skin_tone.py": "SkinToneDetector",
|
| 17 |
"oiliness.py": "OilinessDetector",
|
| 18 |
+
"wrinkle_unet.py": "WrinkleDetector",
|
| 19 |
+
"age.py": "AgeDetector"
|
| 20 |
}
|
| 21 |
|
| 22 |
def load_model(token):
|
|
|
|
| 96 |
if result.get("detected") is not None:
|
| 97 |
output = detector.draw_json(result)
|
| 98 |
|
| 99 |
+
elif analysis_type == "Skin Age":
|
| 100 |
+
detector = detector_classes["AgeDetector"](image)
|
| 101 |
+
result = detector.predict_json()
|
| 102 |
+
output = detector.draw_json(result)
|
| 103 |
+
|
| 104 |
return output
|
| 105 |
|
| 106 |
|
|
|
|
| 110 |
inputs=[
|
| 111 |
gr.Image(type="numpy", label="Upload your face image"),
|
| 112 |
gr.Radio(
|
| 113 |
+
["Dark Circles", "Redness", "Texture", "Skin Tone", "Oiliness", "Wrinkles", "Skin Age"],
|
| 114 |
label="Select Skin Analysis Type"
|
| 115 |
),
|
| 116 |
],
|