Update app.py
Browse files
app.py
CHANGED
|
@@ -122,34 +122,7 @@ def analyze_query(query):
|
|
| 122 |
filters["price_min"] = normalized_price
|
| 123 |
|
| 124 |
|
| 125 |
-
|
| 126 |
-
|
| 127 |
-
|
| 128 |
-
|
| 129 |
-
|
| 130 |
# Поиск площади
|
| 131 |
-
""" area_keywords = ["квм", "кв.м", "кв метров", "кв м", "кв.м.", "квадратов", "квадрата", "м2", "метров", "м²"]
|
| 132 |
-
# Сначала ищем диапазоны
|
| 133 |
-
area_range_match_1 = re.findall(rf"(\d+)\s*-\s*(\d+)\s*({'|'.join(area_keywords)})", query)
|
| 134 |
-
area_range_match_2 = re.findall(rf"(\d+)\s*[.\s]+\s*(\d+)\s*({'|'.join(area_keywords)})", query)
|
| 135 |
-
if area_range_match_1:
|
| 136 |
-
filters["area_min"] = int(area_range_match_1[0][0])
|
| 137 |
-
filters["area_max"] = int(area_range_match_1[0][1])
|
| 138 |
-
elif area_range_match_2:
|
| 139 |
-
filters["area_min"] = int(area_range_match_2[0][0])
|
| 140 |
-
filters["area_max"] = int(area_range_match_2[0][1])
|
| 141 |
-
else:
|
| 142 |
-
# Если не найдены диапазоны, ищем "от" или "до"
|
| 143 |
-
area_min_match = re.findall(rf"\b(от)\s*(\d+)\s*({'|'.join(area_keywords)})", query)
|
| 144 |
-
area_max_match = re.findall(rf"\b(до)\s*(\d+)\s*({'|'.join(area_keywords)})", query)
|
| 145 |
-
if area_min_match:
|
| 146 |
-
filters["area_min"] = int(area_min_match[0][1]) # Преобразуем число в целый тип
|
| 147 |
-
if area_max_match:
|
| 148 |
-
filters["area_max"] = int(area_max_match[0][1]) # Преобразуем число в целый тип
|
| 149 |
-
return filters
|
| 150 |
-
"""
|
| 151 |
-
|
| 152 |
-
# Поиск площади
|
| 153 |
area_keywords = ["квм", "кв.м", "кв метров", "кв м", "кв.м.", "квадратов", "квадрата", "м2", "метров", "м²"]
|
| 154 |
area_range_match = re.findall(rf"от\s*(\d+[\s]*[.,]?\d*)\s*до\s*(\d+[\s]*[.,]?\d*)\s*({'|'.join(area_keywords)})\b", query)
|
| 155 |
if area_range_match:
|
|
|
|
| 122 |
filters["price_min"] = normalized_price
|
| 123 |
|
| 124 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 125 |
# Поиск площади
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 126 |
area_keywords = ["квм", "кв.м", "кв метров", "кв м", "кв.м.", "квадратов", "квадрата", "м2", "метров", "м²"]
|
| 127 |
area_range_match = re.findall(rf"от\s*(\d+[\s]*[.,]?\d*)\s*до\s*(\d+[\s]*[.,]?\d*)\s*({'|'.join(area_keywords)})\b", query)
|
| 128 |
if area_range_match:
|