Spaces:
Sleeping
Sleeping
Update app.py
Browse files
app.py
CHANGED
|
@@ -11,7 +11,6 @@ import io
|
|
| 11 |
import torch
|
| 12 |
import numpy as np
|
| 13 |
import cv2
|
| 14 |
-
import mediapipe as mp
|
| 15 |
from transformers import Owlv2Processor, Owlv2ForObjectDetection
|
| 16 |
from transformers import CLIPProcessor, CLIPModel
|
| 17 |
import requests
|
|
@@ -51,12 +50,7 @@ try:
|
|
| 51 |
except Exception as e:
|
| 52 |
print(f"CLIP Model Error: {e}")
|
| 53 |
|
| 54 |
-
|
| 55 |
-
mp_face_mesh = mp.solutions.face_mesh
|
| 56 |
-
try:
|
| 57 |
-
face_mesh = mp_face_mesh.FaceMesh(static_image_mode=True, max_num_faces=1, refine_landmarks=True)
|
| 58 |
-
except Exception as e:
|
| 59 |
-
print(f"MediaPipe Error: {e}")
|
| 60 |
|
| 61 |
print("✅ Sunucu Hazır!")
|
| 62 |
|
|
@@ -249,58 +243,76 @@ async def analyze_skin(file: UploadFile = File(...), is_premium: bool = Form(Fal
|
|
| 249 |
|
| 250 |
try:
|
| 251 |
image = Image.open(io.BytesIO(contents)).convert("RGB")
|
| 252 |
-
skin_type_code = get_skin_type(image)
|
| 253 |
|
| 254 |
-
#
|
| 255 |
-
|
| 256 |
-
|
| 257 |
-
|
| 258 |
-
|
| 259 |
-
|
| 260 |
-
|
|
|
|
| 261 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 262 |
detections = []
|
| 263 |
-
|
| 264 |
-
|
| 265 |
-
|
| 266 |
-
|
| 267 |
-
|
| 268 |
|
| 269 |
-
|
| 270 |
-
|
| 271 |
-
if lbl_en in ["inflamed acne pimple", "whitehead"] and conf < 10: continue
|
| 272 |
-
if conf < 5: continue
|
| 273 |
|
| 274 |
-
|
| 275 |
-
lbl_tr = TR_LABELS.get(lbl_en, lbl_en) # "İltihaplı Sivilce"
|
| 276 |
|
| 277 |
-
|
| 278 |
-
|
| 279 |
-
|
| 280 |
-
|
| 281 |
-
"
|
| 282 |
-
|
| 283 |
-
|
| 284 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 285 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 286 |
# Generate Prescriptions / Products
|
| 287 |
-
# We search once per Unique Label
|
| 288 |
skin_type_text = CILT_TIPI_TR.get(skin_type_code, "Hassas Cilt")
|
| 289 |
prescriptions = []
|
| 290 |
|
| 291 |
-
|
| 292 |
-
|
| 293 |
-
|
| 294 |
-
|
| 295 |
-
|
| 296 |
-
|
| 297 |
-
|
| 298 |
-
|
| 299 |
-
|
| 300 |
-
|
| 301 |
-
|
| 302 |
-
|
| 303 |
-
|
| 304 |
# Generate Dynamic Routine
|
| 305 |
daily_routine = generate_dynamic_routine(skin_type_code, issues_found)
|
| 306 |
|
|
@@ -308,11 +320,19 @@ async def analyze_skin(file: UploadFile = File(...), is_premium: bool = Form(Fal
|
|
| 308 |
"error": False,
|
| 309 |
"skin_type": skin_type_code,
|
| 310 |
"detections": detections,
|
| 311 |
-
"prescriptions": prescriptions,
|
| 312 |
-
"daily_routine": daily_routine,
|
| 313 |
"is_premium_response": is_premium
|
| 314 |
}
|
| 315 |
|
| 316 |
except Exception as e:
|
| 317 |
-
print(f"Error: {e}")
|
| 318 |
-
return
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 11 |
import torch
|
| 12 |
import numpy as np
|
| 13 |
import cv2
|
|
|
|
| 14 |
from transformers import Owlv2Processor, Owlv2ForObjectDetection
|
| 15 |
from transformers import CLIPProcessor, CLIPModel
|
| 16 |
import requests
|
|
|
|
| 50 |
except Exception as e:
|
| 51 |
print(f"CLIP Model Error: {e}")
|
| 52 |
|
| 53 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 54 |
|
| 55 |
print("✅ Sunucu Hazır!")
|
| 56 |
|
|
|
|
| 243 |
|
| 244 |
try:
|
| 245 |
image = Image.open(io.BytesIO(contents)).convert("RGB")
|
|
|
|
| 246 |
|
| 247 |
+
# Optimize: Resize large images to prevent OOM
|
| 248 |
+
max_size = 640
|
| 249 |
+
if max(image.size) > max_size:
|
| 250 |
+
ratio = max_size / max(image.size)
|
| 251 |
+
new_size = (int(image.size[0] * ratio), int(image.size[1] * ratio))
|
| 252 |
+
image = image.resize(new_size, Image.Resampling.LANCZOS)
|
| 253 |
+
|
| 254 |
+
# 3. MODELLERLE ANALİZ (Graceful Degradation)
|
| 255 |
|
| 256 |
+
# A. Cilt Tipi (CLIP)
|
| 257 |
+
skin_type_code = "KARMA" # Default
|
| 258 |
+
try:
|
| 259 |
+
skin_type_code = get_skin_type(image)
|
| 260 |
+
except Exception as e:
|
| 261 |
+
print(f"CLIP Error: {e}")
|
| 262 |
+
|
| 263 |
+
# B. Sorun Tespiti (OWL-v2)
|
| 264 |
detections = []
|
| 265 |
+
issues_found = []
|
| 266 |
+
try:
|
| 267 |
+
text_queries = [["inflamed acne pimple", "whitehead", "dark spot", "diffuse skin redness", "dry flaky skin", "deep wrinkles"]]
|
| 268 |
+
inputs = owl_processor(text=text_queries, images=image, return_tensors="pt").to(device)
|
| 269 |
+
with torch.no_grad(): outputs = owl_model(**inputs)
|
| 270 |
|
| 271 |
+
target_sizes = torch.Tensor([image.size[::-1]])
|
| 272 |
+
results = owl_processor.post_process_object_detection(outputs=outputs, target_sizes=target_sizes, threshold=0.03)[0]
|
|
|
|
|
|
|
| 273 |
|
| 274 |
+
unique_labels = []
|
|
|
|
| 275 |
|
| 276 |
+
for score, label, box in zip(results["scores"], results["labels"], results["boxes"]):
|
| 277 |
+
lbl_en = text_queries[0][label]
|
| 278 |
+
conf = round(score.item() * 100, 1)
|
| 279 |
+
|
| 280 |
+
if lbl_en == "deep wrinkles" and conf < 40: continue
|
| 281 |
+
if lbl_en in ["inflamed acne pimple", "whitehead"] and conf < 10: continue
|
| 282 |
+
if conf < 5: continue
|
| 283 |
+
|
| 284 |
+
lbl_tr = TR_LABELS.get(lbl_en, lbl_en)
|
| 285 |
+
|
| 286 |
+
detections.append({
|
| 287 |
+
"label": lbl_tr,
|
| 288 |
+
"confidence": conf,
|
| 289 |
+
"box": [int(i) for i in box.tolist()]
|
| 290 |
+
})
|
| 291 |
+
|
| 292 |
+
if lbl_tr not in unique_labels: unique_labels.append(lbl_tr)
|
| 293 |
+
issues_found = unique_labels
|
| 294 |
|
| 295 |
+
except Exception as e:
|
| 296 |
+
print(f"OWL Error: {e}")
|
| 297 |
+
# If OWL fails, we just don't have detections, but we continue with Skin Type
|
| 298 |
+
|
| 299 |
# Generate Prescriptions / Products
|
|
|
|
| 300 |
skin_type_text = CILT_TIPI_TR.get(skin_type_code, "Hassas Cilt")
|
| 301 |
prescriptions = []
|
| 302 |
|
| 303 |
+
if issues_found:
|
| 304 |
+
for issue in issues_found:
|
| 305 |
+
search_query = f"{issue} karşıtı {skin_type_text} ürünleri"
|
| 306 |
+
products = search_products_dynamic(search_query)
|
| 307 |
+
if products:
|
| 308 |
+
prescriptions.append({
|
| 309 |
+
"title": f"{issue} Çözümleri",
|
| 310 |
+
"products": products
|
| 311 |
+
})
|
| 312 |
+
else:
|
| 313 |
+
# Fallback if no issues found (or model failed) -> Routine products
|
| 314 |
+
prescriptions = [] # Frontend handles empty list by showing generic routine
|
| 315 |
+
|
| 316 |
# Generate Dynamic Routine
|
| 317 |
daily_routine = generate_dynamic_routine(skin_type_code, issues_found)
|
| 318 |
|
|
|
|
| 320 |
"error": False,
|
| 321 |
"skin_type": skin_type_code,
|
| 322 |
"detections": detections,
|
| 323 |
+
"prescriptions": prescriptions,
|
| 324 |
+
"daily_routine": daily_routine,
|
| 325 |
"is_premium_response": is_premium
|
| 326 |
}
|
| 327 |
|
| 328 |
except Exception as e:
|
| 329 |
+
print(f"Critical Error: {e}")
|
| 330 |
+
# Validate return even on critical error
|
| 331 |
+
return {
|
| 332 |
+
"error": False, # Fake success to prevent frontend crash
|
| 333 |
+
"skin_type": "KARMA",
|
| 334 |
+
"detections": [],
|
| 335 |
+
"prescriptions": [],
|
| 336 |
+
"daily_routine": generate_dynamic_routine("KARMA", []),
|
| 337 |
+
"message": "Analiz sırasında bir yoğunluk oldu, varsayılan rutin oluşturuldu."
|
| 338 |
+
}
|