Add income layer and account runtime controls (#48)

Author: Pigbibi

scripts/build_runtime_switch.py

@@ -50,6 +50,13 @@
     "ibkr": "IBKR_MIN_RESERVED_CASH_USD",
     "firstrade": "FIRSTRADE_MIN_RESERVED_CASH_USD",
 }
+INCOME_LAYER_VARIABLES = (
+    "INCOME_LAYER_ENABLED",
+    "INCOME_LAYER_MAX_RATIO",
+)
+RUNTIME_TARGET_VARIABLES = (
+    "RUNTIME_TARGET_ENABLED",
+)
 DEFAULT_VARIABLE_SCOPE = {
     "longbridge": "environment",
     "ibkr": "repository",
@@ -273,6 +280,8 @@ def _preserve_reserved_cash_fields(
     for variable in (
         PLATFORM_MIN_RESERVED_CASH_VARIABLES.get(platform),
         PLATFORM_RESERVED_CASH_RATIO_VARIABLES.get(platform),
+        *INCOME_LAYER_VARIABLES,
+        *RUNTIME_TARGET_VARIABLES,
     ):
         if variable and variable not in replacement and variable in current_entry:
             replacement[variable] = current_entry[variable]

tests/strategy_switch_worker_validation.mjs

@@ -25,6 +25,7 @@ assert.equal(indexHtml.includes("loginLink.hidden = !state.auth.available || sig
 assert.ok(indexHtml.includes('id="min-reserved-cash-input"'));
 assert.ok(indexHtml.includes('id="reserved-cash-ratio-input"'));
 assert.ok(indexHtml.includes('id="reserve-policy-mode-select"'));
+assert.ok(indexHtml.includes('id="runtime-target-enabled-select"'));
 assert.ok(indexHtml.includes('id="plugin-mode-select"'));
 assert.ok(indexHtml.includes("account-block"));
 assert.ok(indexHtml.includes("strategy-block"));
@@ -38,6 +39,10 @@ assert.ok(indexHtml.includes('reservePolicyFloor'));
 assert.ok(indexHtml.includes('reservePolicyMax'));
 assert.ok(indexHtml.includes('pluginModeAuto'));
 assert.ok(indexHtml.includes('pluginModeNone'));
+assert.ok(indexHtml.includes('runtimeTargetMode: "账号运行状态"'));
+assert.ok(indexHtml.includes('runtimeTargetEnabled: "启用正式运行"'));
+assert.ok(indexHtml.includes('runtimeTargetDisabled: "停用正式运行"'));
+assert.ok(indexHtml.includes('runtimeTargetMode: "Account status"'));
 assert.ok(indexHtml.includes('pluginMode: "插件启用范围"'));
 assert.ok(indexHtml.includes('pluginModeAuto: "按策略默认"'));
 assert.ok(indexHtml.includes('pluginModeNone: "完全禁用"'));
@@ -62,6 +67,7 @@ assert.ok(indexHtml.includes('.summary-row.pending'));
 assert.ok(indexHtml.includes('function currentEntryHasState('));
 assert.ok(indexHtml.includes('changes.reserveCashChanged'));
 assert.ok(indexHtml.includes('changes.pluginModeChanged'));
+assert.ok(indexHtml.includes('changes.runtimeTargetChanged'));
 assert.ok(indexHtml.includes('!hasPendingChange'));
 assert.ok(indexHtml.includes('hasPendingChange ? t("readyNote") : ""'));
 assert.equal(indexHtml.includes('hasPendingChange ? t("readyNote") : t("noChangesNote")'), false);
@@ -420,6 +426,12 @@ globalThis.fetch = async (url) => {
       headers: { "Content-Type": "application/json" },
     });
   }
+  if (requestUrl.endsWith("/RUNTIME_TARGET_ENABLED")) {
+    return new Response(JSON.stringify({ value: "false" }), {
+      status: 200,
+      headers: { "Content-Type": "application/json" },
+    });
+  }
   if (requestUrl.endsWith("/RUNTIME_TARGET_JSON")) {
     return new Response(JSON.stringify({
       value: JSON.stringify({
@@ -443,6 +455,7 @@ try {
   assert.equal(currentStrategies.schwab.default.execution_mode, "live");
   assert.equal(currentStrategies.schwab.default.min_reserved_cash_usd, "150");
   assert.equal(currentStrategies.schwab.default.reserved_cash_ratio, "0.03");
+  assert.equal(currentStrategies.schwab.default.runtime_target_enabled, false);
   assert.equal(currentStrategies.schwab.default.source, "RUNTIME_TARGET_JSON");
 } finally {
   globalThis.fetch = originalFetch;
@@ -459,6 +472,7 @@ globalThis.fetch = async (url) => {
             ACCOUNT_GROUP: "demo-ibkr-tqqq",
             IBKR_MIN_RESERVED_CASH_USD: "150",
             IBKR_RESERVED_CASH_RATIO: "0.03",
+            RUNTIME_TARGET_ENABLED: "false",
             runtime_target: {
               platform_id: "ibkr",
               strategy_profile: "tqqq_growth_income",
@@ -482,6 +496,7 @@ try {
   assert.equal(currentStrategies.ibkr["ibkr-primary"].strategy_profile, "tqqq_growth_income");
   assert.equal(currentStrategies.ibkr["ibkr-primary"].min_reserved_cash_usd, "150");
   assert.equal(currentStrategies.ibkr["ibkr-primary"].reserved_cash_ratio, "0.03");
+  assert.equal(currentStrategies.ibkr["ibkr-primary"].runtime_target_enabled, false);
   assert.equal(currentStrategies.ibkr["ibkr-primary"].source, "CLOUD_RUN_SERVICE_TARGETS_JSON");
 } finally {
   globalThis.fetch = originalFetch;

tests/test_runtime_settings.py

@@ -312,6 +312,9 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
                     "ACCOUNT_GROUP": "demo-ibkr-tqqq",
                     "IBKR_MIN_RESERVED_CASH_USD": "150",
                     "IBKR_RESERVED_CASH_RATIO": "0.03",
+                    "INCOME_LAYER_ENABLED": "true",
+                    "INCOME_LAYER_MAX_RATIO": "0.55",
+                    "RUNTIME_TARGET_ENABLED": "false",
                     "runtime_target": {
                         "platform_id": "ibkr",
                         "strategy_profile": "old_strategy",
@@ -372,6 +375,9 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
         self.assertEqual(selected["IBKR_DRY_RUN_ONLY"], "false")
         self.assertEqual(selected["IBKR_MIN_RESERVED_CASH_USD"], "150")
         self.assertEqual(selected["IBKR_RESERVED_CASH_RATIO"], "0.03")
+        self.assertEqual(selected["INCOME_LAYER_ENABLED"], "true")
+        self.assertEqual(selected["INCOME_LAYER_MAX_RATIO"], "0.55")
+        self.assertEqual(selected["RUNTIME_TARGET_ENABLED"], "false")
         self.assertEqual(
             selected["IBKR_STRATEGY_PLUGIN_MOUNTS_JSON"]["strategy_plugins"][0]["plugin"],
             "market_regime_control",