lekss361/gendesign

Fork 0

fix(forecasting): thread room_bucket velocity into format ranking (#1593) #1696

Merged

lekss361 merged 2 commits from fix/base-pace-room-bucket-1593 into main

2026-06-17 18:08:26 +00:00

lekss361 commented

2026-06-17 17:57:02 +00:00

Owner

Проблема (#1593)

recommendation.py: base_pace считался без room_bucket, compute_market_metrics не имел per-bucket velocity → ранжирование форматов определялось только macro_coef, per-bucket рекомендации не различались.

Решение

Данные уже были (_query_sales_window использует ROLLUP(rooms_int) → sold_by_room). Добавлено поле MarketMetrics.velocity_by_room: dict|None (per-bucket velocity = sold_by_room/window_months; None при отсутствии выборки). _demand_only_overlay берёт bucket_base_pace из него (маппинг _FORECAST_TO_METRIC_BUCKETS, «80+ м²» = «4»+«5+»), fallback на агрегат при None. Остальные 6 callers compute_market_metrics проверены — никто не конструирует MarketMetrics напрямую, не затронуты.

Verify

ruff clean; pytest → 1246 passed, 1 skipped (+5 тестов: per-bucket values, None-кейсы, ranking определяется velocity не macro_coef, graceful fallback).

Closes #1593

## Проблема (#1593) `recommendation.py`: `base_pace` считался без room_bucket, `compute_market_metrics` не имел per-bucket velocity → ранжирование форматов определялось только `macro_coef`, per-bucket рекомендации не различались. ## Решение Данные уже были (`_query_sales_window` использует `ROLLUP(rooms_int)` → `sold_by_room`). Добавлено поле `MarketMetrics.velocity_by_room: dict|None` (per-bucket velocity = sold_by_room/window_months; None при отсутствии выборки). `_demand_only_overlay` берёт `bucket_base_pace` из него (маппинг `_FORECAST_TO_METRIC_BUCKETS`, «80+ м²» = «4»+«5+»), fallback на агрегат при None. Остальные 6 callers `compute_market_metrics` проверены — никто не конструирует `MarketMetrics` напрямую, не затронуты. ## Verify `ruff` clean; `pytest` → **1246 passed, 1 skipped** (+5 тестов: per-bucket values, None-кейсы, ranking определяется velocity не macro_coef, graceful fallback). Closes #1593

lekss361 added 1 commit 2026-06-17 17:57:03 +00:00

fix(forecasting): thread room_bucket into base_pace/compute_market_metrics for real format ranking (#1593 )

CI / backend-tests (push) Blocked by required conditions

Details

CI / frontend-tests (push) Blocked by required conditions

Details

CI / openapi-codegen-check (push) Blocked by required conditions

Details

CI / changes (push) Successful in 8s

Details

CI / changes (pull_request) Successful in 8s

Details

CI / frontend-tests (pull_request) Has been skipped

Details

CI / openapi-codegen-check (pull_request) Successful in 1m42s

Details

CI / backend-tests (pull_request) Has been cancelled

Details

cc6ef80d07

Add `velocity_by_room: dict[str, float] | None` to `MarketMetrics` — per-bucket
unit velocity (ед./мес) derived from the existing `sold_by_room` ROLLUP data that
`_query_sales_window` already returns. No new SQL required.

Thread per-bucket velocity through `_demand_only_overlay` via the new
`_FORECAST_TO_METRIC_BUCKETS` constant that maps each forecast bucket to its
market_metrics room-bucket keys. "80+ м²" sums "4" + "5+" keys. Fallback to
aggregate `unit_velocity` when `velocity_by_room` is None (thin-data path).

Previously `base_pace` was identical for all 5 room-buckets, so §9.4 norm and §9.2
base_pace cancelled out in pace/max_pace and ranking was driven purely by §9.5
macro_coef (segment steepness proxy). Now §9.2 reflects real per-bucket observed
demand from objective_lots.contract_date data.

Callers of `compute_market_metrics` that don't use `velocity_by_room` are unaffected
(the new field is additive to the frozen dataclass). All existing callers verified —
none construct `MarketMetrics` directly except the one production site.

bot-backend added 1 commit 2026-06-17 18:08:05 +00:00

fix(forecasting): wrap long lines, guard window_months=0, correct base_pace fallback comment (#1593 review)

CI / backend-tests (push) Has been cancelled

Details

CI / frontend-tests (push) Has been cancelled

Details

CI / openapi-codegen-check (push) Has been cancelled

Details

CI / changes (push) Has been cancelled

Details

CI / backend-tests (pull_request) Has been cancelled

Details

CI / changes (pull_request) Has been cancelled

Details

CI / openapi-codegen-check (pull_request) Has been cancelled

Details

CI / frontend-tests (pull_request) Has been cancelled

Details

ec0d80c1e9

- Add window_months > 0 guard to vel_by_room dict comprehension (mirrors _monthly_rate)
- Correct outer comment in recommendation.py: honest-zero for known-zero buckets,
  fallback only when velocity_by_room=None or bucket absent from _FORECAST_TO_METRIC_BUCKETS
- Add comment in as_dict() noting velocity_by_room is intentionally not serialized
  (internal pipeline attr consumed directly by recommendation.py)