Update app.py

app.py

@@ -1,4 +1,3 @@
-
 import base64
 import os
 import urllib.parse
@@ -144,28 +143,38 @@ def pil_to_base64(img, max_size=280):
     return base64.b64encode(buf.getvalue()).decode("utf-8")
 
 # ---------------------------------------------------------------------------
-# EMBEDDING + FAISS SEARCH (תיקון חילוץ הוקטורים מתוך אובייקט ה-CLIP)
+# EMBEDDING + FAISS SEARCH (תיקון סופי ומאובטח לחילוץ הוקטורים מחבילת CLIP)
 # ---------------------------------------------------------------------------
 @torch.no_grad()
 def embed_query_image(pil_image):
     inputs = win_processor(images=pil_image, return_tensors="pt").to(DEVICE)
     outputs = win_model.get_image_features(**inputs)
-    # תיקון קריטי: חילוץ וקטור המאפיינים האמיתי מתוך ה-BaseModelOutput
+    # חילוץ בטוח באמצעות בדיקת סוג האובייקט והפיכתו לטנסור טהור
     if hasattr(outputs, "image_embeds"):
         feats = outputs.image_embeds
+    elif isinstance(outputs, getattr(gr, "__package__", object)) or not hasattr(outputs, "cpu"):
+        feats = outputs[0] if (isinstance(outputs, tuple) or isinstance(outputs, list)) else outputs
     else:
         feats = outputs
+    
+    if hasattr(feats, "detach"):
+        feats = feats.detach()
     return feats.cpu().numpy().astype("float32")
 
 @torch.no_grad()
 def embed_query_text(sentence):
     inputs = win_processor(text=[sentence], return_tensors="pt", padding=True, truncation=True).to(DEVICE)
     outputs = win_model.get_text_features(**inputs)
-    # תיקון קריטי: חילוץ וקטור המאפיינים האמיתי מתוך ה-BaseModelOutput
+    # חילוץ בטוח באמצעות בדיקת סוג האובייקט והפיכתו לטנסור טהור
     if hasattr(outputs, "text_embeds"):
         feats = outputs.text_embeds
+    elif isinstance(outputs, getattr(gr, "__package__", object)) or not hasattr(outputs, "cpu"):
+        feats = outputs[0] if (isinstance(outputs, tuple) or isinstance(outputs, list)) else outputs
     else:
         feats = outputs
+        
+    if hasattr(feats, "detach"):
+        feats = feats.detach()
     return feats.cpu().numpy().astype("float32")
 
 def build_feature_sentence(skin_tone, undertone, style_preference, gender=None, age_group=None):
@@ -247,6 +256,9 @@ def generate_new_outfit_image(pil_image, row, target_gender=None):
     resized_protect_img = Image.fromarray(protect.astype(np.uint8) * 255).resize((head_w, head_h), resample=Image.NEAREST)
     
     canvas = Image.new("RGB", (canvas_w, canvas_h), color=(240, 238, 235))
+    # תיקון קריטי: הגדרת משתני המיקום המקומיים לחישוב הקנבס
+    paste_x = (canvas_w - head_w) // 2
+    paste_y = int(canvas_h * 0.03)
     canvas.paste(resized_face_crop, (paste_x, paste_y))
     
     mask_arr = np.full((canvas_h, canvas_w), 255, dtype=np.uint8)
@@ -400,7 +412,6 @@ body, .gradio-container { background-color: #F8F5F5 !important; font-family: 'In
 .gradio-container { max-width: 850px !important; margin: 0 auto !important; padding-top: 20px !important; }
 footer { display: none !important; }
 
-/* Global Font Contrast Controls - No Invisible Text */
 h1, h2, h3, p, span, label, input, select, textarea, button { color: #2C2A29 !important; }
 
 .tab-nav button { font-size: 14px !important; font-weight: 600 !important; padding: 14px 24px !important; color: #555 !important; }
@@ -409,7 +420,6 @@ h1, h2, h3, p, span, label, input, select, textarea, button { color: #2C2A29 !im
 #find-btn, .big-btn { background: #161617 !important; color: #FFFFFF !important; border: none !important; border-radius: 8px !important; font-weight: 700 !important; font-size: 14px !important; padding: 14px !important; text-transform: uppercase; letter-spacing: .08em !important; width: 100% !important; margin-top: 10px; }
 #find-btn:hover, .big-btn:hover { background: #2D2D2F !important; }
 
-/* Clean Pastel Premium Layout Blocks */
 .dark-panel { background: #FFFFFF !important; border-radius: 16px !important; padding: 24px !important; border: 1px solid #ECE4D6 !important; margin-bottom: 20px; }
 .dark-panel label, .dark-panel span { color: #2C2A29 !important; font-weight: 600; }
 
@@ -424,7 +434,6 @@ h1, h2, h3, p, span, label, input, select, textarea, button { color: #2C2A29 !im
 .color-bubble { width: 44px; height: 44px; border-radius: 50%; margin: 0 auto 6px; border: 1px solid rgba(0,0,0,.06); box-shadow: inset 0 0 0 2px #FFF; }
 .tip-text { font-size: 15px; color: #222222 !important; line-height: 1.6; margin: 0; font-style: italic; }
 
-/* Perfect 6-Card Row Flow without Hiding or Squishing */
 .outfit-grid { display: grid !important; grid-template-columns: repeat(3, 1fr) !important; gap: 20px !important; margin-top: 20px !important; width: 100% !important; }
 @media (max-width: 768px) { .outfit-grid { grid-template-columns: repeat(2, 1fr) !important; } }
 @media (max-width: 480px) { .outfit-grid { grid-template-columns: 1fr !important; } }
@@ -437,17 +446,16 @@ h1, h2, h3, p, span, label, input, select, textarea, button { color: #2C2A29 !im
 .prod-title { font-size: 15px; font-weight: 700; color: #111111 !important; margin: 0 0 4px 0; line-height: 1.3; min-height: 40px; display: flex; align-items: center; }
 .prod-brand { font-size: 13px; color: #999999 !important; margin-bottom: 14px; display: block; }
 
+/* כפתורי הרכישה המקוריים */
 .shop-btn { display: block; width: 100%; background: #161617; color: #FFFFFF !important; text-align: center; padding: 11px 0; border-radius: 8px; font-size: 13px; font-weight: 700; text-decoration: none !important; letter-spacing: 0.5px; }
 .shop-btn:hover { background: #2D2D2F; color: #FFFFFF !important; }
 .more-matches-label { font-size: 11px; font-weight: 700; color: #9C8E82 !important; letter-spacing: 1.6px; text-transform: uppercase; margin: 24px 0 12px; }
 .palette-name { font-family: 'Playfair Display', serif !important; }
-.footer-note { font-size: 13px; color: #A0A0A0 !important; text-align: center; margin-top: 16px; }
 """
 
 # ---------------------------------------------------------------------------
 # INTERFACE BUILD
 # ---------------------------------------------------------------------------
-# CRITICAL FIX: Moving custom CSS and theme injection parameters directly to the final launch function to comply with Gradio 6
 with gr.Blocks(title="Personal Color Styling") as demo:
     gr.HTML("""
     <div style="text-align:center; padding:24px 20px 10px;">
@@ -479,9 +487,13 @@ with gr.Blocks(title="Personal Color Styling") as demo:
             [style_card_a, new_img_a, answer_a, outfit_cards_a],
         )
 
-        # CRITICAL FIX: All expected positional inputs must map corresponding elements to prevent load_example mismatches
+        # תיקון: הגדרת מערך ערכים מלא ומדויק לכל הפרמטרים של ה-Examples כדי למנוע את שגיאת ה-load_example
         gr.Examples(
-            examples=[[p, "woman", "adult", "What style would suit me best?"] for p in SAMPLE_PHOTOS],
+            examples=[
+                [SAMPLE_PHOTOS[0], "woman", "adult", "What style would suit me best?"],
+                [SAMPLE_PHOTOS[1], "man", "adult", "What style would suit me best?"],
+                [SAMPLE_PHOTOS[2], "woman", "teen", "What style would suit me best?"]
+            ],
             inputs=[photo_in, gender_a, age_a, question_a],
             outputs=[style_card_a, new_img_a, answer_a, outfit_cards_a],
             fn=recommend_from_photo,
@@ -518,5 +530,5 @@ with gr.Blocks(title="Personal Color Styling") as demo:
         )
 
 if __name__ == "__main__":
-    # CRITICAL FIX: Safe execution of Gradio 6 theme parameters
+    # העברת פרמטרי ה-CSS וה-Theme באופן בטוח לתוך פונקציית הריצה הסופית כנדרש בגרדיו 6
     demo.launch(css=CUSTOM_CSS, theme=gr.themes.Soft(primary_hue="amber"))