Update app.py

app.py

@@ -2,7 +2,7 @@ import os
 import random
 import warnings
 import logging
-import urllib.parse # URL'leri düzeltmek için şart
+import urllib.parse
 from fastapi import FastAPI, File, UploadFile, Form
 from fastapi.middleware.cors import CORSMiddleware
 from PIL import Image
@@ -13,6 +13,7 @@ import cv2
 import mediapipe as mp
 from transformers import Owlv2Processor, Owlv2ForObjectDetection
 from transformers import CLIPProcessor, CLIPModel
+from duckduckgo_search import DDGS
 
 # --- AYARLAR ---
 warnings.filterwarnings("ignore")
@@ -32,17 +33,17 @@ app.add_middleware(
 print("⏳ Modeller Yükleniyor...")
 device = "cpu" 
 
-# OWL-v2 (Sorun Tespiti)
+# OWL-v2
 owl_id = "google/owlv2-base-patch16-ensemble"
 owl_processor = Owlv2Processor.from_pretrained(owl_id)
 owl_model = Owlv2ForObjectDetection.from_pretrained(owl_id).to(device)
 
-# CLIP (Cilt Tipi)
+# CLIP
 clip_id = "openai/clip-vit-base-patch32"
 clip_processor = CLIPProcessor.from_pretrained(clip_id)
 clip_model = CLIPModel.from_pretrained(clip_id).to(device)
 
-# MediaPipe (Maskeleme)
+# MediaPipe
 mp_face_mesh = mp.solutions.face_mesh
 face_mesh = mp_face_mesh.FaceMesh(static_image_mode=True, max_num_faces=1, refine_landmarks=True)
 
@@ -51,64 +52,94 @@ print("✅ Sunucu Hazır!")
 # --- SÖZLÜKLER ---
 TR_LABELS = {
     "acne": "Akne", "pimple": "Sivilce", "dark spot": "Leke",
-    "wrinkles": "Kırışıklık", "oily skin": "Yağlanma",
+    "deep wrinkles": "Kırışıklık", "oily skin": "Yağlanma", # Prompt değişti
     "dry flaky skin": "Kuruluk", "skin redness": "Kızarıklık",
     "peeling skin": "Deri Soyulması", "rough skin": "Pürüzlü",
     "whitehead pimple": "Beyaz Uçlu Sivilce", "red acne bumps": "Kızarık Akne"
 }
 
-# --- YENİ: GARANTİLİ LİNK OLUŞTURUCU ---
-def generate_search_link(market, query):
-    # Türkçe karakterleri ve boşlukları URL formatına çevirir (Örn: "Çay Ağacı" -> "%C3%87ay%20A%C4%9Fac%C4%B1")
-    encoded_query = urllib.parse.quote(query)
-    
-    if market == "Trendyol":
-        return f"https://www.trendyol.com/sr?q={encoded_query}&os=1" # os=1: Stoktakileri göster
-    elif market == "Hepsiburada":
-        return f"https://www.hepsiburada.com/ara?q={encoded_query}"
-    elif market == "Watsons":
-        return f"https://www.watsons.com.tr/search?text={encoded_query}"
-    elif market == "Amazon":
-        return f"https://www.amazon.com.tr/s?k={encoded_query}"
-    elif market == "Gratis":
-        return f"https://www.gratis.com/arama?q={encoded_query}"
-    return ""
-
-# --- ÜRÜN ÖNERİ MOTORU ---
-def get_products_smart(category_key, search_term, is_premium=False):
-    products = []
-    
-    # Her kategori için farklı mağazalardan GARANTİ ÇALIŞAN arama linkleri oluşturuyoruz.
-    # Artık "Ürün Bulunamadı" veya "Ana Sayfa" sorunu yok.
-    
-    # 1. Trendyol (En Popüler)
-    products.append({
-        "title": f"Trendyol: En İyi {search_term} Ürünleri",
-        "link": generate_search_link("Trendyol", f"{search_term} en çok satanlar"),
-        "source": "Trendyol"
-    })
-    
-    # 2. Hepsiburada (Alternatif)
-    products.append({
-        "title": f"Hepsiburada: {search_term} Fırsatları",
-        "link": generate_search_link("Hepsiburada", search_term),
-        "source": "Hepsiburada"
-    })
+# --- MEGA ÜRÜN VERİTABANI ---
+MEGA_DATABASE = {
+    "YAĞLI_AKNE": [
+        {"marka": "La Roche-Posay", "urun": "Effaclar Duo (+)", "link": "https://www.trendyol.com/sr?q=effaclar+duo"},
+        {"marka": "The Purest Solutions", "urun": "Salisilik Asit Tonik", "link": "https://www.trendyol.com/sr?q=the+purest+salisilik"},
+        {"marka": "CeraVe", "urun": "Blemish Control Gel", "link": "https://www.hepsiburada.com/ara?q=cerave+blemish"},
+        {"marka": "Bioderma", "urun": "Sebium Kerato+", "link": "https://www.trendyol.com/sr?q=bioderma+sebium+kerato"},
+        {"marka": "Cosrx", "urun": "BHA Blackhead Power Liquid", "link": "https://www.korendy.com.tr"},
+        {"marka": "Vichy", "urun": "Normaderm Phytosolution", "link": "https://www.trendyol.com/sr?q=vichy+normaderm"}
+    ],
+    "YAĞLI_TEMİZLİK": [
+        {"marka": "CeraVe", "urun": "Foaming Cleanser", "link": "https://www.trendyol.com/sr?q=cerave+foaming"},
+        {"marka": "La Roche-Posay", "urun": "Effaclar Jel", "link": "https://www.trendyol.com/sr?q=effaclar+jel"},
+        {"marka": "Bioderma", "urun": "Sebium Foaming Gel", "link": "https://www.trendyol.com/sr?q=bioderma+sebium+gel"},
+        {"marka": "Simple", "urun": "Daily Skin Detox", "link": "https://www.gratis.com"}
+    ],
+    "KURU_NEM": [
+        {"marka": "CeraVe", "urun": "Moisturizing Cream", "link": "https://www.trendyol.com/sr?q=cerave+moisturizing"},
+        {"marka": "Kiehl's", "urun": "Ultra Facial Cream", "link": "https://www.kiehls.com.tr"},
+        {"marka": "La Roche-Posay", "urun": "Lipikar Baume AP+M", "link": "https://www.trendyol.com/sr?q=lipikar+baume"},
+        {"marka": "Bioderma", "urun": "Atoderm Intensive Balm", "link": "https://www.trendyol.com/sr?q=bioderma+atoderm"}
+    ],
+    "HASSAS_YATIŞTIRICI": [
+        {"marka": "Dr. Jart+", "urun": "Cicapair Tiger Grass", "link": "https://www.sephora.com.tr"},
+        {"marka": "La Roche-Posay", "urun": "Cicaplast Baume B5", "link": "https://www.trendyol.com/sr?q=cicaplast"},
+        {"marka": "Skin1004", "urun": "Madagascar Centella", "link": "https://www.korendy.com.tr"},
+        {"marka": "Avene", "urun": "Cicalfate+ Repair Cream", "link": "https://www.trendyol.com/sr?q=avene+cicalfate"}
+    ],
+    "LEKE_TEDAVİSİ": [
+        {"marka": "Caudalie", "urun": "Vinoperfect Serum", "link": "https://www.trendyol.com/sr?q=caudalie+vinoperfect"},
+        {"marka": "SkinCeuticals", "urun": "Discoloration Defense", "link": "https://www.trendyol.com/sr?q=skinceuticals+discoloration"},
+        {"marka": "The Ordinary", "urun": "Alpha Arbutin 2% + HA", "link": "https://www.trendyol.com/sr?q=ordinary+arbutin"},
+        {"marka": "Garnier", "urun": "C Vitamini Parlaklık Serumu", "link": "https://www.gratis.com"}
+    ],
+    "YAŞLANMA_KARŞITI": [
+        {"marka": "L'Oreal", "urun": "Revitalift Retinol Serum", "link": "https://www.trendyol.com/sr?q=loreal+retinol"},
+        {"marka": "La Roche-Posay", "urun": "Retinol B3 Serum", "link": "https://www.trendyol.com/sr?q=la+roche+retinol"},
+        {"marka": "The Purest", "urun": "Retinol %1 Serum", "link": "https://www.trendyol.com/sr?q=the+purest+retinol"},
+        {"marka": "Kiehl's", "urun": "Retinol Skin-Renewing", "link": "https://www.kiehls.com.tr"}
+    ]
+}
+
+# --- FONKSİYONLAR ---
+def get_skin_type(image):
+    prompts = ["extremely oily shiny skin", "very dry flaky skin", "normal skin", "combination skin"]
+    labels = ["YAĞLI", "KURU", "NORMAL", "KARMA"]
+    inputs = clip_processor(text=prompts, images=image, return_tensors="pt", padding=True).to(device)
+    with torch.no_grad(): probs = clip_model(**inputs).logits_per_image.softmax(dim=1)
+    return labels[torch.max(probs, 1).indices.item()]
+
+def get_products(category_key, search_term, is_premium=False):
+    products_to_show = []
     
-    # Premium Kullanıcılar İçin Ekstra Mağazalar
-    if is_premium:
-        products.append({
-            "title": f"Watsons: {search_term} Seçenekleri",
-            "link": generate_search_link("Watsons", search_term),
-            "source": "Watsons"
-        })
-        products.append({
-            "title": f"Amazon: {search_term} (Hızlı Kargo)",
-            "link": generate_search_link("Amazon", search_term),
-            "source": "Amazon"
+    # 1. Veritabanından Çek
+    if category_key in MEGA_DATABASE:
+        db_products = MEGA_DATABASE[category_key][:] # Kopyasını al
+        random.shuffle(db_products)
+        limit = 6 if is_premium else 2
+        products_to_show = db_products[:limit]
+
+    # 2. Eğer veritabanı boşsa Canlı Arama Yap
+    if len(products_to_show) < 2:
+        try:
+            with DDGS() as ddgs:
+                query = f"site:trendyol.com {search_term} en çok satanlar"
+                results = list(ddgs.text(query, max_results=3))
+                for r in results:
+                    products_to_show.append({
+                        "marka": "Trend", 
+                        "urun": r['title'].split("|")[0], 
+                        "link": r['href']
+                    })
+        except: pass
+        
+    final_list = []
+    for p in products_to_show:
+        final_list.append({
+            "title": f"[{p['marka']}] {p['urun']}",
+            "link": p['link'],
+            "source": "Öneri"
         })
-
-    return products
+    return final_list
 
 def generate_prescription_blocks(skin_type, issues):
     blocks = []
@@ -118,38 +149,25 @@ def generate_prescription_blocks(skin_type, issues):
         blocks.append({"title": "Günlük Temizleme", "key": "YAĞLI_TEMİZLİK", "search": "Yağlı Cilt Temizleme Jeli"})
     elif "KURU" in skin_type:
         blocks.append({"title": "Nemlendirici Bakım", "key": "KURU_NEM", "search": "Kuru Cilt Nemlendirici"})
-    elif "KARMA" in skin_type:
-        blocks.append({"title": "Dengeleyici Bakım", "key": "KARMA_BAKIM", "search": "Karma Cilt Temizleyici"})
 
     # Sorun Bloğu
     unique_issues = list(set(issues))
     for issue in unique_issues:
         if "acne" in issue or "pimple" in issue:
-            blocks.append({"title": "Akne Tedavisi", "key": "AKNE_TEDAVİ", "search": "Salisilik Asit Serum"})
+            blocks.append({"title": "Akne Tedavisi", "key": "YAĞLI_AKNE", "search": "Akne Kremi"})
         elif "dark spot" in issue:
-            blocks.append({"title": "Leke Giderici", "key": "LEKE_TEDAVİ", "search": "C Vitamini Leke Serumu"})
-        elif "redness" in issue:
-            blocks.append({"title": "Yatıştırıcı Bakım", "key": "KIZARIKLIK", "search": "Centella Asiatica Krem"})
-        elif "dry" in issue or "peeling" in issue:
-            if "KURU" not in skin_type: # Zaten kuru cilt önerisi varsa tekrar etme
-                blocks.append({"title": "Onarıcı Bakım", "key": "KURULUK", "search": "Panthenol Krem"})
+            blocks.append({"title": "Leke Giderici", "key": "LEKE_TEDAVİ", "search": "Leke Serumu"})
+        elif "redness" in issue or "dry" in issue:
+            blocks.append({"title": "Yatıştırıcı Bakım", "key": "HASSAS_YATIŞTIRICI", "search": "Cica Krem"})
         elif "wrinkles" in issue:
-            blocks.append({"title": "Yaşlanma Karşıtı", "key": "KIRIŞIKLIK", "search": "Retinol Serum"})
+            blocks.append({"title": "Yaşlanma Karşıtı", "key": "YAŞLANMA_KARŞITI", "search": "Retinol Serum"})
 
     return blocks
 
-# --- FONKSİYONLAR ---
-def get_skin_type(image):
-    prompts = ["extremely oily shiny skin", "very dry flaky skin", "normal skin", "combination skin"]
-    labels = ["YAĞLI", "KURU", "NORMAL", "KARMA"]
-    inputs = clip_processor(text=prompts, images=image, return_tensors="pt", padding=True).to(device)
-    with torch.no_grad(): probs = clip_model(**inputs).logits_per_image.softmax(dim=1)
-    return labels[torch.max(probs, 1).indices.item()]
-
 # --- API ENDPOINT ---
 @app.get("/")
 def home():
-    return {"status": "Pure Sense API (Fix V4) Çalışıyor"}
+    return {"status": "Pure Sense API (Wrinkle Fix) Çalışıyor"}
 
 @app.post("/analyze")
 async def analyze_skin(
@@ -162,13 +180,13 @@ async def analyze_skin(
     # 1. Cilt Tipi
     skin_type = get_skin_type(image)
     
-    # 2. Sorun Tespiti (HASSAS AYARLI)
-    text_queries = [["acne", "pimple", "dark spot", "skin redness", "dry flaky skin", "wrinkles"]]
+    # 2. Sorun Tespiti (GÜNCELLENMİŞ PROMPTLAR)
+    # "wrinkles" yerine "deep wrinkles" yazdık ki ince çizgileri görmezden gelsin.
+    text_queries = [["acne", "pimple", "dark spot", "skin redness", "dry flaky skin", "deep wrinkles"]]
     inputs = owl_processor(text=text_queries, images=image, return_tensors="pt").to(device)
     with torch.no_grad(): outputs = owl_model(**inputs)
     
     target_sizes = torch.Tensor([image.size[::-1]])
-    # Threshold'u 0.02 (%2) yaptık. Çok düşük olursa gürültü olur, çok yüksek olursa kaçırır.
     results = owl_processor.post_process_object_detection(outputs=outputs, target_sizes=target_sizes, threshold=0.02)[0]
     
     detections = []
@@ -178,12 +196,15 @@ async def analyze_skin(
         lbl_en = text_queries[0][label]
         conf = round(score.item() * 100, 1)
         
-        # --- FİLTRELEME (Gürültüyü Azaltma) ---
-        # Akne gibi net şeylerde en az %8 emin olsun
-        if lbl_en in ["acne", "pimple"] and conf < 8: continue
+        # --- GELİŞMİŞ FİLTRELEME ---
+        # KIRIŞIKLIK FİLTRESİ: Sadece %40'tan eminse göstersin.
+        if lbl_en == "deep wrinkles" and conf < 40: continue
+        
+        # AKNE FİLTRESİ: %10 altı yok.
+        if lbl_en in ["acne", "pimple"] and conf < 10: continue
         
-        # Kızarıklık gibi silik şeylerde %3 yeterli
-        if lbl_en not in ["acne", "pimple"] and conf < 3: continue
+        # Diğerleri için %3 yeterli
+        if conf < 3: continue
         
         lbl_tr = TR_LABELS.get(lbl_en, lbl_en)
         if lbl_tr not in issues_found: issues_found.append(lbl_tr)
@@ -195,17 +216,12 @@ async def analyze_skin(
         })
     
     # 3. Reçete Hazırla
-    # Bulunan Türkçe sorunları İngilizce köklerine çevirip reçete motoruna verelim
-    raw_issues = []
-    for i in issues_found:
-        for k, v in TR_LABELS.items():
-            if v == i: raw_issues.append(k)
-            
+    raw_issues = [i.lower() for i in text_queries[0] if TR_LABELS.get(i,i) in issues_found]
     prescription_blocks = generate_prescription_blocks(skin_type, raw_issues)
     
     final_prescriptions = []
     for block in prescription_blocks:
-        products = get_products_smart(block['key'], block['search'], is_premium)
+        products = get_products(block['key'], block['search'], is_premium)
         final_prescriptions.append({
             "title": block['title'],
             "ingredient": block['search'],