Light1YT
86e9ea2937
Многоагентный аудит + имплементация: один воркер на файл, точечные правки. Верификация: py_compile (47/47 .py) + tsc --noEmit (0 ошибок). Unit-тесты не прогонялись (окружение не поднято: rollup native dep / нет pytest-venv). Полностью исправлено (169): #1336, #1337, #1339, #1340, #1341, #1342, #1343, #1345, #1346, #1348, #1349, #1350, #1351, #1354, #1356, #1358, #1359, #1360, #1362, #1364, #1365, #1366, #1367, #1368, #1369, #1370, #1371, #1372, #1373, #1374, #1375, #1376, #1377, #1378, #1379, #1380, #1381, #1382, #1384, #1385, #1386, #1387, #1388, #1389, #1390, #1391, #1392, #1394, #1395, #1396, #1397, #1399, #1400, #1401, #1402, #1403, #1404, #1408, #1409, #1410, #1411, #1412, #1413, #1414, #1415, #1416, #1417, #1418, #1420, #1423, #1425, #1426, #1427, #1428, #1429, #1430, #1431, #1432, #1433, #1434, #1435, #1437, #1438, #1439, #1440, #1441, #1442, #1443, #1444, #1445, #1446, #1447, #1448, #1449, #1450, #1451, #1452, #1453, #1454, #1455, #1456, #1457, #1458, #1459, #1460, #1461, #1462, #1463, #1464, #1465, #1466, #1467, #1468, #1469, #1471, #1472, #1473, #1474, #1476, #1478, #1479, #1481, #1482, #1483, #1484, #1485, #1487, #1488, #1489, #1490, #1491, #1492, #1493, #1494, #1495, #1496, #1497, #1499, #1500, #1501, #1502, #1504, #1505, #1506, #1507, #1510, #1514, #1515, #1516, #1517, #1518, #1519, #1521, #1522, #1523, #1524, #1525, #1526, #1527, #1528, #1529, #1531, #1532, #1533, #1534, #1535, #1536, #1537, #1538 Частично (9, in-file часть, остаток cross-file): #1361, #1419, #1422, #1424, #1470, #1475, #1477, #1480, #1498 Требуют cross-file (3, не тронуты): #1338, #1363, #1421 Пропущено (1): #1539 Не входило в партию: 22 needs-Leha issue (нужны решения владельца). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
97 lines
3.6 KiB
Python
97 lines
3.6 KiB
Python
"""SearchParams + SearchResponse — /api/v1/search (Phase 3.2)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Literal
|
|
|
|
from pydantic import BaseModel, Field, model_validator
|
|
|
|
SortKey = Literal[
|
|
"price_asc", "price_desc", "area_desc", "area_asc", "date_desc", "dist_asc"
|
|
]
|
|
|
|
|
|
class SearchParams(BaseModel):
|
|
"""Фильтры поиска по listings_search_mv (master plan sec 9.1)."""
|
|
|
|
# --- Geo (radius search) ---
|
|
lat: float | None = Field(default=None, ge=-90.0, le=90.0)
|
|
lon: float | None = Field(default=None, ge=-180.0, le=180.0)
|
|
radius_m: int = Field(default=2000, ge=100, le=50000)
|
|
|
|
# --- Property filters ---
|
|
rooms: int | None = Field(default=None, ge=0, le=10)
|
|
rooms_in: list[int] | None = None
|
|
area_m2_min: float | None = Field(default=None, ge=0)
|
|
area_m2_max: float | None = Field(default=None, ge=0)
|
|
price_rub_min: int | None = Field(default=None, ge=0)
|
|
price_rub_max: int | None = Field(default=None, ge=0)
|
|
price_per_m2_max: int | None = Field(default=None, ge=0)
|
|
floor_min: int | None = Field(default=None, ge=1)
|
|
floor_max: int | None = Field(default=None, ge=1)
|
|
|
|
# --- House filters ---
|
|
year_built_min: int | None = Field(default=None, ge=1800, le=2100)
|
|
year_built_max: int | None = Field(default=None, ge=1800, le=2100)
|
|
house_class: list[str] | None = None
|
|
floors_total_min: int | None = Field(default=None, ge=1)
|
|
floors_total_max: int | None = Field(default=None, ge=1)
|
|
|
|
# --- Quality / cross-source ---
|
|
has_kadastr: bool = False
|
|
sources: list[Literal["avito", "cian", "yandex_realty", "n1"]] | None = None
|
|
multi_source_only: bool = False
|
|
require_avito: bool = False
|
|
require_cian: bool = False
|
|
require_yandex: bool = False
|
|
|
|
# --- Text search ---
|
|
address_query: str | None = Field(default=None, max_length=200)
|
|
description_query: str | None = Field(default=None, max_length=200)
|
|
|
|
# --- Sort + pagination ---
|
|
sort: SortKey = "date_desc"
|
|
page: int = Field(default=1, ge=1, le=1000)
|
|
page_size: int = Field(default=50, ge=1, le=200)
|
|
|
|
@model_validator(mode="after")
|
|
def _validate_geo_pair(self) -> SearchParams:
|
|
if (self.lat is None) != (self.lon is None):
|
|
raise ValueError("lat and lon must be provided together")
|
|
if self.sort == "dist_asc" and self.lat is None:
|
|
raise ValueError("sort=dist_asc requires lat+lon")
|
|
if (
|
|
self.price_rub_min is not None
|
|
and self.price_rub_max is not None
|
|
and self.price_rub_min > self.price_rub_max
|
|
):
|
|
raise ValueError("price_rub_min > price_rub_max")
|
|
if (
|
|
self.area_m2_min is not None
|
|
and self.area_m2_max is not None
|
|
and self.area_m2_min > self.area_m2_max
|
|
):
|
|
raise ValueError("area_m2_min > area_m2_max")
|
|
if (
|
|
self.floor_min is not None
|
|
and self.floor_max is not None
|
|
and self.floor_min > self.floor_max
|
|
):
|
|
raise ValueError("floor_min > floor_max")
|
|
if (
|
|
self.year_built_min is not None
|
|
and self.year_built_max is not None
|
|
and self.year_built_min > self.year_built_max
|
|
):
|
|
raise ValueError("year_built_min > year_built_max")
|
|
if (
|
|
self.floors_total_min is not None
|
|
and self.floors_total_max is not None
|
|
and self.floors_total_min > self.floors_total_max
|
|
):
|
|
raise ValueError("floors_total_min > floors_total_max")
|
|
return self
|
|
|
|
@property
|
|
def offset(self) -> int:
|
|
return (self.page - 1) * self.page_size
|