From 7572622cb54e9305f4fa6a0886a478d7e25003ca Mon Sep 17 00:00:00 2001 From: OoO Date: Tue, 19 May 2026 01:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=82=E5=A0=B4=E6=83=85?= =?UTF-8?q?=E5=A0=B1=E5=80=99=E9=81=B8=E9=80=81=E5=AF=A9=20gate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO_NEXT_STEPS.txt | 1 + config.py | 2 +- ...s-platform-market-campaign-intelligence.md | 1 + routes/README.md | 2 +- routes/market_intel_routes.py | 25 ++ services/market_intel/deployment_readiness.py | 22 ++ .../manual_sample_candidate_queue.py | 216 ++++++++++++- services/market_intel/service.py | 20 +- templates/market_intel/disabled.html | 74 ++++- tests/test_market_intel_skeleton.py | 288 +++++++++++++++--- 10 files changed, 598 insertions(+), 53 deletions(-) diff --git a/TODO_NEXT_STEPS.txt b/TODO_NEXT_STEPS.txt index 48dd9d1..5e59fb5 100644 --- a/TODO_NEXT_STEPS.txt +++ b/TODO_NEXT_STEPS.txt @@ -111,6 +111,7 @@ - Phase 51 manual sample candidate handoff：新增 `/api/market_intel/manual_sample_review/candidate_handoff` POST 與 UI handoff 按鈕，將已通過審核的 sample result 轉成只讀候選活動 preview payload；不保存 handoff、不建立 review queue、不寫 market_*、不允許候選導入、不掛 scheduler；版本同步至 V10.222。 - Phase 52 manual sample candidate queue draft：新增 `services/market_intel/manual_sample_candidate_queue.py`、`/api/market_intel/manual_sample_review/candidate_queue_draft` POST 與 UI queue 草案按鈕，將 handoff 候選轉成只讀人工審核 queue draft；不建立正式 queue、不保存草案、不寫 market_*、不自動核准候選、不掛 scheduler；版本同步至 V10.223。 - V10.224 補 PPT 報表覆蓋矩陣：`/observability/ppt_audit_history` 將每個定義簡報同列串起 DB 寫入、線上預覽、視覺 QA 與交付狀態，並提供預覽、預熱、重跑操作，避免只顯示「目標已產生」。 + - Phase 53 manual sample candidate queue approval：新增 `/api/market_intel/manual_sample_review/candidate_queue_approval` POST 與 UI 送審 gate 按鈕，將 queue draft row preview 對齊既有 `market_alert_review_queue` 契約，檢查必填欄位、寫入 flags、備份與人工批准 gate；不建立 approval record、不寫 review queue、不開 DB transaction、不掛 scheduler；版本同步至 V10.225。 - Schema smoke：`tests/test_market_intel_skeleton.py` 檢查 `Base.metadata` 內含 ADR-035 八張 `market_*` tables。 - Desktop UI QA：本機只註冊 `market_intel_bp` 的 Flask harness 載入 `/market_intel`，確認 Phase 15、候選預覽、writer preview、安全 flags、點陣暖紙視覺正常，console error 0。 - API QA：`/api/market_intel/schema_smoke` 通過 7 張表與 `market_platforms` 必要欄位檢查；`/api/market_intel/platform_seed_writer_plan` 回傳 4 筆 dry-run upsert preview，`writes_executed=false`，四平台皆 `blocked_dry_run_only`。 diff --git a/config.py b/config.py index 6d065b4..2a46e7e 100644 --- a/config.py +++ b/config.py @@ -320,7 +320,7 @@ YOUTUBE_API_KEY = os.getenv('YOUTUBE_API_KEY', '') # ========================================== # 系統版本與路徑 # ========================================== -SYSTEM_VERSION = "V10.224" +SYSTEM_VERSION = "V10.225" LOG_FILE_PATH = os.path.join(BASE_DIR, 'logs/system.log') public_url = PUBLIC_URL # 用於模板顯示 diff --git a/docs/adr/ADR-035-cross-platform-market-campaign-intelligence.md b/docs/adr/ADR-035-cross-platform-market-campaign-intelligence.md index af16528..7419aa0 100644 --- a/docs/adr/ADR-035-cross-platform-market-campaign-intelligence.md +++ b/docs/adr/ADR-035-cross-platform-market-campaign-intelligence.md @@ -178,6 +178,7 @@ EwoooC 目前已有 MOMO EDM / 節慶活動資料、`promo_products`、PChome - 2026-05-19 追加 manual sample review evaluate：`/api/market_intel/manual_sample_review/evaluate` 提供 POST-only 即時審核入口，操作員可貼入單筆 sample result JSON 取得 PASS/BLOCK 與 candidate preview readiness。此入口不保存 payload、不回吐完整 HTML、不連外、不寫 DB、不建立候選活動、不允許候選導入、不掛 scheduler；invalid JSON 只回診斷錯誤。 - 2026-05-19 追加 manual sample candidate handoff：`/api/market_intel/manual_sample_review/candidate_handoff` 將已通過審核的 sample result 轉成只讀候選活動 handoff payload，包含 candidate key、平台、來源、URL、信心分級、排序與人工審核狀態。此入口保持 CSRF 保護，不保存 handoff、不建立 review queue、不寫 market_*、不允許候選導入、不掛 scheduler。 - 2026-05-19 追加 manual sample candidate queue draft：`services.market_intel.manual_sample_candidate_queue` 與 `/api/market_intel/manual_sample_review/candidate_queue_draft` 將 handoff 候選轉成只讀人工審核 queue draft，包含 queue item key、review priority、review state 與 approval_required。此入口保持 CSRF 保護，不建立正式 queue、不保存草案、不寫 market_*、不自動核准候選、不掛 scheduler。 +- 2026-05-19 追加 manual sample candidate queue approval：`/api/market_intel/manual_sample_review/candidate_queue_approval` 將 queue draft 對齊既有 `market_alert_review_queue` 契約，輸出 row preview、必填欄位 gate、寫入 flags、備份與人工批准 gate。此入口保持 CSRF 保護，不建立 approval record、不寫 review queue、不開 DB transaction、不掛 scheduler。 ### Phase 4：Coupang / Shopee Adapter diff --git a/routes/README.md b/routes/README.md index 9717519..9baef2b 100644 --- a/routes/README.md +++ b/routes/README.md @@ -19,7 +19,7 @@ | `edm_routes.py` | EDM 與節慶儀表板 | `/edm`, `/festival` | | `monthly_routes.py` | 月結分析 | `/monthly_summary_analysis`, `/api/monthly_summary_data` | | `daily_sales_routes.py` | 當日業績 | `/daily_sales`, `/daily_sales/export*` | -| `market_intel_routes.py` | 市場情報 Phase 52 manual sample candidate queue draft | `/market_intel`, `/market_intel/*`, `/api/market_intel/status`, `/api/market_intel/schema`, `/api/market_intel/schema_smoke`, `/api/market_intel/schema_db_probe`, `/api/market_intel/platform_seed_db_diff`, `/api/market_intel/legacy_source_bridge`, `/api/market_intel/mcp_readiness`, `/api/market_intel/mcp_tool_contract`, `/api/market_intel/mcp_deploy_preflight`, `/api/market_intel/mcp_activation_runbook`, `/api/market_intel/mcp_fetch_gate`, `/api/market_intel/scheduler_plan`, `/api/market_intel/manual_sample_plan`, `/api/market_intel/manual_sample_acceptance`, `/api/market_intel/manual_sample_review`, `/api/market_intel/manual_sample_review/evaluate`, `/api/market_intel/manual_sample_review/candidate_handoff`, `/api/market_intel/manual_sample_review/candidate_queue_draft`, `/api/market_intel/match_review_plan`, `/api/market_intel/opportunity_plan`, `/api/market_intel/opportunity_scoring_plan`, `/api/market_intel/opportunity_evidence_plan`, `/api/market_intel/opportunity_alert_plan`, `/api/market_intel/adapters`, `/api/market_intel/dry_run_plan`, `/api/market_intel/discovery_plan`, `/api/market_intel/manual_discovery`, `/api/market_intel/candidate_preview`, `/api/market_intel/platform_seed_plan`, `/api/market_intel/platform_seed_write_guard`, `/api/market_intel/platform_seed_writer_plan`, `/api/market_intel/migration_blueprint`, `/api/market_intel/migration_apply_drill`, `/api/market_intel/migration_catalog_review`, `/api/market_intel/migration_live_smoke`, `/api/market_intel/live_db_inventory`, `/api/market_intel/seed_writer_cli_status`, `/api/market_intel/write_approval_runbook`, `/api/market_intel/deployment_readiness` | +| `market_intel_routes.py` | 市場情報 Phase 53 manual sample candidate queue approval | `/market_intel`, `/market_intel/*`, `/api/market_intel/status`, `/api/market_intel/schema`, `/api/market_intel/schema_smoke`, `/api/market_intel/schema_db_probe`, `/api/market_intel/platform_seed_db_diff`, `/api/market_intel/legacy_source_bridge`, `/api/market_intel/mcp_readiness`, `/api/market_intel/mcp_tool_contract`, `/api/market_intel/mcp_deploy_preflight`, `/api/market_intel/mcp_activation_runbook`, `/api/market_intel/mcp_fetch_gate`, `/api/market_intel/scheduler_plan`, `/api/market_intel/manual_sample_plan`, `/api/market_intel/manual_sample_acceptance`, `/api/market_intel/manual_sample_review`, `/api/market_intel/manual_sample_review/evaluate`, `/api/market_intel/manual_sample_review/candidate_handoff`, `/api/market_intel/manual_sample_review/candidate_queue_draft`, `/api/market_intel/manual_sample_review/candidate_queue_approval`, `/api/market_intel/match_review_plan`, `/api/market_intel/opportunity_plan`, `/api/market_intel/opportunity_scoring_plan`, `/api/market_intel/opportunity_evidence_plan`, `/api/market_intel/opportunity_alert_plan`, `/api/market_intel/adapters`, `/api/market_intel/dry_run_plan`, `/api/market_intel/discovery_plan`, `/api/market_intel/manual_discovery`, `/api/market_intel/candidate_preview`, `/api/market_intel/platform_seed_plan`, `/api/market_intel/platform_seed_write_guard`, `/api/market_intel/platform_seed_writer_plan`, `/api/market_intel/migration_blueprint`, `/api/market_intel/migration_apply_drill`, `/api/market_intel/migration_catalog_review`, `/api/market_intel/migration_live_smoke`, `/api/market_intel/live_db_inventory`, `/api/market_intel/seed_writer_cli_status`, `/api/market_intel/write_approval_runbook`, `/api/market_intel/deployment_readiness` | | `api_routes.py` | 通用任務與查詢 API | `/api/run_task`, `/api/history/*` | | `export_routes.py` | 匯出功能 | `/api/export/*` | | `import_routes.py` | 匯入功能 | `/api/import_excel`, `/api/import/monthly_summary` | diff --git a/routes/market_intel_routes.py b/routes/market_intel_routes.py index 8175e43..e665015 100644 --- a/routes/market_intel_routes.py +++ b/routes/market_intel_routes.py @@ -242,6 +242,31 @@ def market_intel_manual_sample_candidate_queue_draft(): ) +@market_intel_bp.route( + "/api/market_intel/manual_sample_review/candidate_queue_approval", + methods=["POST"], +) +@login_required +def market_intel_manual_sample_candidate_queue_approval(): + payload = request.get_json(silent=True) + limit = request.args.get("limit", default=20, type=int) + if not isinstance(payload, dict): + data = _service().build_manual_sample_candidate_queue_approval( + sample_result=None, + payload_error="invalid_json_object", + limit=limit, + ) + return jsonify(data), 400 + + sample_result = payload.get("sample_result", payload) + return jsonify( + _service().build_manual_sample_candidate_queue_approval( + sample_result=sample_result, + limit=limit, + ) + ) + + @market_intel_bp.route("/api/market_intel/match_review_plan") @login_required def market_intel_match_review_plan(): diff --git a/services/market_intel/deployment_readiness.py b/services/market_intel/deployment_readiness.py index 67f240a..967695b 100644 --- a/services/market_intel/deployment_readiness.py +++ b/services/market_intel/deployment_readiness.py @@ -30,6 +30,9 @@ def build_deployment_readiness_preview( manual_sample_candidate_queue_draft = ( service.build_manual_sample_candidate_queue_draft(sample_result={}) ) + manual_sample_candidate_queue_approval = ( + service.build_manual_sample_candidate_queue_approval(sample_result={}) + ) match_review_plan = service.build_match_review_plan() opportunity_plan = service.build_opportunity_plan() opportunity_scoring_plan = service.build_opportunity_scoring_plan() @@ -152,6 +155,22 @@ def build_deployment_readiness_preview( and not manual_sample_candidate_queue_draft["database_commit_executed"] and not manual_sample_candidate_queue_draft["scheduler_attached"] ), + "manual_sample_candidate_queue_approval_post_safe": bool( + manual_sample_candidate_queue_approval["mode"] + == "manual_sample_candidate_queue_approval_preview" + and manual_sample_candidate_queue_approval["payload_received"] + and not manual_sample_candidate_queue_approval["payload_persisted"] + and not manual_sample_candidate_queue_approval["approval_request_created"] + and not manual_sample_candidate_queue_approval["approval_record_written"] + and not manual_sample_candidate_queue_approval["review_queue_write_allowed"] + and not manual_sample_candidate_queue_approval["review_queue_created"] + and not manual_sample_candidate_queue_approval["review_queue_persisted"] + and not manual_sample_candidate_queue_approval["candidate_import_allowed"] + and not manual_sample_candidate_queue_approval["external_network_executed"] + and not manual_sample_candidate_queue_approval["database_write_executed"] + and not manual_sample_candidate_queue_approval["database_commit_executed"] + and not manual_sample_candidate_queue_approval["scheduler_attached"] + ), "match_review_plan_preview_safe": bool( match_review_plan["mode"] == "match_review_plan_preview" and not match_review_plan["review_queue_created"] @@ -396,6 +415,9 @@ def build_deployment_readiness_preview( "manual_sample_review_evaluation": manual_sample_review_evaluation, "manual_sample_candidate_handoff": manual_sample_candidate_handoff, "manual_sample_candidate_queue_draft": manual_sample_candidate_queue_draft, + "manual_sample_candidate_queue_approval": ( + manual_sample_candidate_queue_approval + ), "match_review_plan": match_review_plan, "opportunity_plan": opportunity_plan, "opportunity_scoring_plan": opportunity_scoring_plan, diff --git a/services/market_intel/manual_sample_candidate_queue.py b/services/market_intel/manual_sample_candidate_queue.py index 03c383c..55ab950 100644 --- a/services/market_intel/manual_sample_candidate_queue.py +++ b/services/market_intel/manual_sample_candidate_queue.py @@ -18,11 +18,32 @@ def _priority_for_candidate(candidate): return 20 +def _priority_lane_for_candidate(candidate): + score = int(candidate.get("score") or 0) + band = str(candidate.get("confidence_band") or "").lower() + if band == "high" and score >= 90: + return "urgent" + if band in ("high", "medium"): + return "watch" + return "backlog" + + +def _threshold_level_for_candidate(candidate): + score = int(candidate.get("score") or 0) + if score >= 90: + return "high" + if score >= 70: + return "medium" + return "low" + + def _build_queue_item(candidate, batch_id): candidate_key = str(candidate.get("candidate_key") or "") + evidence_bundle_id = f"sample-candidate:{candidate_key}" return { "queue_item_key": f"review:{candidate_key}", "candidate_key": candidate_key, + "alert_candidate_id": candidate_key, "platform_code": str(candidate.get("platform_code") or ""), "candidate_url": str(candidate.get("candidate_url") or ""), "candidate_text": str(candidate.get("candidate_text") or ""), @@ -30,6 +51,12 @@ def _build_queue_item(candidate, batch_id): "score": candidate.get("score") or 0, "rank_position": candidate.get("rank_position") or 0, "review_state": "needs_review", + "priority_lane": _priority_lane_for_candidate(candidate), + "threshold_level": _threshold_level_for_candidate(candidate), + "total_score": float(candidate.get("score") or 0), + "evidence_bundle_id": evidence_bundle_id, + "dedupe_key": evidence_bundle_id, + "source_batch_id": batch_id, "review_priority": _priority_for_candidate(candidate), "created_from_batch_id": batch_id, "write_status": "blocked_preview_only", @@ -103,18 +130,16 @@ def build_manual_sample_candidate_queue_draft_preview( }, "queue_contract": { "contract_type": "draft_contract_only", - "table_name": "market_campaign_candidate_review_queue", + "table_name": "market_alert_review_queue", "required_fields": [ - "queue_item_key", - "candidate_key", - "platform_code", - "candidate_url", - "candidate_text", - "confidence_band", - "score", + "alert_candidate_id", "review_state", - "review_priority", - "created_from_batch_id", + "priority_lane", + "threshold_level", + "total_score", + "evidence_bundle_id", + "dedupe_key", + "source_batch_id", ], "forbidden_actions": [ "insert_review_queue_rows", @@ -146,3 +171,174 @@ def build_manual_sample_candidate_queue_draft_preview( "do_not_touch_momo_db_lifecycle", ], } + + +def _queue_rows_from_items(queue_items): + rows = [] + for item in queue_items: + rows.append( + { + "alert_candidate_id": item["alert_candidate_id"], + "review_state": item["review_state"], + "priority_lane": item["priority_lane"], + "threshold_level": item["threshold_level"], + "total_score": item["total_score"], + "evidence_bundle_id": item["evidence_bundle_id"], + "dedupe_key": item["dedupe_key"], + "source_batch_id": item["source_batch_id"], + "metadata_json_preview": { + "platform_code": item["platform_code"], + "candidate_url": item["candidate_url"], + "candidate_text": item["candidate_text"], + "confidence_band": item["confidence_band"], + "rank_position": item["rank_position"], + }, + "write_status": "blocked_approval_preview_only", + } + ) + return rows + + +def build_manual_sample_candidate_queue_approval_preview( + *, + runtime_status, + acceptance_contract, + sample_result=None, + payload_error=None, + limit=20, +): + """建立候選審核 queue 寫入前 gate；只回 row preview，不寫 DB。""" + queue_draft = build_manual_sample_candidate_queue_draft_preview( + runtime_status=runtime_status, + acceptance_contract=acceptance_contract, + sample_result=sample_result, + payload_error=payload_error, + limit=limit, + ) + queue_items = queue_draft.get("queue_items", []) + required_fields = queue_draft["queue_contract"]["required_fields"] + queue_rows = _queue_rows_from_items(queue_items) + rows_have_required_fields = all( + all(row.get(field) not in (None, "") for field in required_fields) + for row in queue_rows + ) + gates = [ + { + "key": "queue_draft_ready", + "label": "候選 queue 草案已可交給人工審核", + "passed": bool(queue_draft["queue_draft_ready"]), + }, + { + "key": "queue_contract_targets_existing_table", + "label": "queue 草案目標表對齊既有 market_alert_review_queue", + "passed": queue_draft["queue_contract"]["table_name"] + == "market_alert_review_queue", + }, + { + "key": "queue_rows_have_required_fields", + "label": "row preview 具備 market_alert_review_queue 必填欄位", + "passed": rows_have_required_fields, + }, + { + "key": "runtime_write_flags_enabled", + "label": "正式寫入窗口才可啟用 MARKET_INTEL 寫入 flags", + "passed": bool(getattr(runtime_status, "database_write_allowed", False)), + }, + { + "key": "backup_verified", + "label": "寫入前必須確認正式環境備份完成", + "passed": False, + }, + { + "key": "manual_operator_approval", + "label": "操作者需另行明確批准候選審核 queue 寫入", + "passed": False, + }, + { + "key": "rollback_plan_reviewed", + "label": "已確認可關閉 flags 並回退 app-only 程式碼", + "passed": False, + }, + ] + blocked_reasons = list(queue_draft["blocked_reasons"]) + blocked_reasons.extend(gate["key"] for gate in gates if not gate["passed"]) + blocked_reasons.append("review_queue_write_still_blocked") + + return { + "mode": "manual_sample_candidate_queue_approval_preview", + "queue_draft": { + "mode": queue_draft["mode"], + "queue_draft_ready": queue_draft["queue_draft_ready"], + "review_queue_draft_created": queue_draft["review_queue_draft_created"], + "queue_summary": queue_draft["queue_summary"], + }, + "payload_received": queue_draft["payload_received"], + "payload_valid_json_object": queue_draft["payload_valid_json_object"], + "payload_error": queue_draft["payload_error"], + "payload_persisted": False, + "approval_preview_created": bool(queue_rows), + "approval_request_created": False, + "approval_record_written": False, + "review_queue_write_allowed": False, + "review_queue_created": False, + "review_queue_persisted": False, + "candidate_import_allowed": False, + "external_network_executed": False, + "database_connection_opened": False, + "database_session_created": False, + "database_write_executed": False, + "database_commit_executed": False, + "scheduler_attached": False, + "writes_executed": False, + "would_write_database": False, + "blocked_reasons": blocked_reasons, + "approval_summary": { + "target_table": "market_alert_review_queue", + "row_preview_count": len(queue_rows), + "gates_passed": len([gate for gate in gates if gate["passed"]]), + "gate_count": len(gates), + "manual_approval_required": True, + }, + "approval_gates": gates, + "queue_write_preview": { + "target_table": "market_alert_review_queue", + "row_count": len(queue_rows), + "sql_shape": ( + "INSERT INTO market_alert_review_queue (...) VALUES (...) " + "ON CONFLICT(dedupe_key) DO NOTHING" + ), + "rows": queue_rows, + "write_status": "blocked_approval_preview_only", + }, + "operator_next_actions": [ + { + "key": "verify_queue_rows", + "label": "人工確認 row preview 的候選 URL、分數、優先 lane 與 dedupe key", + "write_status": "blocked", + }, + { + "key": "open_explicit_write_window_later", + "label": "後續另開正式寫入窗口，先備份、開 flags、再用一次性批准執行", + "write_status": "blocked", + }, + ], + "rollback_plan": [ + { + "key": "disable_market_intel_flags", + "label": "關閉 MARKET_INTEL_ENABLED / CRAWLER / WRITE flags", + }, + { + "key": "app_only_rollback", + "label": "只回退 momo-app 程式碼與模板，不碰 momo-db 容器生命週期", + }, + ], + "safe_boundaries": [ + *queue_draft["safe_boundaries"], + "do_not_create_queue_approval_record_from_preview", + "do_not_insert_market_alert_review_queue_from_preview", + "do_not_open_database_transaction_from_approval_preview", + "do_not_auto_approve_queue_write", + "do_not_attach_scheduler_from_queue_approval", + "do_not_touch_momo_db_lifecycle", + ], + } diff --git a/services/market_intel/service.py b/services/market_intel/service.py index e3179a8..458e3b5 100644 --- a/services/market_intel/service.py +++ b/services/market_intel/service.py @@ -37,6 +37,7 @@ from services.market_intel.manual_sample_acceptance import ( build_manual_sample_acceptance_preview, ) from services.market_intel.manual_sample_candidate_queue import ( + build_manual_sample_candidate_queue_approval_preview, build_manual_sample_candidate_queue_draft_preview, ) from services.market_intel.manual_sample_review import ( @@ -106,7 +107,7 @@ class MarketIntelRuntimeStatus: class MarketIntelService: """市場情報入口服務，先集中 feature gate 與安全狀態。""" - phase = "phase_52_manual_sample_candidate_queue_draft" + phase = "phase_53_manual_sample_candidate_queue_approval" def get_runtime_status(self) -> MarketIntelRuntimeStatus: return MarketIntelRuntimeStatus( @@ -514,6 +515,23 @@ class MarketIntelService: queue_draft["phase"] = self.phase return queue_draft + def build_manual_sample_candidate_queue_approval( + self, + sample_result=None, + payload_error=None, + limit=20, + ): + """回報候選審核 queue 寫入前 gate；只產生 preview，不寫 DB。""" + approval = build_manual_sample_candidate_queue_approval_preview( + runtime_status=self.get_runtime_status(), + acceptance_contract=self.build_manual_sample_acceptance(), + sample_result=sample_result, + payload_error=payload_error, + limit=limit, + ) + approval["phase"] = self.phase + return approval + def build_match_review_plan(self): """回報商品比對審核計畫；不建立 queue、不自動確認。""" schema_smoke = self.build_schema_smoke() diff --git a/templates/market_intel/disabled.html b/templates/market_intel/disabled.html index ef9e0ba..cd719a0 100644 --- a/templates/market_intel/disabled.html +++ b/templates/market_intel/disabled.html @@ -251,7 +251,7 @@ align-items: stretch; display: grid; gap: 0.75rem; - grid-template-columns: minmax(0, 1fr) auto auto auto; + grid-template-columns: minmax(0, 1fr) auto auto auto auto; min-width: 0; } @@ -582,6 +582,9 @@ + @@ -908,10 +911,12 @@ const sampleReviewEvaluate = sampleReviewRoot ? sampleReviewRoot.querySelector('[data-market-intel-sample-review-evaluate]') : null; const sampleCandidateHandoff = sampleReviewRoot ? sampleReviewRoot.querySelector('[data-market-intel-sample-candidate-handoff]') : null; const sampleCandidateQueueDraft = sampleReviewRoot ? sampleReviewRoot.querySelector('[data-market-intel-sample-candidate-queue-draft]') : null; + const sampleCandidateQueueApproval = sampleReviewRoot ? sampleReviewRoot.querySelector('[data-market-intel-sample-candidate-queue-approval]') : null; const sampleReviewEndpoint = "{{ url_for('market_intel.market_intel_manual_sample_review') }}"; const sampleReviewEvaluateEndpoint = "{{ url_for('market_intel.market_intel_manual_sample_review_evaluate') }}"; const sampleCandidateHandoffEndpoint = "{{ url_for('market_intel.market_intel_manual_sample_candidate_handoff') }}"; const sampleCandidateQueueDraftEndpoint = "{{ url_for('market_intel.market_intel_manual_sample_candidate_queue_draft') }}"; + const sampleCandidateQueueApprovalEndpoint = "{{ url_for('market_intel.market_intel_manual_sample_candidate_queue_approval') }}"; const schedulerMeta = schedulerRoot ? schedulerRoot.querySelector('[data-market-intel-scheduler-meta]') : null; const schedulerBody = schedulerRoot ? schedulerRoot.querySelector('[data-market-intel-scheduler-body]') : null; const schedulerRefresh = schedulerRoot ? schedulerRoot.querySelector('[data-market-intel-scheduler-refresh]') : null; @@ -2127,6 +2132,70 @@ } }; + const renderCandidateQueueApproval = data => { + const blockers = (data.blocked_reasons || []).join(' / '); + const summary = data.approval_summary || {}; + const gates = data.approval_gates || []; + const rows = (data.queue_write_preview || {}).rows || []; + sampleReviewMeta.innerHTML = [ + `mode=${data.mode || 'unknown'}`, + `target=${summary.target_table || 'unknown'}`, + `rows=${summary.row_preview_count || 0}`, + `gates=${summary.gates_passed || 0}/${summary.gate_count || 0}`, + `write=${data.review_queue_write_allowed ? 'open' : 'blocked'}` + ].map(item => `${escapeHtml(item)}`).join(''); + sampleReviewBody.innerHTML = ` +
此卡只做 queue 寫入送審 gate；不建立 approval record、不寫 market_alert_review_queue、不開 DB transaction。${blockers ? `阻擋：${escapeHtml(blockers)}` : ''}
+
${ + gates.length + ? gates.map(item => renderNamedItem(item, item.passed ? 'pass' : 'block')).join('') + : '
尚未產生 gate。
' + }
+
${ + rows.length + ? rows.map(item => ` +
+ ${escapeHtml(item.alert_candidate_id)} + ${escapeHtml(item.review_state)} / ${escapeHtml(item.priority_lane)} / ${escapeHtml(item.threshold_level)} / score=${escapeHtml(item.total_score)} + ${escapeHtml(item.dedupe_key)} / ${escapeHtml(item.write_status)} +
+ `).join('') + : '
目前沒有可送審的 queue row preview。
' + }
+ `; + }; + + const loadCandidateQueueApproval = async () => { + if (!sampleReviewMeta || !sampleReviewBody || !sampleReviewInput) return; + let parsed; + try { + parsed = JSON.parse(sampleReviewInput.value || '{}'); + } catch (error) { + sampleReviewMeta.innerHTML = 'json_error'; + sampleReviewBody.innerHTML = `
JSON 格式錯誤：${escapeHtml(error.message)}
`; + return; + } + + sampleReviewBody.innerHTML = '
檢查 queue 寫入送審 gate 中...
'; + try { + const response = await fetch(sampleCandidateQueueApprovalEndpoint, { + method: 'POST', + credentials: 'same-origin', + headers: { + 'Content-Type': 'application/json', + 'X-CSRFToken': csrfToken + }, + body: JSON.stringify({ sample_result: parsed }) + }); + const data = await response.json(); + if (!response.ok && !data.mode) throw new Error(`HTTP ${response.status}`); + renderCandidateQueueApproval(data); + } catch (error) { + sampleReviewMeta.innerHTML = 'error'; + sampleReviewBody.innerHTML = `
queue 寫入送審 gate 檢查失敗：${escapeHtml(error.message)}
`; + } + }; + const renderSchedulerMeta = data => { schedulerMeta.innerHTML = [ `mode=${data.mode || 'unknown'}`, @@ -3627,6 +3696,9 @@ if (sampleCandidateQueueDraft) { sampleCandidateQueueDraft.addEventListener('click', loadCandidateQueueDraft); } + if (sampleCandidateQueueApproval) { + sampleCandidateQueueApproval.addEventListener('click', loadCandidateQueueApproval); + } if (schedulerRefresh) { schedulerRefresh.addEventListener('click', loadScheduler); } diff --git a/tests/test_market_intel_skeleton.py b/tests/test_market_intel_skeleton.py index 9b7d096..6ae64d2 100644 --- a/tests/test_market_intel_skeleton.py +++ b/tests/test_market_intel_skeleton.py @@ -520,6 +520,7 @@ def test_market_intel_preview_template_uses_safe_fetch_false_endpoint(): assert "data-market-intel-sample-review-evaluate" in template assert "data-market-intel-sample-candidate-handoff" in template assert "data-market-intel-sample-candidate-queue-draft" in template + assert "data-market-intel-sample-candidate-queue-approval" in template assert "data-market-intel-approval" in template assert "data-market-intel-approval-gates" in template assert "data-market-intel-deploy" in template @@ -541,6 +542,7 @@ def test_market_intel_preview_template_uses_safe_fetch_false_endpoint(): assert "market_intel.market_intel_manual_sample_review_evaluate" in template assert "market_intel.market_intel_manual_sample_candidate_handoff" in template assert "market_intel.market_intel_manual_sample_candidate_queue_draft" in template + assert "market_intel.market_intel_manual_sample_candidate_queue_approval" in template assert "X-CSRFToken" in template assert "market_intel.market_intel_scheduler_plan" in template assert "market_intel.market_intel_match_review_plan" in template @@ -577,7 +579,7 @@ def test_legacy_source_bridge_default_is_planned_only(): bridge = MarketIntelService().build_legacy_source_bridge() assert bridge["mode"] == "legacy_source_bridge_planned" - assert bridge["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert bridge["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert bridge["execute_requested"] is False assert bridge["read_only_query_executed"] is False assert bridge["database_connection_opened"] is False @@ -735,7 +737,7 @@ def test_mcp_tool_contract_preview_is_read_only_and_whitelisted(): contract = MarketIntelService().build_mcp_tool_contract() assert contract["mode"] == "mcp_tool_contract_preview" - assert contract["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert contract["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert contract["caller"] == "market_intel" assert contract["contract_ready"] is True assert contract["blocked_reasons"] == [] @@ -868,7 +870,7 @@ def test_mcp_activation_runbook_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "mcp_activation_runbook_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["deployment_actions_executed"] is False assert data["docker_command_executed"] is False assert data["ssh_command_executed"] is False @@ -881,7 +883,7 @@ def test_mcp_fetch_gate_default_blocks_external_fetch(): gate = MarketIntelService().build_mcp_fetch_gate(fetch_requested=True) assert gate["mode"] == "mcp_fetch_gate_planned" - assert gate["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert gate["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert gate["fetch_requested"] is True assert gate["manual_fetch_gate_open"] is False assert gate["network_request_allowed"] is False @@ -951,7 +953,7 @@ def test_mcp_fetch_gate_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "mcp_fetch_gate_planned" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["fetch_requested"] is False assert data["network_request_allowed"] is False assert data["external_network_executed"] is False @@ -963,7 +965,7 @@ def test_manual_sample_plan_preview_blocks_fetch_and_write(): plan = MarketIntelService().build_manual_sample_plan() assert plan["mode"] == "manual_sample_fetch_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_manual_sample_fetch"] is False assert plan["sample_fetch_executed"] is False assert plan["external_network_executed"] is False @@ -1011,7 +1013,7 @@ def test_manual_sample_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "manual_sample_fetch_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["sample_fetch_executed"] is False assert data["external_network_executed"] is False assert data["database_write_executed"] is False @@ -1022,7 +1024,7 @@ def test_manual_sample_acceptance_preview_blocks_candidate_import(): acceptance = MarketIntelService().build_manual_sample_acceptance() assert acceptance["mode"] == "manual_sample_acceptance_preview" - assert acceptance["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert acceptance["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert acceptance["contract_ready"] is True assert acceptance["sample_result_loaded"] is False assert acceptance["sample_result_accepted"] is False @@ -1064,7 +1066,7 @@ def test_manual_sample_acceptance_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "manual_sample_acceptance_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["sample_result_loaded"] is False assert data["candidate_import_allowed"] is False assert data["external_network_executed"] is False @@ -1076,7 +1078,7 @@ def test_manual_sample_review_preview_is_planned_until_result_loaded(): review = MarketIntelService().build_manual_sample_review() assert review["mode"] == "manual_sample_review_preview" - assert review["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert review["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert review["contract_ready"] is True assert review["sample_result_loaded"] is False assert review["sample_result_reviewed"] is False @@ -1187,7 +1189,7 @@ def test_manual_sample_review_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "manual_sample_review_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["sample_result_loaded"] is False assert data["sample_result_reviewed"] is False assert data["candidate_import_allowed"] is False @@ -1226,7 +1228,7 @@ def test_manual_sample_review_evaluation_preview_accepts_payload_without_persist ) assert review["mode"] == "manual_sample_review_evaluation_preview" - assert review["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert review["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert review["review_request_type"] == "operator_posted_json" assert review["payload_received"] is True assert review["payload_valid_json_object"] is True @@ -1288,7 +1290,7 @@ def test_manual_sample_review_evaluate_route_is_post_only_and_no_write(): assert response.status_code == 200 assert data["mode"] == "manual_sample_review_evaluation_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["payload_received"] is True assert data["payload_valid_json_object"] is True assert data["payload_persisted"] is False @@ -1368,7 +1370,7 @@ def test_manual_sample_candidate_handoff_preview_creates_candidates_without_pers ) assert handoff["mode"] == "manual_sample_candidate_handoff_preview" - assert handoff["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert handoff["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert handoff["payload_received"] is True assert handoff["payload_valid_json_object"] is True assert handoff["payload_persisted"] is False @@ -1432,7 +1434,7 @@ def test_manual_sample_candidate_handoff_route_is_post_only_and_no_write(): assert response.status_code == 200 assert data["mode"] == "manual_sample_candidate_handoff_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["payload_received"] is True assert data["handoff_ready"] is True assert data["candidate_handoff_created"] is True @@ -1491,7 +1493,7 @@ def test_manual_sample_candidate_queue_draft_preview_builds_review_items_without ) assert queue_draft["mode"] == "manual_sample_candidate_queue_draft_preview" - assert queue_draft["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert queue_draft["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert queue_draft["payload_received"] is True assert queue_draft["payload_valid_json_object"] is True assert queue_draft["payload_persisted"] is False @@ -1509,7 +1511,11 @@ def test_manual_sample_candidate_queue_draft_preview_builds_review_items_without assert queue_draft["database_commit_executed"] is False assert queue_draft["scheduler_attached"] is False assert queue_draft["queue_summary"]["queue_item_count"] == 1 + assert queue_draft["queue_contract"]["table_name"] == "market_alert_review_queue" assert queue_draft["queue_items"][0]["review_state"] == "needs_review" + assert queue_draft["queue_items"][0]["priority_lane"] == "urgent" + assert queue_draft["queue_items"][0]["threshold_level"] == "high" + assert queue_draft["queue_items"][0]["source_batch_id"] == "sample-batch-7" assert queue_draft["queue_items"][0]["review_priority"] == 80 assert queue_draft["queue_items"][0]["write_status"] == "blocked_preview_only" assert queue_draft["queue_items"][0]["approval_required"] is True @@ -1561,7 +1567,7 @@ def test_manual_sample_candidate_queue_draft_route_is_post_only_and_no_write(): assert response.status_code == 200 assert data["mode"] == "manual_sample_candidate_queue_draft_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["payload_received"] is True assert data["handoff_ready"] is True assert data["queue_draft_ready"] is True @@ -1594,11 +1600,152 @@ def test_manual_sample_candidate_queue_draft_blocks_invalid_payload(): assert "review_queue_draft_not_ready" in queue_draft["blocked_reasons"] +def test_manual_sample_candidate_queue_approval_preview_blocks_write_and_maps_rows(): + sample_result = { + "batch_id": "sample-batch-9", + "platform_code": "momo", + "source_key": "homepage", + "source_url": "https://www.momoshop.com.tw/", + "status": "fetched", + "status_code": 200, + "content_length": 1700, + "page_hash": "c" * 64, + "title": "MOMO 活動", + "diagnostics": { + "link_count": 2, + "same_host_link_count": 2, + "campaign_link_candidates": [ + { + "confidence_band": "high", + "score": 92, + "url": "https://www.momoshop.com.tw/activity/sample", + "text": "品牌活動", + }, + ], + }, + } + + approval = MarketIntelService().build_manual_sample_candidate_queue_approval( + sample_result=sample_result + ) + + assert approval["mode"] == "manual_sample_candidate_queue_approval_preview" + assert approval["phase"] == "phase_53_manual_sample_candidate_queue_approval" + assert approval["payload_received"] is True + assert approval["payload_valid_json_object"] is True + assert approval["payload_persisted"] is False + assert approval["approval_preview_created"] is True + assert approval["approval_request_created"] is False + assert approval["approval_record_written"] is False + assert approval["review_queue_write_allowed"] is False + assert approval["review_queue_created"] is False + assert approval["review_queue_persisted"] is False + assert approval["candidate_import_allowed"] is False + assert approval["external_network_executed"] is False + assert approval["database_connection_opened"] is False + assert approval["database_session_created"] is False + assert approval["database_write_executed"] is False + assert approval["database_commit_executed"] is False + assert approval["scheduler_attached"] is False + assert approval["approval_summary"]["target_table"] == "market_alert_review_queue" + assert approval["approval_summary"]["row_preview_count"] == 1 + assert approval["approval_summary"]["gates_passed"] == 3 + assert approval["approval_summary"]["manual_approval_required"] is True + row = approval["queue_write_preview"]["rows"][0] + assert row["review_state"] == "needs_review" + assert row["priority_lane"] == "urgent" + assert row["threshold_level"] == "high" + assert row["source_batch_id"] == "sample-batch-9" + assert row["write_status"] == "blocked_approval_preview_only" + assert "runtime_write_flags_enabled" in approval["blocked_reasons"] + assert "manual_operator_approval" in approval["blocked_reasons"] + assert "review_queue_write_still_blocked" in approval["blocked_reasons"] + assert ( + "do_not_insert_market_alert_review_queue_from_preview" + in approval["safe_boundaries"] + ) + + +def test_manual_sample_candidate_queue_approval_route_is_post_only_and_no_write(): + from routes.market_intel_routes import market_intel_bp + + app = Flask(__name__) + app.secret_key = "test-secret" + app.register_blueprint(market_intel_bp) + client = app.test_client() + with client.session_transaction() as session: + session["logged_in"] = True + + response = client.post( + "/api/market_intel/manual_sample_review/candidate_queue_approval", + json={ + "sample_result": { + "batch_id": "sample-batch-10", + "platform_code": "pchome", + "source_key": "homepage", + "source_url": "https://24h.pchome.com.tw/", + "status": "fetched", + "status_code": 200, + "content_length": 1800, + "page_hash": "d" * 64, + "title": "PChome 活動", + "diagnostics": { + "link_count": 2, + "same_host_link_count": 2, + "campaign_link_candidates": [ + { + "confidence_band": "medium", + "score": 73, + "url": "https://24h.pchome.com.tw/activity/sample", + "text": "活動頁", + }, + ], + }, + } + }, + ) + data = response.get_json() + + assert response.status_code == 200 + assert data["mode"] == "manual_sample_candidate_queue_approval_preview" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" + assert data["payload_received"] is True + assert data["approval_preview_created"] is True + assert data["approval_request_created"] is False + assert data["approval_record_written"] is False + assert data["review_queue_write_allowed"] is False + assert data["review_queue_created"] is False + assert data["review_queue_persisted"] is False + assert data["database_write_executed"] is False + assert data["scheduler_attached"] is False + assert data["queue_write_preview"]["target_table"] == "market_alert_review_queue" + assert data["queue_write_preview"]["row_count"] == 1 + + +def test_manual_sample_candidate_queue_approval_blocks_invalid_payload(): + approval = MarketIntelService().build_manual_sample_candidate_queue_approval( + sample_result=None, + payload_error="invalid_json_object", + ) + + assert approval["mode"] == "manual_sample_candidate_queue_approval_preview" + assert approval["payload_received"] is False + assert approval["payload_valid_json_object"] is False + assert approval["approval_preview_created"] is False + assert approval["approval_request_created"] is False + assert approval["approval_record_written"] is False + assert approval["review_queue_write_allowed"] is False + assert approval["review_queue_created"] is False + assert approval["review_queue_persisted"] is False + assert approval["database_write_executed"] is False + assert "review_queue_draft_not_ready" in approval["blocked_reasons"] + + def test_scheduler_plan_preview_blocks_job_attachment(): plan = MarketIntelService().build_scheduler_plan() assert plan["mode"] == "scheduler_attach_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_to_attach_scheduler"] is False assert plan["scheduler_attached"] is False assert plan["scheduler_registration_executed"] is False @@ -1636,7 +1783,7 @@ def test_scheduler_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "scheduler_attach_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["scheduler_registration_executed"] is False assert data["crawler_job_started"] is False assert data["external_network_executed"] is False @@ -1647,7 +1794,7 @@ def test_match_review_plan_preview_blocks_auto_confirm(): plan = MarketIntelService().build_match_review_plan() assert plan["mode"] == "match_review_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_review_queue"] is False assert plan["review_queue_created"] is False assert plan["auto_match_executed"] is False @@ -1683,7 +1830,7 @@ def test_match_review_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "match_review_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["review_queue_created"] is False assert data["auto_confirm_executed"] is False assert data["external_network_executed"] is False @@ -1694,7 +1841,7 @@ def test_opportunity_plan_preview_blocks_alerts_and_ai_summary(): plan = MarketIntelService().build_opportunity_plan() assert plan["mode"] == "opportunity_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_opportunity_queue"] is False assert plan["opportunity_queue_created"] is False assert plan["threat_alert_dispatched"] is False @@ -1735,7 +1882,7 @@ def test_opportunity_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "opportunity_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["opportunity_queue_created"] is False assert data["threat_alert_dispatched"] is False assert data["ai_summary_generated"] is False @@ -1746,7 +1893,7 @@ def test_opportunity_scoring_plan_preview_blocks_scoring_and_alerts(): plan = MarketIntelService().build_opportunity_scoring_plan() assert plan["mode"] == "opportunity_scoring_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_scoring_job"] is False assert plan["scoring_job_created"] is False assert plan["score_calculation_executed"] is False @@ -1794,7 +1941,7 @@ def test_opportunity_scoring_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "opportunity_scoring_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["scoring_job_created"] is False assert data["score_calculation_executed"] is False assert data["sample_scores_generated"] is False @@ -1806,7 +1953,7 @@ def test_opportunity_evidence_plan_preview_blocks_queries_and_alerts(): plan = MarketIntelService().build_opportunity_evidence_plan() assert plan["mode"] == "opportunity_evidence_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_evidence_bundle"] is False assert plan["evidence_bundle_created"] is False assert plan["evidence_query_executed"] is False @@ -1852,7 +1999,7 @@ def test_opportunity_evidence_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "opportunity_evidence_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["evidence_bundle_created"] is False assert data["evidence_query_executed"] is False assert data["sample_evidence_generated"] is False @@ -1865,7 +2012,7 @@ def test_opportunity_alert_plan_preview_blocks_dispatch_and_llm_calls(): plan = MarketIntelService().build_opportunity_alert_plan() assert plan["mode"] == "opportunity_alert_plan_preview" - assert plan["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert plan["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert plan["ready_for_alert_candidates"] is False assert plan["alert_candidate_created"] is False assert plan["alert_queue_created"] is False @@ -1950,7 +2097,7 @@ def test_opportunity_alert_plan_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "opportunity_alert_plan_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["alert_candidate_created"] is False assert data["alert_queue_created"] is False assert data["review_queue_created"] is False @@ -2028,7 +2175,7 @@ def test_mcp_deploy_preflight_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "mcp_external_deploy_preflight_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["deployment_actions_executed"] is False assert data["docker_command_executed"] is False assert data["ssh_command_executed"] is False @@ -2043,7 +2190,7 @@ def test_mcp_readiness_default_is_planned_only(monkeypatch): readiness = MarketIntelService().build_mcp_readiness() assert readiness["mode"] == "mcp_readiness_planned" - assert readiness["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert readiness["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert readiness["execute_requested"] is False assert readiness["router_enabled"] is False assert readiness["external_mcp_complete"] is False @@ -2437,6 +2584,7 @@ def test_deployment_readiness_reports_app_only_release_gate(): assert readiness["checks"]["manual_sample_review_evaluation_post_safe"] is True assert readiness["checks"]["manual_sample_candidate_handoff_post_safe"] is True assert readiness["checks"]["manual_sample_candidate_queue_draft_post_safe"] is True + assert readiness["checks"]["manual_sample_candidate_queue_approval_post_safe"] is True assert readiness["checks"]["match_review_plan_preview_safe"] is True assert readiness["checks"]["opportunity_plan_preview_safe"] is True assert readiness["checks"]["opportunity_scoring_plan_preview_safe"] is True @@ -2613,6 +2761,68 @@ def test_deployment_readiness_reports_app_only_release_gate(): readiness["manual_sample_candidate_queue_draft"]["scheduler_attached"] is False ) + assert ( + readiness["manual_sample_candidate_queue_approval"]["mode"] + == "manual_sample_candidate_queue_approval_preview" + ) + assert ( + readiness["manual_sample_candidate_queue_approval"]["payload_received"] + is True + ) + assert ( + readiness["manual_sample_candidate_queue_approval"]["payload_persisted"] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "approval_request_created" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "approval_record_written" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "review_queue_write_allowed" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"]["review_queue_created"] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "review_queue_persisted" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "candidate_import_allowed" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "external_network_executed" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"][ + "database_write_executed" + ] + is False + ) + assert ( + readiness["manual_sample_candidate_queue_approval"]["scheduler_attached"] + is False + ) assert readiness["scheduler_plan"]["scheduler_registration_executed"] is False assert readiness["scheduler_plan"]["crawler_job_started"] is False assert readiness["scheduler_plan"]["database_write_executed"] is False @@ -2717,7 +2927,7 @@ def test_migration_apply_drill_planned_is_safe_and_manual_only(): drill = MarketIntelService().build_migration_apply_drill() assert drill["mode"] == "migration_apply_drill_preview" - assert drill["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert drill["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert drill["execute_requested"] is False assert drill["schema_state"] == "planned_no_db_probe" assert drill["drill_ready_for_operator_review"] is True @@ -2832,7 +3042,7 @@ def test_migration_apply_drill_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "migration_apply_drill_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["execute_requested"] is False assert data["migration_executed"] is False assert data["rollback_executed"] is False @@ -2844,7 +3054,7 @@ def test_migration_catalog_review_planned_is_safe_and_diagnostic(): review = MarketIntelService().build_migration_catalog_review() assert review["mode"] == "migration_catalog_review_preview" - assert review["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert review["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert review["execute_requested"] is False assert review["catalog_state"] == "planned_no_probe" assert review["seed_state"] == "planned_no_probe" @@ -2959,7 +3169,7 @@ def test_migration_catalog_review_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "migration_catalog_review_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["execute_requested"] is False assert data["catalog_state"] == "planned_no_probe" assert data["migration_executed"] is False @@ -2972,7 +3182,7 @@ def test_migration_live_smoke_planned_is_preview_only(): smoke = MarketIntelService().build_migration_live_smoke() assert smoke["mode"] == "migration_live_smoke_preview" - assert smoke["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert smoke["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert smoke["execute_requested"] is False assert smoke["smoke_result"] == "planned_no_execution" assert smoke["live_smoke_passed"] is False @@ -3034,7 +3244,7 @@ def test_migration_live_smoke_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "migration_live_smoke_preview" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["execute_requested"] is False assert data["smoke_result"] == "planned_no_execution" assert data["migration_executed"] is False @@ -3047,7 +3257,7 @@ def test_live_db_inventory_planned_is_preview_only(): inventory = MarketIntelService().build_live_db_inventory() assert inventory["mode"] == "live_db_inventory_planned" - assert inventory["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert inventory["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert inventory["execute_requested"] is False assert inventory["read_only_query_executed"] is False assert inventory["database_connection_opened"] is False @@ -3191,7 +3401,7 @@ def test_live_db_inventory_route_is_preview_only(): assert response.status_code == 200 assert data["mode"] == "live_db_inventory_planned" - assert data["phase"] == "phase_52_manual_sample_candidate_queue_draft" + assert data["phase"] == "phase_53_manual_sample_candidate_queue_approval" assert data["execute_requested"] is False assert data["read_only_query_executed"] is False assert data["database_write_executed"] is False