Remove legacy mapper fields

Author: Pigbibi

decision_mapper.py

@@ -59,27 +59,4 @@ def map_strategy_decision_to_plan(
             "investable_cash": portfolio_plan.liquid_cash,
         },
     )
-    risk_symbols = list(portfolio_plan.risk_symbols)
-    income_symbols = list(portfolio_plan.income_symbols)
-
-    plan.update({
-        "strategy_assets": portfolio_plan.strategy_symbols,
-        "limit_order_symbols": tuple(risk_symbols + income_symbols),
-        "portfolio_rows": portfolio_plan.portfolio_rows,
-        "available_cash": portfolio_plan.liquid_cash,
-        "market_values": dict(portfolio_plan.market_values),
-        "quantities": dict(portfolio_plan.quantities),
-        "sellable_quantities": dict(portfolio_plan.sellable_quantities or {}),
-        "total_strategy_equity": portfolio_plan.total_equity,
-        "current_min_trade": float(annotations.current_min_trade or 0.0),
-        "targets": dict(portfolio_plan.target_values),
-        "market_status": annotations.status_display or "",
-        "signal_message": annotations.signal_display or "",
-        "deploy_ratio_text": annotations.deploy_ratio_text or "",
-        "income_ratio_text": annotations.income_ratio_text or "",
-        "income_locked_ratio_text": annotations.income_locked_ratio_text or "",
-        "active_risk_asset": annotations.active_risk_asset,
-        "investable_cash": float(annotations.investable_cash or portfolio_plan.liquid_cash),
-        "threshold_value": float(annotations.trade_threshold_value),
-    })
     return plan

tests/test_decision_mapper.py

@@ -42,11 +42,52 @@ def test_maps_semiconductor_strategy_decision_to_execution_plan(self):
             strategy_profile="semiconductor_rotation_income",
         )
 
-        self.assertEqual(plan["strategy_assets"], ("SOXL", "SOXX", "BOXX", "QQQI", "SPYI"))
-        self.assertEqual(plan["limit_order_symbols"], ("SOXL", "SOXX", "QQQI", "SPYI"))
-        self.assertEqual(plan["portfolio_rows"], (("SOXL", "SOXX"), ("QQQI", "SPYI"), ("BOXX",)))
-        self.assertEqual(plan["targets"]["BOXX"], 15000.0)
-        self.assertEqual(plan["threshold_value"], 500.0)
+        self.assertEqual(plan["allocation"]["target_mode"], "value")
+        self.assertEqual(plan["allocation"]["strategy_symbols"], ("SOXL", "SOXX", "BOXX", "QQQI", "SPYI"))
+        self.assertEqual(plan["allocation"]["targets"]["BOXX"], 15000.0)
+        self.assertEqual(plan["portfolio"]["portfolio_rows"], (("SOXL", "SOXX"), ("QQQI", "SPYI"), ("BOXX",)))
+        self.assertEqual(plan["portfolio"]["sellable_quantities"]["BOXX"], 50)
+        self.assertEqual(plan["execution"]["trade_threshold_value"], 500.0)
+        self.assertEqual(plan["execution"]["investable_cash"], 9000.0)
+        self.assertNotIn("strategy_assets", plan)
+        self.assertNotIn("targets", plan)
+        self.assertNotIn("threshold_value", plan)
+
+    def test_prefers_normalized_execution_annotations_when_present(self):
+        decision = StrategyDecision(
+            positions=(PositionTarget(symbol="SOXL", target_value=30000.0),),
+            diagnostics={
+                "execution_annotations": {
+                    "trade_threshold_value": 250.0,
+                    "signal_display": "signal",
+                    "status_display": "risk-on",
+                    "deploy_ratio_text": "60.0%",
+                    "income_ratio_text": "10.0%",
+                    "income_locked_ratio_text": "10.0%",
+                    "active_risk_asset": "SOXL",
+                    "investable_cash": 9000.0,
+                    "current_min_trade": 100.0,
+                }
+            },
+        )
+        account_state = {
+            "available_cash": 10000.0,
+            "market_values": {"SOXL": 0.0},
+            "quantities": {"SOXL": 0},
+            "sellable_quantities": {"SOXL": 0},
+            "total_strategy_equity": 50000.0,
+        }
+
+        plan = map_strategy_decision_to_plan(
+            decision,
+            account_state=account_state,
+            strategy_profile="semiconductor_rotation_income",
+        )
+
+        self.assertEqual(plan["execution"]["trade_threshold_value"], 250.0)
+        self.assertEqual(plan["execution"]["status_display"], "risk-on")
+        self.assertEqual(plan["execution"]["signal_display"], "signal")
+        self.assertEqual(plan["execution"]["investable_cash"], 9000.0)
 
 
 if __name__ == "__main__":