From f9ac5503eb1b9052efc75b296a2253cf2746b4c2 Mon Sep 17 00:00:00 2001
From: Oleg Sheynin <osheynin@gmail.com>
Date: Thu, 25 Apr 2024 15:37:53 -0400
Subject: [PATCH] progress

---
 release_version.txt                 |  2 +-
 scripts/alpaca_hist_md/alpaca_md.sh | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/release_version.txt b/release_version.txt
index ef090a6..da2ac9c 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-0.7.4
\ No newline at end of file
+0.7.5
\ No newline at end of file
diff --git a/scripts/alpaca_hist_md/alpaca_md.sh b/scripts/alpaca_hist_md/alpaca_md.sh
index be0ded0..088ec13 100755
--- a/scripts/alpaca_hist_md/alpaca_md.sh
+++ b/scripts/alpaca_hist_md/alpaca_md.sh
@@ -31,20 +31,34 @@ fi
 
 End=$(date -d "${Start} + 1 day" "+%Y-%m-%d")
 
+# Exclude today
+if [ "${End}" == $(date '+%Y-%m-%d') ] ; then
+    End=$(date -d 'yesterday' ''+%Y-%m-%d'')
+fi
+
 if [ "${NumJobs}" == "" ] ; then
     NumJobs=30
 fi
 
 echo "Start=${Start} End=${End} NumJobs=${NumJobs}"
 
+# export PyScript=/home/cvtt/prod/cvttpy/exchanges/alpaca/hist_mkt_data.py
+
 export PYTHONPATH=/home/cvtt/prod
 export Python=/home/cvtt/.pyenv/python3.10-venv/bin/python3
-export PyScript=/home/cvtt/prod/cvttpy/exchanges/alpaca/hist_mkt_data.py
-
-export OutputDir=/home/cvtt/host_drive/alpaca_md # Local
 export Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md
+export PyScript=/home/cvtt/prod/cvttpy/exchanges/alpaca/hist_md/hist_md_bars.py
+export OutputDir=/home/cvtt/host_drive/alpaca_md # Local
 export LogDir=/home/cvtt/prod/logs/alpaca_md
 
+# ----- T E M P
+# export PYTHONPATH=/home/oleg/develop/cvtt2
+# export Python=/home/oleg/.pyenv/python3.10-venv/bin/python3
+# export Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md
+# export PyScript=/home/oleg/develop/cvtt2/cvttpy/exchanges/alpaca/hist_md/hist_md_bars.py
+# export OutputDir=/home/oleg/develop/cvtt2/tmp # Local
+# export LogDir=/home/oleg/develop/cvtt2/tmp
+
 mkdir -p ${LogDir}
 
 run_proc() {
@@ -69,7 +83,7 @@ run_proc() {
 
 export -f run_proc
 
-if [ -n $InstListFile ]; then
+if [ "$InstListFile" == "" ]; then
 
     key=$(jq -r '.["ALPACA_SANDBOX"] | .api_key' ~/.creds)
     secret=$(jq -r '.["ALPACA_SANDBOX"] | .secret_key' ~/.creds)
@@ -96,5 +110,5 @@ slice_size=500 # 10K symbols parallel cannot handle
 for ((ii=0; ii <${#Instruments[@]}; ii+=slice_size)); do
     InstSlice=("${Instruments[@]:ii:slice_size}")
 
-    parallel -j ${NumJobs} run_proc {} ${Start} ${End} ::: "${InstSlice[@]}"
+    echo parallel -j ${NumJobs} run_proc {} ${Start} ${End} ::: "${InstSlice[@]}"
 done