@tradejs/cli 1.0.5 → 1.0.8

package/dist/scripts/continuity.js

@@ -160,7 +160,7 @@ var continuity = async () => {
           (0, import_time.formatUnix)(gap.ts),
           gap.diffSeconds
         );
-        await (0, import_timescale.deleteCandles)(symbol, interval);
+        await (0, import_timescale.deleteCandles)(provider.id, symbol, interval);
         const reloaded = await connector.kline({
           symbol,
           interval: intervalKey,

package/dist/scripts/derivativesIngest.js

@@ -28,6 +28,7 @@ var import_args = __toESM(require("args"));
 var import_chalk = __toESM(require("chalk"));
 var import_indicators = require("@tradejs/core/indicators");
 var import_timescale = require("@tradejs/infra/timescale");
+var import_userSettings = require("@tradejs/infra/userSettings");
 var import_connectors = require("@tradejs/connectors");
 import_args.default.example(
   "yarn ts-node ./src/scripts/derivativesIngest --provider coinalyze --symbols BTCUSDT,ETHUSDT --intervals 15m,1h --days 120",
@@ -41,6 +42,7 @@ import_args.default.option(
   "Provider name: coinalyze | binance_coinbase_spread",
   "coinalyze"
 );
+import_args.default.option(["U", "user"], "User settings profile name from Redis", "root");
 import_args.default.option(["b", "batchDays"], "Request chunk size in days", 7);
 var flags = import_args.default.parse(process.argv);
 var asInt = (value, fallback) => {
@@ -59,6 +61,8 @@ var run = async () => {
   );
   const days = asInt(flags.days, 120);
   const batchDays = asInt(flags.batchDays, 7);
+  const userName = String(flags.user || "root").trim() || "root";
+  const coinalyzeApiKey = providerName === "coinalyze" ? (await (0, import_userSettings.getUserSettings)(userName)).COINALYZE_API_KEY : void 0;
   if (!symbols.length) throw new Error("No symbols provided");
   if (!intervals.length) throw new Error("No intervals provided");
   await (0, import_timescale.waitForDbReady)();
@@ -76,6 +80,7 @@ var run = async () => {
         );
         const window = await provider.fetchWindow({
           symbol,
+          apiKey: coinalyzeApiKey,
           interval,
           fromMs: cursor,
           toMs

package/dist/scripts/derivativesIngestCoinalyzeAll.js

@@ -31,6 +31,7 @@ var import_lodash = __toESM(require("lodash"));
 var import_connectors = require("@tradejs/connectors");
 var import_indicators = require("@tradejs/core/indicators");
 var import_async = require("@tradejs/core/async");
+var import_userSettings = require("@tradejs/infra/userSettings");
 var import_cli = require("@tradejs/node/cli");
 var import_timescale = require("@tradejs/infra/timescale");
 var coinalyzeIntervalMap = {
@@ -41,7 +42,7 @@ import_args.default.example(
   "yarn ts-node ./src/scripts/derivativesIngestCoinalyzeAll --days 120 --intervals 15m,1h",
   "Fetch derivatives for all getTickers symbols matched to Coinalyze markets"
 );
-import_args.default.option(["U", "user"], "Bybit user config name from Redis", "root");
+import_args.default.option(["U", "user"], "User settings profile name from Redis", "root");
 import_args.default.option(["t", "tickers"], "Comma-separated include symbols");
 import_args.default.option(["e", "exclude"], "Comma-separated exclude symbols");
 import_args.default.option(["l", "tickersLimit"], "Tickers limit");
@@ -76,14 +77,10 @@ var asInt = (value, fallback) => {
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 };
 var parseList = (value) => String(value ?? "").split(",").map((item) => item.trim().toUpperCase()).filter(Boolean);
-var apiKey = process.env.COINALYZE_API_KEY?.trim();
-if (!apiKey) {
-  throw new Error("Missing COINALYZE_API_KEY");
-}
 var coinalyzeBaseUrl = process.env.COINALYZE_BASE_URL?.trim() || "https://api.coinalyze.net/v1";
 var coinalyzeMaxRetries = asInt(process.env.COINALYZE_MAX_RETRIES, 4);
 var lastRequestTs = 0;
-var fetchJsonWithRateLimit = async (url) => {
+var fetchJsonWithRateLimit = async (url, apiKey) => {
   const requestDelayMs = Math.max(100, asInt(flags.requestDelayMs, 200));
   const requestTimeoutMs = Math.max(
     5e3,
@@ -135,9 +132,10 @@ var fetchJsonWithRateLimit = async (url) => {
   }
   throw new Error("Coinalyze request failed after retries");
 };
-var fetchCoinalyzeMarkets = async () => {
+var fetchCoinalyzeMarkets = async (apiKey) => {
   const raw = await fetchJsonWithRateLimit(
-    `${coinalyzeBaseUrl}/future-markets`
+    `${coinalyzeBaseUrl}/future-markets`,
+    apiKey
   );
   return Array.isArray(raw) ? raw : [];
 };
@@ -220,16 +218,17 @@ var toSeriesMap = (raw, metric) => {
   return out;
 };
 var fetchMetricBatch = async (params) => {
-  const { endpoint, metric, marketSymbols, interval, fromMs, toMs } = params;
+  const { endpoint, metric, marketSymbols, apiKey, interval, fromMs, toMs } = params;
   const url = new URL(`${coinalyzeBaseUrl}${endpoint}`);
   url.searchParams.set("symbols", marketSymbols.join(","));
   url.searchParams.set("interval", coinalyzeIntervalMap[interval] || interval);
   url.searchParams.set("from", String(Math.floor(fromMs / 1e3)));
   url.searchParams.set("to", String(Math.floor(toMs / 1e3)));
-  const raw = await fetchJsonWithRateLimit(url.toString());
+  const raw = await fetchJsonWithRateLimit(url.toString(), apiKey);
   return toSeriesMap(raw, metric);
 };
 var run = async () => {
+  const userName = String(flags.user || "root").trim() || "root";
   const intervals = (0, import_indicators.normalizeDerivativesIntervals)(
     flags.intervals
   );
@@ -239,9 +238,16 @@ var run = async () => {
   const tickersLimit = flags.tickersLimit !== void 0 ? asInt(flags.tickersLimit, 0) || void 0 : void 0;
   const exchangePriority = parseList(flags.exchangePriority || "A,6,0");
   if (!intervals.length) throw new Error("No intervals provided");
+  const settings = await (0, import_userSettings.getUserSettings)(userName);
+  const coinalyzeApiKey = settings.COINALYZE_API_KEY.trim();
+  if (!coinalyzeApiKey) {
+    throw new Error(
+      `Missing COINALYZE_API_KEY in user settings for user ${userName}`
+    );
+  }
   const connectorFactory = import_connectors.connectors[import_connectors.ConnectorNames.ByBit];
   const bybit = await connectorFactory({
-    userName: String(flags.user || "root")
+    userName
   });
   const tickers = await (0, import_cli.getTickers)(
     bybit,
@@ -253,7 +259,7 @@ var run = async () => {
   if (!tickers.length) {
     throw new Error("No tickers loaded via getTickers");
   }
-  const markets = await fetchCoinalyzeMarkets();
+  const markets = await fetchCoinalyzeMarkets(coinalyzeApiKey);
   if (!markets.length) {
     throw new Error("No markets returned by Coinalyze /future-markets");
   }
@@ -321,6 +327,7 @@ var run = async () => {
             endpoint: oiPath,
             metric: "oi",
             marketSymbols,
+            apiKey: coinalyzeApiKey,
             interval,
             fromMs: cursor,
             toMs
@@ -329,6 +336,7 @@ var run = async () => {
             endpoint: fundingPath,
             metric: "funding",
             marketSymbols,
+            apiKey: coinalyzeApiKey,
             interval,
             fromMs: cursor,
             toMs
@@ -337,6 +345,7 @@ var run = async () => {
             endpoint: liqPath,
             metric: "liq",
             marketSymbols,
+            apiKey: coinalyzeApiKey,
             interval,
             fromMs: cursor,
             toMs

package/dist/scripts/migration.js

@@ -43,7 +43,7 @@ var migrateFile = async (file) => {
     [],
     projectRoot
   );
-  const rows = (0, import_timescale.toRows)(symbol, interval, data);
+  const rows = (0, import_timescale.toRows)("bybit", symbol, interval, data);
   for (let i = 0; i < rows.length; i += BATCH) {
     await (0, import_timescale.upsertCandles)(rows.slice(i, i + BATCH));
   }

package/dist/scripts/mlExport.js

@@ -24,10 +24,106 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 
 // src/scripts/mlExport.ts
 var import_args = __toESM(require("args"));
-var import_chalk = __toESM(require("chalk"));
+var import_chalk2 = __toESM(require("chalk"));
 var import_promises = __toESM(require("fs/promises"));
 var import_path = __toESM(require("path"));
 var import_ml = require("@tradejs/infra/ml");
+
+// src/scripts/selectStrategy.ts
+var import_readline = __toESM(require("readline"));
+var import_chalk = __toESM(require("chalk"));
+var import_strategies = require("@tradejs/node/strategies");
+var defaultStrategy = "TrendLine";
+var projectRoot = String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
+var getStrategyChoices = async () => {
+  try {
+    const loaded = await (0, import_strategies.getAvailableStrategyNames)(projectRoot);
+    if (loaded.length) {
+      return loaded;
+    }
+  } catch (error) {
+    console.warn(`Failed to load strategy list: ${String(error)}`);
+  }
+  return [
+    "Breakout",
+    "MaStrategy",
+    "AdaptiveMomentumRibbon",
+    "TrendLine",
+    "VolumeDivergence"
+  ];
+};
+var selectStrategy = async (promptLabel = "Select strategy", options) => {
+  const strategies = options?.strategies && options.strategies.length ? options.strategies : await getStrategyChoices();
+  const preferredDefault = options?.defaultStrategy || defaultStrategy;
+  const fallbackStrategy = strategies.includes(preferredDefault) ? preferredDefault : strategies[0];
+  if (!process.stdin.isTTY) {
+    return fallbackStrategy;
+  }
+  console.log(import_chalk.default.cyan("Available strategies:"));
+  strategies.forEach((name, index) => {
+    const isDefault = name === defaultStrategy;
+    const label = isDefault ? import_chalk.default.green(name) : name;
+    const suffix = isDefault ? import_chalk.default.gray(" (default)") : "";
+    console.log(`  ${import_chalk.default.yellow(String(index + 1))}) ${label}${suffix}`);
+  });
+  const rl = import_readline.default.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  const question = (text) => new Promise((resolve) => rl.question(text, resolve));
+  const answer = await question(
+    `${promptLabel} [${import_chalk.default.green(fallbackStrategy)}]: `
+  );
+  rl.close();
+  const trimmed = answer.trim();
+  if (!trimmed) {
+    return fallbackStrategy;
+  }
+  const asNumber = Number(trimmed);
+  if (Number.isFinite(asNumber) && asNumber >= 1 && asNumber <= strategies.length) {
+    return strategies[asNumber - 1];
+  }
+  const byName = strategies.find(
+    (name) => name.toLowerCase() === trimmed.toLowerCase()
+  );
+  if (byName) {
+    return byName;
+  }
+  console.warn(`Unknown strategy "${trimmed}", using ${fallbackStrategy}.`);
+  return fallbackStrategy;
+};
+
+// src/scripts/resolveExportStrategy.ts
+var resolveExportStrategy = async ({
+  explicitStrategy,
+  outDir,
+  datasetLabel,
+  promptLabel,
+  listStrategies
+}) => {
+  const raw = String(explicitStrategy || "").trim();
+  if (raw) {
+    return raw;
+  }
+  const availableStrategies = await listStrategies({ outDir });
+  if (!availableStrategies.length) {
+    return null;
+  }
+  if (availableStrategies.length === 1) {
+    return availableStrategies[0];
+  }
+  if (!process.stdin.isTTY) {
+    throw new Error(
+      `Multiple ${datasetLabel} chunk strategies found in ${outDir}: ${availableStrategies.join(", ")}. Pass --strategy.`
+    );
+  }
+  return selectStrategy(promptLabel, {
+    strategies: availableStrategies,
+    defaultStrategy: availableStrategies[0]
+  });
+};
+
+// src/scripts/mlExport.ts
 import_args.default.example(
   "yarn ts-node ./src/scripts/mlExport --strategy trendline",
   "Merge per-worker ML chunks into one dataset JSONL"
@@ -45,21 +141,24 @@ var listChunkFiles = async (outDir, strategyName) => {
   const entries = await import_promises.default.readdir(outDir, { withFileTypes: true });
   return entries.filter((entry) => entry.isFile()).map((entry) => entry.name).filter((name) => name.startsWith(prefix) && name.endsWith(".jsonl")).map((name) => import_path.default.join(outDir, name)).sort();
 };
-var resolveStrategyName = async () => {
-  const raw = String(flags.strategy || "").trim();
-  if (raw) {
-    return raw;
-  }
-  throw new Error("Missing --strategy. Use mlExportSelect or pass --strategy.");
-};
 var main = async () => {
   const outDir = String(flags.outDir || "data/ml/export");
-  const strategyName = await resolveStrategyName();
   await import_promises.default.mkdir(outDir, { recursive: true });
+  const strategyName = await resolveExportStrategy({
+    explicitStrategy: String(flags.strategy || ""),
+    outDir,
+    datasetLabel: "ML",
+    promptLabel: "Select ML export strategy",
+    listStrategies: import_ml.listMlChunkStrategies
+  });
+  if (!strategyName) {
+    console.log(import_chalk2.default.yellow(`No ML chunk files found in ${outDir}`));
+    process.exit(0);
+  }
   const chunkFiles = await listChunkFiles(outDir, strategyName);
   if (!chunkFiles.length) {
     console.log(
-      import_chalk.default.yellow(
+      import_chalk2.default.yellow(
         `No chunk files found for strategy "${strategyName}" in ${outDir}`
       )
     );
@@ -79,9 +178,9 @@ var main = async () => {
       await import_promises.default.rm(filePath, { force: true });
     }
   }
-  console.log(import_chalk.default.green(`Merged dataset saved: ${mergedPath}`));
+  console.log(import_chalk2.default.green(`Merged dataset saved: ${mergedPath}`));
   console.log(
-    import_chalk.default.gray(
+    import_chalk2.default.gray(
       `strategy=${strategyName}, source_chunks=${chunkFiles.length}, deleteChunks=${Boolean(
         shouldDeleteChunks
       )}`
@@ -90,6 +189,6 @@ var main = async () => {
   process.exit(0);
 };
 main().catch((error) => {
-  console.error(import_chalk.default.red(error?.message || String(error)));
+  console.error(import_chalk2.default.red(error?.message || String(error)));
   process.exit(1);
 });

package/dist/scripts/mlExportSelect.js

@@ -22,9 +22,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 
-// src/scripts/mlExportSelect.ts
-var import_child_process = require("child_process");
-
 // src/scripts/selectStrategy.ts
 var import_readline = __toESM(require("readline"));
 var import_chalk = __toESM(require("chalk"));
@@ -48,9 +45,10 @@ var getStrategyChoices = async () => {
     "VolumeDivergence"
   ];
 };
-var selectStrategy = async (promptLabel = "Select strategy") => {
-  const strategies = await getStrategyChoices();
-  const fallbackStrategy = strategies.includes(defaultStrategy) ? defaultStrategy : strategies[0];
+var selectStrategy = async (promptLabel = "Select strategy", options) => {
+  const strategies = options?.strategies && options.strategies.length ? options.strategies : await getStrategyChoices();
+  const preferredDefault = options?.defaultStrategy || defaultStrategy;
+  const fallbackStrategy = strategies.includes(preferredDefault) ? preferredDefault : strategies[0];
   if (!process.stdin.isTTY) {
     return fallbackStrategy;
   }
@@ -88,12 +86,48 @@ var selectStrategy = async (promptLabel = "Select strategy") => {
   return fallbackStrategy;
 };
 
+// src/scripts/spawnSiblingScript.ts
+var import_fs = __toESM(require("fs"));
+var import_path = __toESM(require("path"));
+var import_child_process = require("child_process");
+var spawnSiblingScript = (currentDir, scriptBaseName, extraArgs) => {
+  const searchDirs = [currentDir, import_path.default.resolve(currentDir, "scripts")];
+  const candidates = searchDirs.flatMap((dir) => [
+    import_path.default.resolve(dir, `${scriptBaseName}.js`),
+    import_path.default.resolve(dir, `${scriptBaseName}.ts`)
+  ]);
+  const scriptPath = candidates.find((candidate) => import_fs.default.existsSync(candidate));
+  if (!scriptPath) {
+    throw new Error(
+      `Script "${scriptBaseName}" not found. Checked: ${candidates.join(", ")}`
+    );
+  }
+  const commandArgs = scriptPath.endsWith(".ts") ? [
+    "-r",
+    "ts-node/register",
+    "-r",
+    "tsconfig-paths/register",
+    scriptPath,
+    ...extraArgs
+  ] : [scriptPath, ...extraArgs];
+  const result = (0, import_child_process.spawnSync)(process.execPath, commandArgs, {
+    env: process.env,
+    stdio: "inherit"
+  });
+  if (result.error) {
+    throw result.error;
+  }
+  return result.status ?? 1;
+};
+
 // src/scripts/mlExportSelect.ts
 var run = async () => {
   const selected = await selectStrategy();
-  const args = ["ts-node", "./src/scripts/mlExport", "--strategy", selected];
-  const result = (0, import_child_process.spawnSync)("yarn", args, { stdio: "inherit" });
-  process.exit(result.status ?? 1);
+  const status = spawnSiblingScript(__dirname, "mlExport", [
+    "--strategy",
+    selected
+  ]);
+  process.exit(status);
 };
 run().catch((err) => {
   console.error("Failed to select strategy:", err);

package/dist/scripts/mlTrainLatestSelect.js

@@ -56,9 +56,10 @@ var getStrategyChoices = async () => {
     "VolumeDivergence"
   ];
 };
-var selectStrategy = async (promptLabel = "Select strategy") => {
-  const strategies = await getStrategyChoices();
-  const fallbackStrategy = strategies.includes(defaultStrategy) ? defaultStrategy : strategies[0];
+var selectStrategy = async (promptLabel = "Select strategy", options) => {
+  const strategies = options?.strategies && options.strategies.length ? options.strategies : await getStrategyChoices();
+  const preferredDefault = options?.defaultStrategy || defaultStrategy;
+  const fallbackStrategy = strategies.includes(preferredDefault) ? preferredDefault : strategies[0];
   if (!process.stdin.isTTY) {
     return fallbackStrategy;
   }