Update core/external_scoring.py

core/external_scoring.py

@@ -6,6 +6,7 @@ import pandas as pd
 __all__ = [
     "get_external_template_df",
     "fill_missing_with_external",
+    "merge_market_into_external_df",
     "score_external_from_df",
 ]
 
@@ -60,16 +61,49 @@ def get_external_template_df() -> pd.DataFrame:
                         columns=["カテゴリー", "入力項目", "値"])
 
 def fill_missing_with_external(df: pd.DataFrame, suggestions: Dict[str, Any] | None = None) -> pd.DataFrame:
-    """LLM等からの suggestions を {入力項目: 値} で受け取り、空欄のみ埋める"""
     if not suggestions:
         return df.copy()
     df2 = df.copy()
     for idx, row in df2.iterrows():
-        key = row["入力項目"]
-        if (row["値"] in (None, "", "—")) and (key in suggestions):
-            df2.at[idx, "値"] = suggestions[key]
+        k = row["入力項目"]
+        if (row["値"] in (None, "", "—")) and (k in suggestions):
+            df2.at[idx, "値"] = suggestions[k]
     return df2
 
+def merge_market_into_external_df(ext_df: pd.DataFrame, market: Dict[str, Any], products: List[str]) -> pd.DataFrame:
+    """市場推定結果と商品リストをext_dfへ反映"""
+    df = ext_df.copy()
+
+    def _set(label: str, val):
+        m = df["入力項目"].eq(label)
+        if m.any():
+            df.loc[m, "値"] = val
+        else:
+            # 念のため行が無ければ追加
+            cat = "成長率" if "成長" in label else "安定性"
+            df = pd.concat([df, pd.DataFrame([[cat, label, val]], columns=df.columns)], ignore_index=True)
+        return df
+
+    # 市場成長率
+    if market.get("市場の年成長率(%)") is not None:
+        df = _set("市場の年成長率(%)", float(market["市場の年成長率(%)"]))
+
+    # 主力商品数 / 成長中主力商品数
+    prods = [p for p in products if str(p).strip()]
+    df = _set("主力商品数", len(prods))
+
+    growing = 0
+    prod_growth: Dict[str, float] = market.get("製品別年成長率(%)") or {}
+    for p in prods:
+        try:
+            if float(prod_growth.get(p, 0.0)) > 10.0:
+                growing += 1
+        except Exception:
+            pass
+    df = _set("成長中主力商品数", growing)
+
+    return df
+
 # ===== スコア計算（定量・ばらつき強化） =====
 _WEIGHTS = {
     ("経営者能力", "経営姿勢"): 8,
@@ -120,17 +154,11 @@ def _ramp(x, good, bad, lo=0.0, hi=10.0, neutral=None):
         if x >= bad: return lo
         if x <= good: return hi
         return lo + (hi-lo) * (x-good)/(bad-good)
-
-def _stretch_0_10(x: float, k: float = 1.2) -> float:
-    """
-    0-10 を保ちつつ中央付近(4-6)の密集をほぐす単調変換。
-    k>1で両端を強調。k≈1.2~1.4 推奨。
-    """
+def _stretch_0_10(x: float, k: float = 1.25) -> float:
     if x is None: return None
     t = (x/10.0)
     t = t**(1.0/k) if t >= 0.5 else (t**k)
     return _clamp(t*10.0, 0.0, 10.0)
-
 def _add(items, cat, name, raw, weight, reason):
     raw2 = _stretch_0_10(raw, k=1.25) if raw is not None else None
     w = round(weight * _WEIGHT_NORM, 2)
@@ -193,7 +221,6 @@ def score_external_from_df(df: pd.DataFrame) -> Dict[str, Any]:
         if v1 is None or v3 is None or v1 <= 0: return None
         try: return (v3/v1)**(1/2) - 1.0
         except Exception: return None
-
     s_cagr = cagr(s1, s3)
     p_cagr = cagr(p1, p3)
 
@@ -307,5 +334,5 @@ def score_external_from_df(df: pd.DataFrame) -> Dict[str, Any]:
         "external_total": total,
         "items": items,
         "category_scores": cat_scores,
-        "notes": "欠損は中立＋市場成長補正。ストレッチでばらつきを拡大。",
+        "notes": "欠損は中立＋市場成長/商品構成を反映。ストレッチでばらつきを拡大。",
     }