Updated load command flow, and added a load script (#40)

Author: mccaffers

README.md

@@ -94,8 +94,9 @@ Xcode - Library Path
 The `BacktestingEngine` binary exposes a subcommand CLI:
 
 ```
-BacktestingEngine load <path> [path...]
-    Read each file as raw JSON, Base64-encode it, and LPUSH onto the Redis
+BacktestingEngine load
+    Base64-encode a built-in strategy JSON (defined in
+    source/commands/loadCommand.cpp) and LPUSH it onto the Redis
     `strategy_queue` list.
 
 BacktestingEngine run <questdb-host>
@@ -105,9 +106,6 @@ BacktestingEngine run <questdb-host>
 BacktestingEngine run <questdb-host> <base64-config>
     Decode the supplied Base64 strategy and execute it directly, bypassing
     Redis.
-
-BacktestingEngine -h | --help
-    Show usage.
 ```
 
 Defaults are `127.0.0.1:6379` for the Redis endpoint and `strategy_queue` for the list key (see `include/redisRunner.hpp` and `include/redisLoader.hpp`).

include/commands/loadCommand.hpp

@@ -6,9 +6,9 @@
 
 #pragma once
 
-// Backs the `load` subcommand: reads each strategy file from disk and LPUSHes
-// it onto the Redis `strategy_queue` via RedisLoader.
+// Backs the `load` subcommand: LPUSHes a strategy JSON (defined in
+// source/commands/loadCommand.cpp) onto the Redis `strategy_queue`.
 class LoadCommand {
 public:
-    static int run(int argc, const char* argv[]);
+    static int run();
 };

scripts/load.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+# Builds the engine and pushes the built-in strategy JSON
+# (source/commands/loadCommand.cpp) onto the Redis `strategy_queue`.
+
+current_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+if ! source "$current_dir/build.sh"; then
+    echo "Error: Build failed. Aborting."
+    exit 1
+fi
+
+if [ ! -f "$BUILD_DIR/$EXECUTABLE_NAME" ]; then
+    echo "Error: Executable $EXECUTABLE_NAME not found in $BUILD_DIR."
+    ls -la "$BUILD_DIR"
+    exit 1
+fi
+
+if ! redis-cli -h localhost ping >/dev/null 2>&1; then
+    echo "redis-server not reachable on localhost:6379 — aborting"
+    exit 1
+fi
+
+exec ./"$BUILD_DIR/$EXECUTABLE_NAME" load

scripts/run.sh

@@ -24,38 +24,7 @@ if ! redis-cli -h localhost ping >/dev/null 2>&1; then
     exit 0
 fi
 
-json='{
-  "RUN_ID": "UNIQUE_IDENTIFIER",
-  "SYMBOLS": "EURUSD,AUDUSD",
-  "LAST_MONTHS": 2,
-  "STRATEGY": {
-      "UUID": "",
-      "TRADING_VARIABLES": {
-          "STRATEGY": "RandomStrategy",
-          "STOP_DISTANCE_IN_PIPS": "1.5",
-          "LIMIT_DISTANCE_IN_PIPS": "1.5",
-          "TRADING_SIZE": "1"
-      },
-      "OHLC_VARIABLES": [
-          {
-              "OHLC_COUNT": 60,
-              "OHLC_MINUTES": 100
-          }
-      ],
-      "STRATEGY_VARIABLES": {
-        "OHLC_RSI_VARIABLES": {
-            "RSI_LONG": 60,
-            "RSI_SHORT": 40
-        }
-      }
-  }
-}'
-
-tmp=$(mktemp -t backtesting-load.XXXXXX)
-trap 'rm -f "$tmp"' EXIT
-printf '%s' "$json" > "$tmp"
-
-if ! ./"$BUILD_DIR/$EXECUTABLE_NAME" load "$tmp"; then
+if ! ./"$BUILD_DIR/$EXECUTABLE_NAME" load; then
     exit 1
 fi
 

source/commands/loadCommand.cpp

@@ -6,39 +6,37 @@
 
 #include "loadCommand.hpp"
 
-#include <fstream>
-#include <iostream>
-#include <sstream>
-#include <string>
+#include <boost/decimal/literals.hpp>
+#include <nlohmann/json.hpp>
 
 #include "redisLoader.hpp"
+#include "trading_definitions.hpp"
 
-int LoadCommand::run(int argc, const char* argv[]) {
-    if (argc < 3) {
-        std::cerr << "Usage: " << argv[0] << " load <path> [path...]"
-                  << std::endl;
-        return 1;
-    }
-    for (int i = 2; i < argc; ++i) {
-        const std::string path = argv[i];
-        std::ifstream ifs(path);
-        if (!ifs) {
-            std::cerr << "BacktestingEngine: failed to open file: " << path
-                      << std::endl;
-            return 1;
-        }
-        std::ostringstream buffer;
-        buffer << ifs.rdbuf();
-        if (ifs.bad()) {
-            std::cerr << "BacktestingEngine: failed to read file: " << path
-                      << std::endl;
-            return 1;
-        }
-        const int rc = RedisLoader::load(buffer.str(), "127.0.0.1", 6379,
-                                         "strategy_queue");
-        if (rc != 0) {
-            return rc;
-        }
-    }
-    return 0;
-}
+int LoadCommand::run() {
+    using namespace boost::decimal::literals;
+    using namespace trading_definitions;
+
+    const Configuration config{
+        .RUN_ID = "UNIQUE_IDENTIFIER",
+        .SYMBOLS = "EURUSD,AUDUSD",
+        .LAST_MONTHS = 2,
+        .STRATEGY = Strategy{
+            .UUID = "",
+            .TRADING_VARIABLES = TradingVariables{
+                .STRATEGY = "RandomStrategy",
+                .STOP_DISTANCE_IN_PIPS = 1.5_DD,
+                .LIMIT_DISTANCE_IN_PIPS = 1.5_DD,
+                .TRADING_SIZE = 1_DD,
+            },
+            .OHLC_VARIABLES = {
+                OHLCVariables{.OHLC_COUNT = 60, .OHLC_MINUTES = 100},
+            },
+            .STRATEGY_VARIABLES = StrategyVariables{
+                .OHLC_RSI_VARIABLES = OHLCRSIVariables{.RSI_LONG = 60, .RSI_SHORT = 40},
+            },
+        },
+    };
+
+    const nlohmann::json j = config;
+    return RedisLoader::load(j.dump());
+}

source/main.cpp

@@ -12,19 +12,22 @@
 #include "loadCommand.hpp"
 #include "runCommand.hpp"
 
+// Entry point
 int main(int argc, const char* argv[]) {
+
   if (argc < 2) {
-    std::cerr << "BacktestingEngine: missing subcommand. See README.md for usage."
+    std::cerr << "BacktestingEngine: missing a subcommand. See README.md for usage"
               << std::endl;
     return 1;
   }
 
   const std::string_view subcommand = argv[1];
 
-  if (subcommand == "load") return LoadCommand::run(argc, argv);
+  if (subcommand == "load") return LoadCommand::run();
   if (subcommand == "run")  return RunCommand::run(argc, argv);
 
   std::cerr << "BacktestingEngine: unknown subcommand. See README.md for usage."
             << std::endl;
+            
   return 1;
 }