Update core/scorer.py

core/scorer.py

@@ -1,48 +1,35 @@
+from __future__ import annotations
 from typing import Dict, Any, List
 
-def _safe(v):
+def _ratio(num, den):
     try:
-        return float(v) if v not in (None, "", "null") else 0.0
+        return float(num) / float(den) if num not in (None,"") and den not in (None,"") and float(den)!=0 else None
     except Exception:
-        return 0.0
+        return None
 
 def score_company(fin: Dict[str, Any]) -> Dict[str, Any]:
-    bs = fin.get("balance_sheet") or {}
-    is_ = fin.get("income_statement") or {}
-    cf = fin.get("cash_flows") or {}
-
-    total_assets = _safe(bs.get("total_assets"))
-    total_liab   = _safe(bs.get("total_liabilities"))
-    equity       = _safe(bs.get("total_equity"))
-    sales        = _safe(is_.get("sales"))
-    op_income    = _safe(is_.get("operating_income"))
-    net_income   = _safe(is_.get("net_income"))
-    ocf          = _safe(cf.get("operating_cash_flow"))
-
-    metrics: List[Dict[str, Any]] = []
-
-    # 安全性: 自己資本比率
-    eq_ratio = (equity / total_assets * 100) if total_assets > 0 else 0
-    metrics.append({"metric": "自己資本比率", "value": eq_ratio, "score": min(max(eq_ratio, 0), 100)})
-
-    # 収益性: 営業利益率
-    op_margin = (op_income / sales * 100) if sales > 0 else 0
-    metrics.append({"metric": "営業利益率", "value": op_margin, "score": min(max(op_margin*4, 0), 100)})
-
-    # 収益性: 最終利益率
-    net_margin = (net_income / sales * 100) if sales > 0 else 0
-    metrics.append({"metric": "当期純利益率", "value": net_margin, "score": min(max(net_margin*4, 0), 100)})
-
-    # キャッシュ: OCF/売上
-    ocf_rate = (ocf / sales * 100) if sales > 0 else 0
-    metrics.append({"metric": "営業CF率", "value": ocf_rate, "score": min(max(ocf_rate*3, 0), 100)})
-
-    # レバレッジ: 負債比率
-    debt_ratio = (total_liab / total_assets * 100) if total_assets > 0 else 0
-    debt_score = max(0, 100 - debt_ratio)  # 低いほど良い
-    metrics.append({"metric": "負債比率(低いほど◎)", "value": debt_ratio, "score": min(debt_score, 100)})
-
-    total = round(sum(m["score"] for m in metrics) / len(metrics), 1)
-    grade = "S" if total >= 90 else "A" if total >= 80 else "B" if total >= 70 else "C" if total >= 60 else "D"
-
-    return {"total_score": total, "grade": grade, "details": metrics}
+    bs = fin.get("balance_sheet", {}) or {}
+    is_ = fin.get("income_statement", {}) or {}
+    cf = fin.get("cash_flows", {}) or {}
+
+    gp_margin   = _ratio(is_.get("gross_profit"), is_.get("sales"))
+    op_margin   = _ratio(is_.get("operating_income"), is_.get("sales"))
+    equity_ratio= _ratio(bs.get("total_equity"), bs.get("total_assets"))
+    cur_ratio   = _ratio(bs.get("current_assets"), bs.get("current_liabilities"))
+    ocf_sales   = _ratio(cf.get("operating_cash_flow"), is_.get("sales"))
+
+    def s(x, w=1.0):
+        if x is None: return 50*w
+        v = max(0, min(1, x if x<=1 else x/2))
+        return (v*100)*w
+
+    details: List[Dict[str,Any]] = [
+        {"metric":"売上総利益率", "score": round(s(gp_margin),1)},
+        {"metric":"営業利益率",   "score": round(s(op_margin),1)},
+        {"metric":"自己資本比率", "score": round(s(equity_ratio),1)},
+        {"metric":"流動比率(概算)","score": round(s(cur_ratio/2 if cur_ratio else None),1)},
+        {"metric":"営業CF/売上",  "score": round(s(ocf_sales),1)},
+    ]
+    total = round(sum(d["score"] for d in details)/len(details),1)
+    grade = "S" if total>=85 else "A" if total>=75 else "B" if total>=65 else "C" if total>=50 else "D"
+    return {"total_score": total, "grade": grade, "details": details}