diff --git a/.env b/.env index 7cb5bf7..8d6b934 100644 --- a/.env +++ b/.env @@ -45,7 +45,7 @@ DAILY_SIM_CRYPTO_RSYNC_TARGETS="${DAILY_SIM_CRYPTO_RSYNC_TARGETS} cvtt@cloud21.c # ==================================== daily_sim_equity -SIM_EQUITY_IMAGE_VERSION=0.0.2 +SIM_EQUITY_IMAGE_VERSION=0.0.5 DAILY_SIM_EQUITY_DATE= DAILY_SIM_EQUITY_SOURCE_HOST=cloud21.cvtt.vpn diff --git a/docker-compose.yml b/docker-compose.yml index 949e442..5ac5f3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,10 @@ #SIM_CRYPTO_IMAGE_VERSION=0.0.2 #SIM_EQUITY_IMAGE_VERSION=0.0.2 +name: daily_mktdata_services services: daily_crypto_cloud28: - image: cloud21.cvtt.vpn:5500/daily_crypto_md:${CRYPTO_IMAGE_VERSION} + image: cloud16.cvtt.vpn:5543/daily_crypto_md:${CRYPTO_IMAGE_VERSION} container_name: ${CRYPTO_CONTAINER_NAME_PFX}.cloud28 user: ${CVTT_USER:-1001:1001} pull_policy: always @@ -37,7 +38,7 @@ services: - 45678:5678 daily_crypto_cloud29: - image: cloud21.cvtt.vpn:5500/daily_crypto_md:${CRYPTO_IMAGE_VERSION} + image: cloud16.cvtt.vpn:5543/daily_crypto_md:${CRYPTO_IMAGE_VERSION} container_name: ${CRYPTO_CONTAINER_NAME_PFX}.cloud29 user: ${CVTT_USER:-1001:1001} pull_policy: always @@ -67,7 +68,7 @@ services: ports: - 45679:5678 daily_equity_hbar: - image: cloud21.cvtt.vpn:5500/daily_equity_md:${EQUITY_IMAGE_VERSION} + image: cloud16.cvtt.vpn:5543/daily_equity_md:${EQUITY_IMAGE_VERSION} container_name: alpaca_md_hbar_loader user: ${CVTT_USER:-1001:1001} pull_policy: always @@ -89,7 +90,7 @@ services: - ./config/identity/id_rsa.pub:/home/cvtt/.ssh/id_rsa.pub:ro daily_equity_qat: - image: cloud21.cvtt.vpn:5500/daily_equity_md:${EQUITY_IMAGE_VERSION} + image: cloud16.cvtt.vpn:5543/daily_equity_md:${EQUITY_IMAGE_VERSION} container_name: alpaca_md_qat_loader user: ${CVTT_USER:-1001:1001} pull_policy: always @@ -132,7 +133,7 @@ services: - ./config/identity/id_rsa.pub:/home/cvtt/.ssh/id_rsa.pub:ro daily_sim_equity: - image: cloud21.cvtt.vpn:5500/daily_sim:${SIM_EQUITY_IMAGE_VERSION} + image: cloud16.cvtt.vpn:5543/daily_sim:${SIM_EQUITY_IMAGE_VERSION} container_name: daily_sim_equity user: ${CVTT_USER:-1001:1001} pull_policy: always diff --git a/retrofit/crypto_retrofit.sh b/retrofit/crypto_retrofit.sh index ad5658d..ee87ed3 100755 --- a/retrofit/crypto_retrofit.sh +++ b/retrofit/crypto_retrofit.sh @@ -21,11 +21,12 @@ run_retrofit() { mkdir -p ${LogDir} Cmd="nohup ${RunDir}/${Script} ${Source} ${Params} > ${LogDir}/$(date '+%Y%m%d_%H%M%S').${Script}.${Source}.log 2>&1 &" - print_and_run ${Cmd} + echo ${Cmd} + eval ${Cmd} } for src in cloud28 cloud29; do run_retrofit retrofit_crypto.sh $src done -run_retrofit sim_crypto_retrofit.sh +#run_retrofit sim_crypto_retrofit.sh diff --git a/retrofit/equity_missing_dates.sh b/retrofit/equity_missing_dates.sh index de8d0ee..e564900 100755 --- a/retrofit/equity_missing_dates.sh +++ b/retrofit/equity_missing_dates.sh @@ -12,7 +12,7 @@ FileGlob=${FILE_GLOB:-${DEFAULT_FGLOB}} BackDaysCount=${BACKDAYS_COUNT:-50} echo "======================= Alpaca MD" -Cmd="get_equity_retrofit_dates ${Source} /works/cvtt/md_archive/equity/alpaca_md/2025/N/NVDA ${FileGlob} ${BackDaysCount}" +Cmd="get_equity_retrofit_dates ${Source} /works/cvtt/md_archive/equity/alpaca_md/*/N/NVDA/${FileGlob} ${BackDaysCount}" echo $Cmd DATES=$($Cmd) diff --git a/retrofit/get_retrofit_dates.sh b/retrofit/get_retrofit_dates.sh index a5d055f..b6a38d1 100755 --- a/retrofit/get_retrofit_dates.sh +++ b/retrofit/get_retrofit_dates.sh @@ -86,12 +86,12 @@ is_equity_business_date() { } get_equity_retrofit_dates() { + # get_equity_retrofit_dates cvtt@cloud21.cvtt.vpn /works/cvtt/md_archive/equity/alpaca_md/*/N/NVDA/*.alpaca_1m_bars.db.gz 50 local host=${1:-} - local root_dir=${2:-} - local filename_glob=${3:-} - local day_count=${4:-} + local filename_glob=${2:-} + local day_count=${3:-} - if [[ -z "$host" || -z "$root_dir" || -z "$filename_glob" || -z "$day_count" ]]; then + if [[ -z "$host" || -z "$filename_glob" || -z "$day_count" ]]; then echo "usage: get_equity_retrofit_dates " >&2 return 1 fi @@ -118,13 +118,14 @@ get_equity_retrofit_dates() { declare -A existing_dates=() local remote_cmd remote_output entry - printf -v remote_cmd "cd %q 2>/dev/null && LC_ALL=C ls -1 %s" "$root_dir" "$filename_glob" + remote_cmd="ls ${filename_glob}" remote_output=$(ssh "$host" "$remote_cmd" 2>/dev/null || true) if [[ -n "$remote_output" ]]; then while IFS= read -r entry; do [[ -z "$entry" ]] && continue - if [[ "$entry" =~ ^([0-9]{8}) ]]; then + fname=$(basename $entry) + if [[ "$fname" =~ ^([0-9]{8}) ]]; then existing_dates["${BASH_REMATCH[1]}"]=1 fi done <<<"$remote_output"