Repository navigation
Expand file tree
/
Copy pathexecutor_node.py
More file actions
539 lines (453 loc) · 18.4 KB
/
Copy pathexecutor_node.py
File metadata and controls
539 lines (453 loc) · 18.4 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
from __future__ import annotations
import re
from typing import Any, Dict, List, Optional, Set
from sqlalchemy import text
from sqlalchemy.ext.asyncio import AsyncSession
from src.core.db.database import async_session_maker
from src.core.logging_settings import logger
from src.services.agent.graph_state import GraphState, NODE_EXECUTOR
MAX_RESULT_ROWS = 100
QUERY_TIMEOUT_SECONDS = 30
def _extract_iliase_from_sql(sql: str) -> List[str]:
patterns = re.findall(r"ILIKE\s+'%([^']+)%'", sql, re.IGNORECASE)
return [p.strip() for p in patterns]
def _extract_periods_from_sql(sql: str) -> List[str]:
periods = re.findall(r"period\s*=\s*'([^']+)'", sql, re.IGNORECASE)
periods += re.findall(r"period\s+IN\s*\(([^)]+)\)", sql, re.IGNORECASE)
# Разбираем IN-список
expanded = []
for p in periods:
if "," in p:
expanded.extend([x.strip().strip("'") for x in p.split(",")])
else:
expanded.append(p.strip().strip("'"))
return expanded
def _extract_price_source_from_sql(sql: str) -> Optional[str]:
match = re.search(r"price_source\s+ILIKE\s+'%([^']+)%'", sql, re.IGNORECASE)
if match:
return match.group(1)
# Точное равенство
match = re.search(r"price_source\s*=\s*'([^']+)'", sql, re.IGNORECASE)
if match:
return match.group(1)
return None
def _collect_samples_from_schema(schema: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
all_samples: List[Dict[str, Any]] = []
seen_items: Set[str] = set()
for sheet in schema:
samples = sheet.get("samples", [])
for s in samples:
item = s.get("item_name") or s.get("item_name_normalized", "")
if item and item not in seen_items:
seen_items.add(item)
all_samples.append(s)
return all_samples
def _split_sql_list(content: str) -> List[str]:
items = []
buf = []
in_quote = False
for ch in content:
if ch == "'":
in_quote = not in_quote
buf.append(ch)
continue
if ch == "," and not in_quote:
items.append("".join(buf))
buf = []
continue
buf.append(ch)
if buf:
items.append("".join(buf))
return [x for x in items if x.strip()]
def _norm_token(value: str) -> str:
repl = {
"c": "с", "o": "о", "e": "е", "a": "а", "p": "р", "k": "к",
"x": "х", "t": "т", "y": "у", "h": "н", "m": "м", "b": "в",
}
out = []
for ch in (value or "").lower():
out.append(repl.get(ch, ch))
return "".join(out)
def _match_item_exact(value: str, real_items: List[str]) -> Optional[str]:
target = _norm_token(value)
for real in real_items:
if _norm_token(real) == target:
return real
return None
def _fix_item_in_list(
original_sql: str,
samples: List[Dict[str, Any]],
) -> Optional[str]:
if not samples:
return None
real_items = []
for s in samples:
it = s.get("item_name") or s.get("item_name_normalized", "")
if it:
real_items.append(str(it))
if not real_items:
return None
changed = False
def _repl_in(m: "re.Match") -> str:
nonlocal changed
items = [x.strip().strip("'") for x in _split_sql_list(m.group(2))]
fixed = []
for it in items:
exact = _match_item_exact(it, real_items) or it
if exact != it:
changed = True
fixed.append(f"'{exact}'")
return f"{m.group(1)}{', '.join(fixed)})"
new_sql = re.sub(r"(fp\.item_name\s+IN\s*\()([^)]*)\)", _repl_in, original_sql, flags=re.IGNORECASE)
if new_sql == original_sql:
new_sql = re.sub(r"(item_name\s+IN\s*\()([^)]*)\)", _repl_in, original_sql, flags=re.IGNORECASE)
def _repl_eq(m: "re.Match") -> str:
nonlocal changed
lit = m.group(1)
it = lit.strip("'")
exact = _match_item_exact(it, real_items) or it
if exact != it:
changed = True
return f"item_name = '{exact}'"
new_sql = re.sub(r"item_name\s*=\s*'([^']*)'", _repl_eq, new_sql, flags=re.IGNORECASE)
new_sql = re.sub(r"fp\.item_name\s*=\s*'([^']*)'", _repl_eq, new_sql, flags=re.IGNORECASE)
return new_sql if changed else None
def _build_samples_fallback_sql(
original_sql: str,
samples: List[Dict[str, Any]],
) -> Optional[str]:
sql_lower = original_sql.lower().strip()
if "price_facts" not in sql_lower:
return None
if not samples:
return None
ilike_patterns = _extract_iliase_from_sql(original_sql)
if not ilike_patterns:
return None
matched_items: Set[str] = set()
for pattern in ilike_patterns:
pattern_lower = pattern.lower()
for s in samples:
item = s.get("item_name_normalized", "")
if item and pattern_lower in item.lower():
matched_items.add(item)
if not matched_items:
return None
items_list = sorted(matched_items)
items_formatted = ", ".join(f"'{item}'" for item in items_list)
new_sql = re.sub(
r"AND\s+fp\.item_name\s+ILIKE\s+'[^']+'\s*",
f"AND fp.item_name IN ({items_formatted})",
original_sql,
flags=re.IGNORECASE,
)
new_sql = re.sub(
r"WHERE\s+fp\.item_name\s+ILIKE\s+'[^']+'\s*",
f"WHERE fp.item_name IN ({items_formatted})",
new_sql,
flags=re.IGNORECASE,
)
new_sql = re.sub(
r"AND\s+item_name\s+ILIKE\s+'[^']+'\s*",
f"AND item_name IN ({items_formatted})",
new_sql,
flags=re.IGNORECASE,
)
new_sql = re.sub(
r"WHERE\s+item_name\s+ILIKE\s+'[^']+'\s*",
f"WHERE item_name IN ({items_formatted})",
new_sql,
flags=re.IGNORECASE,
)
if new_sql == original_sql:
return None
return new_sql
def _build_no_item_filter_sql(original_sql: str) -> Optional[str]:
sql_lower = original_sql.lower().strip()
if "price_facts" not in sql_lower:
return None
lines = original_sql.split('\n')
filtered_lines = []
item_filter_removed = False
for line in lines:
stripped = line.strip()
if 'item_name' in stripped.lower():
item_filter_removed = True
continue
if item_filter_removed and stripped:
# Убираем leading AND/OR
stripped = re.sub(r'^(AND|OR)\s+', '', stripped, flags=re.IGNORECASE)
item_filter_removed = False
if stripped:
filtered_lines.append(stripped)
if not item_filter_removed:
filtered_lines = [l for l in lines if 'item_name' not in l.lower()]
fallback_sql = '\n'.join(filtered_lines).strip()
# Убираем пустые WHERE
fallback_sql = re.sub(r'WHERE\s*AND', 'WHERE', fallback_sql, flags=re.IGNORECASE)
fallback_sql = re.sub(r'WHERE\s*$', '', fallback_sql, flags=re.IGNORECASE)
if not fallback_sql or 'select' not in fallback_sql.lower():
return None
return fallback_sql
def _build_fallback_sql(original_sql: str) -> Optional[str]:
sql_lower = original_sql.lower().strip()
# Проверяем, что это SELECT из mart.price_facts
if "price_facts" not in sql_lower:
return None
# Извлекаем ORDER BY и LIMIT чтобы сохранить их после трансформации
order_by_match = re.search(r'\bORDER\s+BY\s+.+$', original_sql, re.IGNORECASE | re.DOTALL)
order_by_clause = order_by_match.group(0) if order_by_match else ""
# Убираем ORDER BY и LIMIT из основной части для обработки
core_sql = original_sql
if order_by_clause:
core_sql = core_sql[:order_by_match.start()].strip()
# Убираем LIMIT из core если он был перед ORDER BY
core_sql = re.sub(r'\s*LIMIT\s+\d+\s*$', '', core_sql, flags=re.IGNORECASE)
# Убираем условие по price_source
lines = core_sql.split('\n')
filtered_lines = []
price_source_removed = False
for line in lines:
stripped = line.strip()
if 'price_source' in stripped.lower():
price_source_removed = True
continue
if price_source_removed and stripped:
# Убираем leading AND/OR
stripped = re.sub(r'^(AND|OR)\s+', '', stripped, flags=re.IGNORECASE)
price_source_removed = False
if stripped:
filtered_lines.append(stripped)
if not price_source_removed:
filtered_lines = [l for l in lines if 'price_source' not in l.lower()]
fallback_sql = '\n'.join(filtered_lines).strip()
# Убираем пустые WHERE
fallback_sql = re.sub(r'WHERE\s*AND', 'WHERE', fallback_sql, flags=re.IGNORECASE)
fallback_sql = re.sub(r'WHERE\s*$', '', fallback_sql, flags=re.IGNORECASE)
# Добавляем обратно ORDER BY и LIMIT
if order_by_clause:
fallback_sql += '\n' + order_by_clause
# Если после всех изменений SQL стал пустым или некорректным
if not fallback_sql or 'select' not in fallback_sql.lower():
return None
return fallback_sql
_SCHEMA_ALLOW_PATTERN = re.compile(r"FROM\s+(mart\.\w+)", re.IGNORECASE)
_SCHEMA_FORBIDDEN = ("raw.cells", "information_schema", "pg_catalog", "entity_dictionary")
def _check_schema(sql: str) -> List[str]:
errors: List[str] = []
sql_lower = sql.lower()
for bad in _SCHEMA_FORBIDDEN:
if bad in sql_lower:
errors.append(f"Запрос обращается к запрещённой таблице/схеме: {bad}")
tables = _SCHEMA_ALLOW_PATTERN.findall(sql)
if not tables:
# Если нет ни одного mart.* FROM — запрос не корректен для агента.
errors.append("Запрос не обращается ни к одной mart.* таблице")
return errors
async def _execute_sql(
sql_query: str,
session: Optional[AsyncSession],
request_id: str,
) -> tuple[List[Dict[str, Any]], Optional[str]]:
from src.core.db.database import async_session_maker
from src.core.config import settings
# Жёсткая проверка схемы перед выполнением.
schema_errors = _check_schema(sql_query)
if schema_errors:
logger.error(
"Executor Node [{}]: schema check failed: {}",
request_id,
schema_errors,
)
return [], "; ".join(schema_errors)
try:
async with (session or async_session_maker()) as s:
async with s.begin():
await s.execute(
text(f"SET LOCAL statement_timeout = '{settings.DB_STATEMENT_TIMEOUT_MS}'")
)
result = await s.execute(text(sql_query))
if result.returns_rows:
columns = result.keys()
rows = result.fetchmany(MAX_RESULT_ROWS)
rows_list = [dict(zip(columns, row)) for row in rows]
logger.info(
"Executor Node [{}]: query returned {} rows",
request_id,
len(rows_list),
)
return rows_list, None
else:
logger.info(
"Executor Node [{}]: query did not return rows",
request_id,
)
return [], None
except Exception as exc:
error_msg = str(exc)
logger.error(
"Executor Node [{}]: SQL execution failed: {}",
request_id,
error_msg,
)
return [], error_msg
async def executor_node(
state: GraphState,
session: Optional[AsyncSession] = None,
**kwargs: Any,
) -> GraphState:
from src.core.metrics import observe_node
import time as _time
_node_start = _time.monotonic()
request_id = state.get("request_id", "?")[:8]
sql_query = state.get("sql_query", "")
validation_errors = state.get("validation_errors", [])
schema = state.get("schema", [])
logger.info(
"Executor Node [{}]: executing SQL ({} chars)",
request_id,
len(sql_query),
)
if not sql_query:
state["sql_error"] = "Нет SQL-запроса для выполнения"
state["sql_result"] = []
# Инкрементируем счётчик ретраев, чтобы не зациклить codegen→executor.
state["retry_count"] = state.get("retry_count", 0) + 1
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {"error": state["sql_error"]}
return state
if validation_errors:
state["sql_error"] = (
f"SQL не прошёл валидацию: {'; '.join(validation_errors)}"
)
state["sql_result"] = []
state["retry_count"] = state.get("retry_count", 0) + 1
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {"error": state["sql_error"]}
return state
# Пытаемся выполнить оригинальный SQL
result, error = await _execute_sql(sql_query, session, request_id)
# Если оригинальный SQL вернул ошибку — сразу возвращаем
if error:
state["sql_error"] = error
state["sql_result"] = []
state["retry_count"] = state.get("retry_count", 0) + 1
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {
"sql_query": sql_query,
"row_count": 0,
"error": error,
"result_preview": [],
"fallback_used": False,
}
return state
# Если оригинальный SQL вернул данные — отлично
if result:
state["sql_result"] = result
state["sql_error"] = None
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {
"sql_query": sql_query,
"row_count": len(result),
"error": None,
"result_preview": result[:5],
"fallback_used": False,
}
return state
# Оригинальный SQL не вернул данных — пробуем серию fallback-ов
logger.warning(
"Executor Node [{}]: original SQL returned 0 rows, trying fallbacks",
request_id,
)
# Собираем samples из схемы для fallback-ов с реальными названиями
samples = _collect_samples_from_schema(schema)
# Определяем порядок fallback-ов
fallback_chain = []
# Fallback 1: убрать price_source (существующий)
fb1 = _build_fallback_sql(sql_query)
if fb1 and fb1 != sql_query:
fallback_chain.append(("без price_source", fb1))
# Fallback 2: заменить ILIKE на реальные названия из samples
if samples:
fb2 = _build_samples_fallback_sql(sql_query, samples)
if fb2 and fb2 != sql_query:
fallback_chain.append(("с реальными названиями из samples", fb2))
# Fallback 2a: исправить литералы item_name IN/='...' (кириллица vs латиница).
if samples:
fb2a = _fix_item_in_list(sql_query, samples)
if fb2a and fb2a != sql_query:
fallback_chain.append(("исправленные названия item_name (IN/=)", fb2a))
# Fallback 3: убрать price_source + заменить ILIKE на реальные названия
if samples and fb1 and fb1 != sql_query:
fb3 = _build_samples_fallback_sql(fb1, samples)
if fb3 and fb3 != fb1 and fb3 != sql_query:
fallback_chain.append(("без price_source + реальные названия", fb3))
# Fallback 4: убрать фильтрацию по item_name_normalized вообще
fb4 = _build_no_item_filter_sql(sql_query)
if fb4 and fb4 != sql_query:
fallback_chain.append(("без фильтра по названию", fb4))
# Fallback 5: убрать price_source + убрать фильтр по названию
if fb1 and fb1 != sql_query:
fb5 = _build_no_item_filter_sql(fb1)
if fb5 and fb5 != fb1 and fb5 != sql_query:
fallback_chain.append(("без price_source + без фильтра по названию", fb5))
# Пробуем каждый fallback по порядку
for fb_label, fb_sql in fallback_chain:
logger.info(
"Executor Node [{}]: trying fallback '{}': {}",
request_id,
fb_label,
fb_sql[:200],
)
fb_result, fb_error = await _execute_sql(fb_sql, session, request_id)
if fb_error:
logger.warning(
"Executor Node [{}]: fallback '{}' failed: {}",
request_id,
fb_label,
fb_error,
)
continue
if fb_result:
logger.info(
"Executor Node [{}]: fallback '{}' returned {} rows",
request_id,
fb_label,
len(fb_result),
)
state["sql_result"] = fb_result
state["sql_error"] = None
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {
"sql_query": sql_query,
"row_count": len(fb_result),
"error": None,
"result_preview": fb_result[:5],
"fallback_used": True,
"fallback_label": fb_label,
"fallback_sql": fb_sql,
}
return state
logger.warning(
"Executor Node [{}]: fallback '{}' also returned 0 rows",
request_id,
fb_label,
)
# Все fallback-ы не дали результатов
state["sql_result"] = []
state["sql_error"] = None
state["trace"] = state.get("trace", {})
state["trace"][NODE_EXECUTOR] = {
"sql_query": sql_query,
"row_count": 0,
"error": None,
"result_preview": [],
"fallback_used": len(fallback_chain) > 0,
"fallbacks_tried": [label for label, _ in fallback_chain],
}
# Латентность узла для Prometheus.
try:
observe_node("executor", _time.monotonic() - _node_start)
except Exception:
pass
return state