Merge pull request #6 from QuantStrategyLab/codex/ibkr-platform-strategy-policy

[codex] refactor ibkr platform strategy policy

Author: Pigbibi

requirements.txt

@@ -1,7 +1,7 @@
 flask
 gunicorn
-quant-platform-kit @ git+https://github.com/QuantStrategyLab/QuantPlatformKit.git@v0.6.0
-us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@98d063564a53f6678ae12a7e941b58b958941554
+quant-platform-kit @ git+https://github.com/QuantStrategyLab/QuantPlatformKit.git@6e8cc058b821aea8a54015d4b39e02fbdd3dc198
+us-equity-strategies @ git+https://github.com/QuantStrategyLab/UsEquityStrategies.git@8b0c59f2ecd7c74cc2d350f1870f124a2560b205
 pandas
 numpy
 requests

strategy_registry.py

@@ -1,13 +1,16 @@
 from __future__ import annotations
 
-from us_equity_strategies.platform_registry_support import (
+from us_equity_strategies import get_strategy_catalog
+
+from quant_platform_kit.common.strategies import (
+    PlatformStrategyPolicy,
+    StrategyDefinition,
+    US_EQUITY_DOMAIN,
     build_platform_profile_matrix,
     get_enabled_profiles_for_platform,
     resolve_platform_strategy_definition,
 )
 
-from quant_platform_kit.common.strategies import StrategyDefinition, US_EQUITY_DOMAIN
-
 IBKR_PLATFORM = "ibkr"
 
 DEFAULT_STRATEGY_PROFILE = "global_etf_rotation"
@@ -25,25 +28,25 @@
 PLATFORM_SUPPORTED_DOMAINS: dict[str, frozenset[str]] = {
     IBKR_PLATFORM: frozenset({US_EQUITY_DOMAIN}),
 }
+STRATEGY_CATALOG = get_strategy_catalog()
+PLATFORM_POLICY = PlatformStrategyPolicy(
+    platform_id=IBKR_PLATFORM,
+    supported_domains=PLATFORM_SUPPORTED_DOMAINS[IBKR_PLATFORM],
+    enabled_profiles=IBKR_ENABLED_PROFILES,
+    default_profile=DEFAULT_STRATEGY_PROFILE,
+    rollback_profile=ROLLBACK_STRATEGY_PROFILE,
+    require_explicit_profile=True,
+)
 
 SUPPORTED_STRATEGY_PROFILES = IBKR_ENABLED_PROFILES
 
 
 def get_supported_profiles_for_platform(platform_id: str) -> frozenset[str]:
-    return get_enabled_profiles_for_platform(
-        platform_id,
-        expected_platform_id=IBKR_PLATFORM,
-        enabled_profiles=IBKR_ENABLED_PROFILES,
-    )
+    return get_enabled_profiles_for_platform(platform_id, policy=PLATFORM_POLICY)
 
 
 def get_platform_profile_matrix() -> list[dict[str, object]]:
-    return build_platform_profile_matrix(
-        platform_id=IBKR_PLATFORM,
-        enabled_profiles=IBKR_ENABLED_PROFILES,
-        default_profile=DEFAULT_STRATEGY_PROFILE,
-        rollback_profile=ROLLBACK_STRATEGY_PROFILE,
-    )
+    return build_platform_profile_matrix(STRATEGY_CATALOG, policy=PLATFORM_POLICY)
 
 
 def resolve_strategy_definition(
@@ -54,8 +57,6 @@ def resolve_strategy_definition(
     return resolve_platform_strategy_definition(
         raw_value,
         platform_id=platform_id,
-        expected_platform_id=IBKR_PLATFORM,
-        enabled_profiles=IBKR_ENABLED_PROFILES,
-        platform_supported_domains=PLATFORM_SUPPORTED_DOMAINS,
-        require_explicit=True,
+        strategy_catalog=STRATEGY_CATALOG,
+        policy=PLATFORM_POLICY,
     )