lekss361/gendesign
1
0
Fork 0
Code Issues 57 Pull requests Projects Releases Packages Wiki Activity Actions

fix(site-finder): cascade InFailedSqlTransaction — velocity internal rollback #155

Merged
lekss361 merged 2 commits from fix/velocity-internal-rollback-cascade into main 2026-05-15 05:52:39 +00:00
Conversation 3 Commits 2 Files changed 2 +103 -91
2 changed files with 103 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/app/api/v1/parcels.py
View file

@ -1658,6 +1658,7 @@ def analyze_parcel(
"lon": centroid_lon, "lon": centroid_lon,
} }
try: try:
with db.begin_nested():
zoning_row = ( zoning_row = (
db.execute( db.execute(
text(""" text("""
@ -1692,6 +1693,7 @@ def analyze_parcel(
success_recommendation: dict[str, Any] | None = None success_recommendation: dict[str, Any] | None = None
if district_row: if district_row:
try: try:
with db.begin_nested():
success_rows = ( success_rows = (
db.execute( db.execute(
text(""" text("""

10
backend/app/services/site_finder/velocity.py
View file

@ -74,7 +74,11 @@ def compute_velocity(
# obj_class в domrf_kn_objects заполнен слабо (много NULL); фильтруем # obj_class в domrf_kn_objects заполнен слабо (много NULL); фильтруем
# только если явно передан. # только если явно передан.
class_filter = "AND o.obj_class = :obj_class" if obj_class else "" class_filter = "AND o.obj_class = :obj_class" if obj_class else ""
# SAVEPOINT per query: failure rollbacks ТОЛЬКО savepoint, не outer tx.
# db.rollback() здесь НЕЛЬЗЯ — он orphan'ит outer SessionTransaction
# (см. PR #155 bot review — SQLAlchemy 2.0 begin_nested context cleanup).
try: try:
with db.begin_nested():
comp_rows = ( comp_rows = (
db.execute( db.execute(
text( text(
@ -126,6 +130,8 @@ def compute_velocity(
) )
except Exception: except Exception:
logger.exception("velocity: competitor query failed for wkt=%s", parcel_geom_wkt[:80]) logger.exception("velocity: competitor query failed for wkt=%s", parcel_geom_wkt[:80])
# SAVEPOINT auto-rollbacks через __exit__ context manager.
# Outer tx остаётся clean — caller продолжает работать без cascade.
return None return None
if not comp_rows: if not comp_rows:
@ -147,6 +153,7 @@ def compute_velocity(
# area_sq = м² за месяц (primary). Если NULL — realised * 45 м² heuristic. # area_sq = м² за месяц (primary). Если NULL — realised * 45 м² heuristic.
# type = 'apartments' — только жильё. # type = 'apartments' — только жильё.
try: try:
with db.begin_nested():
sales_rows = ( sales_rows = (
db.execute( db.execute(
text( text(
@ -186,6 +193,7 @@ def compute_velocity(
) )
except Exception: except Exception:
logger.exception("velocity: sale_graph query failed for obj_ids=%s", obj_ids[:5]) logger.exception("velocity: sale_graph query failed for obj_ids=%s", obj_ids[:5])
# SAVEPOINT auto-rollback'нут — outer tx clean
return None return None
if not sales_rows: if not sales_rows:
@ -266,6 +274,7 @@ def _get_ekb_median(db: Session, months_window: int = 6) -> float | None:
Fallback к _EKB_MEDIAN_FALLBACK_SQM_PER_MONTH если нет данных в БД. Fallback к _EKB_MEDIAN_FALLBACK_SQM_PER_MONTH если нет данных в БД.
""" """
try: try:
with db.begin_nested():
row = ( row = (
db.execute( db.execute(
text( text(
@ -311,6 +320,7 @@ def _get_ekb_median(db: Session, months_window: int = 6) -> float | None:
) )
except Exception: except Exception:
logger.warning("velocity: ekb_median query failed, using fallback") logger.warning("velocity: ekb_median query failed, using fallback")
# SAVEPOINT auto-rollback'нут
return None return None
if row and row["median"] is not None: if row and row["median"] is not None: