开发机迁移
This commit is contained in:
@@ -1,20 +1,22 @@
|
||||
# AI_CHANGELOG
|
||||
# - 2026-03-20 | Prompt: H2 FDW→直连ETL统一改造 | _process_site() 中 fdw_etl.v_dwd_assistant_service_log
|
||||
# 改为直连 ETL 库查询 app.v_dwd_assistant_service_log。使用 fdw_queries._fdw_context()。
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
召回完成检测器（Recall Completion Detector）
|
||||
|
||||
ETL 数据更新后，直连 ETL 库读取助教服务记录，
|
||||
匹配活跃任务标记为 completed，记录 completed_at 和 completed_task_type 快照，
|
||||
触发 recall_completed 事件通知备注回溯重分类器。
|
||||
ETL 数据更新后，扫描所有 MAIN 关系对的结算记录，
|
||||
记录广义召回事件（recall_events），匹配活跃任务标记 completed，
|
||||
对所有到店的 MAIN 关联客户生成回访任务（follow_up_visit）。
|
||||
|
||||
由 trigger_jobs 中的 recall_completion_check 配置驱动（event: etl_data_updated）。
|
||||
|
||||
CHANGE 2026-04-08 | Fix-13 改造：
|
||||
- 扫描范围从"有 active 任务的客户"扩大为"所有 os_label='MAIN' 的关联客户"
|
||||
- 新增 recall_events 事件表记录广义召回（按天去重）
|
||||
- 无 active 任务的客户到店也生成 follow_up_visit
|
||||
"""
|
||||
|
||||
import json
|
||||
import logging
|
||||
from datetime import timedelta
|
||||
|
||||
from app.trace.decorators import trace_service
|
||||
|
||||
@@ -63,69 +65,37 @@ def run(payload: dict | None = None, job_id: int | None = None) -> dict:
|
||||
"""
|
||||
召回完成检测主流程。
|
||||
|
||||
1. 从 trigger_jobs 读取 last_run_at 作为增量过滤基准
|
||||
2. 获取所有 distinct site_id（从 active 任务中）
|
||||
3. 对每个 site_id，SET LOCAL app.current_site_id 后
|
||||
通过 FDW 读取 v_dwd_assistant_service_log 中 service_time > last_run_at 的新增服务记录
|
||||
4. 对每条服务记录，查找 biz.coach_tasks 中匹配的
|
||||
(site_id, assistant_id, member_id) 且 status='active' 的任务
|
||||
5. 将匹配任务标记为 completed：
|
||||
- status = 'completed'
|
||||
- completed_at = 服务时间
|
||||
- completed_task_type = 当前 task_type（快照）
|
||||
6. 记录 coach_task_history
|
||||
7. 触发 fire_event('recall_completed', {site_id, assistant_id, member_id, service_time})
|
||||
|
||||
参数:
|
||||
payload: 事件载荷（event 触发时由 trigger_scheduler 传入）
|
||||
job_id: 触发器 job ID（由 trigger_scheduler 传入），用于在最终事务中
|
||||
更新 last_run_at，保证 handler 数据变更与 last_run_at 原子提交
|
||||
|
||||
返回: {"completed_count": int}
|
||||
CHANGE 2026-04-08 | Fix-13 改造：扫描所有 MAIN 关系对。
|
||||
1. 从 biz.sites 获取所有活跃门店
|
||||
2. 对每个 site_id，通过 _fdw_context 扫描 MAIN 关系对的结算记录
|
||||
3. 有结算 → 写 recall_events + 完成任务（如有）+ 生成回访
|
||||
"""
|
||||
completed_count = 0
|
||||
event_count = 0
|
||||
|
||||
conn = _get_connection()
|
||||
try:
|
||||
# ── 1. 读取 last_run_at ──
|
||||
# ── 1. 从业务库获取所有活跃门店 ──
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT last_run_at
|
||||
FROM biz.trigger_jobs
|
||||
WHERE job_name = 'recall_completion_check'
|
||||
"""
|
||||
)
|
||||
row = cur.fetchone()
|
||||
last_run_at = row[0] if row else None
|
||||
conn.commit()
|
||||
|
||||
# ── 2. 获取所有有 active 任务的 distinct site_id ──
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT DISTINCT site_id
|
||||
FROM biz.coach_tasks
|
||||
WHERE status = 'active'
|
||||
"""
|
||||
"SELECT site_id FROM biz.sites WHERE is_active = true"
|
||||
)
|
||||
site_ids = [r[0] for r in cur.fetchall()]
|
||||
conn.commit()
|
||||
|
||||
# ── 3. 逐 site_id 读取新增服务记录 ──
|
||||
# ── 2. 逐 site_id 处理 ──
|
||||
for site_id in site_ids:
|
||||
try:
|
||||
count = _process_site(conn, site_id, last_run_at)
|
||||
completed_count += count
|
||||
result = _process_site(conn, site_id)
|
||||
completed_count += result["completed"]
|
||||
event_count += result["events"]
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"处理门店召回检测失败: site_id=%s", site_id
|
||||
)
|
||||
conn.rollback()
|
||||
|
||||
# ── 事务安全（T5）：handler 成功后更新 last_run_at ──
|
||||
# job_id 由 trigger_scheduler 传入，在 handler 最终事务中更新
|
||||
# handler 异常时此处不会执行（异常向上传播），last_run_at 不变
|
||||
# ── 更新 last_run_at（兼容 trigger_scheduler 调度记录） ──
|
||||
if job_id is not None:
|
||||
from app.services.trigger_scheduler import update_job_last_run_at
|
||||
|
||||
@@ -137,145 +107,196 @@ def run(payload: dict | None = None, job_id: int | None = None) -> dict:
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
logger.info("召回完成检测完成: completed_count=%d", completed_count)
|
||||
return {"completed_count": completed_count}
|
||||
logger.info(
|
||||
"召回完成检测完成: completed_count=%d, event_count=%d",
|
||||
completed_count, event_count,
|
||||
)
|
||||
return {"completed_count": completed_count, "event_count": event_count}
|
||||
|
||||
|
||||
def _process_site(conn, site_id: int, last_run_at) -> int:
|
||||
def _process_site(conn, site_id: int) -> dict:
|
||||
"""
|
||||
处理单个门店的召回完成检测。
|
||||
处理单个门店的广义召回检测。
|
||||
|
||||
直连 ETL 库读取新增服务记录，匹配 active 任务并标记 completed。
|
||||
返回本门店完成的任务数。
|
||||
CHANGE 2026-04-08 | Fix-13 改造：
|
||||
1. 从 ETL 查询所有 os_label='MAIN' 的 (assistant_id, member_id) 对
|
||||
2. 批量查询这些客户的最新结算记录
|
||||
3. 对每个有新结算的关系对：写 recall_events + 完成任务 + 生成回访
|
||||
"""
|
||||
completed = 0
|
||||
events = 0
|
||||
|
||||
# CHANGE 2026-03-20 | H2 FDW→直连ETL | fdw_etl.v_dwd_assistant_service_log → app.v_dwd_assistant_service_log
|
||||
# intent: 修复 RLS 门店隔离失效（postgres_fdw 不传递 GUC 参数）
|
||||
# assumptions: _fdw_context 内部管理 ETL 连接，conn 仅用于后续业务库操作
|
||||
from app.services.fdw_queries import _fdw_context
|
||||
|
||||
# ── 1. 获取本门店所有 MAIN 关系对 ──
|
||||
with _fdw_context(conn, site_id) as cur:
|
||||
if last_run_at is not None:
|
||||
# 列名映射: FDW 外部表 assistant_id/member_id/service_time
|
||||
# → RLS 视图 site_assistant_id/tenant_member_id/create_time
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT DISTINCT site_assistant_id, tenant_member_id, create_time
|
||||
FROM app.v_dwd_assistant_service_log
|
||||
WHERE create_time > %s
|
||||
ORDER BY create_time ASC
|
||||
""",
|
||||
(last_run_at,),
|
||||
)
|
||||
else:
|
||||
# 首次运行，读取所有服务记录
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT DISTINCT site_assistant_id, tenant_member_id, create_time
|
||||
FROM app.v_dwd_assistant_service_log
|
||||
ORDER BY create_time ASC
|
||||
"""
|
||||
)
|
||||
service_records = cur.fetchall()
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT assistant_id, member_id
|
||||
FROM app.v_dws_member_assistant_relation_index
|
||||
WHERE os_label = 'MAIN'
|
||||
"""
|
||||
)
|
||||
main_pairs = [(r[0], r[1]) for r in cur.fetchall()]
|
||||
|
||||
# ── 4-7. 逐条服务记录匹配并处理 ──
|
||||
for assistant_id, member_id, service_time in service_records:
|
||||
# 散客过滤（member_id ≤ 0 不参与任务系统）
|
||||
if member_id is None or member_id <= 0:
|
||||
continue
|
||||
try:
|
||||
count = _process_service_record(
|
||||
conn, site_id, assistant_id, member_id, service_time
|
||||
if not main_pairs:
|
||||
return {"completed": 0, "events": 0}
|
||||
|
||||
# ── 2. 批量查询这些客户的最新结算时间 ──
|
||||
member_ids = list({mid for _, mid in main_pairs})
|
||||
settlement_map: dict[tuple[int, int], object] = {} # (assistant_id, member_id) → latest_pay_time
|
||||
|
||||
with _fdw_context(conn, site_id) as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT sl.site_assistant_id AS assistant_id,
|
||||
sh.member_id,
|
||||
MAX(sh.pay_time) AS latest_pay_time
|
||||
FROM app.v_dwd_settlement_head sh
|
||||
JOIN app.v_dwd_assistant_service_log sl
|
||||
ON sl.order_settle_id = sh.order_settle_id
|
||||
AND sl.is_delete = 0
|
||||
WHERE sh.member_id = ANY(%s)
|
||||
AND sh.settle_type IN (1, 3)
|
||||
GROUP BY sl.site_assistant_id, sh.member_id
|
||||
""",
|
||||
(member_ids,),
|
||||
)
|
||||
for row in cur.fetchall():
|
||||
settlement_map[(row[0], row[1])] = row[2]
|
||||
|
||||
# ── 3. 获取本门店所有 active 的召回/回访任务（用于匹配） ──
|
||||
active_tasks_map: dict[tuple[int, int], list] = {} # (assistant_id, member_id) → [(id, task_type, created_at)]
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT id, assistant_id, member_id, task_type, created_at
|
||||
FROM biz.coach_tasks
|
||||
WHERE site_id = %s
|
||||
AND status = 'active'
|
||||
AND task_type IN ('high_priority_recall', 'priority_recall', 'follow_up_visit')
|
||||
""",
|
||||
(site_id,),
|
||||
)
|
||||
for row in cur.fetchall():
|
||||
key = (row[1], row[2])
|
||||
active_tasks_map.setdefault(key, []).append(
|
||||
{"id": row[0], "task_type": row[3], "created_at": row[4]}
|
||||
)
|
||||
completed += count
|
||||
conn.commit()
|
||||
|
||||
# ── 4. 逐关系对处理 ──
|
||||
for assistant_id, member_id in main_pairs:
|
||||
latest_pay = settlement_map.get((assistant_id, member_id))
|
||||
if latest_pay is None:
|
||||
continue
|
||||
|
||||
active_tasks = active_tasks_map.get((assistant_id, member_id), [])
|
||||
|
||||
try:
|
||||
result = _process_pair(
|
||||
conn, site_id, assistant_id, member_id,
|
||||
latest_pay, active_tasks,
|
||||
)
|
||||
completed += result["completed"]
|
||||
events += result["events"]
|
||||
except Exception:
|
||||
logger.exception(
|
||||
"处理服务记录失败: site_id=%s, assistant_id=%s, member_id=%s",
|
||||
site_id,
|
||||
assistant_id,
|
||||
member_id,
|
||||
"处理关系对失败: site_id=%s, assistant_id=%s, member_id=%s",
|
||||
site_id, assistant_id, member_id,
|
||||
)
|
||||
conn.rollback()
|
||||
|
||||
return completed
|
||||
return {"completed": completed, "events": events}
|
||||
|
||||
|
||||
def _process_service_record(
|
||||
def _process_pair(
|
||||
conn,
|
||||
site_id: int,
|
||||
assistant_id: int,
|
||||
member_id: int,
|
||||
service_time,
|
||||
) -> int:
|
||||
latest_pay_time,
|
||||
active_tasks: list[dict],
|
||||
) -> dict:
|
||||
"""
|
||||
处理单条服务记录：匹配 active 任务并标记 completed + 生成回访任务。
|
||||
处理单个 MAIN 关系对的召回检测。
|
||||
|
||||
CHANGE 2026-03-30 | 回访任务直接在此生成（不再依赖 note_reclassifier 事件链）。
|
||||
规则：
|
||||
- 有 active 召回任务 → 标记 completed，然后生成回访任务
|
||||
- 有 active 回访任务 → 关闭旧回访，生成新回访（重置 48h 倒计时）
|
||||
- 无任何 active 召回/回访 → 直接生成回访任务
|
||||
CHANGE 2026-04-08 | Fix-13 改造：
|
||||
- 写 recall_events（ON CONFLICT DO NOTHING 按天去重）
|
||||
- 有 active 召回任务且 pay_time > created_at → 完成任务
|
||||
- 关闭旧回访 → 新建回访（48h）
|
||||
- 无 active 任务也生成回访
|
||||
|
||||
每条服务记录独立事务，失败不影响其他。
|
||||
返回本次完成的任务数。
|
||||
返回: {"completed": int, "events": int}
|
||||
"""
|
||||
completed = 0
|
||||
events = 0
|
||||
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("BEGIN")
|
||||
|
||||
# ── 1. 查找匹配的 active 召回类任务 ──
|
||||
# ── 1. 写 recall_events（按天去重） ──
|
||||
# 先查是否有匹配的召回任务（用于填充 task_id/task_type）
|
||||
recall_tasks = [
|
||||
t for t in active_tasks
|
||||
if t["task_type"] in ("high_priority_recall", "priority_recall")
|
||||
and latest_pay_time > t["created_at"]
|
||||
]
|
||||
event_task_id = recall_tasks[0]["id"] if recall_tasks else None
|
||||
event_task_type = recall_tasks[0]["task_type"] if recall_tasks else None
|
||||
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT id, task_type
|
||||
FROM biz.coach_tasks
|
||||
WHERE site_id = %s
|
||||
AND assistant_id = %s
|
||||
AND member_id = %s
|
||||
AND status = 'active'
|
||||
AND task_type IN ('high_priority_recall', 'priority_recall')
|
||||
INSERT INTO biz.recall_events
|
||||
(site_id, assistant_id, member_id, pay_time, task_id, task_type)
|
||||
VALUES (%s, %s, %s, %s, %s, %s)
|
||||
ON CONFLICT (site_id, assistant_id, member_id, (date_trunc('day', pay_time AT TIME ZONE 'Asia/Shanghai')))
|
||||
DO NOTHING
|
||||
RETURNING id
|
||||
""",
|
||||
(site_id, assistant_id, member_id),
|
||||
(site_id, assistant_id, member_id, latest_pay_time,
|
||||
event_task_id, event_task_type),
|
||||
)
|
||||
active_recall_tasks = cur.fetchall()
|
||||
inserted = cur.fetchone()
|
||||
if inserted is None:
|
||||
# 今天已记录过，跳过后续处理（避免重复生成回访）
|
||||
conn.commit()
|
||||
return {"completed": 0, "events": 0}
|
||||
|
||||
has_active_recall = len(active_recall_tasks) > 0
|
||||
events = 1
|
||||
|
||||
# 将所有匹配的 active 召回任务标记为 completed
|
||||
for task_id, task_type in active_recall_tasks:
|
||||
# ── 2. 完成匹配的召回任务 ──
|
||||
has_active_recall = len(recall_tasks) > 0
|
||||
|
||||
for task in recall_tasks:
|
||||
cur.execute(
|
||||
"""
|
||||
UPDATE biz.coach_tasks
|
||||
SET status = 'completed',
|
||||
completed_at = %s,
|
||||
completed_task_type = %s,
|
||||
completion_type = 'auto',
|
||||
updated_at = NOW()
|
||||
WHERE id = %s AND status = 'active'
|
||||
""",
|
||||
(service_time, task_type, task_id),
|
||||
(latest_pay_time, task["task_type"], task["id"]),
|
||||
)
|
||||
_insert_history(
|
||||
cur,
|
||||
task_id,
|
||||
task["id"],
|
||||
action="completed",
|
||||
old_status="active",
|
||||
new_status="completed",
|
||||
old_task_type=task_type,
|
||||
new_task_type=task_type,
|
||||
old_task_type=task["task_type"],
|
||||
new_task_type=task["task_type"],
|
||||
detail={
|
||||
"service_time": str(service_time),
|
||||
"completed_task_type": task_type,
|
||||
"service_time": str(latest_pay_time),
|
||||
"completed_task_type": task["task_type"],
|
||||
},
|
||||
)
|
||||
completed += 1
|
||||
|
||||
# ── 2. 生成回访任务（CHANGE 2026-03-30） ──
|
||||
# 如果还有 active 召回任务（其他助教的），不生成回访
|
||||
# 注意：上面已经把当前助教的召回任务标记为 completed 了
|
||||
# 这里检查的是当前助教-客户对是否还有未完成的召回任务（不应该有了）
|
||||
|
||||
# 关闭已有的 active 回访任务
|
||||
# ── 3. 关闭已有的 active 回访任务 ──
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT id FROM biz.coach_tasks
|
||||
@@ -299,16 +320,19 @@ def _process_service_record(
|
||||
action="superseded_by_new_visit",
|
||||
old_status="active", new_status="inactive",
|
||||
old_task_type="follow_up_visit", new_task_type="follow_up_visit",
|
||||
detail={"reason": "new_service_record", "service_time": str(service_time)},
|
||||
detail={"reason": "new_service_record", "service_time": str(latest_pay_time)},
|
||||
)
|
||||
|
||||
# 创建新的回访任务（48h 过期）
|
||||
from datetime import timedelta
|
||||
expires_at = service_time + timedelta(hours=48) if hasattr(service_time, '__add__') else None
|
||||
# ── 4. 创建新的回访任务（48h 过期） ──
|
||||
expires_at = (
|
||||
latest_pay_time + timedelta(hours=48)
|
||||
if hasattr(latest_pay_time, '__add__') else None
|
||||
)
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO biz.coach_tasks
|
||||
(site_id, assistant_id, member_id, task_type, status, expires_at, created_at, updated_at)
|
||||
(site_id, assistant_id, member_id, task_type, status,
|
||||
expires_at, created_at, updated_at)
|
||||
VALUES (%s, %s, %s, 'follow_up_visit', 'active', %s, NOW(), NOW())
|
||||
RETURNING id
|
||||
""",
|
||||
@@ -322,14 +346,14 @@ def _process_service_record(
|
||||
new_task_type="follow_up_visit",
|
||||
detail={
|
||||
"reason": "service_record_detected",
|
||||
"service_time": str(service_time),
|
||||
"service_time": str(latest_pay_time),
|
||||
"had_recall": has_active_recall,
|
||||
},
|
||||
)
|
||||
|
||||
conn.commit()
|
||||
|
||||
# ── 3. 触发 recall_completed 事件（仅当有召回任务被完成时） ──
|
||||
# ── 5. 触发 recall_completed 事件（仅当有召回任务被完成时） ──
|
||||
if has_active_recall:
|
||||
try:
|
||||
from app.services.trigger_scheduler import fire_event
|
||||
@@ -339,7 +363,7 @@ def _process_service_record(
|
||||
"site_id": site_id,
|
||||
"assistant_id": assistant_id,
|
||||
"member_id": member_id,
|
||||
"service_time": str(service_time),
|
||||
"service_time": str(latest_pay_time),
|
||||
},
|
||||
)
|
||||
except Exception:
|
||||
@@ -348,4 +372,4 @@ def _process_service_record(
|
||||
site_id, assistant_id, member_id,
|
||||
)
|
||||
|
||||
return completed
|
||||
return {"completed": completed, "events": events}
|
||||
|
||||
Reference in New Issue
Block a user