fix

VERSION

@@ -1 +1 @@
-2.1.3,remove cvttdata
+2.1.6,docker prepare sim - crypto - progress 

scripts/mkt_data/sim_prepare/prepare_crypto_simdata.sh

@@ -1,112 +1,55 @@
 #!/bin/bash
 
-# SQLite DDL for simulation
-# =========================
-
-
-# -- md_quotes
-
-# -- md_1min_bars
-
-
-usage() {
-  echo -n "Usage: $0"
-  echo -n " -d YYYMMDD Date>"
-  echo -n " [-O <output dir (./) >]"
-  echo -n " [-S <archive_source_host (cloud21)>]"
-  echo -n " [-D <orig_db_source> (cloud21)]"
-  echo
-  exit 1
-}
-
 # --------------------- Settings
-SourceHost=cloud21
-SourceRootDir=/opt/store/cvtt/md_archive/crypto
-DbSource=cloud21
+# SOURCE_HOST=cloud21.cvtt.vpn
+# SOURCE_ROOT_DIR=/opt/store/cvtt/md_archive/crypto
+# DB_SOURCE=cloud28
+# OUTPUT_DIR=/tmp
+# DATE=20250516
+# RSYNC_TARGETS="cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/ cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
 # --------------------- Settings
 
-while getopts ":d:O:S:D:" opt; do
-  case ${opt} in
-    d )
-      Date=$OPTARG
-      ;;
-    O )
-      OutputDir=$OPTARG
-      ;;
-    S )
-      SourceHost=$OPTARG
-      ;;
-    D )
-      DbSource=$OPTARG
-      ;;
-    \? )
-      echo "Invalid option: -$OPTARG" >&2
-      usage
-      ;;
-    : )
-      echo "Option -$OPTARG requires an argument." >&2
-      usage
-      ;;
-  esac
-done
-
-if [ -z ${Date}  ] ; then
-    echo "date is not specified"
-    usage
-fi
-if [ -z ${OutputDir}  ] ; then
-    OutputDir=.
+if [ -z ${DATE}  ] ; then
+    DATE=$(date -d 'yesterday' +'%Y%m%d')
 fi
 
-SourceHost+=".cvtt.vpn"
-mkdir -p ${OutputDir}
+if [ -z ${OUTPUT_DIR}  ] ; then
+    OUTPUT_DIR=.
+fi
 
-# --- Binance
-Instruments=( PAIR-ADA-USDT )
-Instruments+=( PAIR-BCH-USDT )
-Instruments+=( PAIR-BTC-USDT )
-Instruments+=( PAIR-DOT-USDT )
-Instruments+=( PAIR-ETH-USDT )
-Instruments+=( PAIR-LTC-USDT )
-Instruments+=( PAIR-SOL-USDT )
-Instruments+=( PAIR-USDC-USDT )
-Instruments+=( PAIR-XRP-USDT )
+echo "DATE=${DATE} SOURCE_HOST=${SOURCE_HOST}"
 
-# --- Coinbase
-Instruments+=( PAIR-ADA-USD )
-Instruments+=( PAIR-BCH-USD )
-Instruments+=( PAIR-BTC-USD )
-Instruments+=( PAIR-DOT-USD )
-Instruments+=( PAIR-ETH-USD )
-Instruments+=( PAIR-LTC-USD )
-Instruments+=( PAIR-SOL-USD )
-Instruments+=( PAIR-XRP-USD )
+mkdir -p ${OUTPUT_DIR}
 
-echo "Date=${Date} Instruments=${Instruments[@]} OutputDir=${OutputDir}"
-echo Getting data from ${DataHost} ...
-
-year=$(date -d ${Date} +"%Y")
-month=$(date -d ${Date} +"%m")
-SourceDir="${SourceRootDir}/${DbSource}/${year}/${month}"
-SourceFile="${SourceDir}/${Date}.mktdata.db.gz"
+year=$(date -d ${DATE} +"%Y")
+month=$(date -d ${DATE} +"%m")
+SourceDir="${SOURCE_ROOT_DIR}/${DB_SOURCE}/${year}/${month}"
+SourceFile="${SourceDir}/${DATE}.mktdata.db.gz"
 
 Cmd="rsync -ahv"
-Cmd+=" ${SourceHost}:${SourceFile}"
-Cmd+=" $OutputDir/"
+Cmd+=" -e 'ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'"
+Cmd+=" ${SOURCE_HOST}:${SourceFile}"
+Cmd+=" $OUTPUT_DIR/"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="(cd ${OutputDir} && gunzip *.db.gz)"
+Cmd="(cd ${OUTPUT_DIR} && gunzip -f *.db.gz)"
 echo ${Cmd}
 eval ${Cmd}
 
-SourceDbFile="${OutputDir}/${Date}.mktdata.db"
-ResultDbFile="${OutputDir}/${Date}.crypto_sim_md.db"
+SourceDbFile="${OUTPUT_DIR}/${DATE}.mktdata.db"
+ResultDbFile="${OUTPUT_DIR}/${DATE}.crypto_sim_md.db"
 
+echo "SourceDbFile=${SourceDbFile}"
 echo "Creating Result Database File ${ResultDbFile}"
+cleanup() {
+    rm ${SourceDbFile}
+}
+trap cleanup EXIT
 
 echo "Creating table md_trades ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_trades (
     tstamp text,
     tstamp_ns integer,
@@ -119,12 +62,14 @@ CREATE TABLE  IF NOT EXISTS md_trades (
     condition text,
     tape text
 );
+
 CREATE UNIQUE INDEX  IF NOT EXISTS md_trades_uidx
 ON md_trades(tstamp_ns, exchange_id, instrument_id);
 EOF
 
 echo "Creating table md_quotes ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_quotes (
     tstamp text,
     tstamp_ns integer,
@@ -143,6 +88,7 @@ EOF
 
 echo "Creating table md_1min_bars ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_1min_bars (
 	tstamp text,
 	tstamp_ns integer,
@@ -162,6 +108,7 @@ EOF
 
 echo "Loading md_trades ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_trades SELECT
@@ -199,6 +146,7 @@ EOF
 
 echo "Loading md_quotes ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_quotes SELECT
@@ -237,6 +185,7 @@ EOF
 
 echo "Loading md_1min_bars ..."
 sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${SourceDbFile}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_1min_bars SELECT
@@ -273,25 +222,14 @@ COMMIT;
 DETACH source_db;
 EOF
 
-Cmd="rm ${SourceDbFile}"
-echo ${Cmd}
-eval ${Cmd}
-
-
 Cmd="gzip ${ResultDbFile}"
 echo ${Cmd}
 eval ${Cmd}
 
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="rm ${ResultDbFile}.gz"
+for tgt in ${RSYNC_TARGETS} ; do 
+    Cmd="rsync -ahvv ${ResultDbFile}.gz ${tgt}"
     echo ${Cmd}
     eval ${Cmd}
+done 
 
 echo Done $0 ${*}

scripts/mkt_data/sim_prepare/prepare_eqt_simdata.sh

@@ -104,6 +104,7 @@ echo "Creating Result Database File ${ResultDbFile}"
 
 echo "Creating table md_trades ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_trades (
     tstamp text,
     tstamp_ns integer,
@@ -122,6 +123,7 @@ EOF
 
 echo "Creating table md_quotes ..."
 sqlite3 ${ResultDbFile} <<EOF
+.echo ON
 CREATE TABLE  IF NOT EXISTS md_quotes (
     tstamp text,
     tstamp_ns integer,
@@ -166,6 +168,7 @@ for sym in ${Symbols[@]}; do
 
     echo "Loading md_trades and md_quotes from ${src_qat_db} ..."
     sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${src_qat_db}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_trades SELECT
@@ -200,6 +203,7 @@ EOF
 
     echo "Loading md_1min_bars from ${src_hbar_db} ..."
     sqlite3  ${ResultDbFile} <<EOF
+.echo ON
 ATTACH '${src_hbar_db}' AS source_db;
 BEGIN;
 INSERT OR IGNORE INTO md_1min_bars SELECT