fix

VERSION

@@ -0,0 +1 @@
+0.1.8.F1,using HA trading-calendar

__TBD__/buildx.sh

@@ -26,7 +26,7 @@ ImageName=${AppName}
 ImageDir=${HOME}/docker_images
 mkdir -p ${ImageDir}
 
-Version=$(cat ${RootDir}/cvttpy/release_version.txt | awk -F, '{print $1}')
+Version=$(cat ${RootDir}/cvttpy/VERSION | awk -F, '{print $1}')
 
 cd ${RootDir}
 

build.sh

@@ -25,7 +25,7 @@ ImageDir=${HOME}/docker_images
 mkdir -p ${ImageDir}
 
 
-Version=$(cat ${RootDir}/${Project}/release_version.txt | awk -F, '{print $1}')
+Version=$(cat ${RootDir}/${Project}/VERSION | awk -F, '{print $1}')
 # Version=${ProjectVersion}
 
 cd ${RootDir}

config_service/HOWTO.md

@@ -2,7 +2,7 @@
 ## Build
 ```bash
 TgtHostname=cloud16.cvtt.vpn
-Version=$(cat cvttpy/release_version.txt)
+Version=$(cat cvttpy/VERSION)
 
 cd /home/oleg/develop/cvtt2
 docker build  -t config_service -t config_service:${Version} -f cvttpy/utils/docker/config_service/Dockerfile .

market_data/alpaca_hbar/Dockerfile

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y \
     jq
 
 # must be from disted version
-COPY cvtt-rust/dist/bin/alpaca_md_hbar_loader /
+COPY cvtt-rust/bin/alpaca_md_hbar_loader /
 
 # COPY ${FROM_DIR}/.creds  /.creds
 COPY ${FROM_DIR}/alpaca_hbar.sh /alpaca_hbar.sh

market_data/alpaca_hbar/alpaca_hbar.sh

@@ -50,7 +50,7 @@ mkdir -p ${LogDir}
 
 echo "CommandLine: ${*}"
 
-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
 
 
 if [ -z ${Start}  ] ; then

market_data/alpaca_qat/Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -y \
 
 
 # must be from disted version
-COPY cvtt-rust/dist/bin/alpaca_md_qat_loader /
+COPY cvtt-rust/bin/alpaca_md_qat_loader /
 
 # COPY ${FROM_DIR}/.creds  /.creds
 COPY ${FROM_DIR}/alpaca_qat.sh /alpaca_qat.sh

market_data/alpaca_qat/alpaca_qat.sh

@@ -54,7 +54,7 @@ mkdir -p ${LogDir}
 
 echo "CommandLine: ${*}"
 
-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
 
 
 if [ -z ${Start}  ] ; then

market_data/crypto_md_day/HOWTO.md

@@ -1,7 +1,7 @@
 # Build/Dev Host
 ## Build
 ```bash
-Version=$(cat /home/oleg/develop/cvtt2/cvttpy/release_version.txt)
+Version=$(cat /home/oleg/develop/cvtt2/cvttpy/VERSION)
 
 cd /home/oleg/develop/cvtt2
 docker build  -t crypto_md_day -t crypto_md_day:${Version} -f docker_dev/crypto_md_day/Dockerfile .

market_data/crypto_md_day/crypto_md_day.sh

@@ -52,7 +52,7 @@ export PYTHONPATH=/
 
 Cmd="python3.12"
 Cmd="${Cmd} 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} --credentials_file=/.creds"
 Cmd="${Cmd} --date=${Date}"

market_data/md_recorder/run_md_recorder.sh

@@ -26,7 +26,7 @@ if  ! is_valid "${job}"; then
     usage
 fi
 
-ConfigServer=cloud23.cvtt.vpn:6789
+ConfigServer=cloud16.cvtt.vpn:6789
 
 Cmd="python3.12"
 Cmd="${Cmd} cvttpy/apps/md/md_recorder.py"

market_data/md_recorder_monitor/run_mdr_monitor.sh

@@ -32,7 +32,7 @@ if [ "${2}" != "" ]; then
 fi
 
 
-ConfigServer=cloud23.cvtt.vpn:6789
+ConfigServer=cloud16.cvtt.vpn:6789
 
 Cmd="python3.12"
 Cmd="${Cmd} cvttpy/apps/md/md_rec_monitor.py"

market_data/relative_liquidity/Dockerfile

@@ -1,7 +1,7 @@
 FROM python:3.12-slim
 
 WORKDIR /
-COPY docker_dev/relative_liquidity/requirements.txt /
+COPY docker_dev/market_data/relative_liquidity/requirements.txt /requirements.txt
 RUN pip install --upgrade pip --root-user-action=ignore
 RUN pip install -r /requirements.txt --root-user-action=ignore
 
@@ -19,15 +19,3 @@ CMD [                                        \
     "--db_file=/app/data/rel_liquidity.db",                      \
     "--log_file=/logs/%T.REL_LIQUIDITY_SVC.log" \
 ]
-
-
-# Cmd="docker run"
-# Cmd="${Cmd} -d"
-# Cmd="${Cmd} --rm"
-# Cmd="${Cmd} --pull=always"
-# Cmd="${Cmd} --name=relative_liquidity_svc"
-# Cmd="${Cmd} -p 5678:5678"
-# Cmd="${Cmd} -v /home/cvtt/prod/data:/app/data"
-# Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
-# Cmd="${Cmd} cloud21.cvtt.vpn:5500/relative_liquidity:latest"
-

release_version.txt

@@ -1 +0,0 @@
-0.1.2,removed dependency on known_hosts file

research/crypto_exch_stats/Dockerfile

@@ -1,7 +1,9 @@
 FROM python:3.12-slim
 
+ARG FROM_DIR=./docker_dev/research/crypto_exch_stats
+
 WORKDIR /
-COPY docker_dev/research/crypto_exch_stats/requirements.txt /
+COPY ${FROM_DIR}/requirements.txt /
 
 RUN pip install --upgrade pip --root-user-action=ignore
 RUN pip install -r /requirements.txt --root-user-action=ignore
@@ -16,7 +18,7 @@ ENV PYTHONPATH=/
 CMD [                                                                      \
     "python3.12",                                                          \
     "cvttpy/apps//research/exchange_trading_stats.py",                     \
-    "--config=http://cloud23.cvtt.vpn:6789/apps/tests/listen_market_data", \
+    "--config=http://cloud16.cvtt.vpn:6789/apps/tests/listen_market_data", \
     "--active_exchanges=OKX,GEMINI,BITSTAMP,COINBASE_AT,BNBSPOT,KRAKEN",   \
     "--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", \
     "--db_file=/app/data/exchange_trading_stats.db",                       \

trading.__DEPRECATED__/executor/run_executor.sh

@@ -6,7 +6,7 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: $0"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7222)>"]
     echo -n " [-z (compress log)"]
@@ -14,7 +14,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX
 AdminPort=7222
 COMPRESS_LOG=false

trading.__DEPRECATED__/md_portal/run_md_portal.sh

@@ -5,7 +5,7 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: ${0}"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNBOX)>]"
     echo -n " [-a <admin_port (7220)>]"
     echo -n " [-n <portal_name (MD_PORTAL_ALPACA)>]"
@@ -14,7 +14,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX
 PortalName=MD_PORTAL_ALPACA_SNDBX
 AdminPort=7220

trading.__DEPRECATED__/quant/run_quant.sh

@@ -7,7 +7,7 @@ usage() {
 
     echo -n " -S <strategy> (dflt: TRDALGO_001)"
 
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7224)>"]
     echo -n " [-z (compress log)"]
@@ -15,7 +15,7 @@ usage() {
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7224
 Strategy=DAILY_STOCK_001

trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh

@@ -6,7 +6,7 @@
 usage() {
     echo -n "Usage: $0"
     echo -n " -b <book>"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -16,7 +16,7 @@ usage() {
 
 
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7223
 Book=""

trading.__DEPRECATED__/service_checker/run_svc_checker.sh

@@ -5,12 +5,12 @@
 # runs on host to start container
 usage() {
     echo -n "Usage: ${0}"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo
     exit 1
 }
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 
 
 while getopts ":c:" opt; do

trading.__DEPRECATED__/trader/run_trader.sh

@@ -10,7 +10,7 @@ usage() {
 
     echo -n " -A <algo> (dflt: TRDALGO_001)"
 
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -20,7 +20,7 @@ usage() {
 
 
 
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7226
 Algo=TRDALGO_001

trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh

@@ -6,7 +6,7 @@
 usage() {
     echo -n "Usage: $0"
     echo -n " -b <book>"
-    echo -n " [-c <config (dflt: http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
+    echo -n " [-c <config (dflt: http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca)>]"
     echo -n " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
     echo -n " [-a <admin_port (7223)>"]
     echo -n " [-z (compress log)"]
@@ -17,7 +17,7 @@ usage() {
 ActiveExchanges=ALPACA_SNDBX-MDPORTAL
 AdminPort=7225
 Book=""
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
+Config=http://cloud16.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
 COMPRESS_LOG=false