From 70c7769fd6b79636d2fe815d3a6bc39849797cca Mon Sep 17 00:00:00 2001 From: Oleg Sheynin Date: Sun, 24 Mar 2024 16:40:20 -0400 Subject: [PATCH] fix and progress --- release_version.txt | 2 +- scripts/alpaca_hist_md/alpaca_md.sh | 27 +++++++++++++++------------ 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/release_version.txt b/release_version.txt index eb514eb..e0ea44c 100644 --- a/release_version.txt +++ b/release_version.txt @@ -1 +1 @@ -0.6.4 \ No newline at end of file +0.6.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 429377a..45fba16 100755 --- a/scripts/alpaca_hist_md/alpaca_md.sh +++ b/scripts/alpaca_hist_md/alpaca_md.sh @@ -1,6 +1,11 @@ #!/bin/bash -CalendarURL=http://cloud16.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS +Start=${1} +End=${2} +NumJobs=${3} + +export CalendarURL=http://cloud16.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS + is_business_day() { dt=${1} @@ -14,13 +19,9 @@ is_business_day() { } export -f is_business_day -Start=${1} -End=${2} -NumJobs=${3} if [ "${Start}" == "" ] ; then - echo "Usage: ${0} [] [ (25)]]" - exit + Start=$(date -d "yesterday" "+%Y-%m-%d") fi if ! is_business_day ${Start}; then @@ -39,12 +40,15 @@ fi echo "Start=${Start} End=${End} NumJobs=${NumJobs}" -Python=/home/cvtt/.pyenv/python3.10-venv/bin/python3 -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 -OutputDir=/home/cvtt/alpaca_md -Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md +export OutputDir=/home/cvtt/alpaca_md +export Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md +export LogDir=/home/cvtt/prod/logs/alpaca_md +mkdir -p ${LogDir} run_proc() { Inst=${1} @@ -61,12 +65,11 @@ run_proc() { if [ "${End}" != "" ]; then Cmd="${Cmd} --end=${End}" fi - Cmd="${Cmd} --log_file=./logs/${Start}.${Inst}.log" + Cmd="${Cmd} --log_file=${LogDir}/${Start}.${Inst}.log" echo ${Cmd} eval ${Cmd} } -export PYTHONPATH=/home/cvtt/prod export -f run_proc key=$(jq -r '.["ALPACA_SANDBOX"] | .api_key' ~/.creds)