Support income layer start amount (#101)

Author: Pigbibi

.github/workflows/sync-cloud-run-env.yml

@@ -103,6 +103,7 @@ jobs:
       INCOME_THRESHOLD_USD: ${{ vars.INCOME_THRESHOLD_USD }}
       QQQI_INCOME_RATIO: ${{ vars.QQQI_INCOME_RATIO }}
       INCOME_LAYER_ENABLED: ${{ vars.INCOME_LAYER_ENABLED }}
+      INCOME_LAYER_START_USD: ${{ vars.INCOME_LAYER_START_USD }}
       INCOME_LAYER_MAX_RATIO: ${{ vars.INCOME_LAYER_MAX_RATIO }}
       RUNTIME_TARGET_ENABLED: ${{ vars.RUNTIME_TARGET_ENABLED }}
       EXECUTION_REPORT_GCS_URI: ${{ vars.EXECUTION_REPORT_GCS_URI }}
@@ -561,6 +562,7 @@ jobs:
           add_optional_env INCOME_THRESHOLD_USD
           add_optional_env QQQI_INCOME_RATIO
           add_optional_env INCOME_LAYER_ENABLED
+          add_optional_env INCOME_LAYER_START_USD
           add_optional_env INCOME_LAYER_MAX_RATIO
           add_optional_env RUNTIME_TARGET_ENABLED
           add_optional_env EXECUTION_REPORT_GCS_URI

runtime_config_support.py

@@ -54,6 +54,7 @@ class PlatformRuntimeSettings:
     income_threshold_usd: float | None = None
     qqqi_income_ratio: float | None = None
     income_layer_enabled: bool | None = None
+    income_layer_start_usd: float | None = None
     income_layer_max_ratio: float | None = None
     runtime_execution_window_trading_days: int | None = None
     feature_snapshot_path: str | None = None
@@ -169,6 +170,7 @@ def load_platform_runtime_settings(
         income_threshold_usd=resolve_optional_float_env(os.environ, "INCOME_THRESHOLD_USD"),
         qqqi_income_ratio=_qqqi_income_ratio_env(),
         income_layer_enabled=_optional_bool_env("INCOME_LAYER_ENABLED"),
+        income_layer_start_usd=_optional_non_negative_float_env("INCOME_LAYER_START_USD"),
         income_layer_max_ratio=_optional_ratio_env("INCOME_LAYER_MAX_RATIO"),
         runtime_execution_window_trading_days=_runtime_execution_window_trading_days_env(
             strategy_definition.profile
@@ -301,6 +303,17 @@ def _optional_ratio_env(name: str) -> float | None:
     return value
 
 
+def _optional_non_negative_float_env(name: str) -> float | None:
+    value = resolve_optional_float_env(os.environ, name)
+    if value is None:
+        return None
+    if not math.isfinite(value):
+        raise ValueError(f"{name} must be finite, got {value}")
+    if value < 0:
+        raise ValueError(f"{name} must be non-negative, got {value}")
+    return float(value)
+
+
 def _resolve_non_negative_float_env(name: str, *, default: float) -> float:
     value = resolve_optional_float_env(os.environ, name)
     if value is None:

strategy_runtime.py

@@ -144,9 +144,12 @@ def load_runtime_parameters(self) -> dict[str, Any]:
 def _build_runtime_overrides(profile: str, runtime_settings: PlatformRuntimeSettings) -> dict[str, Any]:
     overrides: dict[str, Any] = {}
     income_layer_enabled = getattr(runtime_settings, "income_layer_enabled", None)
+    income_layer_start_usd = getattr(runtime_settings, "income_layer_start_usd", None)
     income_layer_max_ratio = getattr(runtime_settings, "income_layer_max_ratio", None)
     if income_layer_enabled is not None:
         overrides["income_layer_enabled"] = income_layer_enabled
+    if income_layer_start_usd is not None:
+        overrides["income_layer_start_usd"] = income_layer_start_usd
     if income_layer_max_ratio is not None:
         overrides["income_layer_max_ratio"] = income_layer_max_ratio
     if profile == "tqqq_growth_income":

tests/test_runtime_config_support.py

@@ -100,11 +100,13 @@ def test_reserved_cash_policy_loads_from_env(monkeypatch):
 def test_income_layer_overrides_load_from_env(monkeypatch):
     monkeypatch.setenv("RUNTIME_TARGET_JSON", _target_json("tqqq_growth_income"))
     monkeypatch.setenv("INCOME_LAYER_ENABLED", "false")
+    monkeypatch.setenv("INCOME_LAYER_START_USD", "250000")
     monkeypatch.setenv("INCOME_LAYER_MAX_RATIO", "0.25")
 
     settings = load_platform_runtime_settings(project_id_resolver=lambda: "project-1")
 
     assert settings.income_layer_enabled is False
+    assert settings.income_layer_start_usd == 250000.0
     assert settings.income_layer_max_ratio == 0.25
 
 
@@ -116,6 +118,14 @@ def test_invalid_income_layer_max_ratio_is_rejected(monkeypatch):
         load_platform_runtime_settings(project_id_resolver=lambda: "project-1")
 
 
+def test_invalid_income_layer_start_usd_is_rejected(monkeypatch):
+    monkeypatch.setenv("RUNTIME_TARGET_JSON", _target_json("tqqq_growth_income"))
+    monkeypatch.setenv("INCOME_LAYER_START_USD", "-1")
+
+    with pytest.raises(ValueError, match="INCOME_LAYER_START_USD"):
+        load_platform_runtime_settings(project_id_resolver=lambda: "project-1")
+
+
 def test_runtime_target_enabled_loads_from_env(monkeypatch):
     monkeypatch.setenv("RUNTIME_TARGET_JSON", _target_json())
     monkeypatch.setenv("RUNTIME_TARGET_ENABLED", "false")

tests/test_strategy_runtime.py

@@ -52,10 +52,12 @@ def test_runtime_execution_window_override_ignores_other_profiles():
 def test_income_layer_overrides_apply_to_runtime_config():
     settings = _runtime_settings(
         income_layer_enabled=False,
+        income_layer_start_usd=250000.0,
         income_layer_max_ratio=0.25,
     )
 
     assert _build_runtime_overrides("global_etf_rotation", settings) == {
         "income_layer_enabled": False,
+        "income_layer_start_usd": 250000.0,
         "income_layer_max_ratio": 0.25,
     }

tests/test_sync_cloud_run_env_workflow.py

@@ -37,6 +37,14 @@ def test_sync_cloud_run_env_workflow_syncs_strategy_plugin_alert_settings():
         assert f"{name}: ${{{{ vars.{name} }}}}" in workflow
         assert f"add_optional_env {name}" in workflow
 
+    for name in (
+        "INCOME_LAYER_ENABLED",
+        "INCOME_LAYER_START_USD",
+        "INCOME_LAYER_MAX_RATIO",
+    ):
+        assert f"{name}: ${{{{ vars.{name} }}}}" in workflow
+        assert f"add_optional_env {name}" in workflow
+
     assert (
         "STRATEGY_PLUGIN_ALERT_EMAIL_SENDER_PASSWORD_SECRET_NAME: "
         "${{ vars.STRATEGY_PLUGIN_ALERT_EMAIL_SENDER_PASSWORD_SECRET_NAME }}"