fix(review-feedback-1723): 收敛

Author: ZhuLinsen

api/v1/endpoints/analysis.py

@@ -70,12 +70,14 @@
     extract_analysis_context_pack_overview,
     sanitize_context_snapshot_for_api,
 )
-from src.market_phase_summary import extract_market_phase_summary
-from src.core.trading_calendar import get_market_for_stock
+from src.market_phase_summary import (
+    extract_market_phase_summary,
+    rebuild_market_phase_summary_for_stock_code,
+)
+from src.services.stock_code_utils import is_code_like, resolve_index_stock_code_for_analysis
 from src.report_language import get_localized_stock_name, normalize_report_language
 from src.schemas.decision_action import build_action_fields
 from src.services.name_to_code_resolver import resolve_name_to_code
-from src.services.stock_code_utils import is_code_like
 from src.services.task_queue import (
     get_task_queue,
     DuplicateTaskError,
@@ -200,12 +202,8 @@ def _resolve_and_normalize_input(raw_value: str) -> str:
     if not text:
         return ""
 
-    indexed_code = resolve_index_stock_code(text)
-    if indexed_code:
-        return canonical_stock_code(indexed_code)
-
     if is_code_like(text):
-        return canonical_stock_code(text)
+        return resolve_index_stock_code_for_analysis(text)
 
     if _is_obviously_invalid_analysis_input(text):
         raise _invalid_analysis_input_error()
@@ -832,18 +830,10 @@ def _display_stock_code_from_index(stock_code: Any) -> str:
 
 
 def _display_market_phase_summary(stock_code: Any, context_snapshot: Any) -> Any:
-    summary = extract_market_phase_summary(context_snapshot)
-    display_code = _display_stock_code_from_index(stock_code)
-    if not display_code or display_code == str(stock_code or "").strip():
-        return summary
-
-    market = get_market_for_stock(display_code)
-    if market not in {"jp", "kr"}:
-        return summary
-
-    if not isinstance(summary, dict):
-        return summary
-    return {**summary, "market": market}
+    return rebuild_market_phase_summary_for_stock_code(
+        _display_stock_code_from_index(stock_code),
+        context_snapshot,
+    )
 
 
 def _prepare_report_for_task_enrichment(

bot/commands/analyze.py

@@ -13,7 +13,7 @@
 
 from bot.commands.base import BotCommand
 from bot.models import BotMessage, BotResponse
-from data_provider.base import canonical_stock_code
+from src.services.stock_code_utils import resolve_index_stock_code_for_analysis
 
 logger = logging.getLogger(__name__)
 
@@ -67,7 +67,7 @@ def validate_args(self, args: List[str]) -> Optional[str]:
 
     def execute(self, message: BotMessage, args: List[str]) -> BotResponse:
         """执行分析命令"""
-        code = canonical_stock_code(args[0])
+        code = resolve_index_stock_code_for_analysis(args[0])
 
         # 检查是否需要完整报告（默认精简，传 full/完整/详细 切换）
         report_type = "simple"

main.py

@@ -64,10 +64,10 @@
 import uuid
 from datetime import date, datetime, timezone, timedelta
 
-from data_provider.base import canonical_stock_code
 from src.webui_frontend import prepare_webui_frontend_assets
 from src.config import get_config, Config
 from src.logging_config import setup_logging
+from src.services.stock_code_utils import resolve_index_stock_code_for_analysis
 
 
 logger = logging.getLogger(__name__)
@@ -1144,7 +1144,11 @@ def main() -> int:
     # 解析股票列表（统一为大写 Issue #355）
     stock_codes = None
     if args.stocks:
-        stock_codes = [canonical_stock_code(c) for c in args.stocks.split(',') if (c or "").strip()]
+        stock_codes = [
+            resolve_index_stock_code_for_analysis(c)
+            for c in args.stocks.split(',')
+            if (c or "").strip()
+        ]
         logger.info(f"使用命令行指定的股票列表: {stock_codes}")
 
     # === 处理 --webui / --webui-only 参数，映射到 --serve / --serve-only ===

src/data/stock_index_loader.py

@@ -138,6 +138,8 @@ def _build_stock_code_lookup(raw_items: list) -> Dict[str, str]:
             continue
         if not _is_jp_kr_index_code(canonical_code):
             continue
+        if len(item) > 8 and item[8] is False:
+            continue
 
         _add_code_lookup(exact_lookup, canonical_code, canonical_code)
         _add_code_lookup(exact_lookup, display_code, canonical_code)

src/market_phase_summary.py

@@ -4,10 +4,11 @@
 from __future__ import annotations
 
 import json
+from datetime import datetime
 from collections.abc import Mapping
 from typing import Any, Dict, List, Optional
 
-from src.core.trading_calendar import MarketPhase
+from src.core.trading_calendar import MarketPhase, build_market_phase_context, get_market_for_stock
 
 
 MARKET_PHASE_SUMMARY_KEY = "market_phase_summary"
@@ -111,6 +112,56 @@ def extract_market_phase_summary(context_snapshot: Any) -> Optional[Dict[str, An
     return render_market_phase_summary(summary)
 
 
+def _parse_phase_local_time(value: Any) -> Optional[datetime]:
+    if isinstance(value, datetime):
+        return value
+    if isinstance(value, str):
+        try:
+            return datetime.fromisoformat(value)
+        except ValueError:
+            return None
+    return None
+
+
+def rebuild_market_phase_summary_for_stock_code(
+    stock_code: Any,
+    context_snapshot: Any,
+) -> Optional[Dict[str, Any]]:
+    """Rebuild phase summary with derived fields for JP/KR display codes.
+
+    Legacy CN snapshots on JP/KR stock records can retain CN-local values. This
+    helper recomputes those derived fields using the target market context while
+    preserving non-derived source fields when possible.
+    """
+    summary = extract_market_phase_summary(context_snapshot)
+    if not isinstance(summary, Mapping):
+        return None
+
+    market = get_market_for_stock(str(stock_code or "").strip())
+    if market not in {"jp", "kr"}:
+        return dict(summary)
+
+    phase = str(summary.get("phase", "")).strip()
+    analysis_phase = phase if phase in _ALLOWED_PHASES else "auto"
+    analysis_intent = str(summary.get("analysis_intent") or "auto").strip()
+    if not analysis_intent:
+        analysis_intent = "auto"
+
+    rebuilt = build_market_phase_context(
+        market=market,
+        current_time=_parse_phase_local_time(summary.get("market_local_time")),
+        trigger_source=str(summary.get("trigger_source") or "system").strip() or "system",
+        analysis_intent=analysis_intent,
+        analysis_phase=analysis_phase,
+    ).to_dict()
+
+    rebuilt.setdefault("warnings", list(summary.get("warnings") or []))
+    if not rebuilt.get("warnings"):
+        rebuilt["warnings"] = list(summary.get("warnings") or [])
+
+    return rebuilt
+
+
 def normalize_analysis_phase_bucket(value: Any) -> str:
     """Fold detailed phase labels into the public backtest/statistics buckets."""
     phase = _safe_text(value)

src/services/history_service.py

@@ -16,7 +16,6 @@
 from typing import Optional, Dict, Any, List, Tuple, TYPE_CHECKING
 
 from src.config import get_config, resolve_news_window_days
-from src.core.trading_calendar import get_market_for_stock
 from src.data.stock_index_loader import resolve_index_stock_code
 from src.report_language import (
     get_bias_status_emoji,
@@ -33,7 +32,10 @@
 )
 from src.storage import DatabaseManager
 from src.services.run_diagnostics import build_run_diagnostic_summary
-from src.market_phase_summary import extract_market_phase_summary
+from src.market_phase_summary import (
+    extract_market_phase_summary,
+    rebuild_market_phase_summary_for_stock_code,
+)
 from src.schemas.decision_action import build_action_fields
 from src.utils.sniper_points import find_sniper_points
 from src.utils.data_processing import (
@@ -281,18 +283,10 @@ def _display_stock_code(raw_code: Any) -> str:
         return resolve_index_stock_code(code) or code
 
     def _display_market_phase_summary(self, stock_code: str, context_snapshot: Any) -> Any:
-        summary = extract_market_phase_summary(context_snapshot)
-        display_code = self._display_stock_code(stock_code)
-        if not display_code or display_code == str(stock_code or "").strip():
-            return summary
-
-        market = get_market_for_stock(display_code)
-        if market not in {"jp", "kr"}:
-            return summary
-
-        if not isinstance(summary, dict):
-            return summary
-        return {**summary, "market": market}
+        return rebuild_market_phase_summary_for_stock_code(
+            self._display_stock_code(stock_code),
+            context_snapshot,
+        )
 
     def _record_to_list_item_dict(self, record) -> Dict[str, Any]:
         raw_result = parse_json_field(getattr(record, "raw_result", None))

src/services/stock_code_utils.py

@@ -8,7 +8,7 @@
 import re
 from typing import Optional
 
-from data_provider.base import is_bse_code
+from data_provider.base import canonical_stock_code, is_bse_code
 
 
 # Known exchange prefixes (case-insensitive) and the digit lengths they accept.
@@ -107,3 +107,28 @@ def normalize_code(raw: str) -> Optional[str]:
     if stripped is not None:
         return stripped
     return None
+
+
+def resolve_index_stock_code_for_analysis(raw: str) -> str:
+    """Resolve bare JP/KR candidates via stock index and keep suffix forms.
+
+    For code-like inputs:
+    - Existing index-backed entries (e.g. ``005930`` -> ``005930.KS``) are
+      preferred.
+    - Non-matching code-like inputs keep the canonicalized input.
+
+    Non-code-like values are still canonicalized only, letting callers keep
+    their own validation policy (e.g. API name resolution path).
+    """
+    text = (raw or "").strip()
+    if not text:
+        return ""
+
+    if is_code_like(text):
+        from src.data.stock_index_loader import resolve_index_stock_code
+
+        resolved = resolve_index_stock_code(text)
+        if resolved:
+            return canonical_stock_code(resolved)
+
+    return canonical_stock_code(text)

src/services/task_queue.py

@@ -34,6 +34,7 @@
     reset_run_diagnostic_context,
 )
 from src.utils.analysis_metadata import SELECTION_SOURCES
+from src.services.stock_code_utils import resolve_index_stock_code_for_analysis
 
 logger = logging.getLogger(__name__)
 
@@ -45,7 +46,7 @@ def _dedupe_stock_code_key(stock_code: str) -> str:
     The task queue should treat equivalent market code shapes as the same
     underlying stock, e.g. ``600519`` and ``600519.SH``.
     """
-    return canonical_stock_code(normalize_stock_code(stock_code))
+    return resolve_index_stock_code_for_analysis(normalize_stock_code(stock_code))
 
 
 class TaskStatus(str, Enum):
@@ -350,7 +351,7 @@ def submit_task(
         Raises:
             DuplicateTaskError: Raised when the stock is already being analyzed
         """
-        stock_code = canonical_stock_code(stock_code)
+        stock_code = resolve_index_stock_code_for_analysis(stock_code)
         if not stock_code:
             raise ValueError("股票代码不能为空或仅包含空白字符")
 
@@ -399,7 +400,7 @@ def submit_tasks_batch(
         created_task_ids: List[str] = []
 
         canonical_codes = [
-            normalized for normalized in (canonical_stock_code(code) for code in stock_codes)
+            normalized for normalized in (resolve_index_stock_code_for_analysis(code) for code in stock_codes)
             if normalized
         ]
 

src/services/task_service.py

@@ -23,6 +23,7 @@
 from src.enums import ReportType
 from src.storage import get_db
 from bot.models import BotMessage
+from src.services.stock_code_utils import resolve_index_stock_code_for_analysis
 
 logger = logging.getLogger(__name__)
 
@@ -90,25 +91,32 @@ def submit_analysis(
         if isinstance(report_type, str):
             report_type = ReportType.from_str(report_type)
 
-        task_id = f"{code}_{datetime.now().strftime('%Y%m%d_%H%M%S_%f')}"
+        normalized_code = resolve_index_stock_code_for_analysis(code)
+        if not normalized_code:
+            raise ValueError("股票代码不能为空或仅包含空白字符")
+
+        task_id = f"{normalized_code}_{datetime.now().strftime('%Y%m%d_%H%M%S_%f')}"
 
         # 提交到线程池
         self.executor.submit(
             self._run_analysis,
-            code,
+            normalized_code,
             task_id,
             report_type,
             source_message,
             save_context_snapshot,
             query_source
         )
 
-        logger.info(f"[TaskService] 已提交股票 {code} 的分析任务, task_id={task_id}, report_type={report_type.value}")
+        logger.info(
+            f"[TaskService] 已提交股票 {normalized_code} 的分析任务, "
+            f"task_id={task_id}, report_type={report_type.value}"
+        )
 
         return {
             "success": True,
             "message": "分析任务已提交，将异步执行并推送通知",
-            "code": code,
+            "code": normalized_code,
             "task_id": task_id,
             "report_type": report_type.value
         }

tests/test_analysis_api_contract.py

@@ -1527,6 +1527,43 @@ def test_build_analysis_report_repairs_bare_kr_code_and_phase_summary(self) -> N
         self.assertEqual(report.meta.market_phase_summary.trigger_source, "scheduled_job")
         self.assertEqual(report.meta.market_phase_summary.analysis_intent, "postmarket")
 
+    def test_build_analysis_report_rebuilds_legacy_cn_market_summary_for_kr_code(self) -> None:
+        if _build_analysis_report is None:
+            self.skipTest("analysis endpoint helpers unavailable in this environment")
+
+        legacy_cn_summary = {
+            **_market_phase_summary(),
+            "market": "cn",
+            "phase": "intraday",
+            "market_local_time": "2026-03-27T10:00:00+08:00",
+            "session_date": "2026-03-27",
+            "effective_daily_bar_date": "2026-03-26",
+            "analysis_intent": "intraday",
+            "trigger_source": "history_snapshot",
+            "warnings": ["legacy_cn_snapshot"],
+        }
+
+        with patch("api.v1.endpoints.analysis.resolve_index_stock_code", return_value="005930.KS"):
+            report = _build_analysis_report(
+                report_data={
+                    "meta": {"stock_code": "005930"},
+                    "summary": {},
+                    "strategy": {},
+                    "details": {},
+                },
+                query_id="q-kr-legacy-cn",
+                stock_code="005930",
+                stock_name="三星电子",
+                context_snapshot={"market_phase_summary": legacy_cn_summary},
+                fallback_fundamental_payload=None,
+            )
+
+        self.assertIsNotNone(report.meta.market_phase_summary)
+        self.assertEqual(report.meta.stock_code, "005930.KS")
+        self.assertEqual(report.meta.market_phase_summary.market, "kr")
+        self.assertTrue(report.meta.market_phase_summary.market_local_time.endswith("+09:00"))
+        self.assertIn("legacy_cn_snapshot", report.meta.market_phase_summary.warnings)
+
     def test_build_analysis_report_merges_partial_top_level_context_with_fallback(self) -> None:
         if _build_analysis_report is None:
             self.skipTest("analysis endpoint helpers unavailable in this environment")