Update category mappings and enhance outfit templates for better filtering and accuracy

inference.py

@@ -132,7 +132,7 @@ class InferenceService:
                     2: "shoes",      # shoes, sneakers, boots, footwear
                     3: "jacket",     # jacket, blazer, coat, outerwear
                     4: "dress",      # dress, gown
-                    5: "pants",      # skirt, shorts (map to pants for outfit logic)
+                    5: "shorts",     # skirt, shorts (Updated from pants to shorts for better filtering)
                     6: "shirt",      # sweater, hoodie, pullover (map to shirt)
                     7: "accessory",  # watch, ring, necklace, jewelry
                     8: "accessory",  # bag, purse, handbag
@@ -140,7 +140,7 @@ class InferenceService:
                     10: "accessory", # belt, accessory
                     11: "kameez",    # kameez, kurta, traditional Pakistani shirt
                     12: "shalwar",   # shalwar, traditional Pakistani pants
-                    13: "peshawari"  # Peshawari chappal, traditional Pakistani sandals
+                    13: "sandals"    # Peshawari chappal, traditional Pakistani sandals (Updated to sandals)
                 }
                 
                 predicted_category = category_map.get(indices[0].item(), "other")
@@ -160,20 +160,46 @@ class InferenceService:
             
         filename_lower = filename.lower()
         
-        # Upper body items
-        if any(kw in filename_lower for kw in ["shirt", "top", "blouse", "tank", "hoodie", "sweater", "jacket", "blazer", "coat"]):
-            return "shirt"
-        
-        # Bottom items  
-        if any(kw in filename_lower for kw in ["pant", "jean", "short", "skirt", "trouser", "legging", "jogger"]):
+        # Traditional Pakistani Wear
+        if any(kw in filename_lower for kw in ["kameez", "kurta", "kurti"]):
+            return "kameez"
+        if any(kw in filename_lower for kw in ["shalwar", "salwar", "pyjama", "pajama"]):
+            return "shalwar"
+        if any(kw in filename_lower for kw in ["peshawari", "chappal", "khussa", "kolhapuri"]):
+            return "sandals"
+            
+        # Specific Bottoms
+        if any(kw in filename_lower for kw in ["short", "shorts", "bermuda"]):
+            return "shorts"
+        if any(kw in filename_lower for kw in ["jean", "jeans", "denim"]):
+            return "jeans"
+        if any(kw in filename_lower for kw in ["skirt", "miniskirt"]):
+            return "skirt"
+        if any(kw in filename_lower for kw in ["pant", "trouser", "slack", "chino", "legging", "jogger"]):
             return "pants"
-        
-        # Shoes
-        if any(kw in filename_lower for kw in ["shoe", "boot", "sneaker", "sandal", "heel", "loafer", "oxford"]):
+            
+        # Specific Footwear
+        if any(kw in filename_lower for kw in ["sandal", "flip flop", "slide", "slipper"]):
+            return "sandals"
+        if any(kw in filename_lower for kw in ["sneaker", "trainer", "runner", "athletic shoe"]):
+            return "sneakers"
+        if any(kw in filename_lower for kw in ["boot", "bootie"]):
+            return "boots"
+        if any(kw in filename_lower for kw in ["shoe", "heel", "loafer", "oxford", "pump", "flat"]):
             return "shoes"
+            
+        # Specific Tops/Outerwear
+        if any(kw in filename_lower for kw in ["waistcoat", "vest"]):
+            return "waistcoat"
+        if any(kw in filename_lower for kw in ["blazer", "suit jacket", "coat", "jacket"]):
+            return "jacket"
+        if any(kw in filename_lower for kw in ["hoodie", "sweatshirt"]):
+            return "hoodie"
+        if any(kw in filename_lower for kw in ["shirt", "top", "blouse", "tank", "tee", "t-shirt", "polo", "sweater", "cardigan"]):
+            return "shirt"
         
         # Accessories
-        if any(kw in filename_lower for kw in ["watch", "ring", "necklace", "bracelet", "bag", "hat", "belt", "scarf"]):
+        if any(kw in filename_lower for kw in ["watch", "ring", "necklace", "bracelet", "bag", "hat", "belt", "scarf", "tie", "pocket square"]):
             return "accessory"
         
         # Default fallback
@@ -434,80 +460,85 @@ class InferenceService:
         outfit_templates = {
             "casual": {
                 "style": "relaxed, comfortable, everyday",
-                "preferred_categories": ["tshirt", "jean", "sneaker", "hoodie", "sweatpant", "shirt", "pants", "shoes"],
+                "preferred_categories": ["tshirt", "jean", "sneaker", "hoodie", "sweatpant", "shirt", "pants", "shoes", "shorts", "jeans", "sneakers"],
+                "excluded_categories": ["waistcoat", "suit jacket", "dress pant", "oxford"],
                 "color_palette": ["neutral", "denim", "white", "black", "gray"],
                 "accessory_limit": 2,
                 "weather_modifiers": {
-                    "hot": {"preferred_categories": ["tank", "short", "sandal", "light shirt"]},
-                    "cold": {"preferred_categories": ["hoodie", "sweater", "jacket", "boot"]},
-                    "rain": {"preferred_categories": ["jacket", "boot", "waterproof"]}
+                    "hot": {"preferred_categories": ["tank", "shorts", "sandals", "light shirt"], "excluded_categories": ["hoodie", "sweater", "jacket", "boots"]},
+                    "cold": {"preferred_categories": ["hoodie", "sweater", "jacket", "boots"], "excluded_categories": ["shorts", "sandals", "tank"]},
+                    "rain": {"preferred_categories": ["jacket", "boots", "waterproof"], "excluded_categories": ["sandals", "suede"]}
                 },
                 "occasion_modifiers": {
-                    "business": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 3},
-                    "formal": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 4}
+                    "business": {"preferred_categories": ["shirt", "pants", "shoes", "blazer"], "excluded_categories": ["shorts", "sandals", "tank", "sweatpant", "hoodie", "legging"], "accessory_limit": 3},
+                    "formal": {"preferred_categories": ["shirt", "pants", "shoes", "blazer"], "excluded_categories": ["shorts", "sandals", "sneakers", "jeans", "tshirt"], "accessory_limit": 4}
                 }
             },
             "smart_casual": {
                 "style": "polished but relaxed, business casual",
-                "preferred_categories": ["shirt", "chino", "loafer", "blazer", "polo", "pants", "shoes"],
+                "preferred_categories": ["shirt", "chino", "loafer", "blazer", "polo", "pants", "shoes", "jeans", "boots"],
+                "excluded_categories": ["shorts", "sandals", "tank", "sweatpant", "hoodie", "athletic"],
                 "color_palette": ["navy", "white", "khaki", "brown", "gray"],
                 "accessory_limit": 3,
                 "weather_modifiers": {
-                    "hot": {"preferred_categories": ["polo", "light shirt", "loafer"]},
-                    "cold": {"preferred_categories": ["blazer", "sweater", "boot"]},
-                    "rain": {"preferred_categories": ["blazer", "boot", "umbrella"]}
+                    "hot": {"preferred_categories": ["polo", "light shirt", "loafer"], "excluded_categories": ["boots", "heavy jacket"]},
+                    "cold": {"preferred_categories": ["blazer", "sweater", "boots"], "excluded_categories": ["loafer"]},
+                    "rain": {"preferred_categories": ["blazer", "boots", "umbrella"], "excluded_categories": ["suede"]}
                 },
                 "occasion_modifiers": {
-                    "business": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 4},
-                    "formal": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 4}
+                    "business": {"preferred_categories": ["shirt", "pants", "shoes", "blazer"], "excluded_categories": ["jeans", "sneakers"], "accessory_limit": 4},
+                    "formal": {"preferred_categories": ["shirt", "pants", "shoes", "blazer", "suit"], "excluded_categories": ["jeans", "sneakers", "polo"], "accessory_limit": 4}
                 }
             },
             "formal": {
                 "style": "professional, elegant, sophisticated",
-                "preferred_categories": ["blazer", "jacket", "suit jacket", "dress shirt", "dress pant", "oxford", "suit", "shirt", "pants", "shoes"],
+                "preferred_categories": ["blazer", "jacket", "suit jacket", "dress shirt", "dress pant", "oxford", "suit", "shirt", "pants", "shoes", "waistcoat"],
+                "excluded_categories": ["shorts", "sandals", "sneakers", "jeans", "tshirt", "hoodie", "sweatpant", "tank", "legging"],
                 "color_palette": ["navy", "black", "white", "gray", "charcoal"],
                 "accessory_limit": 4,
                 "requires_outerwear": True,  # Flag to indicate formal outfits should include jackets
                 "weather_modifiers": {
                     "hot": {"preferred_categories": ["light shirt", "light pant", "oxford"], "requires_outerwear": False},
-                    "cold": {"preferred_categories": ["blazer", "suit", "boot"], "requires_outerwear": True},
-                    "rain": {"preferred_categories": ["blazer", "boot", "umbrella"], "requires_outerwear": True}
+                    "cold": {"preferred_categories": ["blazer", "suit", "boots", "waistcoat"], "requires_outerwear": True},
+                    "rain": {"preferred_categories": ["blazer", "boots", "umbrella"], "requires_outerwear": True}
                 },
                 "occasion_modifiers": {
-                    "business": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 4, "requires_outerwear": True},
-                    "casual": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 3, "requires_outerwear": False}
+                    "business": {"preferred_categories": ["shirt", "pants", "shoes", "waistcoat"], "accessory_limit": 4, "requires_outerwear": True},
+                    "casual": {"preferred_categories": ["shirt", "pants", "shoes", "blazer"], "accessory_limit": 3, "requires_outerwear": False}
                 }
             },
             "sporty": {
                 "style": "athletic, active, performance",
-                "preferred_categories": ["athletic shirt", "jogger", "running shoe", "tank", "legging", "shirt", "pants", "shoes"],
+                "preferred_categories": ["athletic shirt", "jogger", "running shoe", "tank", "legging", "shirt", "pants", "shoes", "sneakers", "shorts", "hoodie"],
+                "excluded_categories": ["blazer", "suit", "dress pant", "oxford", "loafer", "waistcoat", "jeans", "sandals"],
                 "color_palette": ["bright", "neon", "white", "black", "primary colors"],
                 "accessory_limit": 1,
                 "weather_modifiers": {
-                    "hot": {"preferred_categories": ["tank", "short", "running shoe"]},
+                    "hot": {"preferred_categories": ["tank", "shorts", "running shoe"]},
                     "cold": {"preferred_categories": ["hoodie", "legging", "running shoe"]},
                     "rain": {"preferred_categories": ["jacket", "running shoe", "cap"]}
                 },
                 "occasion_modifiers": {
-                    "business": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 2},
-                    "formal": {"preferred_categories": ["shirt", "pants", "shoes"], "accessory_limit": 3}
+                    "business": {"preferred_categories": ["shirt", "pants", "shoes"], "excluded_categories": ["tank", "shorts", "legging"], "accessory_limit": 2},
+                    "formal": {"preferred_categories": ["shirt", "pants", "shoes"], "excluded_categories": ["tank", "shorts", "legging", "hoodie"], "accessory_limit": 3}
                 }
             },
             "traditional": {
                 "style": "Pakistani traditional, cultural, ethnic",
-                "preferred_categories": ["kameez", "kurta", "shalwar", "peshawari", "chappal", "traditional", "ethnic"],
+                "preferred_categories": ["kameez", "kurta", "shalwar", "peshawari", "chappal", "traditional", "ethnic", "waistcoat", "sandals"],
+                "excluded_categories": ["shorts", "jeans", "sneakers", "hoodie", "tank", "suit", "tie"],
                 "color_palette": ["white", "black", "navy", "maroon", "gold", "green", "traditional colors"],
                 "accessory_limit": 3,
                 "requires_traditional": True,  # Flag for traditional outfit combinations
                 "weather_modifiers": {
-                    "hot": {"preferred_categories": ["light kameez", "cotton shalwar", "peshawari chappal"]},
-                    "cold": {"preferred_categories": ["warm kameez", "thick shalwar", "traditional boots"]},
+                    "hot": {"preferred_categories": ["light kameez", "cotton shalwar", "peshawari chappal", "sandals"]},
+                    "cold": {"preferred_categories": ["warm kameez", "thick shalwar", "traditional boots", "waistcoat", "shawl"]},
                     "rain": {"preferred_categories": ["waterproof kameez", "shalwar", "traditional boots"]}
                 },
                 "occasion_modifiers": {
-                    "business": {"preferred_categories": ["formal kameez", "shalwar", "peshawari"], "accessory_limit": 2},
-                    "formal": {"preferred_categories": ["elegant kameez", "shalwar", "peshawari"], "accessory_limit": 3},
-                    "casual": {"preferred_categories": ["casual kameez", "shalwar", "chappal"], "accessory_limit": 2}
+                    "business": {"preferred_categories": ["formal kameez", "shalwar", "peshawari", "waistcoat"], "accessory_limit": 2},
+                    "formal": {"preferred_categories": ["elegant kameez", "shalwar", "peshawari", "waistcoat"], "accessory_limit": 3},
+                    "casual": {"preferred_categories": ["casual kameez", "shalwar", "chappal", "sandals"], "accessory_limit": 2}
                 }
             }
         }
@@ -545,10 +576,16 @@ class InferenceService:
         if constraints.get("requires_outerwear"):
             template["requires_outerwear"] = constraints["requires_outerwear"]
         
+        # Initialize excluded categories if not present
+        if "excluded_categories" not in template:
+            template["excluded_categories"] = []
+
         # Apply weather modifications
         if weather != "any" and weather in template.get("weather_modifiers", {}):
             weather_mod = template["weather_modifiers"][weather]
             template["preferred_categories"].extend(weather_mod.get("preferred_categories", []))
+            if "excluded_categories" in weather_mod:
+                template["excluded_categories"].extend(weather_mod["excluded_categories"])
             if "accessory_limit" in weather_mod:
                 template["accessory_limit"] = weather_mod["accessory_limit"]
         
@@ -556,11 +593,14 @@ class InferenceService:
         if occasion in template.get("occasion_modifiers", {}):
             occasion_mod = template["occasion_modifiers"][occasion]
             template["preferred_categories"].extend(occasion_mod.get("preferred_categories", []))
+            if "excluded_categories" in occasion_mod:
+                template["excluded_categories"].extend(occasion_mod["excluded_categories"])
             if "accessory_limit" in occasion_mod:
                 template["accessory_limit"] = occasion_mod["accessory_limit"]
         
         # Remove duplicates and add context info
         template["preferred_categories"] = list(set(template["preferred_categories"]))
+        template["excluded_categories"] = list(set(template["excluded_categories"]))
         template["context"] = {
             "occasion": occasion,
             "weather": weather,
@@ -572,6 +612,7 @@ class InferenceService:
         
         print(f"🔍 DEBUG: Using template '{template_name}' with context: occasion={occasion}, weather={weather}")
         print(f"🔍 DEBUG: Template categories: {template['preferred_categories']}")
+        print(f"🔍 DEBUG: Excluded categories: {template['excluded_categories']}")
         print(f"🔍 DEBUG: Accessory limit: {template['accessory_limit']}")
 
         # Enhanced category-aware pools with diversity checks
@@ -765,7 +806,7 @@ class InferenceService:
         def get_category_type(cat: str) -> str:
             """Map category to outfit slot type with comprehensive taxonomy"""
             cat_lower = cat.lower().strip()
-            print(f"🔍 DEBUG: Mapping category '{cat}' -> '{cat_lower}'")
+            # print(f"🔍 DEBUG: Mapping category '{cat}' -> '{cat_lower}'")
             
             # Direct mapping for CLIP-detected categories
             if cat_lower == "shirt":
@@ -784,6 +825,16 @@ class InferenceService:
                 return "bottom"  # Shalwar is bottom wear
             elif cat_lower == "peshawari":
                 return "shoe"  # Peshawari chappal is footwear
+            elif cat_lower == "shorts":
+                return "bottom"
+            elif cat_lower == "sandals":
+                return "shoe"
+            elif cat_lower == "sneakers":
+                return "shoe"
+            elif cat_lower == "jeans":
+                return "bottom"
+            elif cat_lower == "waistcoat":
+                return "outerwear"
             
             # Upper body items (tops, innerwear)
             upper_keywords = [
@@ -1135,8 +1186,15 @@ class InferenceService:
                 return False
                 
             categories = [get_category_type(cat_str(i)) for i in subset]
+            raw_categories = [cat_str(i) for i in subset]
             category_counts = {}
             
+            # Check for excluded categories
+            excluded = template.get("excluded_categories", [])
+            for cat in raw_categories:
+                if any(ex in cat for ex in excluded):
+                    return False
+            
             for cat in categories:
                 category_counts[cat] = category_counts.get(cat, 0) + 1
             
@@ -1159,6 +1217,7 @@ class InferenceService:
         def calculate_outfit_penalty(subset: List[int], base_score: float) -> float:
             """Calculate sophisticated penalty-adjusted score with advanced fashion reasoning"""
             categories = [get_category_type(cat_str(i)) for i in subset]
+            raw_categories = [cat_str(i) for i in subset]
             category_counts = {}
             
             for cat in categories:
@@ -1177,9 +1236,15 @@ class InferenceService:
                 penalty += -1000.0
             
             # Duplicate core categories: -∞ penalty (fashion rule violation)
+            # EXCEPTION: Allow multiple outerwear if one is a waistcoat (3-piece suit)
             core_categories = {"upper", "bottom", "shoe", "outerwear"}
+            has_waistcoat = any("waistcoat" in c for c in raw_categories)
+            
             for cat in core_categories:
-                if category_counts.get(cat, 0) > 1:
+                count = category_counts.get(cat, 0)
+                if cat == "outerwear" and has_waistcoat and count <= 2:
+                    continue  # Allow waistcoat + jacket
+                if count > 1:
                     penalty += -1000.0
             
             # 2. Context-specific critical violations
@@ -1231,6 +1296,8 @@ class InferenceService:
                     bonus += 0.4  # Complete formal set bonus
                 if style_score > 0.7:
                     bonus += 0.3  # High style coherence bonus
+                if has_waistcoat and category_counts.get("outerwear", 0) == 2:
+                    bonus += 0.5  # 3-piece suit bonus
             
             # Business outfit bonuses
             elif occasion == "business":
@@ -1250,13 +1317,15 @@ class InferenceService:
             
             # 8. Traditional Pakistani outfit bonuses
             if outfit_style == "traditional":
-                traditional_items = [cat for cat in categories if any(traditional in cat.lower() for traditional in ["kameez", "kurta", "shalwar", "peshawari", "chappal"])]
+                traditional_items = [cat for cat in raw_categories if any(traditional in cat for traditional in ["kameez", "kurta", "shalwar", "peshawari", "chappal", "waistcoat"])]
                 if len(traditional_items) >= 2:
                     bonus += 0.7  # Strong cultural appropriateness bonus
-                if len(traditional_items) == 3:
+                if len(traditional_items) >= 3:
                     bonus += 0.4  # Complete traditional set bonus
                 if style_score > 0.6:
                     bonus += 0.3  # Traditional style coherence
+                if has_waistcoat:
+                    bonus += 0.3  # Waistcoat with traditional wear
             
             # 9. Fashion rule compliance bonuses
             # Perfect category distribution