Tüm varyantları göster ve Alsancak filtrelemesini düzelt

smart_warehouse.py

@@ -10,7 +10,7 @@ def get_warehouse_stock_smart(user_message, previous_result=None):
     
     OPENAI_API_KEY = os.getenv("OPENAI_API_KEY")
     
-    # Check if user is asking about specific warehouse from previous result
+    # Check if user is asking about specific warehouse
     warehouse_keywords = {
         'caddebostan': 'Caddebostan',
         'ortaköy': 'Ortaköy', 
@@ -28,16 +28,6 @@ def get_warehouse_stock_smart(user_message, previous_result=None):
             asked_warehouse = warehouse
             break
     
-    # If asking about warehouse and we have previous result, filter it
-    if asked_warehouse and previous_result and isinstance(previous_result, list):
-        filtered = []
-        for line in previous_result:
-            if asked_warehouse in line or "Bulunan" in line or "varyant" in line:
-                filtered.append(line)
-        
-        if len(filtered) > 2:  # Has actual warehouse data
-            return filtered
-    
     # Get XML data with retry
     xml_text = None
     for attempt in range(3):  # Try 3 times
@@ -146,9 +136,9 @@ Examples:
                 # Parse multiple indices
                 indices = [int(idx.strip()) for idx in indices_str.split(',')]
                 
-                # Aggregate warehouse info from all matching products
-                all_warehouses = {}
-                product_details = []
+                # Collect all matching products
+                all_variants = []
+                warehouse_stock = {}
                 
                 for idx in indices:
                     if 0 <= idx < len(all_products):
@@ -162,6 +152,13 @@ Examples:
                             product_name = name_match.group(1)
                             variant = variant_match.group(1) if variant_match else ""
                             
+                            # Track this variant
+                            variant_info = {
+                                'name': product_name,
+                                'variant': variant,
+                                'warehouses': []
+                            }
+                            
                             # Get warehouse stock
                             warehouse_regex = r'<Warehouse>.*?<Name><!\[CDATA\[(.*?)\]\]></Name>.*?<Stock>(.*?)</Stock>.*?</Warehouse>'
                             warehouses = re.findall(warehouse_regex, product_block, re.DOTALL)
@@ -170,61 +167,57 @@ Examples:
                                 try:
                                     stock = int(wh_stock.strip())
                                     if stock > 0:
-                                        # Format warehouse name
                                         display_name = format_warehouse_name(wh_name)
+                                        variant_info['warehouses'].append({
+                                            'name': display_name,
+                                            'stock': stock
+                                        })
                                         
-                                        # If filtering by warehouse, only include that warehouse
-                                        if asked_warehouse:
-                                            if asked_warehouse in display_name:
-                                                product_details.append({
-                                                    'name': product_name,
-                                                    'variant': variant,
-                                                    'warehouse': display_name,
-                                                    'stock': stock
-                                                })
-                                        else:
-                                            if display_name not in all_warehouses:
-                                                all_warehouses[display_name] = []
-                                            all_warehouses[display_name].append({
-                                                'variant': variant,
-                                                'stock': stock
-                                            })
+                                        # Track total stock per warehouse
+                                        if display_name not in warehouse_stock:
+                                            warehouse_stock[display_name] = 0
+                                        warehouse_stock[display_name] += stock
                                 except:
                                     pass
+                            
+                            if variant_info['warehouses']:  # Only add if has stock
+                                all_variants.append(variant_info)
                 
                 # Format result
                 result = []
                 
                 if asked_warehouse:
-                    # Show products in specific warehouse
-                    if product_details:
-                        result.append(f"{asked_warehouse} mağazasında mevcut:")
-                        for detail in product_details:
-                            result.append(f"• {detail['name']} ({detail['variant']}): {detail['stock']} adet")
+                    # Filter for specific warehouse
+                    warehouse_variants = []
+                    for variant in all_variants:
+                        for wh in variant['warehouses']:
+                            if asked_warehouse in wh['name']:
+                                warehouse_variants.append({
+                                    'name': variant['name'],
+                                    'variant': variant['variant'],
+                                    'stock': wh['stock']
+                                })
+                    
+                    if warehouse_variants:
+                        result.append(f"{format_warehouse_name(asked_warehouse)} mağazasında mevcut:")
+                        for v in warehouse_variants:
+                            result.append(f"• {v['name']} ({v['variant']}): {v['stock']} adet")
                     else:
-                        result.append(f"{asked_warehouse} mağazasında bu ürün mevcut değil")
+                        result.append(f"{format_warehouse_name(asked_warehouse)} mağazasında bu ürün mevcut değil")
                 else:
-                    # Show all warehouses
-                    if all_warehouses:
-                        result.append(f"Bulunan {sum(len(v) for v in all_warehouses.values())} varyant:")
-                        
-                        # Show a sample of variants
-                        shown = 0
-                        for warehouse, variants in all_warehouses.items():
-                            for v in variants[:2]:  # Show max 2 per warehouse
-                                if shown < 5:
-                                    variant_text = f" ({v['variant']})" if v['variant'] else ""
-                                    result.append(f"• {product_name}{variant_text}")
-                                    shown += 1
+                    # Show all variants and warehouses
+                    if all_variants:
+                        result.append(f"Bulunan {len(all_variants)} varyant:")
                         
-                        if sum(len(v) for v in all_warehouses.values()) > 5:
-                            result.append(f"... ve {sum(len(v) for v in all_warehouses.values()) - 5} varyant daha")
+                        # Show ALL variants (not just first 5)
+                        for variant in all_variants:
+                            variant_text = f" ({variant['variant']})" if variant['variant'] else ""
+                            result.append(f"• {variant['name']}{variant_text}")
                         
                         result.append("")
-                        result.append("Toplam stok durumu:")
-                        for warehouse, variants in sorted(all_warehouses.items()):
-                            total = sum(v['stock'] for v in variants)
-                            result.append(f"{warehouse}: {total} adet")
+                        result.append("Mağaza stok durumu:")
+                        for warehouse, total_stock in sorted(warehouse_stock.items()):
+                            result.append(f"{warehouse}: {total_stock} adet")
                     else:
                         result.append("Hiçbir mağazada stok yok")