using specific version for md_recorder

VERSION

@@ -1 +1 @@
-1.9.8,release_version.txt -> VERSION
+2.0.2,using HA trading-calendar and config service

build/build_release.sh

@@ -150,6 +150,7 @@ whats_new=$(cat ${version_file} | awk -F',' '{print $2}')
 
 
 echo "--------------------------------"
+echo "Version file: ${version_file}"
 echo "Release version: ${release_version}"
 
 confirm

build/docker_images_builder.sh

@@ -5,6 +5,11 @@ usage() {
     echo
     exit 1
 }
+
+error_exit() {
+    echo "ERROR: ${1}"
+    exit 1
+}
 # --- Settings
 RootDir=${1}
 if [ -z "${RootDir}" ] ; then
@@ -14,7 +19,7 @@ fi
 RegistryService=cloud21.cvtt.vpn:5500
 RegistryProtocol=http
 
-ConfigUrl=http://cloud23.cvtt.vpn:6789/admin/docker_images
+ConfigUrl=http://cloud16.cvtt.vpn:6789/admin/docker_images
 
 
 ReleaseHost="cloud21.cvtt.vpn"
@@ -77,22 +82,21 @@ build_docker_image() {
     Cmd+=" -t ${image_name}:${image_version}"
     Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}"
     echo ${Cmd}
-    eval ${Cmd} 1>&2 || exit 1
+    eval ${Cmd} 1>&2 || error_exit "Docker build failed"
 
-    if [ ! -z "${test_script}" ]; then
+    if [ ! -z "${test_script}" ] && [ "${test_script}" != "null" ]; then
         if [ ! -f ${DockerDir}/${test_script} ]; then
-            echo "Test script ${test_script} is missing"
+            error_exit "Test script ${test_script} is missing"
-            exit 1
         fi
         echo "Running test script ${test_script} for ${image_name}"
 
         Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script copy failed"
 
         Cmd="docker exec ${image_name} chmod +x /${test_script}"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script chmod failed"
 
         Cmd="docker run"
         Cmd+=" --rm"
@@ -102,12 +106,12 @@ build_docker_image() {
         Cmd+=" /bin/bash -c /${TestScript}"
 
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script run failed"
 
         echo "Removing test script ${test_script} from ${image_name}"
         Cmd="docker exec ${image_name} rm /${test_script}"
         echo ${Cmd}
-        eval ${Cmd} 1>&2 || exit 1
+        eval ${Cmd} 1>&2 || error_exit "Test script remove failed"
     fi
 
 
@@ -148,23 +152,23 @@ COMMENT
     Cmd+=" ${image_name}:latest"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag failed"
 
     Cmd="docker tag"
     Cmd+=" ${image_name}:${image_version}"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker tag  2failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:latest"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push failed"
 
     Cmd="docker push"
     Cmd+=" ${RegistryService}/${image_name}:${image_version}"
     echo ${Cmd}
-    eval ${Cmd} || exit
+    eval ${Cmd} || error_exit "Docker push 2 failed"
 
     echo "Removing the copy of ${project} from ${RootDir}"
     Cmd="rm -rf ${RootDir}/${project}"
@@ -232,6 +236,7 @@ get_latest_dist_version() {
     echo "${Version}"
 }
 
+echo "------------------------------------- Starting ${0} ${*}"
 echo RootDir=${RootDir}
 
 cd ${RootDir}
@@ -256,7 +261,7 @@ for item in "${Jobs[@]}"; do
     project=$(echo "$item" | jq -r '.value.based_on_project')
     test_script=$(echo "$item" | jq -r '.value.test_script')
 
-    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" "${test_script}
+    build_docker_image "$title" "$image_name" "$docker_dev_path" "$project" "${test_script}"
 done
 
 Cmd="rm -rf ${RootDir}/docker_dev"

cronjobs/save_cronjobs.sh

@@ -9,7 +9,7 @@ get_user_hosts() {
     local User=${1}
     local Domain=${2}
 
-    Cmd="curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts"
+    Cmd="curl -s http://cloud16.cvtt.vpn:6789/admin/cvtt_hosts"
     Cmd="${Cmd} | ${HOME}/bin/hjson -j"
     Cmd="${Cmd} | jq -r"
     Cmd="${Cmd} --arg domain \"${Domain}\""

docker/market_data/hist/__DEPRECATED__/alpaca_md_day.sh

@@ -17,7 +17,7 @@ is_container_running() {
     fi
 }
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 is_business_day() {
     dt=${1}

docker/market_data/hist/crypto_md_day.sh

@@ -16,7 +16,7 @@ Cmd+=" --network=host"
 Cmd+=" --name=crypto_md_day.${host}.${date}"
 Cmd+=" --rm"
 Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
 Cmd+=" ${DockerImage}"
 Cmd+=" -h ${host}"
 Cmd+=" -d ${date}"

docker/market_data/hist/load_alpaca_hbar.sh

@@ -15,7 +15,7 @@ is_container_running() {
     fi
 }
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 is_business_day() {
     dt=${1}
@@ -92,7 +92,7 @@ Cmd+=" --name=${ContainerName}"
 Cmd+=" --rm"
 Cmd+=" --volume=${LogDir}:/logs"
 Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
 Cmd+=" ${DockerImage}"
 Cmd+=" -d ${date_to_load}"
 if [ -n "${NumSymbols}" ]; then

docker/market_data/hist/load_alpaca_qat.sh

@@ -15,7 +15,7 @@ is_container_running() {
     fi
 }
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 is_business_day() {
     dt=${1}
@@ -97,7 +97,7 @@ Cmd+=" --name=${ContainerName}"
 Cmd+=" --rm"
 Cmd+=" --volume=${LogDir}:/logs"
 Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
 Cmd+=" ${DockerImage}"
 Cmd+=" -d ${date_to_load}"
 Cmd+=" -S ${Symbols}"

docker/market_data/recorder/md_recorder.sh

@@ -3,7 +3,7 @@
 ValidJobs=('BNBFUT_CLD21' 'BNBSPOT_CLD21' 'COINBASE_CLD21' 'BNBFUT_CVTTDATA' 'BNBSPOT_CVTTDATA' 'COINBASE_CVTTDATA')
 # runs on host to start container
 usage() {
-  echo "Usage: $0 <job_name; one of (${ValidJobs[@]})>"
+  echo "Usage: $0 <job_name; one of (${ValidJobs[@]})> [image_tag]"
   exit 1
 }
 
@@ -35,6 +35,12 @@ if  ! is_valid "${job}"; then
     usage
 fi
 
+ImageTag=${2}
+if [ "${ImageTag}" == "" ] ; then
+    ImageTag="1.6.9"
+fi
+
+DockerImage=cloud21.cvtt.vpn:5500/md_recorder:${ImageTag}
 ContainerName="md_recorder.${job}"
 
 if is_container_running "$ContainerName"; then
@@ -47,13 +53,13 @@ Cmd="docker run"
 Cmd+=" -d"
 Cmd+=" --rm"
 Cmd+=" --network=host"
-Cmd+=" --pull=always"
+# Cmd+=" --pull=always"
 Cmd+=" --name=${ContainerName}"
 Cmd+=" -v /home/cvtt/.creds:/.creds"
 Cmd+=" -v /home/cvtt/prod/data:/app/data"
 Cmd+=" -v /home/cvtt/prod/logs:/logs"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd+=" cloud21.cvtt.vpn:5500/md_recorder:latest"
+Cmd+=" ${DockerImage}"
 Cmd+=" ${job}"
 
 echo ${Cmd}

docker/market_data/recorder/md_recorder_monitor.sh

@@ -52,7 +52,7 @@ Cmd+=" --pull=always"
 Cmd+=" --name=${ContainerName}"
 Cmd+=" -v /home/cvtt/.creds:/.creds"
 Cmd+=" -v /home/cvtt/prod/logs:/logs"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
 Cmd+=" cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
 Cmd+=" ${Instance} ${AdminPort}"
 

docker/research/crypto_exch_stats.sh

@@ -8,7 +8,7 @@ Cmd+=" --network=host"
 Cmd+=" --name=crypto_exch_stats"
 Cmd+=" --volume=${HOME}/prod/data:/app/data"
 Cmd+=" --volume=${HOME}/prod/logs:/logs"
-Cmd+=" -e CONFIG_SERVICE=cloud23.cvtt.vpn:6789"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
 Cmd+=" cloud21.cvtt.vpn:5500/crypto_exch_stats:latest"
 
 echo ${Cmd}

research/prepare_eqt_simdata.sh

@@ -15,7 +15,7 @@ is_business_day() {
     dt=${1}
     date=$(date -d "${dt}" +"%Y-%m-%d")
 
-    CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+    CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
     URL="${CalendarURL}&start=${date}&end=${date}"
     open_time=$(curl -s "${URL}" | jq '.[] | .open_time')
     if [ -n  "${open_time}" ]; then

scripts/__DEPRECATED__/archive_yesterday_md.sh

@@ -31,7 +31,7 @@ echo "Schemas=${Schemas}"
 Cmd=
 Cmd="${Python}"
 Cmd="${Cmd} ${RootDir}/cvttpy/research/utils/archive_ts_md.py"
-Cmd="${Cmd} --config=http://cloud23.cvtt.vpn:6789/apps/md_recorder"
+Cmd="${Cmd} --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder"
 Cmd="${Cmd} --db_credentials_key=${CredKey}"
 Cmd="${Cmd} --date=${yesterday}"
 Cmd="${Cmd} --schemas=${Schemas}"

scripts/healthcheck/cvtt_ts_status_check.sh

@@ -3,7 +3,7 @@
 usage() {
     echo -n "Usage: ${0}"
     echo -n " [-c <config (dflt: apps/cvtt_eqt_alpaca)>]"
-    echo -n " [-s <config_serverice (dflt: http://cloud23.cvtt.vpn:6789)>]"
+    echo -n " [-s <config_serverice (dflt: http://cloud16.cvtt.vpn:6789)>]"
     echo -n " [-N <name (dflt: ALPACA-SNDBX)>]"
     echo
     exit 1
@@ -23,7 +23,7 @@ export PYTHONPATH=${RootDir}
 StatusChannel=Status-CVTT
 AlertChannel=Alerts-CVTT
 Sender=${RootDir}/ops/utils/send_mmost.sh
-ConfigService=http://cloud23.cvtt.vpn:6789
+ConfigService=http://cloud16.cvtt.vpn:6789
 Config=apps/cvtt_eqt_alpaca
 Name="ALPACA-SNDBX"
 

scripts/healthcheck/hosts_check.sh

@@ -13,7 +13,7 @@ RootDir="${HOME}/prod"
 
 AlertChannel=Alerts-CVTT
 Sender=${RootDir}/ops/utils/send_mmost.sh
-ConfigUrl=http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts
+ConfigUrl=http://cloud16.cvtt.vpn:6789/admin/cvtt_hosts
 
 HOSTS_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j)
 

scripts/healthcheck/services_check.sh

@@ -12,7 +12,7 @@ RootDir="${HOME}/prod"
 
 AlertChannel=Alerts-CVTT
 Sender=${RootDir}/ops/utils/send_mmost.sh
-ConfigUrl=http://cloud23.cvtt.vpn:6789/admin/cvtt_services
+ConfigUrl=http://cloud16.cvtt.vpn:6789/admin/cvtt_services
 
 SERVICES_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j)
 

scripts/healthcheck/storage_health_check.sh

@@ -18,7 +18,7 @@ get_user_hosts() {
     local User=${1}
     local Domain=${2}
 
-    Cmd="curl -s http://cloud23.cvtt.vpn:6789/admin/cvtt_hosts"
+    Cmd="curl -s http://cloud16.cvtt.vpn:6789/admin/cvtt_hosts"
     Cmd+=" | ${HOME}/bin/hjson -j"
     Cmd+=" | jq -r"
     Cmd+=" --arg domain \"${Domain}\""

scripts/mkt_data/alpaca_hist_md/alpaca_md.sh

@@ -4,7 +4,7 @@ Start=${1}
 NumJobs=${2}
 InstListFile=${3}
 
-export CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+export CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
 
 is_business_day() {
     dt=${1}
@@ -46,7 +46,7 @@ echo "Start=${Start} End=${End} NumJobs=${NumJobs}"
 
 export PYTHONPATH=/home/cvtt/prod
 export Python=/home/cvtt/.pyenv/python3.12-venv/bin/python3
-export Config=http://cloud23.cvtt.vpn:6789/apps/minimal_md
+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/prod/archive/md_archive/equity/alpaca_md # Local

scripts/mkt_data/alpaca_hist_md/load_rel_liq.sh

@@ -5,7 +5,7 @@ export PYTHONPATH=${HOME}/prod
 Python=${HOME}/.pyenv/python3.12-venv/bin/python3
 Script=${HOME}/prod/cvttpy/exchanges/alpaca/hist_md/rl_calc_loader.py
 DbFile=${HOME}/prod/data/rel_liquidity.db
-Config=http://cloud23.cvtt.vpn:6789/apps/minimal_md_eqt
+Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md_eqt
 
 Cmd="${Python}"
 Cmd="${Cmd} ${Script}"

scripts/mkt_data/alpaca_hist_md/run_alpaca_hist_md.sh

@@ -3,7 +3,7 @@
 is_business_day() {
     dt=${1}
 
-    CalendarURL=http://cloud23.cvtt.vpn:8000/api/v1/markets/hours?mic=XNYS
+    CalendarURL=https://trading-calendar.cvtt.net/api/v1/markets/hours?mic=XNYS
     open_time=$(curl -s "${CalendarURL}&start=${dt}&end=${dt}" | jq '.[] | .open_time')
     if [ -n  "${open_time}" ]; then
         return 0

scripts/mkt_data/crypto_hist_md/exchanges_trading_stats.sh

@@ -4,7 +4,7 @@ export PYTHONPATH=/home/cvtt/prod
 
 Cmd="/home/cvtt/.pyenv/python3.12-venv/bin/python3"
 Cmd="${Cmd} /home/cvtt/prod/cvttpy/apps/research/exchange_trading_stats.py"
-Cmd="${Cmd} --config=http://cloud23.cvtt.vpn:6789/apps/tests/listen_market_data"
+Cmd="${Cmd} --config=http://cloud16.cvtt.vpn:6789/apps/tests/listen_market_data"
 Cmd="${Cmd} --active_exchanges=OKX,GEMINI,BITSTAMP,COINBASE_AT,BNBSPOT,KRAKEN"
 Cmd="${Cmd} --instruments=OKX:PAIR-BTC-USDT,GEMINI:PAIR-BTC-USD,BITSTAMP:PAIR-BTC-USD,COINBASE:PAIR-BTC-USD,BNBSPOT:PAIR-BTC-USDT,KRAKEN:PAIR-BTC-USD"
 Cmd="${Cmd} --db_file=/home/cvtt/prod/data/exchange_trading_stats.db"

scripts/set_version.sh

@@ -47,7 +47,7 @@ function rsync_load_version() {
         if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
         then
             echo "Directory found..."
-            rsync_cmd="rsync -ahvv -e \"ssh -p ${port}\""
+            rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
             rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}"
             rsync_cmd="${rsync_cmd} ${LocalSoftwareDir}/${Project}/"
             echo ${rsync_cmd}