Update app.py

app.py

@@ -17,9 +17,13 @@ def closest_color(requested_color):
     min_colors = {}
     for key, name in mcolors.CSS4_COLORS.items():
         r_c, g_c, b_c = mcolors.hex2color(name)
-        rd = (r_c - requested_color[0]) ** 2
-        gd = (g_c - requested_color[1]) ** 2
-        bd = (b_c - requested_color[2]) ** 2
+        if isinstance(requested_color, str):
+            r_r, g_r, b_r = mcolors.hex2color(requested_color)
+        else:
+            r_r, g_r, b_r = requested_color
+        rd = (r_c - r_r) ** 2
+        gd = (g_c - g_r) ** 2
+        bd = (b_c - b_r) ** 2
         min_colors[(rd + gd + bd)] = key
     return min_colors[min(min_colors.keys())]
 
@@ -33,31 +37,37 @@ def get_dominant_color(image):
     dominant_color = tuple(c / 255 for c in dominant_color)  # Normalize RGB values to [0, 1]
     return dominant_color
 
+def get_monochromatic_palette(color_name, num_colors=5):
+    rgb_color = mcolors.to_rgb(mcolors.CSS4_COLORS[color_name])
+    h, s, v = colorsys.rgb_to_hsv(*rgb_color)
+    
+    palette = []
+    for i in range(num_colors):
+        # Vary both saturation and value
+        new_s = max(0, min(1, s + (i - num_colors // 2) * 0.1))
+        new_v = max(0, min(1, v + (i - num_colors // 2) * 0.1))
+        
+        new_rgb = colorsys.hsv_to_rgb(h, new_s, new_v)
+        palette.append(closest_color(new_rgb))
+    
+    # Remove duplicates while preserving order
+    return list(dict.fromkeys(palette))
+
 def get_complementary_color(rgb_color):
     h, s, v = colorsys.rgb_to_hsv(*rgb_color)
     complementary_h = (h + 0.5) % 1.0
     r, g, b = colorsys.hsv_to_rgb(complementary_h, s, v)
     complementary_color = closest_color((r, g, b))
-    complementary_palette = []
-    # Get shades or tones of the complementary color
-    complementary_colors = get_monochromatic_palette(complementary_color)
-    for color in complementary_colors:
-        if closest_color(color) != complementary_color:
-            complementary_palette.append(closest_color(color))
     
-    return complementary_color, complementary_palette
-
-def get_monochromatic_palette(color_name, num_shades=3):
-    rgb_color = mcolors.CSS4_COLORS[color_name]
-    r, g, b = mcolors.hex2color(rgb_color)
-    hsv_color = colorsys.rgb_to_hsv(r, g, b)
-    hsv_colors = [hsv_color]
-    for i in range(1, num_shades):
-        hsv_colors.append((hsv_color[0], hsv_color[1], hsv_color[2] * (1 - 0.2 * i)))
-    hex_palette = [mcolors.rgb2hex(colorsys.hsv_to_rgb(*hsv)) for hsv in hsv_colors]
-    named_palette = [closest_color(mcolors.hex2color(hex_color)) for hex_color in hex_palette]
+    # Get monochromatic palette of the complementary color
+    complementary_palette = get_monochromatic_palette(complementary_color)
     
-    return named_palette
+    # Ensure the main complementary color is first in the list
+    if complementary_color in complementary_palette:
+        complementary_palette.remove(complementary_color)
+    complementary_palette.insert(0, complementary_color)
+    
+    return complementary_color, complementary_palette
 
 def get_outfit_recommendation(pred_class):
     if pred_class == 'top':
@@ -74,7 +84,7 @@ def predict(image):
     garment_recommendation = get_outfit_recommendation(pred_class)
     
     # Construct output string
-    output = f"For your {pred_class}, consider pairing it with a {garment_recommendation.lower()} in {complementary_color}, {', '.join(complementary_palette)}"
+    output = f"For your {pred_class}, consider pairing it with a {garment_recommendation.lower()} in {', '.join(complementary_palette)}"
     
     return output  # Return the formatted output
 
@@ -91,4 +101,4 @@ interface = gr.Interface(
     description="Upload an image of jeans or a top to get a recommendation for a complementary outfit based on fashion theory."
 )
 
-interface.launch()
+interface.launch(share=True)