@tradejs/cli 1.0.5 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -1
- package/dist/cli.js +13791 -7652
- package/dist/lib/aiTrainMetrics.js +173 -0
- package/dist/lib/candlesProviderMigration.js +266 -0
- package/dist/lib/cliArgs.js +40 -0
- package/dist/lib/derivativesContextBackfill.js +487 -0
- package/dist/lib/researchAgent.js +195 -0
- package/dist/lib/runtimeParity.js +234 -0
- package/dist/lib/telegramReports.js +91 -0
- package/dist/lib/timeWindow.js +101 -0
- package/dist/scripts/agentRun.js +895 -0
- package/dist/scripts/aiExport.js +192 -0
- package/dist/scripts/aiExportSelect.js +135 -0
- package/dist/scripts/aiTrain.js +2321 -0
- package/dist/scripts/backtest.js +998 -111
- package/dist/scripts/candlesMigrateProvider.js +5302 -0
- package/dist/scripts/continuity.js +1 -1
- package/dist/scripts/derivativesIngest.js +5 -0
- package/dist/scripts/derivativesIngestCoinalyzeAll.js +21 -12
- package/dist/scripts/migration.js +1 -1
- package/dist/scripts/mlExport.js +112 -13
- package/dist/scripts/mlExportSelect.js +43 -9
- package/dist/scripts/mlTrainLatestSelect.js +4 -3
- package/dist/scripts/researchAuto.js +845 -0
- package/dist/scripts/resolveExportStrategy.js +133 -0
- package/dist/scripts/results.js +46 -22
- package/dist/scripts/runtimeParity.js +1651 -0
- package/dist/scripts/selectStrategy.js +4 -3
- package/dist/scripts/signals.js +799 -62
- package/dist/scripts/signalsSummary.js +655 -0
- package/dist/scripts/spawnSiblingScript.js +71 -0
- package/dist/scripts/user-add.js +0 -9
- package/dist/workers/testerWorker.js +13 -2
- package/package.json +18 -12
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __create = Object.create;
|
|
3
|
+
var __defProp = Object.defineProperty;
|
|
4
|
+
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
5
|
+
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
6
|
+
var __getProtoOf = Object.getPrototypeOf;
|
|
7
|
+
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
8
|
+
var __export = (target, all) => {
|
|
9
|
+
for (var name in all)
|
|
10
|
+
__defProp(target, name, { get: all[name], enumerable: true });
|
|
11
|
+
};
|
|
12
|
+
var __copyProps = (to, from, except, desc) => {
|
|
13
|
+
if (from && typeof from === "object" || typeof from === "function") {
|
|
14
|
+
for (let key of __getOwnPropNames(from))
|
|
15
|
+
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
16
|
+
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
17
|
+
}
|
|
18
|
+
return to;
|
|
19
|
+
};
|
|
20
|
+
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
21
|
+
// If the importer is in node compatibility mode or this is not an ESM
|
|
22
|
+
// file that has been converted to a CommonJS file using a Babel-
|
|
23
|
+
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
24
|
+
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
25
|
+
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
26
|
+
mod
|
|
27
|
+
));
|
|
28
|
+
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
29
|
+
|
|
30
|
+
// src/scripts/spawnSiblingScript.ts
|
|
31
|
+
var spawnSiblingScript_exports = {};
|
|
32
|
+
__export(spawnSiblingScript_exports, {
|
|
33
|
+
spawnSiblingScript: () => spawnSiblingScript
|
|
34
|
+
});
|
|
35
|
+
module.exports = __toCommonJS(spawnSiblingScript_exports);
|
|
36
|
+
var import_fs = __toESM(require("fs"));
|
|
37
|
+
var import_path = __toESM(require("path"));
|
|
38
|
+
var import_child_process = require("child_process");
|
|
39
|
+
var spawnSiblingScript = (currentDir, scriptBaseName, extraArgs) => {
|
|
40
|
+
const searchDirs = [currentDir, import_path.default.resolve(currentDir, "scripts")];
|
|
41
|
+
const candidates = searchDirs.flatMap((dir) => [
|
|
42
|
+
import_path.default.resolve(dir, `${scriptBaseName}.js`),
|
|
43
|
+
import_path.default.resolve(dir, `${scriptBaseName}.ts`)
|
|
44
|
+
]);
|
|
45
|
+
const scriptPath = candidates.find((candidate) => import_fs.default.existsSync(candidate));
|
|
46
|
+
if (!scriptPath) {
|
|
47
|
+
throw new Error(
|
|
48
|
+
`Script "${scriptBaseName}" not found. Checked: ${candidates.join(", ")}`
|
|
49
|
+
);
|
|
50
|
+
}
|
|
51
|
+
const commandArgs = scriptPath.endsWith(".ts") ? [
|
|
52
|
+
"-r",
|
|
53
|
+
"ts-node/register",
|
|
54
|
+
"-r",
|
|
55
|
+
"tsconfig-paths/register",
|
|
56
|
+
scriptPath,
|
|
57
|
+
...extraArgs
|
|
58
|
+
] : [scriptPath, ...extraArgs];
|
|
59
|
+
const result = (0, import_child_process.spawnSync)(process.execPath, commandArgs, {
|
|
60
|
+
env: process.env,
|
|
61
|
+
stdio: "inherit"
|
|
62
|
+
});
|
|
63
|
+
if (result.error) {
|
|
64
|
+
throw result.error;
|
|
65
|
+
}
|
|
66
|
+
return result.status ?? 1;
|
|
67
|
+
};
|
|
68
|
+
// Annotate the CommonJS export names for ESM import in node:
|
|
69
|
+
0 && (module.exports = {
|
|
70
|
+
spawnSiblingScript
|
|
71
|
+
});
|
package/dist/scripts/user-add.js
CHANGED
|
@@ -26,39 +26,30 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
|
|
|
26
26
|
var import_args = __toESM(require("args"));
|
|
27
27
|
var import_chalk = __toESM(require("chalk"));
|
|
28
28
|
var import_bcryptjs = __toESM(require("bcryptjs"));
|
|
29
|
-
var import_crypto = __toESM(require("crypto"));
|
|
30
29
|
var import_redis = require("@tradejs/infra/redis");
|
|
31
30
|
import_args.default.example("yarn user-add -u myname -p 123456", "Create or update user");
|
|
32
31
|
import_args.default.option(["u", "user"], "Username", "");
|
|
33
32
|
import_args.default.option(["p", "password"], "Password (plain text)", "");
|
|
34
|
-
import_args.default.option(["t", "token"], "Persistent token (optional)", "");
|
|
35
33
|
var flags = import_args.default.parse(process.argv);
|
|
36
34
|
var run = async () => {
|
|
37
35
|
const userName = String(flags.user || "").trim();
|
|
38
36
|
const password = String(flags.password || "");
|
|
39
|
-
const requestedToken = String(flags.token || "").trim();
|
|
40
37
|
if (!userName || !password) {
|
|
41
38
|
console.error(import_chalk.default.red("Missing -U <user> or -P <password>"));
|
|
42
39
|
process.exit(1);
|
|
43
40
|
}
|
|
44
41
|
const passwordHash = await import_bcryptjs.default.hash(password, 10);
|
|
45
42
|
const existing = await (0, import_redis.getData)(import_redis.redisKeys.user(userName), null);
|
|
46
|
-
const existingToken = typeof existing === "object" && existing ? existing.token : void 0;
|
|
47
|
-
const token = requestedToken || existingToken || (userName === "root" ? import_crypto.default.randomBytes(24).toString("hex") : void 0);
|
|
48
43
|
const next = {
|
|
49
44
|
...existing ?? {},
|
|
50
45
|
passwordHash,
|
|
51
46
|
userName,
|
|
52
|
-
...token ? { token } : {},
|
|
53
47
|
updatedAt: (/* @__PURE__ */ new Date()).toISOString()
|
|
54
48
|
};
|
|
55
49
|
await (0, import_redis.setData)(import_redis.redisKeys.user(userName), next, {
|
|
56
50
|
expire: 0
|
|
57
51
|
});
|
|
58
52
|
console.log(import_chalk.default.green(`User ${userName} updated`));
|
|
59
|
-
if (token) {
|
|
60
|
-
console.log(import_chalk.default.gray(`token: ${token}`));
|
|
61
|
-
}
|
|
62
53
|
process.exit(0);
|
|
63
54
|
};
|
|
64
55
|
run();
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
// src/workers/testerWorker.ts
|
|
4
4
|
var import_backtest = require("@tradejs/node/backtest");
|
|
5
|
+
var import_ai = require("@tradejs/infra/ai");
|
|
5
6
|
var import_logger = require("@tradejs/infra/logger");
|
|
6
7
|
var import_ml = require("@tradejs/infra/ml");
|
|
7
8
|
var import_redis = require("@tradejs/infra/redis");
|
|
@@ -23,10 +24,12 @@ process.on(
|
|
|
23
24
|
if (!testResult) {
|
|
24
25
|
throw new Error("No result");
|
|
25
26
|
}
|
|
26
|
-
const { stat, orderLogId } = testResult;
|
|
27
|
+
const { stat, orderLogId, inlineOrderLog, inlinePositionLog } = testResult;
|
|
27
28
|
process.send?.({
|
|
28
29
|
stat,
|
|
29
30
|
orderLogId,
|
|
31
|
+
inlineOrderLog,
|
|
32
|
+
inlinePositionLog,
|
|
30
33
|
test
|
|
31
34
|
});
|
|
32
35
|
} catch (error) {
|
|
@@ -36,6 +39,7 @@ process.on(
|
|
|
36
39
|
process.send?.({
|
|
37
40
|
error: true,
|
|
38
41
|
id: test.name,
|
|
42
|
+
symbol: test.symbol,
|
|
39
43
|
msg: {
|
|
40
44
|
message: errorMessage,
|
|
41
45
|
stack: errorStack
|
|
@@ -44,10 +48,17 @@ process.on(
|
|
|
44
48
|
}
|
|
45
49
|
}
|
|
46
50
|
} finally {
|
|
51
|
+
await (0, import_ai.closeAllAiDatasetWriters)();
|
|
47
52
|
await (0, import_ml.closeAllMlDatasetWriters)();
|
|
48
53
|
(0, import_backtest.resetTestingKlineCache)();
|
|
49
54
|
}
|
|
50
|
-
process.send
|
|
55
|
+
if (process.send) {
|
|
56
|
+
process.send({ done: true }, () => {
|
|
57
|
+
process.disconnect?.();
|
|
58
|
+
process.exit(0);
|
|
59
|
+
});
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
51
62
|
process.disconnect?.();
|
|
52
63
|
process.exit(0);
|
|
53
64
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tradejs/cli",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.8",
|
|
4
4
|
"description": "Official CLI for the TradeJS open-source framework: infra setup, backtests, signals, bots, and ML workflows.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"tradejs",
|
|
@@ -29,22 +29,22 @@
|
|
|
29
29
|
"tradejs": "dist/cli.js"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@tradejs/base": "^1.0.
|
|
33
|
-
"@tradejs/connectors": "^1.0.
|
|
34
|
-
"@tradejs/core": "^1.0.
|
|
35
|
-
"@tradejs/indicators": "^1.0.
|
|
36
|
-
"@tradejs/infra": "^1.0.
|
|
37
|
-
"@tradejs/node": "^1.0.
|
|
38
|
-
"@tradejs/strategies": "^1.0.
|
|
39
|
-
"@tradejs/types": "^1.0.
|
|
32
|
+
"@tradejs/base": "^1.0.8",
|
|
33
|
+
"@tradejs/connectors": "^1.0.8",
|
|
34
|
+
"@tradejs/core": "^1.0.8",
|
|
35
|
+
"@tradejs/indicators": "^1.0.8",
|
|
36
|
+
"@tradejs/infra": "^1.0.8",
|
|
37
|
+
"@tradejs/node": "^1.0.8",
|
|
38
|
+
"@tradejs/strategies": "^1.0.8",
|
|
39
|
+
"@tradejs/types": "^1.0.8",
|
|
40
40
|
"args": "^5.0.3",
|
|
41
41
|
"bcryptjs": "^2.4.3",
|
|
42
42
|
"chalk": "4.1.2",
|
|
43
43
|
"date-fns": "^3.3.1",
|
|
44
|
+
"dotenv": "^16.4.1",
|
|
44
45
|
"ioredis": "5.8.0",
|
|
45
|
-
"lodash": "^4.
|
|
46
|
-
"progress": "^2.0.3"
|
|
47
|
-
"uuid": "11.1.0"
|
|
46
|
+
"lodash": "^4.18.1",
|
|
47
|
+
"progress": "^2.0.3"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
50
|
"@types/node": "^20",
|
|
@@ -55,6 +55,7 @@
|
|
|
55
55
|
"typescript": "^5.1"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
|
+
"agent-run": "yarn run run:dist agent-run",
|
|
58
59
|
"build": "tsup",
|
|
59
60
|
"typecheck": "tsc -p ./tsconfig.json --noEmit",
|
|
60
61
|
"run:src": "dotenv -e \"${DOTENV_CONFIG_PATH:-${PROJECT_CWD:-$PWD}/.env}\" -- ts-node -r tsconfig-paths/register",
|
|
@@ -63,8 +64,11 @@
|
|
|
63
64
|
"clean-redis": "yarn run run:dist clean-redis",
|
|
64
65
|
"clean-tests": "yarn run run:dist clean-tests",
|
|
65
66
|
"doctor": "yarn run run:dist doctor",
|
|
67
|
+
"ai-export": "yarn run run:dist ai-export",
|
|
68
|
+
"ai-train": "yarn run run:dist ai-train",
|
|
66
69
|
"backtest": "yarn run run:dist backtest",
|
|
67
70
|
"bot": "yarn run run:dist bot",
|
|
71
|
+
"candles:migrate-provider": "yarn run run:dist candles:migrate-provider",
|
|
68
72
|
"signals": "yarn run run:dist signals",
|
|
69
73
|
"results": "yarn run run:dist results",
|
|
70
74
|
"continuity": "yarn run run:dist continuity",
|
|
@@ -78,12 +82,14 @@
|
|
|
78
82
|
"ml-export": "yarn run run:dist ml-export",
|
|
79
83
|
"ml-inspect": "yarn run run:dist ml-inspect",
|
|
80
84
|
"ml-train:latest": "yarn run run:dist ml-train:latest",
|
|
85
|
+
"research:auto": "yarn run run:dist research:auto",
|
|
81
86
|
"ml-train:trendline:catboost": "yarn run run:dist ml-train:trendline:catboost",
|
|
82
87
|
"ml-train:trendline:extra-trees": "yarn run run:dist ml-train:trendline:extra-trees",
|
|
83
88
|
"ml-train:trendline:lightgbm": "yarn run run:dist ml-train:trendline:lightgbm",
|
|
84
89
|
"ml-train:trendline:rf": "yarn run run:dist ml-train:trendline:rf",
|
|
85
90
|
"ml-train:trendline:xgboost": "yarn run run:dist ml-train:trendline:xgboost",
|
|
86
91
|
"ml-train:unified:catboost": "yarn run run:dist ml-train:unified:catboost",
|
|
92
|
+
"runtime-parity": "yarn run run:dist runtime-parity",
|
|
87
93
|
"test-script": "yarn run run:dist test-script",
|
|
88
94
|
"test-ml": "yarn run run:dist test-ml",
|
|
89
95
|
"user-add": "yarn run run:dist user-add"
|