Re-enable warehouse stock with optimized performance
Browse files- Added signal-based timeout (3s max)
- Limited to first 50 products for speed
- Simplified matching algorithm
- Removed threading complexity
- Should work without freezing now
🤖 Generated with [Claude Code](https://claude.ai/code)
Co-Authored-By: Claude <[email protected]>
app.py
CHANGED
@@ -29,162 +29,110 @@ from enhanced_features import (
|
|
29 |
)
|
30 |
from image_renderer import extract_product_info_for_gallery, format_message_with_images
|
31 |
|
32 |
-
# Warehouse stock integration -
|
33 |
def get_warehouse_stock(product_name):
|
34 |
-
|
35 |
-
"""B2B API'den mağaza stok bilgilerini çek - BF Space integration"""
|
36 |
try:
|
37 |
import re
|
38 |
-
|
39 |
-
response = requests.get(warehouse_url, verify=False, timeout=5)
|
40 |
|
41 |
-
|
42 |
-
|
43 |
-
|
44 |
-
root = ET.fromstring(response.content)
|
45 |
-
|
46 |
-
# Turkish character normalization function
|
47 |
-
turkish_map = {'ı': 'i', 'ğ': 'g', 'ü': 'u', 'ş': 's', 'ö': 'o', 'ç': 'c', 'İ': 'i', 'I': 'i'}
|
48 |
-
|
49 |
-
def normalize_turkish(text):
|
50 |
-
import unicodedata
|
51 |
-
text = unicodedata.normalize('NFD', text)
|
52 |
-
text = ''.join(char for char in text if unicodedata.category(char) != 'Mn')
|
53 |
-
for tr_char, en_char in turkish_map.items():
|
54 |
-
text = text.replace(tr_char, en_char)
|
55 |
-
return text
|
56 |
-
|
57 |
-
# Normalize search product name
|
58 |
-
search_name = normalize_turkish(product_name.lower().strip())
|
59 |
-
search_name = search_name.replace('(2026)', '').replace('(2025)', '').replace(' gen 3', '').replace(' gen', '').strip()
|
60 |
-
search_words = search_name.split()
|
61 |
-
|
62 |
-
# Separate size/color words from product words
|
63 |
-
size_color_words = ['s', 'm', 'l', 'xl', 'xs', 'small', 'medium', 'large',
|
64 |
-
'turuncu', 'siyah', 'beyaz', 'mavi', 'kirmizi', 'yesil',
|
65 |
-
'orange', 'black', 'white', 'blue', 'red', 'green']
|
66 |
-
|
67 |
-
variant_words = [word for word in search_words if word in size_color_words]
|
68 |
-
product_words = [word for word in search_words if word not in size_color_words]
|
69 |
|
70 |
-
#
|
71 |
-
|
|
|
72 |
|
73 |
-
|
74 |
-
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
|
79 |
-
if is_size_color_query:
|
80 |
-
for product in root.findall('Product'):
|
81 |
-
product_name_elem = product.find('ProductName')
|
82 |
-
variant_elem = product.find('Variant')
|
83 |
|
84 |
-
|
85 |
-
|
86 |
-
|
87 |
-
|
88 |
-
|
89 |
-
|
90 |
-
|
91 |
-
|
92 |
-
|
93 |
-
|
94 |
-
|
95 |
-
|
96 |
-
|
97 |
-
|
98 |
-
|
99 |
-
|
100 |
-
|
101 |
-
|
|
|
|
|
|
|
|
|
102 |
|
103 |
-
if variant_matches:
|
104 |
-
candidates = variant_matches
|
105 |
-
else:
|
106 |
-
# Fallback to normal product name search
|
107 |
-
is_size_color_query = False
|
108 |
-
|
109 |
-
# Second pass: Normal product name exact matches (if no variant match)
|
110 |
-
if not is_size_color_query or not candidates:
|
111 |
for product in root.findall('Product'):
|
|
|
|
|
|
|
|
|
112 |
product_name_elem = product.find('ProductName')
|
113 |
if product_name_elem is not None and product_name_elem.text:
|
114 |
xml_product_name = product_name_elem.text.strip()
|
115 |
normalized_xml = normalize_turkish(xml_product_name.lower())
|
116 |
-
normalized_xml = normalized_xml.replace('(2026)', '').replace('(2025)', '').replace(' gen 3', '').replace(' gen', '').strip()
|
117 |
-
xml_words = normalized_xml.split()
|
118 |
|
119 |
-
#
|
120 |
-
if
|
121 |
-
|
122 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
123 |
|
124 |
-
if
|
125 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
126 |
|
127 |
-
#
|
128 |
-
|
129 |
-
candidates = exact_matches if exact_matches else []
|
130 |
-
|
131 |
-
# If still no matches, try fuzzy matching
|
132 |
-
if not candidates:
|
133 |
-
for product in root.findall('Product'):
|
134 |
-
product_name_elem = product.find('ProductName')
|
135 |
-
if product_name_elem is not None and product_name_elem.text:
|
136 |
-
xml_product_name = product_name_elem.text.strip()
|
137 |
-
normalized_xml = normalize_turkish(xml_product_name.lower())
|
138 |
-
normalized_xml = normalized_xml.replace('(2026)', '').replace('(2025)', '').replace(' gen 3', '').replace(' gen', '').strip()
|
139 |
-
xml_words = normalized_xml.split()
|
140 |
-
|
141 |
-
# Count common words
|
142 |
-
common_words = set(search_words) & set(xml_words)
|
143 |
-
|
144 |
-
# Need at least 2 common words AND first word must match (brand check)
|
145 |
-
if (len(common_words) >= 2 and
|
146 |
-
len(search_words) > 0 and len(xml_words) > 0 and
|
147 |
-
search_words[0] == xml_words[0]):
|
148 |
-
best_matches.append((product, xml_product_name, normalized_xml, len(common_words)))
|
149 |
|
150 |
-
|
151 |
-
|
152 |
-
|
153 |
-
|
154 |
-
|
155 |
-
|
156 |
-
|
157 |
-
|
158 |
-
|
159 |
-
|
160 |
-
|
161 |
-
|
162 |
-
name_elem = warehouse.find('Name')
|
163 |
-
stock_elem = warehouse.find('Stock')
|
164 |
-
|
165 |
-
if name_elem is not None and stock_elem is not None:
|
166 |
-
warehouse_name = name_elem.text if name_elem.text else "Bilinmeyen"
|
167 |
-
try:
|
168 |
-
stock_count = int(stock_elem.text) if stock_elem.text else 0
|
169 |
-
if stock_count > 0:
|
170 |
-
# Sum stocks for same warehouse
|
171 |
-
if warehouse_name in warehouse_stock_map:
|
172 |
-
warehouse_stock_map[warehouse_name] += stock_count
|
173 |
-
else:
|
174 |
-
warehouse_stock_map[warehouse_name] = stock_count
|
175 |
-
except (ValueError, TypeError):
|
176 |
-
pass
|
177 |
-
|
178 |
-
if warehouse_stock_map:
|
179 |
-
# Return warehouse stock as list
|
180 |
-
all_warehouse_info = []
|
181 |
-
for warehouse_name, total_stock in warehouse_stock_map.items():
|
182 |
-
all_warehouse_info.append(f"{warehouse_name}: Stokta var")
|
183 |
-
return all_warehouse_info
|
184 |
-
else:
|
185 |
-
return ["Hiçbir mağazada stokta bulunmuyor"]
|
186 |
|
187 |
except Exception as e:
|
|
|
|
|
|
|
|
|
188 |
print(f"Mağaza stok bilgisi çekme hatası: {e}")
|
189 |
return None
|
190 |
|
@@ -498,26 +446,10 @@ def chatbot_fn(user_message, history, image=None):
|
|
498 |
# Extract product name from improved search result for warehouse stock
|
499 |
enhanced_response = product_result['response']
|
500 |
|
501 |
-
# Try to get warehouse stock info
|
502 |
try:
|
503 |
-
import threading
|
504 |
warehouse_info = ""
|
505 |
-
|
506 |
-
|
507 |
-
def get_warehouse_improved():
|
508 |
-
try:
|
509 |
-
warehouse_result[0] = get_warehouse_stock(user_message)
|
510 |
-
except Exception as e:
|
511 |
-
print(f"Warehouse improved thread error: {e}")
|
512 |
-
warehouse_result[0] = None
|
513 |
-
|
514 |
-
# 2 saniye timeout ile warehouse call
|
515 |
-
warehouse_thread = threading.Thread(target=get_warehouse_improved)
|
516 |
-
warehouse_thread.daemon = True
|
517 |
-
warehouse_thread.start()
|
518 |
-
warehouse_thread.join(timeout=2)
|
519 |
-
|
520 |
-
warehouse_stock = warehouse_result[0]
|
521 |
if warehouse_stock and warehouse_stock != ["Hiçbir mağazada stokta bulunmuyor"]:
|
522 |
warehouse_info = f"\n\n🏪 MAĞAZA STOK BİLGİLERİ:\n"
|
523 |
for store_info in warehouse_stock:
|
@@ -594,28 +526,10 @@ def chatbot_fn(user_message, history, image=None):
|
|
594 |
if len(product_info[1]) > 6 and product_info[1][6]: # Resim URL'si varsa
|
595 |
product_image = f"\\nÜrün resmi: {product_info[1][6]}"
|
596 |
|
597 |
-
# Mağaza stok bilgilerini ekle (
|
598 |
warehouse_stock_info = ""
|
599 |
try:
|
600 |
-
|
601 |
-
import time
|
602 |
-
|
603 |
-
warehouse_result = [None]
|
604 |
-
|
605 |
-
def get_warehouse_quick():
|
606 |
-
try:
|
607 |
-
warehouse_result[0] = get_warehouse_stock(product_info[2])
|
608 |
-
except Exception as e:
|
609 |
-
print(f"Warehouse thread error: {e}")
|
610 |
-
warehouse_result[0] = None
|
611 |
-
|
612 |
-
# 3 saniye timeout ile warehouse call
|
613 |
-
warehouse_thread = threading.Thread(target=get_warehouse_quick)
|
614 |
-
warehouse_thread.daemon = True
|
615 |
-
warehouse_thread.start()
|
616 |
-
warehouse_thread.join(timeout=3)
|
617 |
-
|
618 |
-
warehouse_stock = warehouse_result[0]
|
619 |
if warehouse_stock and warehouse_stock != ["Hiçbir mağazada stokta bulunmuyor"]:
|
620 |
warehouse_stock_info = f"\\n🏪 Mağaza stok bilgileri:\\n"
|
621 |
for store_info in warehouse_stock:
|
|
|
29 |
)
|
30 |
from image_renderer import extract_product_info_for_gallery, format_message_with_images
|
31 |
|
32 |
+
# Warehouse stock integration - OPTIMIZED VERSION
|
33 |
def get_warehouse_stock(product_name):
|
34 |
+
"""B2B API'den mağaza stok bilgilerini çek - Optimize edilmiş versiyon"""
|
|
|
35 |
try:
|
36 |
import re
|
37 |
+
import signal
|
|
|
38 |
|
39 |
+
# Create a timeout handler
|
40 |
+
def timeout_handler(signum, frame):
|
41 |
+
raise TimeoutError("Warehouse API timeout")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
42 |
|
43 |
+
# Set alarm for 3 seconds
|
44 |
+
signal.signal(signal.SIGALRM, timeout_handler)
|
45 |
+
signal.alarm(3)
|
46 |
|
47 |
+
try:
|
48 |
+
warehouse_url = 'https://video.trek-turkey.com/bizimhesap-warehouse-xml.php'
|
49 |
+
response = requests.get(warehouse_url, verify=False, timeout=2)
|
50 |
+
|
51 |
+
if response.status_code != 200:
|
52 |
+
return None
|
|
|
|
|
|
|
|
|
53 |
|
54 |
+
root = ET.fromstring(response.content)
|
55 |
+
|
56 |
+
# Turkish character normalization function
|
57 |
+
turkish_map = {'ı': 'i', 'ğ': 'g', 'ü': 'u', 'ş': 's', 'ö': 'o', 'ç': 'c', 'İ': 'i', 'I': 'i'}
|
58 |
+
|
59 |
+
def normalize_turkish(text):
|
60 |
+
import unicodedata
|
61 |
+
text = unicodedata.normalize('NFD', text)
|
62 |
+
text = ''.join(char for char in text if unicodedata.category(char) != 'Mn')
|
63 |
+
for tr_char, en_char in turkish_map.items():
|
64 |
+
text = text.replace(tr_char, en_char)
|
65 |
+
return text
|
66 |
+
|
67 |
+
# Normalize search product name
|
68 |
+
search_name = normalize_turkish(product_name.lower().strip())
|
69 |
+
search_name = search_name.replace('(2026)', '').replace('(2025)', '').replace(' gen 3', '').replace(' gen', '').strip()
|
70 |
+
search_words = search_name.split()
|
71 |
+
|
72 |
+
# Quick search - limit to first 50 products for speed
|
73 |
+
candidates = []
|
74 |
+
product_count = 0
|
75 |
+
max_products = 50 # Limit for performance
|
76 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
77 |
for product in root.findall('Product'):
|
78 |
+
if product_count >= max_products:
|
79 |
+
break
|
80 |
+
product_count += 1
|
81 |
+
|
82 |
product_name_elem = product.find('ProductName')
|
83 |
if product_name_elem is not None and product_name_elem.text:
|
84 |
xml_product_name = product_name_elem.text.strip()
|
85 |
normalized_xml = normalize_turkish(xml_product_name.lower())
|
|
|
|
|
86 |
|
87 |
+
# Simple keyword matching for speed
|
88 |
+
if any(word in normalized_xml for word in search_words if len(word) > 2):
|
89 |
+
candidates.append((product, xml_product_name))
|
90 |
+
if len(candidates) >= 5: # Limit candidates for speed
|
91 |
+
break
|
92 |
+
|
93 |
+
# Collect stock info quickly
|
94 |
+
warehouse_stock_map = {}
|
95 |
+
|
96 |
+
for product, xml_name in candidates:
|
97 |
+
warehouses = product.find('Warehouses')
|
98 |
+
if warehouses is not None:
|
99 |
+
for warehouse in warehouses.findall('Warehouse'):
|
100 |
+
name_elem = warehouse.find('Name')
|
101 |
+
stock_elem = warehouse.find('Stock')
|
102 |
|
103 |
+
if name_elem is not None and stock_elem is not None:
|
104 |
+
warehouse_name = name_elem.text if name_elem.text else "Bilinmeyen"
|
105 |
+
try:
|
106 |
+
stock_count = int(stock_elem.text) if stock_elem.text else 0
|
107 |
+
if stock_count > 0:
|
108 |
+
if warehouse_name in warehouse_stock_map:
|
109 |
+
warehouse_stock_map[warehouse_name] += stock_count
|
110 |
+
else:
|
111 |
+
warehouse_stock_map[warehouse_name] = stock_count
|
112 |
+
except (ValueError, TypeError):
|
113 |
+
pass
|
114 |
|
115 |
+
# Cancel alarm
|
116 |
+
signal.alarm(0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
117 |
|
118 |
+
if warehouse_stock_map:
|
119 |
+
all_warehouse_info = []
|
120 |
+
for warehouse_name, total_stock in warehouse_stock_map.items():
|
121 |
+
all_warehouse_info.append(f"{warehouse_name}: Stokta var")
|
122 |
+
return all_warehouse_info
|
123 |
+
else:
|
124 |
+
return ["Hiçbir mağazada stokta bulunmuyor"]
|
125 |
+
|
126 |
+
except TimeoutError:
|
127 |
+
signal.alarm(0)
|
128 |
+
print("Warehouse API timeout - skipping")
|
129 |
+
return None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
130 |
|
131 |
except Exception as e:
|
132 |
+
try:
|
133 |
+
signal.alarm(0)
|
134 |
+
except:
|
135 |
+
pass
|
136 |
print(f"Mağaza stok bilgisi çekme hatası: {e}")
|
137 |
return None
|
138 |
|
|
|
446 |
# Extract product name from improved search result for warehouse stock
|
447 |
enhanced_response = product_result['response']
|
448 |
|
449 |
+
# Try to get warehouse stock info (optimize edilmiş)
|
450 |
try:
|
|
|
451 |
warehouse_info = ""
|
452 |
+
warehouse_stock = get_warehouse_stock(user_message)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
453 |
if warehouse_stock and warehouse_stock != ["Hiçbir mağazada stokta bulunmuyor"]:
|
454 |
warehouse_info = f"\n\n🏪 MAĞAZA STOK BİLGİLERİ:\n"
|
455 |
for store_info in warehouse_stock:
|
|
|
526 |
if len(product_info[1]) > 6 and product_info[1][6]: # Resim URL'si varsa
|
527 |
product_image = f"\\nÜrün resmi: {product_info[1][6]}"
|
528 |
|
529 |
+
# Mağaza stok bilgilerini ekle (optimize edilmiş versiyon)
|
530 |
warehouse_stock_info = ""
|
531 |
try:
|
532 |
+
warehouse_stock = get_warehouse_stock(product_info[2])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
533 |
if warehouse_stock and warehouse_stock != ["Hiçbir mağazada stokta bulunmuyor"]:
|
534 |
warehouse_stock_info = f"\\n🏪 Mağaza stok bilgileri:\\n"
|
535 |
for store_info in warehouse_stock:
|