prepare crypto sim enhanced

VERSION

@@ -0,0 +1 @@
+2.0.8,prepare crypto sim enhanced

admin/docker_images.sh

@@ -1,6 +1,6 @@
 #!/bin/env bash
 
-Registry=http://homestore.cvtt.vpn:5500
+Registry=http://hs01.cvtt.vpn:5500
 
 Catalog=${Registry}/v2/_catalog
 
@@ -11,5 +11,12 @@ jstr=$(curl -s -X GET ${Catalog})
 echo "${jstr}" | jq -r '.repositories[]' | while read repo; do
     TagListURL="${Registry}/v2/${repo}/tags/list"
     # echo $repo
-    curl -s -X GET ${TagListURL}
+    Cmd="curl -s -X GET ${TagListURL}"
+    echo ${Cmd}
+    eval ${Cmd}
+    # TagList=$(eval ${Cmd})
+    # # echo ${TagList}
+    # echo "${TagList}" | jq -r '.tags[]' | while read tag; do
+    #     echo "${Registry}/${repo}:${tag}"
+    # done
 done

build/build_release.sh

@@ -3,19 +3,20 @@
 # ---------------- Settings
 declare -A git_repo_arr
 
-git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvttpy.git
+git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/cvttpy.git
-git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/ops.git
+git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/ops.git
-git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/research.git
+git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/research.git
 git_repo_arr[cvtt-rust]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/cvtt-rust.git
+git_repo_arr[docker_dev]=git@cloud21.cvtt.vpn:/opt/store/git/cvtt2/docker_dev.git
 
 dist_root=/home/cvttdist/software/cvtt2
 dist_user=cvttdist
 dist_host="cloud21.cvtt.vpn"
 dist_ssh_port="22"
 
-dist_locations="cloud21.cvtt.vpn:22 homestore.cvtt.vpn:22"
 # ---------------- Settings
-
+dist_locations="cloud21.cvtt.vpn:22 hs01.cvtt.vpn:22"
+version_file="VERSION"
 # ---------------- cmdline
 prj=
 brnch=master
@@ -144,11 +145,12 @@ if [ "${?}" != "0" ]; then
 fi
 
 
-release_version=$(cat release_version.txt | awk -F',' '{print $1}')
+release_version=$(cat ${version_file} | awk -F',' '{print $1}')
-whats_new=$(cat release_version.txt | awk -F',' '{print $2}')
+whats_new=$(cat ${version_file} | awk -F',' '{print $2}')
 
 
 echo "--------------------------------"
+echo "Version file: ${version_file}"
 echo "Release version: ${release_version}"
 
 confirm
@@ -171,17 +173,19 @@ if [ "${project}" == "cvtt-rust" ]; then
 
     cmd_arr+=("cd ${prj_dir}")
 
-    cmd_arr+=("mkdir -p ${prj_dir}/dist/release")
+    release_dir=${prj_dir}/dist/${project}
-    cmd_arr+=("cp release_version.txt ./dist/release")
+
+    cmd_arr+=("mkdir -p ${release_dir}")
+    cmd_arr+=("cp ${version_file} ${release_dir}")
 
     jq_cmd="jq '.packages[] | select(.targets[].kind[] == \"bin\") | .name'"
     apps=$(cargo metadata --no-deps --format-version 1 --manifest-path=${prj_dir}/Cargo.toml | eval $jq_cmd | uniq)
     for app in ${apps[@]}; do
         app=${app//\"/} # remove quotes
-        cmd_arr+=("cargo install --root ${prj_dir}/dist/release --path ${prj_dir}/apps/${app}")
+        cmd_arr+=("cargo install --root ${release_dir} --path ${prj_dir}/apps/${app}")
     done
 
-    SourceLoc=${prj_dir}/dist/release
+    SourceLoc=${release_dir}
 fi
 
 dist_path="${dist_root}/${project}/${release_version}"

build/docker_images_builder.sh

@@ -0,0 +1,273 @@
+#!/bin/bash
+
+usage() {
+    echo -n "Usage: ${0}  <RootDir>"
+    echo
+    exit 1
+}
+
+error_exit() {
+    echo "ERROR: ${1}"
+    exit 1
+}
+# --- Settings
+RootDir=${1}
+if [ -z "${RootDir}" ] ; then
+    usage
+fi
+
+RegistryService=cloud21.cvtt.vpn:5500
+RegistryProtocol=http
+
+ConfigUrl=http://cloud16.cvtt.vpn:6789/admin/docker_images
+
+
+ReleaseHost="cloud21.cvtt.vpn"
+ReleasePort="22"
+ReleaseUser="cvttdist"
+ReleaseDir="/home/cvttdist/software/cvtt2"
+
+DIMAGES_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j)
+
+
+SetVersionScript=${HOME}/prod/set_version.sh
+
+
+# --------------- D E B U G
+
+mkdir -p ${RootDir}
+
+build_docker_image() {
+    title=${1}
+    image_name=${2}
+    docker_dev_path=${3}
+    project=${4}
+    test_script=${5}
+
+    echo "Building ${title}..."
+    echo "ImageName=${image_name}"
+    echo "DockerDevPath=${docker_dev_path}"
+    echo "BasedOnDist=${project}"
+
+    # Get Latest DIST version
+    echo "Checking for latest version of ${project} on ${ReleaseUser}@${ReleaseHost}:${ReleaseDir}"
+    image_version=$(get_latest_dist_version ${project})
+    if [ -z "${image_version}" ]; then
+        echo "No latest version found for ${project}"
+        return
+    fi
+    echo "Latest version is ${image_version}"
+
+    if image_exists "${image_name}" "${image_version}"; then
+        echo "Image $image_name:$image_version exists in the registry. Building is not required."
+        return
+    fi
+    echo "Image $image_name:$image_version does not exist in the registry."
+    echo "getting lastest version of ${project} on ${ReleaseUser}@${ReleaseHost}:${ReleaseDir}"
+
+    Cmd="${SetVersionScript} ${project} ${image_version}"
+    echo ${Cmd}
+    eval ${Cmd}
+
+    convert_symlink_to_dir ${project}
+
+    DockerDir=./docker_dev/${docker_dev_path}
+    echo "================================================================================"
+    echo "Building ${title}... on ${DockerDir}"
+    echo "================================================================================"
+
+    Cmd="docker build"
+    Cmd+=" -t ${image_name}"
+    Cmd+=" -t ${image_name}:latest"
+    Cmd+=" -t ${image_name}:${image_version}"
+    Cmd+=" -f ${DockerDir}/Dockerfile ${RootDir}"
+    echo ${Cmd}
+    eval ${Cmd} 1>&2 || error_exit "Docker build failed"
+
+    if [ ! -z "${test_script}" ] && [ "${test_script}" != "null" ]; then
+        if [ ! -f ${DockerDir}/${test_script} ]; then
+            error_exit "Test script ${test_script} is missing"
+        fi
+        echo "Running test script ${test_script} for ${image_name}"
+
+        Cmd="docker cp ${DockerDir}/${test_script} ${image_name}:/"
+        echo ${Cmd}
+        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 || error_exit "Test script chmod failed"
+
+        Cmd="docker run"
+        Cmd+=" --rm"
+        Cmd+=" -d"
+        Cmd+=" --name test-container"
+        Cmd+=" ${image_name}"
+        Cmd+=" /bin/bash -c /${TestScript}"
+
+        echo ${Cmd}
+        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 || error_exit "Test script remove failed"
+    fi
+
+
+: <<'COMMENT'
+    -------------------------
+    Every single docker_dev project must have a test script
+    image_test.sh
+    that is copied to the image's root directory.
+    -------------------------
+
+
+    Cmd="docker run"
+    Cmd+=" --rm"
+    Cmd+=" -d"
+    Cmd+=" --name test-container"
+    Cmd+=" ${image_name}"
+    Cmd+=" /bin/bash -c /${TestScript}"
+
+    echo ${Cmd}
+    eval ${Cmd} 1>&2 || exit 1
+
+
+    # Get the exit status of the test script
+    docker wait test-container
+
+    # Check the exit status of the container
+    EXIT_STATUS=$?
+
+    # Analyze the exit status
+    if [ ${EXIT_STATUS} -ne 0 ]; then
+        echo "Tests Failed"
+        exit 1
+    fi
+COMMENT
+
+
+    Cmd="docker tag"
+    Cmd+=" ${image_name}:latest"
+    Cmd+=" ${RegistryService}/${image_name}:latest"
+    echo ${Cmd}
+    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} || error_exit "Docker tag  2failed"
+
+    Cmd="docker push"
+    Cmd+=" ${RegistryService}/${image_name}:latest"
+    echo ${Cmd}
+    eval ${Cmd} || error_exit "Docker push failed"
+
+    Cmd="docker push"
+    Cmd+=" ${RegistryService}/${image_name}:${image_version}"
+    echo ${Cmd}
+    eval ${Cmd} || error_exit "Docker push 2 failed"
+
+    echo "Removing the copy of ${project} from ${RootDir}"
+    Cmd="rm -rf ${RootDir}/${project}"
+    echo ${Cmd}
+    eval ${Cmd}
+
+    print_all_reg_images ${project}
+}
+
+convert_symlink_to_dir() {
+    project=${1}
+    if [ -L ${RootDir}/${project} ]; then
+        echo "Converting symlink ${RootDir}/${project} to directory"
+
+        Cmd="mv ${RootDir}/${project} ${RootDir}/${project}.symlink"
+        echo ${Cmd} && eval ${Cmd}
+
+        src_path=$(readlink -f ${RootDir}/${project}.symlink)
+
+        Cmd="cp -r ${src_path} ${RootDir}/${project}"
+        echo ${Cmd} && eval ${Cmd}
+    fi
+    if [ -d ${project} ]; then
+        echo "${RootDir}/${project} is a Directory"
+    fi
+    Cmd="rm ${RootDir}/${project}.symlink"
+    echo ${Cmd} && eval ${Cmd}
+}
+
+image_exists() {
+    image_name=${1}
+    version=${2}
+    response=$(curl -s -o /dev/null -w "%{http_code}" "${RegistryProtocol}://${RegistryService}/v2/${image_name}/manifests/${version}" -H "Accept: application/vnd.docker.distribution.manifest.v2+json")
+    if [ "$response" -eq 200 ]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+print_all_reg_images() {
+    project=${1}
+
+    repositories=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/_catalog" | jq -r '.repositories[]')
+
+    for repo in $repositories; do
+        # Fetch all tags for the repository
+        tags=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/$repo/tags/list" | jq -r '.tags[]')
+
+        # List each tag
+        for tag in $tags; do
+            if [ "${project}" == "" ];then
+                echo "$repo:$tag"
+            else
+                echo "$repo:$tag" | grep ${project}
+            fi
+        done
+    done
+}
+
+get_latest_dist_version() {
+    project=${1}
+
+    Version=$(ssh -q -p ${ReleasePort} ${ReleaseUser}@${ReleaseHost} "ls -tr ${ReleaseDir}/${project} | tail -1" )
+    echo "${Version}"
+}
+
+echo "------------------------------------- Starting ${0} ${*}"
+echo RootDir=${RootDir}
+
+cd ${RootDir}
+
+echo "Getting latest version of docker_dev"
+Cmd="${SetVersionScript} docker_dev latest"
+echo ${Cmd}
+eval ${Cmd}
+
+convert_symlink_to_dir docker_dev
+
+Jobs=()
+while IFS= read -r item; do
+    Jobs+=("$item")
+done < <(echo "${DIMAGES_CONFIG}" | jq -c 'to_entries[]')
+
+for item in "${Jobs[@]}"; do
+    # Extract key (name) and values
+    title=$(echo "$item" | jq -r '.key')
+    image_name=$(echo "$item" | jq -r '.value.image_name')
+    docker_dev_path=$(echo "$item" | jq -r '.value.docker_dev_path')
+    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}"
+done
+
+Cmd="rm -rf ${RootDir}/docker_dev"
+echo ${Cmd}
+eval ${Cmd}
+
+echo "Done ${0} ${*}"
+#===============================================================================
+#===============================================================================

build/list_docker_images.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+usage() {
+    echo -n "Usage: ${0}  <grep_filter>"
+    echo
+    exit 1
+}
+# --- Settings
+RegistryService=cloud21.cvtt.vpn:5500
+RegistryProtocol=http
+
+print_all_reg_images() {
+    project=${1}
+
+    repositories=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/_catalog" | jq -r '.repositories[]')
+
+    for repo in $repositories; do
+        # Fetch all tags for the repository
+        tags=$(curl -s "${RegistryProtocol}://${RegistryService}/v2/$repo/tags/list" | jq -r '.tags[]')
+
+        # List each tag
+        echo "REPO: $repo"
+        for tag in $tags; do
+            if [ "${project}" == "" ];then
+                echo "$repo:$tag"
+            else
+                echo "$repo:$tag" | grep ${project}
+            fi
+        done
+    done
+}
+
+print_all_reg_images ${1}

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

@@ -1,25 +1,44 @@
 #!/bin/bash
+usage() {
+    echo "Usage: ${0} <docker_image_tag> <host> [<date>]"
+    exit 1
+}
 
-host=${1}
+# ------- Settings
-date=${2}
-
 DockerRegistry=cloud21.cvtt.vpn:5500
-DockerImage=${DockerRegistry}/crypto_md_day
+# ------- Settings
+
+ImageTag=${1}
+host=${2}
+date=${3}
+
+if [ -z ${ImageTag} ] ; then
+    usage
+fi
+
+if [ -z ${host} ] ; then
+    usage
+fi
 
 if [ -z ${date} ] ; then
     date=$(date -d "yesterday" +%Y%m%d)
 fi
 
+DockerImage=${DockerRegistry}/crypto_md_day:${ImageTag}
+
+
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
+Cmd+=" --pull=always"
-Cmd="${Cmd} --network=host"
+Cmd+=" --network=host"
-Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
+Cmd+=" --name=crypto_md_day.${host}.${date}"
-Cmd="${Cmd} --rm"
+Cmd+=" --rm"
-Cmd="${Cmd} ${DockerImage}"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} -h ${host}"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd="${Cmd} -d ${date}"
+Cmd+=" ${DockerImage}"
-# Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
+Cmd+=" -h ${host}"
-Cmd="${Cmd} -s coinbase,bnbspot"
+Cmd+=" -d ${date}"
+# Cmd+=" -s coinbase,bnbspot,bnbfut"
+Cmd+=" -s coinbase,bnbspot"
 
 echo $Cmd
 eval $Cmd

docker/market_data/hist/load_alpaca_hbar.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 usage() {
-  echo "Usage: $0  -N <num_symbols> [-L <LogDir>] [-d <YYYYMMDD Date>]"
+  echo "Usage: $0  -N <num_symbols> [-L <LogDir>] [-d <YYYYMMDD Date>] [-t <docker_image_tag>]"
   exit 1
 }
 
@@ -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}
@@ -45,12 +45,12 @@ export -f get_prev_business_day
 
 # ----- Settings
 DockerRegistry=cloud21.cvtt.vpn:5500
-DockerImage=${DockerRegistry}/alpaca_hbar #:latest
 ContainerName=alpaca_hbar
 LogDir=/home/cvtt/prod/logs
+ImageTag=0.1.7
 # ----- Settings
 
-while getopts ":d:N:L:" opt; do
+while getopts ":d:N:L:t:" opt; do
   case ${opt} in
     d )
       date_to_load=$OPTARG
@@ -61,6 +61,9 @@ while getopts ":d:N:L:" opt; do
     L )
       LogDir=$OPTARG
       ;;
+    t )
+      ImageTag=$OPTARG
+      ;;
     \? )
       echo "Invalid option: -$OPTARG" >&2
       usage
@@ -72,6 +75,9 @@ while getopts ":d:N:L:" opt; do
   esac
 done
 
+DockerImage=${DockerRegistry}/alpaca_hbar:${ImageTag} #:latest
+
+
 if is_container_running "$ContainerName"; then
     echo "Container ${ContainerName} is already running."
     exit 3
@@ -86,15 +92,17 @@ fi
 echo "date_to_load=${date_to_load}"
 
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
+Cmd+=" --pull=always"
-Cmd="${Cmd} --network=host"
+Cmd+=" --network=host"
-Cmd="${Cmd} --name=${ContainerName}"
+Cmd+=" --name=${ContainerName}"
-Cmd="${Cmd} --rm"
+Cmd+=" --rm"
-Cmd="${Cmd} --volume=${LogDir}:/logs"
+Cmd+=" --volume=${LogDir}:/logs"
-Cmd="${Cmd} ${DockerImage}"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} -d ${date_to_load}"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" -d ${date_to_load}"
 if [ -n "${NumSymbols}" ]; then
-    Cmd="${Cmd} -N ${NumSymbols}"
+    Cmd+=" -N ${NumSymbols}"
 fi
 
 echo $Cmd

docker/market_data/hist/load_alpaca_qat.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 usage() {
-  echo "Usage: $0  -S <symbols> [-L <LogDir>] [-d <YYYYMMDD Date>]"
+  echo "Usage: $0  -S <symbols> [-L <LogDir>] [-d <YYYYMMDD Date>] [-t <docker_image_tag>]"
   exit 1
 }
 
@@ -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}
@@ -45,12 +45,12 @@ export -f get_prev_business_day
 
 # ----- Settings
 DockerRegistry=cloud21.cvtt.vpn:5500
-DockerImage=${DockerRegistry}/alpaca_qat #:latest
 ContainerName=alpaca_qat
 LogDir=/home/cvtt/prod/logs
+ImageTag=0.1.7
 # ----- Settings
 
-while getopts ":d:S:L:" opt; do
+while getopts ":d:S:L:t:" opt; do
   case ${opt} in
     d )
       date_to_load=$OPTARG
@@ -61,6 +61,9 @@ while getopts ":d:S:L:" opt; do
     L )
       LogDir=$OPTARG
       ;;
+    t )
+      ImageTag=$OPTARG
+      ;;
     \? )
       echo "Invalid option: -$OPTARG" >&2
       usage
@@ -82,6 +85,8 @@ if is_container_running "$ContainerName"; then
     exit 3
 fi
 
+DockerImage=${DockerRegistry}/alpaca_qat:${ImageTag} #:latest
+
 if [ -z "${date_to_load}" ]; then
     echo "date_to_load is empty"
     date_to_load=$(get_prev_business_day $(date  -d "yesterday" '+%Y-%m-%d'))
@@ -91,14 +96,16 @@ fi
 echo "date_to_load=${date_to_load}"
 
 Cmd="docker run"
-Cmd="${Cmd} --pull=always"
+Cmd+=" --pull=always"
-Cmd="${Cmd} --network=host"
+Cmd+=" --network=host"
-Cmd="${Cmd} --name=${ContainerName}"
+Cmd+=" --name=${ContainerName}"
-Cmd="${Cmd} --rm"
+Cmd+=" --rm"
-Cmd="${Cmd} --volume=${LogDir}:/logs"
+Cmd+=" --volume=${LogDir}:/logs"
-Cmd="${Cmd} ${DockerImage}"
+Cmd+=" --volume=${HOME}/.creds:/.creds"
-Cmd="${Cmd} -d ${date_to_load}"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
-Cmd="${Cmd} -S ${Symbols}"
+Cmd+=" ${DockerImage}"
+Cmd+=" -d ${date_to_load}"
+Cmd+=" -S ${Symbols}"
 
 echo $Cmd
 eval $Cmd

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
@@ -44,15 +50,17 @@ fi
 
 
 Cmd="docker run"
-Cmd="${Cmd} -d"
+Cmd+=" -d"
-Cmd="${Cmd} --rm"
+Cmd+=" --rm"
-Cmd="${Cmd} --network=host"
+Cmd+=" --network=host"
-Cmd="${Cmd} --pull=always"
+# Cmd+=" --pull=always"
-Cmd="${Cmd} --name=${ContainerName}"
+Cmd+=" --name=${ContainerName}"
-Cmd="${Cmd} -v /home/cvtt/prod/data:/app/data"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
-Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -v /home/cvtt/prod/data:/app/data"
-Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder:latest"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
-Cmd="${Cmd} ${job}"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
+Cmd+=" ${DockerImage}"
+Cmd+=" ${job}"
 
 echo ${Cmd}
 eval ${Cmd}

docker/market_data/recorder/md_recorder_monitor.sh

@@ -27,9 +27,6 @@ is_container_running() {
     fi
 }
 
-
-
-
 Instance=${1}
 if ! is_valid "${Instance}"; then
     usage
@@ -48,14 +45,16 @@ if is_container_running "$ContainerName"; then
 fi
 
 Cmd="docker run"
-Cmd="${Cmd} -d"
+Cmd+=" -d"
-Cmd="${Cmd} --rm"
+Cmd+=" --rm"
-Cmd="${Cmd} --network=host"
+Cmd+=" --network=host"
-Cmd="${Cmd} --pull=always"
+Cmd+=" --pull=always"
-Cmd="${Cmd} --name=${ContainerName}"
+Cmd+=" --name=${ContainerName}"
-Cmd="${Cmd} -v /home/cvtt/prod/logs:/logs"
+Cmd+=" -v /home/cvtt/.creds:/.creds"
-Cmd="${Cmd} cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
+Cmd+=" -v /home/cvtt/prod/logs:/logs"
-Cmd="${Cmd} ${Instance} ${AdminPort}"
+Cmd+=" -e CONFIG_SERVICE=cloud16.cvtt.vpn:6789"
+Cmd+=" cloud21.cvtt.vpn:5500/md_recorder_monitor:latest"
+Cmd+=" ${Instance} ${AdminPort}"
 
 echo ${Cmd}
 eval ${Cmd}

docker/research/crypto_exch_stats.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+Cmd="docker run"
+Cmd+=" -d"
+Cmd+=" --rm"
+Cmd+=" --pull=always"
+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=cloud16.cvtt.vpn:6789"
+Cmd+=" cloud21.cvtt.vpn:5500/crypto_exch_stats:latest"
+
+echo ${Cmd}
+eval ${Cmd}
+# Cmd+=" cloud21.cvtt.vpn:5500/relative_liquidity:latest"
+

release_version.txt

@@ -1 +0,0 @@
-1.8.2,md eqty checklist  to use new structure

research/ad_hoc/rearrange2.sh

@@ -2,7 +2,7 @@
 
 # by chatGPT
 # ==========================================
-# homestore.cvtt.vpn SETTINGS
+# hs01.cvtt.vpn SETTINGS
 # ==========================================
 
 # Define source and destination base directories

research/load_crypto_md.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 usage() {
-  echo "Usage: $0 [-h <host (homestore*/cloud21)>] [-d <YYYYMMDD> (yesterday*)] [-s <source> (cvttdata/cloud21*)>]"
+  echo "Usage: $0 [-h <host (hs01*/cloud21)>] [-d <YYYYMMDD> (yesterday*)] [-s <source> (cvttdata/cloud21*)>]"
   exit 1
 }
 
@@ -20,7 +20,7 @@ is_valid() {
 }
 
 date=""
-host=homestore
+host=hs01
 source=cloud21
 
 while getopts ":h:d:s:" opt; do
@@ -51,7 +51,7 @@ fi
 
 echo "$date $host $source"
 
-valid_hosts=('homestore' 'cloud21')
+valid_hosts=('hs01' 'cloud21')
 if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
     echo "Host '${host}' is not valid"
     usage
@@ -67,8 +67,8 @@ if [ "${host}" == "cloud21" ] ; then
     SourceHost=cloud21.cvtt.vpn
     SourceUser=cvtt
     SourceRootDir="/opt/store/cvtt/md_archive/crypto/${source}"
-elif [ "${host}" == "homestore" ]; then
+elif [ "${host}" == "hs01" ]; then
-    SourceHost=homestore.cvtt.vpn
+    SourceHost=hs01.cvtt.vpn
     SourceUser=cvtt
     SourceRootDir=/works/cvtt/md_archive/crypto/${source}
 else

research/load_eqty_md.sh

@@ -2,7 +2,7 @@
 
 usage() {
   echo -n "Usage: $0"
-  echo -n " [-h <host (homestore*/cloud21)>]"
+  echo -n " [-h <host (hs01*/cloud21)>]"
   echo -n " [-d <YYYYMMDD> (yesterday*)]"
   echo -n " [-s <stocks comma separated>"
   echo -n " [-t <target directory>"
@@ -19,7 +19,7 @@ fi
 
 # ------------------ Settings
 md_date=""
-host=homestore
+host=hs01
 stocks=COIN,GBTC,SQ
 
 TargetDir="/opt/jupyter_gpu/data/eqty_md"
@@ -81,7 +81,7 @@ fi
 
 echo "$md_date $host $source"
 
-valid_hosts=('homestore' 'cloud21')
+valid_hosts=('hs01' 'cloud21')
 if ! is_valid "${host}"  "${valid_hosts[@]}" ; then
     echo "Host '${host}' is not valid"
     usage
@@ -108,8 +108,8 @@ if [ "${host}" == "cloud21" ] ; then
     SourceHost=cloud21.cvtt.vpn
     SourceUser=cvtt
     SourceRootDir="/opt/store/cvtt/md_archive/equity/alpaca_md"
-elif [ "${host}" == "homestore" ]; then
+elif [ "${host}" == "hs01" ]; then
-    SourceHost=homestore.cvtt.vpn
+    SourceHost=hs01.cvtt.vpn
     SourceUser=cvtt
     SourceRootDir="/works/cvtt/md_archive/equity/alpaca_md"
 else

research/prepare_crypto_simdata.sh

@@ -0,0 +1,297 @@
+#!/bin/bash
+
+# SQLite DDL for simulation
+# =========================
+
+
+# -- md_quotes
+
+# -- md_1min_bars
+
+
+usage() {
+  echo -n "Usage: $0"
+  echo -n " -d YYYMMDD Date>"
+  echo -n " [-O <output dir (./) >]"
+  echo -n " [-S <archive_source_host (cloud21)>]"
+  echo -n " [-D <orig_db_source> (cloud21)]"
+  echo
+  exit 1
+}
+
+# --------------------- Settings
+SourceHost=cloud21
+SourceRootDir=/opt/store/cvtt/md_archive/crypto
+DbSource=cloud21
+# --------------------- Settings
+
+while getopts ":d:O:S:D:" opt; do
+  case ${opt} in
+    d )
+      Date=$OPTARG
+      ;;
+    O )
+      OutputDir=$OPTARG
+      ;;
+    S )
+      SourceHost=$OPTARG
+      ;;
+    D )
+      DbSource=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+
+if [ -z ${Date}  ] ; then
+    echo "date is not specified"
+    usage
+fi
+if [ -z ${OutputDir}  ] ; then
+    OutputDir=.
+fi
+
+SourceHost+=".cvtt.vpn"
+mkdir -p ${OutputDir}
+
+# --- Binance
+Instruments=( PAIR-ADA-USDT )
+Instruments+=( PAIR-BCH-USDT )
+Instruments+=( PAIR-BTC-USDT )
+Instruments+=( PAIR-DOT-USDT )
+Instruments+=( PAIR-ETH-USDT )
+Instruments+=( PAIR-LTC-USDT )
+Instruments+=( PAIR-SOL-USDT )
+Instruments+=( PAIR-USDC-USDT )
+Instruments+=( PAIR-XRP-USDT )
+
+# --- Coinbase
+Instruments+=( PAIR-ADA-USD )
+Instruments+=( PAIR-BCH-USD )
+Instruments+=( PAIR-BTC-USD )
+Instruments+=( PAIR-DOT-USD )
+Instruments+=( PAIR-ETH-USD )
+Instruments+=( PAIR-LTC-USD )
+Instruments+=( PAIR-SOL-USD )
+Instruments+=( PAIR-XRP-USD )
+
+echo "Date=${Date} Instruments=${Instruments[@]} OutputDir=${OutputDir}"
+echo Getting data from ${DataHost} ...
+
+year=$(date -d ${Date} +"%Y")
+month=$(date -d ${Date} +"%m")
+SourceDir="${SourceRootDir}/${DbSource}/${year}/${month}"
+SourceFile="${SourceDir}/${Date}.mktdata.db.gz"
+
+Cmd="rsync -ahv"
+Cmd+=" ${SourceHost}:${SourceFile}"
+Cmd+=" $OutputDir/"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="(cd ${OutputDir} && gunzip *.db.gz)"
+echo ${Cmd}
+eval ${Cmd}
+
+SourceDbFile="${OutputDir}/${Date}.mktdata.db"
+ResultDbFile="${OutputDir}/${Date}.crypto_sim_md.db"
+
+echo "Creating Result Database File ${ResultDbFile}"
+
+echo "Creating table md_trades ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_trades (
+    tstamp text,
+    tstamp_ns integer,
+    exchange_id text,
+    instrument_id text,
+    exch text,
+    px real,
+    qty real,
+    trade_id text,
+    condition text,
+    tape text
+);
+CREATE UNIQUE INDEX  IF NOT EXISTS md_trades_uidx
+ON md_trades(tstamp_ns, exchange_id, instrument_id);
+EOF
+
+echo "Creating table md_quotes ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_quotes (
+    tstamp text,
+    tstamp_ns integer,
+    exchange_id text,
+    instrument_id text,
+    bid_exch text,
+    bid_px real,
+    bid_qty real,
+    ask_exch text,
+    ask_px real,
+    ask_qty real
+);
+CREATE UNIQUE INDEX  IF NOT EXISTS md_quotes_uidx
+ON md_quotes(tstamp_ns, exchange_id, instrument_id);
+EOF
+
+echo "Creating table md_1min_bars ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_1min_bars (
+	tstamp text,
+	tstamp_ns integer,
+	exchange_id text,
+	instrument_id text,
+	open real,
+	high real,
+	low real,
+	close real,
+	volume real,
+	vwap real,
+	num_trades integer
+);
+CREATE UNIQUE INDEX IF NOT EXISTS md_1min_bars_uidx
+ON md_1min_bars(tstamp, exchange_id, instrument_id);
+EOF
+
+echo "Loading md_trades ..."
+sqlite3  ${ResultDbFile} <<EOF
+ATTACH '${SourceDbFile}' AS source_db;
+BEGIN;
+INSERT OR IGNORE INTO md_trades SELECT
+	datetime(exchange_ts_ns / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (exchange_ts_ns % 1000000000) / 1000)  as tstamp,
+	time as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	"" as exch,
+	price as px,
+	quantity as qty,
+	"" as trade_id,
+	taker_side as condition,
+	"" as tape
+from source_db.bnbspot_md_trades;
+COMMIT;
+
+BEGIN;
+INSERT OR IGNORE INTO md_trades
+SELECT
+	datetime(exchange_ts_ns / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (exchange_ts_ns % 1000000000) / 1000)  as tstamp,
+	time as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	"" as exch,
+	price as px,
+	quantity as qty,
+	"" as trade_id,
+	taker_side as condition,
+	"" as tape
+from source_db.coinbase_md_trades;
+COMMIT;
+
+DETACH source_db;
+EOF
+
+echo "Loading md_quotes ..."
+sqlite3  ${ResultDbFile} <<EOF
+ATTACH '${SourceDbFile}' AS source_db;
+BEGIN;
+INSERT OR IGNORE INTO md_quotes SELECT
+	datetime(exchange_ts_ns / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (exchange_ts_ns % 1000000000) / 1000)  as tstamp,
+	time as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	exchange_id as bid_exch,
+	bid_price as bid_px,
+	bid_quantity as bid_qty,
+	exchange_id as ask_exch,
+	ask_price as ask_px,
+	ask_quantity as ask_qty
+from bnbspot_md_booktops;
+COMMIT;
+
+BEGIN;
+INSERT OR IGNORE INTO md_quotes SELECT
+	datetime(exchange_ts_ns / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (exchange_ts_ns % 1000000000) / 1000)  as tstamp,
+	time as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	exchange_id as bid_exch,
+	bid_price as bid_px,
+	bid_quantity as bid_qty,
+	exchange_id as ask_exch,
+	ask_price as ask_px,
+	ask_quantity as ask_qty
+from coinbase_md_booktops;
+COMMIT;
+
+DETACH source_db;
+EOF
+
+### --- REPLACE 0 with num_trades ---
+
+echo "Loading md_1min_bars ..."
+sqlite3  ${ResultDbFile} <<EOF
+ATTACH '${SourceDbFile}' AS source_db;
+BEGIN;
+INSERT OR IGNORE INTO md_1min_bars SELECT
+	datetime(tstamp / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (tstamp % 1000000000) / 1000)  as tsatmp,
+	tstamp as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	open,
+	high,
+	low,
+	close,
+	volume,
+	vwap,
+	0 as num_trades
+from bnbspot_ohlcv_1min;
+COMMIT;
+
+BEGIN;
+INSERT OR IGNORE INTO md_1min_bars SELECT
+	datetime(tstamp / 1000000000, 'unixepoch') || '.' ||  printf('%06d', (tstamp % 1000000000) / 1000)  as tstamp,
+	tstamp as tstamp_ns,
+	exchange_id,
+	instrument_id,
+	open,
+	high,
+	low,
+	close,
+	volume,
+	vwap,
+	0 as num_trades
+from coinbase_ohlcv_1min;
+COMMIT;
+
+DETACH source_db;
+EOF
+
+Cmd="rm ${SourceDbFile}"
+echo ${Cmd}
+eval ${Cmd}
+
+
+Cmd="gzip ${ResultDbFile}"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/crypto/sim/"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/crypto/sim/"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rm ${ResultDbFile}.gz"
+echo ${Cmd}
+eval ${Cmd}
+
+echo Done $0 ${*}

research/prepare_eqt_simdata.sh

@@ -0,0 +1,244 @@
+#!/bin/bash
+
+usage() {
+  echo "Usage: $0  -S <symbols> -d <YYYYMMDD Date> [-O <output dir (./) >]"
+  exit 1
+}
+
+# --------------------- Settings
+SourceHost=cloud21.cvtt.vpn
+SourceRootDir=/opt/store/cvtt/md_archive/equity/alpaca_md
+# --------------------- Settings
+
+
+is_business_day() {
+    dt=${1}
+    date=$(date -d "${dt}" +"%Y-%m-%d")
+
+    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
+        return 0
+    else
+        return 1
+    fi
+
+}
+export -f is_business_day
+
+
+while getopts ":d:S:O:" opt; do
+  case ${opt} in
+    d )
+      Date=$OPTARG
+      ;;
+    S )
+      SymList=$OPTARG
+      ;;
+    O )
+      OutputDir=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+
+if [ -z ${SymList}  ] ; then
+    echo "symbols are not specified"
+    usage
+fi
+if [ -z ${Date}  ] ; then
+    echo "date is not specified"
+    usage
+fi
+if [ -z ${OutputDir}  ] ; then
+    OutputDir=.
+fi
+mkdir -p ${OutputDir}
+
+if ! is_business_day ${Date}; then
+   echo "${Date} is not business day"
+   usage
+fi
+
+OLD_IFS=${IFS}
+IFS=","
+read -ra Symbols <<< "${SymList}"
+IFS=${OLD_IFS}
+
+echo "Date=${Date} Symbols=${Symbols[@]} OutputDir=${OutputDir}"
+echo Getting data from ${DataHost} ...
+
+year=$(date -d ${Date} +"%Y")
+for sym in ${Symbols[@]}; do
+    inst_id="STOCK-${sym}"
+    capital=${sym:0:1}
+    SourceDir="${SourceRootDir}/${year}/${capital}/${sym}"
+    SourceHbarFile="${SourceDir}/${Date}.${sym}.alpaca_1m_bars.db.gz"
+    SourceQatFile="${SourceDir}/${Date}.${sym}.alpaca_qat.db.gz"
+
+    for src_file in ${SourceHbarFile} ${SourceQatFile}; do
+        Cmd="rsync -ahv"
+        Cmd+=" ${SourceHost}:${src_file}"
+        Cmd+=" $OutputDir/"
+        echo ${Cmd}
+        eval ${Cmd}
+    done
+done
+
+Cmd="(cd ${OutputDir} && gunzip *.db.gz)"
+echo ${Cmd}
+eval ${Cmd}
+
+ResultDbFile="${OutputDir}/${Date}.alpaca_sim_md.db"
+echo "Creating Result Database File ${ResultDbFile}"
+
+echo "Creating Result Database File ${ResultDbFile}"
+
+echo "Creating table md_trades ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_trades (
+    tstamp text,
+    tstamp_ns integer,
+    exchange_id text,
+    instrument_id text,
+    exch text,
+    px real,
+    qty real,
+    trade_id text,
+    condition text,
+    tape text
+);
+CREATE UNIQUE INDEX  IF NOT EXISTS md_trades_uidx
+ON md_trades(tstamp_ns, exchange_id, instrument_id);
+EOF
+
+echo "Creating table md_quotes ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_quotes (
+    tstamp text,
+    tstamp_ns integer,
+    exchange_id text,
+    instrument_id text,
+    bid_exch text,
+    bid_px real,
+    bid_qty real,
+    ask_exch text,
+    ask_px real,
+    ask_qty real
+);
+CREATE UNIQUE INDEX  IF NOT EXISTS md_quotes_uidx
+ON md_quotes(tstamp_ns, exchange_id, instrument_id);
+EOF
+
+echo "Creating table md_1min_bars ..."
+sqlite3 ${ResultDbFile} <<EOF
+CREATE TABLE  IF NOT EXISTS md_1min_bars (
+	tstamp text,
+	tstamp_ns integer,
+	exchange_id text,
+	instrument_id text,
+	open real,
+	high real,
+	low real,
+	close real,
+	volume real,
+	vwap real,
+	num_trades integer
+);
+CREATE UNIQUE INDEX IF NOT EXISTS md_1min_bars_uidx
+ON md_1min_bars(tstamp, exchange_id, instrument_id);
+EOF
+
+
+# set -f # not to expand *
+
+for sym in ${Symbols[@]}; do
+   src_hbar_db=${OutputDir}/${Date}.${sym}.alpaca_1m_bars.db
+   src_qat_db=${OutputDir}/${Date}.${sym}.alpaca_qat.db
+
+    echo "Loading md_trades and md_quotes from ${src_qat_db} ..."
+    sqlite3  ${ResultDbFile} <<EOF
+ATTACH '${src_qat_db}' AS source_db;
+BEGIN;
+INSERT OR IGNORE INTO md_trades SELECT
+	tstamp,
+	tstamp_ns,
+	exchange_id,
+	instrument_id,
+	exch,
+	px,
+	qty,
+	trade_id,
+	condition,
+	tape
+FROM source_db.md_trades;
+COMMIT;
+
+BEGIN;
+INSERT OR IGNORE INTO md_quotes SELECT
+	tstamp,
+	tstamp_ns,
+	exchange_id,
+	instrument_id,
+	bid_exch,
+	bid_px,
+	bid_qty,
+	ask_exch,
+	ask_px,
+	ask_qty
+FROM source_db.md_quotes;
+COMMIT;
+EOF
+
+    echo "Loading md_1min_bars from ${src_hbar_db} ..."
+    sqlite3  ${ResultDbFile} <<EOF
+ATTACH '${src_hbar_db}' AS source_db;
+BEGIN;
+INSERT OR IGNORE INTO md_1min_bars SELECT
+	tstamp,
+	tstamp_ns,
+	exchange_id,
+	instrument_id,
+	open,
+	high,
+	low,
+	close,
+	volume,
+	vwap,
+	num_trades
+    FROM source_db.md_1min_bars;
+COMMIT;
+
+DETACH source_db;
+EOF
+
+    Cmd="rm ${src_hbar_db} ${src_qat_db}"
+    echo ${Cmd}
+    eval ${Cmd}
+done
+
+Cmd="gzip ${ResultDbFile}"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/equity/alpaca_md/sim/"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rsync -ahvv ${ResultDbFile}.gz cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/equity/alpaca_md/sim/"
+echo ${Cmd}
+eval ${Cmd}
+
+Cmd="rm ${ResultDbFile}.gz"
+echo ${Cmd}
+eval ${Cmd}
+
+echo Done $0 ${*}

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

@@ -5,15 +5,15 @@
 #         "users": ["oleg"],
 #         "type": "cloud",
 #         "ssh_port": 7822,
-#         # "to_check": "No"
+#         "to_check": "false"
+#         "timeout_sec": 5
 #     },
 
 RootDir="${HOME}/prod"
-# RootDir=/home/oleg/develop/cvtt2  ###### D E B U G
 
 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)
 
@@ -46,6 +46,8 @@ function host_alert() {
 User=oleg
 Hosts=()
 DEFAULT_SSH_PORT=22
+DEFAULT_TIMEOUT=5
+DEFAULT_TO_CHECK="true"
 Domains=("${Domains[@]}" "$(get_domains)")
 
 for Domain in ${Domains[@]} ; do
@@ -56,16 +58,21 @@ for Host in ${Hosts[@]} ; do
     host=$(echo $Host | cut -d'.' -f1)
     Domain=$(echo $Host | cut -d'.' -f2-)
 
-    ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // "Yes"')
+
-    if [ "${ToCheck^^}" == "NO" ]; then
-        continue
-    fi
     PortSSH=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].ssh_port // '"$DEFAULT_SSH_PORT"'')
 
+    Timeout=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].timeout_sec // '"$DEFAULT_TIMEOUT"'')
+
+    ToCheck=$(echo "$HOSTS_CONFIG" | jq -r --arg domain "$Domain" --arg host "$host" '.[$domain][$host].to_check // '"$DEFAULT_TO_CHECK"'')
+    to_check="${ToCheck^^}"
+    if [ "${to_check}" == "TRUE" -o "${to_check}" == "YES" -o "${to_check}" == "Y" -o "${to_check}" == "T" ] ; then
         echo "Checking host: $Host on port $PortSSH"
+    else
+        continue
+    fi
 
     # Use nc to check if the specified port is open
-    if ! nc -z -w5 "$Host" "$PortSSH"; then
+    if ! nc -z -w ${Timeout} "$Host" "$PortSSH"; then
         echo "Host $Host is not available on port $PortSSH"
         host_alert "Host $Host is not available on port $PortSSH"
     fi

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,14 +18,14 @@ 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+=" | ${HOME}/bin/hjson -j"
-    Cmd="${Cmd} | jq -r"
+    Cmd+=" | jq -r"
-    Cmd="${Cmd} --arg domain \"${Domain}\""
+    Cmd+=" --arg domain \"${Domain}\""
-    Cmd="${Cmd} --arg usr \"${User}\""
+    Cmd+=" --arg usr \"${User}\""
-    Cmd="${Cmd} '.[\$domain] | to_entries[] | select(.value.users[] | contains(\$usr)) | .key'"
+    Cmd+=" '.[\$domain] | to_entries[] | select(.value.users[] | contains(\$usr)) | .key'"
 
-    Cmd="${Cmd} | sed  's/\$/.${Domain}/'"
+    Cmd+=" | sed  's/\$/.${Domain}/'"
     eval ${Cmd}
 }
 
@@ -66,13 +66,16 @@ function storage_check() {
         else
             port=22
         fi
-        Cmd="ssh -p ${port} $host"
+        Cmd="ssh -p ${port}"
-        Cmd="${Cmd} eval \"df -hTl"
+        Cmd+=" -o StrictHostKeyChecking=no"
-        Cmd="${Cmd} -x squashfs"
+        Cmd+=" -o UserKnownHostsFile=/dev/null"
-        Cmd="${Cmd} -x tmpfs"
+        Cmd+="  $host"
-        Cmd="${Cmd} -x vfat"
+        Cmd+=" eval \"df -hTl"
-        Cmd="${Cmd} -x devtmpfs"
+        Cmd+=" -x squashfs"
-        Cmd="${Cmd} | grep -v Filesystem\""
+        Cmd+=" -x tmpfs"
+        Cmd+=" -x vfat"
+        Cmd+=" -x devtmpfs"
+        Cmd+=" | grep -v Filesystem\""
 
         IFS=$'\n' ; lines=$(eval ${Cmd})
         for ln in $lines

scripts/mkt_data/alpaca_hist_md/alpaca_md.sh

@@ -4,7 +4,7 @@ Start=${1}
 NumJobs=${2}
 InstListFile=${3}
 
-export CalendarURL=http://cloud16.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}

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://cloud16.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/checklists/crypto_md_chcklst.sh

@@ -25,10 +25,12 @@ run_checklist() {
 
     declare -A Commands
     Commands=(
-        ["homestore:cloud21"]="ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cloud21/${yr}/${mn} | tail -5"
+        ["hs01:cloud21"]="ssh cvtt@hs01.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cloud21/${yr}/${mn} | tail -5"
-        ["homestore:cvttdata"]="ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cvttdata/${yr}/${mn} | tail -5"
+        ["hs01:cvttdata"]="ssh cvtt@hs01.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cvttdata/${yr}/${mn} | tail -5"
-        ["cloud21:cloud21"]="ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/crypto/cloud21/${yr}/${mn} | tail -5"
+        ["hs01:sim"]="ssh cvtt@hs01.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/sim/ | tail -5"
-        ["cloud21:cvttdata"]="ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/crypto/cvttdata/${yr}/${mn} | tail -5"
+        ["cloud21:cloud21"]="ssh cvtt@cloud21.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cloud21/${yr}/${mn} | tail -5"
+        ["cloud21:cvttdata"]="ssh cvtt@cloud21.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/cvttdata/${yr}/${mn} | tail -5"
+        ["cloud21:sim"]="ssh cvtt@cloud21.cvtt.vpn ls -l /works/cvtt/md_archive/crypto/sim | tail -5"
         ["gpushnik"]="ssh oleg@gpushnik.cvtt.vpn 'ls -l /opt/jupyter_gpu/data/crypto_md | tail -10'"
     )
 

scripts/mkt_data/checklists/eqty_md_chcklst.sh

@@ -24,17 +24,19 @@ run_checklist() {
     yr=$(date -d 'yesterday' '+%Y')
     CheckSymbols="A/AAPL N/NVDA M/META"
     declare -A Commands
-    Commands["homestore"]=""
+    Commands["hs01"]=""
     for sym in ${CheckSymbols}; do
-        Commands["homestore"]+="ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
+        Commands["hs01"]+="ssh cvtt@hs01.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
     done
-    Commands["homestore"]+="echo"
+    Commands["hs01"]+="echo"
+    Commands["hs01:sim"]="ssh cvtt@hs01.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/sim | tail -5" 
 
     Commands["cloud21"]=""
     for sym in ${CheckSymbols}; do
-        Commands["cloud21"]+="ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
+        Commands["cloud21"]+="ssh cvtt@cloud21.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
     done
     Commands["cloud21"]+="echo"
+    Commands["cloud21:sim"]="ssh cvtt@cloud21.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/sim | tail -5" 
 
     Commands["gpushnik"]="ssh oleg@gpushnik.cvtt.vpn 'ls -l /opt/jupyter_gpu/data/eqty_md | tail -10'"
 
@@ -46,6 +48,13 @@ run_checklist() {
     done
 }
 
+tmpfile=$(mktemp)
+function cleanup {
+    cd ${HOME}
+    rm -f ${tmpfile}
+}
+trap cleanup EXIT
+
 # run_checklist
 
 tmpfile=$(mktemp)

scripts/mkt_data/sync_market_data.sh

@@ -2,7 +2,7 @@
 
 Source=/home/cvtt/prod/archive/md_archive/
 Targets=
-Targets="${Targets} cvtt@homestore.cvtt.vpn:/works/cvtt/md_archive/"
+Targets="${Targets} cvtt@hs01.cvtt.vpn:/works/cvtt/md_archive/"
 Targets="${Targets} cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/"
 
 

scripts/set_version.sh

@@ -4,7 +4,7 @@
 # ----- Settings
 LocalSoftwareDir=${HOME}/software/cvtt2
 
-ProdDir=${HOME}/prod
+ProdDir=$(pwd)
 
 ReleaseHosts=("cloud21.cvtt.vpn")
 ReleasePorts=("22")
@@ -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}
@@ -77,9 +77,9 @@ rsync_load_version
 Location="${LocalSoftwareDir}/${Project}/${Version}/${Project}"
 
 Cmd="cd ${ProdDir}"
-Cmd="${Cmd} && rm -rf ${Project}"
+Cmd+=" && rm -rf ${Project}"
-Cmd="${Cmd} && ln -snf ${Location} ${Project}"
+Cmd+=" && ln -snf ${Location} ${Project}"
 
 echo ${Cmd} && eval ${Cmd}
 
-echo "Done: $0 $*"
+echo "Done: $0 ${*}"

utils/Makefile

@@ -6,7 +6,7 @@ SUBDIRS += configs
 
 
 FILES=
-FILES += release_version.txt
+FILES += VERSION
 
 all: install