dzmu commited on
Commit
2f8cb34
·
verified ·
1 Parent(s): d0d6795

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +25 -5
app.py CHANGED
@@ -226,7 +226,10 @@ def analyze_outfit(input_img: Image.Image):
226
 
227
  category_label = CATEGORY_LABEL_MAP[category_key]
228
  final_score_str = f"{final_score:.2f}"
229
- print(f"Style analysis: Category={category_label}, Score={final_score_str}")
 
 
 
230
 
231
  # Get top clothing item from CLIP
232
  top_clip_items = get_top_clip_clothing(all_probs, n=1)
@@ -305,24 +308,41 @@ def analyze_outfit(input_img: Image.Image):
305
  category_html = f"""
306
  <div class='results-container'>
307
  <h2 class='result-category'>RATING: {category_label.upper()}</h2>
308
- <p class='result-score'>Style Score: {final_score_str}</p>
309
  </div>
310
  """
 
311
  return category_html, tts_path, response_text
312
 
313
  except Exception as e:
314
  print(f"Error during response/TTS generation: {e}")
 
 
315
  category_html = f"""
316
  <div class='results-container'>
317
- <h2 class='result-category'>Result: {category_label.upper()} (Score: {final_score_str})</h2>
318
- <p class='result-score' style='color: #FFAAAA;'>Error generating audio/full response.</p>
 
319
  </div>
320
  """
321
  # Still provide category info, but indicate TTS/response error
322
  return category_html, None, f"Analysis complete ({category_label}), but error generating audio/response."
323
 
324
  # --- Elite Fashion / Techno CSS (Keep your existing CSS) ---
325
- custom_css = """:root { --primary-bg-color: #000000; --secondary-bg-color: #1A1A1A; --text-color: #FFFFFF; --accent-color: #1F04FF; --border-color: #333333; --input-bg-color: #1A1A1A; --button-text-color: #FFFFFF; --body-text-size: 16px; } body, .gradio-container { background-color: var(--primary-bg-color) !important; color: var(--text-color) !important; font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-size: var(--body-text-size); } footer { display: none !important; } .gr-block { background-color: var(--secondary-bg-color) !important; border: 1px solid var(--border-color) !important; border-radius: 8px !important; padding: 15px !important; box-shadow: none !important; } .gr-input, .gr-output, .gr-textbox textarea, .gr-dropdown select, .gr-checkboxgroup input { background-color: var(--input-bg-color) !important; color: var(--text-color) !important; border: 1px solid var(--border-color) !important; border-radius: 5px !important; } .gr-textbox textarea::placeholder { color: #888888 !important; } .gr-label span, .gr-label .label-text { color: var(--text-color) !important; font-weight: 500 !important; font-size: 0.95em !important; margin-bottom: 8px !important; } .gr-image { background-color: var(--primary-bg-color) !important; border: 1px dashed var(--border-color) !important; border-radius: 8px !important; overflow: hidden; } .gr-image img { border-radius: 6px !important; object-fit: contain; } .gr-image .no-image, .gr-image .upload-button { color: #AAAAAA !important; } .gr-audio > div:first-of-type { border: 1px solid var(--border-color) !important; background-color: var(--secondary-bg-color) !important; border-radius: 5px !important; padding: 10px !important; } .gr-audio audio { width: 100%; filter: invert(1) hue-rotate(180deg); } .gr-button { border: none !important; border-radius: 5px !important; transition: background-color 0.2s ease, transform 0.1s ease; font-weight: 600 !important; } .gr-button-primary { background-color: var(--accent-color) !important; color: var(--button-text-color) !important; font-size: 1.1em !important; padding: 12px 20px !important; } .gr-button-primary:hover { background-color: #482FFF !important; transform: scale(1.02); box-shadow: 0 0 10px var(--accent-color); } .gr-button-primary:active { transform: scale(0.98); } h1, h2, h3 { color: var(--text-color) !important; font-weight: 600; letter-spacing: 0.5px; } .prose h1 { text-align: center; margin-bottom: 25px !important; font-size: 2em !important; text-transform: uppercase; letter-spacing: 1.5px; } .prose p { color: #CCCCCC !important; font-size: 0.95em; text-align: center; } .results-container { text-align: center; padding: 20px; border: 1px solid var(--accent-color); border-radius: 8px; background: linear-gradient(145deg, var(--secondary-bg-color), #2a2a2a); } .result-category { color: var(--accent-color) !important; font-size: 1.5em; margin-bottom: 5px; font-weight: 700; text-transform: uppercase; } .result-score { color: var(--text-color) !important; font-size: 1.1em; margin-top: 0; } .gradio-container { max-width: 850px !important; margin: auto !important; padding-top: 30px; } .gr-row { gap: 25px !important; }"""
 
 
 
 
 
 
 
 
 
 
 
 
 
326
 
327
  # --- Gradio Interface (Using the custom CSS) ---
328
  with gr.Blocks(css=custom_css, theme=gr.themes.Base(primary_hue="neutral", secondary_hue="neutral", text_size=gr.themes.sizes.text_lg)) as demo:
 
226
 
227
  category_label = CATEGORY_LABEL_MAP[category_key]
228
  final_score_str = f"{final_score:.2f}"
229
+ percentage_score = max(0, final_score * 100)
230
+ percentage_score_str = f"{percentage_score:.0f}%" # Formats as integer (e.g., "3%", "15%", "0%")
231
+ #print(f"Style analysis: Category={category_label}, Score={final_score_str}")
232
+ print(f"Style analysis: Category={category_label}, {score_label}={percentage_score_str} (Raw Score: {final_score:.4f})")
233
 
234
  # Get top clothing item from CLIP
235
  top_clip_items = get_top_clip_clothing(all_probs, n=1)
 
308
  category_html = f"""
309
  <div class='results-container'>
310
  <h2 class='result-category'>RATING: {category_label.upper()}</h2>
311
+ <p class='result-score'>{score_label}: {percentage_score_str}</p> {/* <<< Changed line to show % */}
312
  </div>
313
  """
314
+ #<p class='result-score'>Style Score: {final_score_str}</p>
315
  return category_html, tts_path, response_text
316
 
317
  except Exception as e:
318
  print(f"Error during response/TTS generation: {e}")
319
+ percentage_score = max(0, final_score * 100)
320
+ percentage_score_str = f"{percentage_score:.0f}%"
321
  category_html = f"""
322
  <div class='results-container'>
323
+ <h2 class='result-category'>Result: {category_label.upper()}</h2>
324
+ <p class='result-score'>{score_label}: {percentage_score_str}</p> {/* <<< Changed line to show % */}
325
+ <p class='result-error' style='color: #FFAAAA; font-size: 0.9em;'>Error generating audio/full response.</p>
326
  </div>
327
  """
328
  # Still provide category info, but indicate TTS/response error
329
  return category_html, None, f"Analysis complete ({category_label}), but error generating audio/response."
330
 
331
  # --- Elite Fashion / Techno CSS (Keep your existing CSS) ---
332
+ custom_css = """:root { --primary-bg-color: #000000; --secondary-bg-color: #1A1A1A; --text-color: #FFFFFF; --accent-color: #1F04FF; --border-color: #333333; --input-bg-color: #1A1A1A; --button-text-color: #FFFFFF; --body-text-size: 16px; } body, .gradio-container { background-color: var(--primary-bg-color) !important; color: var(--text-color) !important; font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-size: var(--body-text-size); } footer { display: none !important; } .gr-block { background-color: var(--secondary-bg-color) !important; border: 1px solid var(--border-color) !important; border-radius: 8px !important; padding: 15px !important; box-shadow: none !important; } .gr-input, .gr-output, .gr-textbox textarea, .gr-dropdown select, .gr-checkboxgroup input { background-color: var(--input-bg-color) !important; color: var(--text-color) !important; border: 1px solid var(--border-color) !important; border-radius: 5px !important; } .gr-textbox textarea::placeholder { color: #888888 !important; } .gr-label span, .gr-label .label-text { color: var(--text-color) !important; font-weight: 500 !important; font-size: 0.95em !important; margin-bottom: 8px !important; } .gr-image { background-color: var(--primary-bg-color) !important; border: 1px dashed var(--border-color) !important; border-radius: 8px !important; overflow: hidden; } .gr-image img { border-radius: 6px !important; object-fit: contain; } .gr-image .no-image, .gr-image .upload-button { color: #AAAAAA !important; } .gr-audio > div:first-of-type { border: 1px solid var(--border-color) !important; background-color: var(--secondary-bg-color) !important; border-radius: 5px !important; padding: 10px !important; } .gr-audio audio { width: 100%; filter: invert(1) hue-rotate(180deg); } .gr-button { border: none !important; border-radius: 5px !important; transition: background-color 0.2s ease, transform 0.1s ease; font-weight: 600 !important; } .gr-button-primary { background-color: var(--accent-color) !important; color: var(--button-text-color) !important; font-size: 1.1em !important; padding: 12px 20px !important; } .gr-button-primary:hover { background-color: #482FFF !important; transform: scale(1.02); box-shadow: 0 0 10px var(--accent-color); } .gr-button-primary:active { transform: scale(0.98); } h1, h2, h3 { color: var(--text-color) !important; font-weight: 600; letter-spacing: 0.5px; } .prose h1 { text-align: center; margin-bottom: 25px !important; font-size: 2em !important; text-transform: uppercase; letter-spacing: 1.5px; } .prose p { color: #CCCCCC !important; font-size: 0.95em; text-align: center; } .results-container { text-align: center; padding: 20px; border: 1px solid var(--accent-color); border-radius: 8px; background: linear-gradient(145deg, var(--secondary-bg-color), #2a2a2a); } .result-category { color: var(--accent-color) !important; font-size: 1.5em; margin-bottom: 5px; font-weight: 700; text-transform: uppercase; } .result-score { color: var(--text-color) !important; font-size: 1.1em; margin-top: 0; } .gradio-container { max-width: 850px !important; margin: auto !important; padding-top: 30px; } .gr-row { gap: 25px !important; }
333
+ .result-score { /* Style for the score/confidence percentage */
334
+ color: var(--text-color) !important;
335
+ font-size: 1.1em;
336
+ margin-top: 0; /* Adjust spacing as needed */
337
+ margin-bottom: 5px; /* Add space below score */
338
+ }
339
+
340
+ /* You might also want a specific style for errors if you added .result-error */
341
+ .result-error {
342
+ color: #FFAAAA !important; /* Example error color */
343
+ font-size: 0.9em;
344
+ margin-top: 5px;
345
+ }"""
346
 
347
  # --- Gradio Interface (Using the custom CSS) ---
348
  with gr.Blocks(css=custom_css, theme=gr.themes.Base(primary_hue="neutral", secondary_hue="neutral", text_size=gr.themes.sizes.text_lg)) as demo: