Skip to content

Commit c0dc2c7

Browse files
PigbibiPigbibi
committed
Sanitize strategy switch account examples
1 parent e11154c commit c0dc2c7

5 files changed

Lines changed: 73 additions & 73 deletions

File tree

‎tests/strategy_switch_worker_validation.mjs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ assert.ok(indexHtml.includes('switchSurface.classList.toggle("summary-hidden", !
1919
assert.equal(indexHtml.includes("publicSummary"), false);
2020
assert.ok(indexHtml.includes("function hasPrivateConfig()"));
2121
assert.ok(indexHtml.includes('el("quick-form").hidden = !showPrivateControls'));
22-
assert.equal(indexHtml.includes("u15998061"), false);
22+
assert.equal(indexHtml.includes("ibkr-primary"), false);
2323
assert.equal(indexHtml.includes("longbridge-quant-sg-service"), false);
2424
assert.equal(indexHtml.includes('account_selector: "SG"'), false);
2525
assert.match(indexHtml, /body\.app-loading \.shell\s*\{\s*display: none;/);
@@ -28,7 +28,7 @@ const servedPageResponse = await worker.fetch(new Request("https://switch.exampl
2828
const servedHtml = await servedPageResponse.text();
2929
assert.equal(servedPageResponse.status, 200);
3030
assert.ok(servedHtml.includes("function hasPrivateConfig()"));
31-
assert.equal(servedHtml.includes("u15998061"), false);
31+
assert.equal(servedHtml.includes("ibkr-primary"), false);
3232
assert.equal(servedHtml.includes("longbridge-quant-sg-service"), false);
3333
assert.equal(servedHtml.includes('account_selector: "SG"'), false);
3434

@@ -131,13 +131,13 @@ const accountOptions = __test.normalizeAccountOptionsPayload(
131131
],
132132
ibkr: [
133133
{
134-
key: "u15998061",
135-
label: "u15998061",
136-
target_name: "u15998061",
137-
account_selector: "U15998061",
138-
deployment_selector: "live-u1599-tqqq",
139-
account_scope: "live-u1599-tqqq",
140-
service_name: "interactive-brokers-live-u1599-tqqq-service",
134+
key: "ibkr-primary",
135+
label: "ibkr-primary",
136+
target_name: "ibkr-primary",
137+
account_selector: "DEMO_IBKR_PRIMARY",
138+
deployment_selector: "demo-ibkr-tqqq",
139+
account_scope: "demo-ibkr-tqqq",
140+
service_name: "interactive-brokers-demo-ibkr-tqqq-service",
141141
},
142142
],
143143
schwab: [
@@ -260,11 +260,11 @@ __test.assertStrategyAllowedForAccount(
260260
const ibkrAccount = __test.assertConfiguredAccount(
261261
{
262262
platform: "ibkr",
263-
target_name: "u15998061",
264-
account_selector: "U15998061",
265-
deployment_selector: "live-u1599-tqqq",
266-
account_scope: "live-u1599-tqqq",
267-
service_name: "interactive-brokers-live-u1599-tqqq-service",
263+
target_name: "ibkr-primary",
264+
account_selector: "DEMO_IBKR_PRIMARY",
265+
deployment_selector: "demo-ibkr-tqqq",
266+
account_scope: "demo-ibkr-tqqq",
267+
service_name: "interactive-brokers-demo-ibkr-tqqq-service",
268268
strategy_profile: "tqqq_growth_income",
269269
},
270270
accountOptions,

‎tests/test_runtime_settings.py‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -254,30 +254,30 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
254254
"defaults": {"NOTIFY_LANG": "zh"},
255255
"targets": [
256256
{
257-
"service": "interactive-brokers-live-u1599-tqqq-service",
258-
"ACCOUNT_GROUP": "live-u1599-tqqq",
257+
"service": "interactive-brokers-demo-ibkr-tqqq-service",
258+
"ACCOUNT_GROUP": "demo-ibkr-tqqq",
259259
"runtime_target": {
260260
"platform_id": "ibkr",
261261
"strategy_profile": "old_strategy",
262262
"dry_run_only": False,
263-
"deployment_selector": "live-u1599-tqqq",
264-
"account_selector": ["U15998061"],
265-
"account_scope": "live-u1599-tqqq",
266-
"service_name": "interactive-brokers-live-u1599-tqqq-service",
263+
"deployment_selector": "demo-ibkr-tqqq",
264+
"account_selector": ["DEMO_IBKR_PRIMARY"],
265+
"account_scope": "demo-ibkr-tqqq",
266+
"service_name": "interactive-brokers-demo-ibkr-tqqq-service",
267267
"execution_mode": "live",
268268
},
269269
},
270270
{
271-
"service": "interactive-brokers-live-u1660-soxl-service",
272-
"ACCOUNT_GROUP": "live-u1660-soxl",
271+
"service": "interactive-brokers-demo-ibkr-soxl-service",
272+
"ACCOUNT_GROUP": "demo-ibkr-soxl",
273273
"runtime_target": {
274274
"platform_id": "ibkr",
275275
"strategy_profile": "soxl_soxx_trend_income",
276276
"dry_run_only": False,
277-
"deployment_selector": "live-u1660-soxl",
278-
"account_selector": ["U16608560"],
279-
"account_scope": "live-u1660-soxl",
280-
"service_name": "interactive-brokers-live-u1660-soxl-service",
277+
"deployment_selector": "demo-ibkr-soxl",
278+
"account_selector": ["DEMO_IBKR_SOXL"],
279+
"account_scope": "demo-ibkr-soxl",
280+
"service_name": "interactive-brokers-demo-ibkr-soxl-service",
281281
"execution_mode": "live",
282282
},
283283
},
@@ -292,13 +292,13 @@ def test_build_switch_target_patches_ibkr_service_targets_json(self):
292292
"--platform",
293293
"ibkr",
294294
"--target-name",
295-
"live-u1599-tqqq",
295+
"demo-ibkr-tqqq",
296296
"--strategy-profile",
297297
"tqqq_growth_income",
298298
"--account-selector",
299-
"U15998061",
299+
"DEMO_IBKR_PRIMARY",
300300
"--service-name",
301-
"interactive-brokers-live-u1599-tqqq-service",
301+
"interactive-brokers-demo-ibkr-tqqq-service",
302302
"--existing-service-targets-json-file",
303303
str(path),
304304
]
@@ -324,16 +324,16 @@ def test_build_switch_target_patches_ibkr_service_targets_with_empty_plugin_moun
324324
existing = {
325325
"targets": [
326326
{
327-
"service": "interactive-brokers-live-u1599-tqqq-service",
328-
"ACCOUNT_GROUP": "live-u1599-tqqq",
327+
"service": "interactive-brokers-demo-ibkr-tqqq-service",
328+
"ACCOUNT_GROUP": "demo-ibkr-tqqq",
329329
"runtime_target": {
330330
"platform_id": "ibkr",
331331
"strategy_profile": "tqqq_growth_income",
332332
"dry_run_only": False,
333-
"deployment_selector": "live-u1599-tqqq",
334-
"account_selector": ["U15998061"],
335-
"account_scope": "live-u1599-tqqq",
336-
"service_name": "interactive-brokers-live-u1599-tqqq-service",
333+
"deployment_selector": "demo-ibkr-tqqq",
334+
"account_selector": ["DEMO_IBKR_PRIMARY"],
335+
"account_scope": "demo-ibkr-tqqq",
336+
"service_name": "interactive-brokers-demo-ibkr-tqqq-service",
337337
"execution_mode": "live",
338338
},
339339
"IBKR_STRATEGY_PLUGIN_MOUNTS_JSON": {
@@ -359,13 +359,13 @@ def test_build_switch_target_patches_ibkr_service_targets_with_empty_plugin_moun
359359
"--platform",
360360
"ibkr",
361361
"--target-name",
362-
"live-u1599-tqqq",
362+
"demo-ibkr-tqqq",
363363
"--strategy-profile",
364364
"soxl_soxx_trend_income",
365365
"--account-selector",
366-
"U15998061",
366+
"DEMO_IBKR_PRIMARY",
367367
"--service-name",
368-
"interactive-brokers-live-u1599-tqqq-service",
368+
"interactive-brokers-demo-ibkr-tqqq-service",
369369
"--existing-service-targets-json-file",
370370
str(path),
371371
]

‎web/strategy-switch-console/README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ Each account item supports:
9696

9797
```json
9898
{
99-
"key": "u15998061",
100-
"label": "u15998061",
101-
"target_name": "u15998061",
102-
"account_selector": "U15998061",
103-
"deployment_selector": "live-u1599-tqqq",
104-
"account_scope": "live-u1599-tqqq",
105-
"service_name": "interactive-brokers-live-u1599-tqqq-service",
99+
"key": "ibkr-primary",
100+
"label": "ibkr-primary",
101+
"target_name": "ibkr-primary",
102+
"account_selector": "DEMO_IBKR_PRIMARY",
103+
"deployment_selector": "demo-ibkr-tqqq",
104+
"account_scope": "demo-ibkr-tqqq",
105+
"service_name": "interactive-brokers-demo-ibkr-tqqq-service",
106106
"default_strategy_profile": "tqqq_growth_income",
107107
"supported_domains": ["us_equity", "hk_equity"]
108108
}

‎web/strategy-switch-console/README.zh-CN.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ wrangler secret put STRATEGY_SWITCH_ACCOUNT_OPTIONS_JSON < /tmp/strategy-switch-
103103

104104
```json
105105
{
106-
"key": "u15998061",
107-
"label": "u15998061",
108-
"target_name": "u15998061",
109-
"account_selector": "U15998061",
110-
"deployment_selector": "live-u1599-tqqq",
111-
"account_scope": "live-u1599-tqqq",
112-
"service_name": "interactive-brokers-live-u1599-tqqq-service",
106+
"key": "ibkr-primary",
107+
"label": "ibkr-primary",
108+
"target_name": "ibkr-primary",
109+
"account_selector": "DEMO_IBKR_PRIMARY",
110+
"deployment_selector": "demo-ibkr-tqqq",
111+
"account_scope": "demo-ibkr-tqqq",
112+
"service_name": "interactive-brokers-demo-ibkr-tqqq-service",
113113
"default_strategy_profile": "tqqq_growth_income",
114114
"supported_domains": ["us_equity", "hk_equity"]
115115
}

‎web/strategy-switch-console/account-options.example.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,35 @@
2727
],
2828
"ibkr": [
2929
{
30-
"key": "u15998061",
31-
"label": "u15998061",
32-
"target_name": "u15998061",
33-
"account_selector": "U15998061",
34-
"deployment_selector": "live-u1599-tqqq",
35-
"account_scope": "live-u1599-tqqq",
36-
"service_name": "interactive-brokers-live-u1599-tqqq-service",
30+
"key": "ibkr-primary",
31+
"label": "ibkr-primary",
32+
"target_name": "ibkr-primary",
33+
"account_selector": "DEMO_IBKR_PRIMARY",
34+
"deployment_selector": "demo-ibkr-tqqq",
35+
"account_scope": "demo-ibkr-tqqq",
36+
"service_name": "interactive-brokers-demo-ibkr-tqqq-service",
3737
"default_strategy_profile": "tqqq_growth_income",
3838
"supported_domains": ["us_equity", "hk_equity"]
3939
},
4040
{
41-
"key": "u16608560",
42-
"label": "u16608560",
43-
"target_name": "u16608560",
44-
"account_selector": "U16608560",
45-
"deployment_selector": "live-u1660-soxl",
46-
"account_scope": "live-u1660-soxl",
47-
"service_name": "interactive-brokers-live-u1660-soxl-service",
41+
"key": "ibkr-soxl",
42+
"label": "ibkr-soxl",
43+
"target_name": "ibkr-soxl",
44+
"account_selector": "DEMO_IBKR_SOXL",
45+
"deployment_selector": "demo-ibkr-soxl",
46+
"account_scope": "demo-ibkr-soxl",
47+
"service_name": "interactive-brokers-demo-ibkr-soxl-service",
4848
"default_strategy_profile": "soxl_soxx_trend_income",
4949
"supported_domains": ["us_equity", "hk_equity"]
5050
},
5151
{
52-
"key": "u18336562",
53-
"label": "u18336562",
54-
"target_name": "u18336562",
55-
"account_selector": "U18336562",
56-
"deployment_selector": "live-u1833-smart-dca",
57-
"account_scope": "live-u1833-smart-dca",
58-
"service_name": "interactive-brokers-live-u1833-smart-dca-service",
52+
"key": "ibkr-dca",
53+
"label": "ibkr-dca",
54+
"target_name": "ibkr-dca",
55+
"account_selector": "DEMO_IBKR_DCA",
56+
"deployment_selector": "demo-ibkr-dca",
57+
"account_scope": "demo-ibkr-dca",
58+
"service_name": "interactive-brokers-demo-ibkr-dca-service",
5959
"default_strategy_profile": "nasdaq_sp500_smart_dca",
6060
"supported_domains": ["us_equity", "hk_equity"]
6161
}

0 commit comments

Comments
 (0)