fix

build/build_release.sh

@@ -6,6 +6,8 @@ declare -A git_repo_arr
 git_repo_arr[cvttpy]=git@cloud21.cvtt.vpn:/opt/store/git/cvttpy.git
 git_repo_arr[ops]=git@cloud21.cvtt.vpn:/opt/store/git/ops.git
 git_repo_arr[research]=git@cloud21.cvtt.vpn:/opt/store/git/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/docker_dev.git
 
 dist_root=/home/cvttdist/software/cvtt2
 dist_user=cvttdist
@@ -48,13 +50,29 @@ while getopts ":p:b:i" opt; do
 done
 # ---------------- cmdline
 
-function confirm {
+confirm() {
     if [ "${interactive}" == "Y" ]; then
         echo "--------------------------------"
         echo -n "Press <Enter> to continue" && read
     fi
 }
 
+rust_binaries() {
+    res=()
+    for binname in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].targets[] | select(.kind | index("bin")) | .name'); do
+        res+=("${binname}")
+    done
+    echo "${res[@]}"
+}
+
+rust_libraries() {
+    res=()
+    for libname in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[].targets[] | select(.kind | index("lib")) | .name'); do
+        res+=("lib${libname}.rlib")
+    done
+    echo "${res[@]}"
+}
+
 if [ "${interactive}" == "Y" ]; then
     echo -n "Enter project [${prj}]: "
     read project
@@ -149,6 +167,26 @@ cmd_arr+=("${Cmd}")
 Cmd="rm -rf .git"
 cmd_arr+=("${Cmd}")
 
+SourceLoc=../${project}
+if [ "${project}" == "cvtt-rust" ]; then
+
+    cmd_arr+=("cd ${prj_dir}")
+
+    release_dir=${prj_dir}/dist/${project}
+
+    cmd_arr+=("mkdir -p ${release_dir}")
+    cmd_arr+=("cp release_version.txt ${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 ${release_dir} --path ${prj_dir}/apps/${app}")
+    done
+
+    SourceLoc=${release_dir}
+fi
+
 dist_path="${dist_root}/${project}/${release_version}"
 
 for dist_loc in ${dist_locations}; do
@@ -156,9 +194,9 @@ for dist_loc in ${dist_locations}; do
     dist_host=${dhp[0]}
     dist_port=${dhp[1]}
     Cmd="rsync -avzh"
-    Cmd="${Cmd} --rsync-path=\"mkdir -p ${dist_path} && rsync\""
+    Cmd="${Cmd} --rsync-path=\"mkdir -p ${dist_path}"
-    Cmd="${Cmd} -e \"ssh -p ${dist_ssh_port}\""
+    Cmd="${Cmd} && rsync\" -e \"ssh -p ${dist_ssh_port}\""
-    Cmd="${Cmd} ../${project} ${dist_user}@${dist_host}:${dist_path}/"
+    Cmd="${Cmd} $SourceLoc ${dist_user}@${dist_host}:${dist_path}/"
     cmd_arr+=("${Cmd}")
 done
 
@@ -179,8 +217,4 @@ do
     pwd && echo ${cmd} && eval ${cmd}
 done
 
-echo "PROJECT ${project} **** P U L L   N E W   T A G S  F R O M  o r i g i n ****"
-echo "----"
-echo "(cd ${project}; git pull --tags; git pushall)"
-echo "----"
 echo "$0 Done ${project} ${release_version}"

build/docker_images_builder.sh

@@ -0,0 +1,136 @@
+#!/bin/bash
+
+usage() {
+    echo -n "Usage: ${0}  <RootDir>"
+    echo
+    exit 1
+}
+# --- Settings
+RootDir=${1}
+if [ -z "${RootDir}" ] ; then
+    usage
+fi
+
+RegistryService=cloud21.cvtt.vpn:5500
+RegistryProtocol=http
+
+ConfigUrl=http://cloud23.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)
+
+# RootDir=/home/oleg/prod
+SetVersionScript=/home/oleg/prod/ops/scripts/set_version.sh
+
+
+# --------------- D E B U G
+
+mkdir -p ${RootDir}
+
+build_docker_image() {
+    title=${1}
+    image_name=${2}
+    docker_dev=${3}
+    project=${4}
+
+    echo "Building ${title}..."
+    echo "ImageName=${image_name}"
+    echo "DockerDev=${docker_dev}"
+    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}"
+        exit 1
+    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}"
+    ${SetVersionScript} ${project} ${image_version}
+
+}
+
+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
+}
+
+get_latest_dist_version() {
+    project=${1}
+
+    Version=$(ssh -q -p ${ReleasePort} ${ReleaseUser}@${ReleaseHost} "ls -tr ${ReleaseDir}/${project} | tail -1" )
+    echo "${Version}"
+}
+
+echo RootDir=${RootDir}
+
+cd ${RootDir}
+echo "Getting latest version of docker_dev"
+Cmd="${SetVersionScript} docker_dev latest"
+echo ${Cmd}
+eval ${Cmd}
+
+echo "${DIMAGES_CONFIG}" | jq -c 'to_entries[]' | while IFS= read -r item; do
+    # Extract key (name) and values
+    title=$(echo "$item" | jq -r '.key')
+    image_name=$(echo "$item" | jq -r '.value.image_name')
+    docker_dev=$(echo "$item" | jq -r '.value.docker_dev')
+    project=$(echo "$item" | jq -r '.value.based_on_dist')
+    build_docker_image "$title" "$image_name" "$docker_dev" "$project"
+done
+
+exit
+#===============================================================================
+#===============================================================================
+
+DockerDir=$(realpath $(dirname ${0})/${AppPath})
+
+AppName=$(basename ${AppPath})
+
+ImageName=${AppName}
+ImageDir=${HOME}/docker_images
+mkdir -p ${ImageDir}
+
+Version=$(cat ${RootDir}/cvttpy/release_version.txt | awk -F, '{print $1}')
+
+cd ${RootDir}
+
+Cmd="docker build -t ${ImageName} -t ${ImageName}:latest -t ${ImageName}:${Version} -f ${DockerDir}/Dockerfile ."
+echo ${Cmd}
+eval ${Cmd} || exit
+
+Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest"
+echo ${Cmd}
+eval ${Cmd} || exit
+
+Cmd="docker tag ${ImageName}:${Version} ${RegistryService}/${ImageName}:${Version}"
+echo ${Cmd}
+eval ${Cmd} || exit
+
+Cmd="docker push ${RegistryService}/${ImageName}:latest"
+echo ${Cmd}
+eval ${Cmd} || exit
+
+Cmd="docker push ${RegistryService}/${ImageName}:${Version}"
+echo ${Cmd}
+eval ${Cmd} || exit
+
+

release_version.txt

@@ -1 +1 @@
-1.7.4.fx2,minor update for storage check
+1.8.3,changes to build scripts 

research/ad_hoc/rearrange2.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# by chatGPT
+# ==========================================
+# homestore.cvtt.vpn SETTINGS
+# ==========================================
+
+# Define source and destination base directories
+SOURCE_BASE_DIR="/works/cvtt/md_archive/equity/alpaca_md.OLD"           # Replace with your actual source directory
+DESTINATION_BASE_DIR="/works/cvtt/md_archive/equity/alpaca_md"  # Replace with your destination directory
+
+# Loop through all .db.gz files in the source directory
+find "$SOURCE_BASE_DIR" -type f -name "*.db.gz" | while read -r file; do
+    # Extract relevant directory components from the path
+    relative_path="${file#$SOURCE_BASE_DIR/}"
+    ticker=$(echo "$relative_path" | cut -d'/' -f2)
+    year=$(echo "$relative_path" | cut -d'/' -f3)
+    original_date=$(basename "$file" | cut -d'.' -f1)
+
+    # Define the new file name and destination path
+    new_file_name="${original_date}.${ticker}.alpaca_1m_bars.db.gz"
+    destination_dir="$DESTINATION_BASE_DIR/$year/A/$ticker"
+
+    # Create the destination directory if it doesn't exist
+    mkdir -p "$destination_dir"
+    #echo DEBUG mkdir -p "$destination_dir"
+
+    # Move and rename the file
+    mv "$file" "$destination_dir/$new_file_name"
+    #echo DEBUG mv "$file" "$destination_dir/$new_file_name"
+
+    echo "Moved $file to $destination_dir/$new_file_name"
+done

research/load_eqty_md.sh

@@ -167,10 +167,10 @@ EOF
 echo "Loading files"
 for stock in "${Stocks[@]}"; do
     StockLetter="${stock:0:1}"
-    SourceFile=$(${date} -d ${md_date} "+%Y%m%d.${stock}.1min.db")
+    SourceFile=$(${date} -d ${md_date} "+%Y%m%d.${stock}.alpaca_1m_bars.db")
 
     SourceFileZip="${SourceFile}.gz"
-    SourceFilePath=$(${date} -d ${md_date} "+${SourceRootDir}/${StockLetter}/${stock}/%Y/${SourceFileZip}")
+    SourceFilePath=$(${date} -d ${md_date} "+${SourceRootDir}/%Y/${StockLetter}/${stock}/${SourceFileZip}")
     echo ${SourceFilePath}
 
     download_file ${SourceFilePath}
@@ -180,6 +180,3 @@ if [ -f ${TargetFilePath} ]; then
     chmod 600
     ls -lh ${TargetFilePath}
 fi
-
-# mkdir -p /tmp/aaa
-# cp -r ${tmp_dir}/* /tmp/aaa/

scripts/healthcheck/hosts_check.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+# "cryptovaltrading.com": {
+#     "cloud18": {
+#         "users": ["oleg"],
+#         "type": "cloud",
+#         "ssh_port": 7822,
+#         # "to_check": "No"
+#     },
+
+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
+
+HOSTS_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j)
+
+get_domains() {
+    echo ${HOSTS_CONFIG} | jq -r '. | keys[]'
+}
+get_user_hosts() {
+    local User=${1}
+    local Domain=${2}
+
+    jdcmd="jq -r --arg domain \"$Domain\""
+    jdcmd="$jdcmd --arg usr \"$User\""
+    jdcmd="$jdcmd '.[\$domain]"
+    jdcmd="$jdcmd | to_entries[]"
+    jdcmd="$jdcmd | select(.value.users[]"
+    jdcmd="$jdcmd | contains(\$usr))"
+    jdcmd="$jdcmd | .key'"
+    echo ${HOSTS_CONFIG} | eval ${jdcmd} |sed "s/$/.$Domain/" # >&2
+}
+
+function host_alert() {
+    alert=${1}
+    if [ "${alert}" != "" ]
+    then
+        echo -e "### :fire: HOST ALERT \n${alert}" | ${Sender} ${AlertChannel}
+    fi
+
+}
+
+User=oleg
+Hosts=()
+DEFAULT_SSH_PORT=22
+Domains=("${Domains[@]}" "$(get_domains)")
+
+for Domain in ${Domains[@]} ; do
+    Hosts=("${Hosts[@]}" "$(get_user_hosts ${User} ${Domain})")
+done
+
+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"'')
+
+    echo "Checking host: $Host on port $PortSSH"
+
+    # Use nc to check if the specified port is open
+    if ! nc -z -w5 "$Host" "$PortSSH"; then
+        echo "Host $Host is not available on port $PortSSH"
+        host_alert "Host $Host is not available on port $PortSSH"
+    fi
+done

scripts/healthcheck/services_check.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+    # "Jenkins" {
+    #     "to_check": "Yes",
+    #     "protocol": "http",
+    #     "host": "cvtt-build.cvtt.vpn",
+    #     "port": 8080
+    # },
+
+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_services
+
+SERVICES_CONFIG=$(curl -s ${ConfigUrl} | ${HOME}/bin/hjson -j)
+
+echo $Sender
+echo $AlertChannel
+
+
+function service_alert() {
+    alert="${1}"
+    if [ "${alert}" != "" ]
+    then
+        #it may contain quotes
+        alert=$(echo "${alert}" | sed 's/"/\\"/g')
+        echo -e "### :boom: SERVICE ALERT\n${alert}" | ${Sender} ${AlertChannel}
+    fi
+
+}
+
+User=oleg
+Hosts=()
+DEFAULT_TO_CHECK=Yes
+
+mapfile -t SvcNames < <(echo ${SERVICES_CONFIG} | jq -r '. | keys[]')
+
+DEFAULT_TO_CHECK=Yes
+for SvcName in "${SvcNames[@]}" ; do
+    ToCheck=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName" '.[$svcname].to_check // "Yes"')
+    if [ "${ToCheck^^}" == "NO" ]; then
+        continue
+    fi
+    Host=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName"  '.[$svcname].host ')
+    Port=$(echo "$SERVICES_CONFIG" | jq -r --arg svcname "$SvcName"  '.[$svcname].port ')
+    echo "Checking \"$SvcName\" (${Host}:${Port})"
+
+
+    # Use nc to check if the specified port is open
+    if ! nc -z -w5 "$Host" "$Port"; then
+        msg="Service \"${SvcName}\" (${Host}:${Port}) is not available"
+        echo ${msg}
+        service_alert "${msg}"
+    fi
+done
+

scripts/mkt_data/checklists/eqty_md_chcklst.sh

@@ -7,7 +7,6 @@ usage() {
 }
 
 RootDir="${HOME}/prod"
-# RootDir=/home/oleg/develop/cvtt2  ###### D E B U G
 
 export PYTHONPATH=${RootDir}
 
@@ -15,28 +14,33 @@ StatusChannel="MD-Status"
 Sender=${RootDir}/ops/utils/send_mmost.sh
 
 # ----- For DEBUGGING
-# Sender=cat
+# RootDir=/home/oleg/develop/cvtt2  ###### D E B U G
-# StatusChannel=
+# Sender=cat #### D E B U G
+# StatusChannel=  #### D E B U G
 
 run_checklist() {
 
 
     yr=$(date -d 'yesterday' '+%Y')
-
+    CheckSymbols="A/AAPL N/NVDA M/META"
     declare -A Commands
-    Commands["homestore"]="ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/A/AAPL/${yr} | tail -3"
+    Commands["homestore"]=""
-    Commands["homestore"]+="; echo"
+    for sym in ${CheckSymbols}; do
-    Commands["homestore"]+="; ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/N/NVDA/${yr} | tail -3"
+        Commands["homestore"]+="ssh cvtt@homestore.cvtt.vpn ls -l /works/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
+    done
+    Commands["homestore"]+="echo"
 
-    Commands["cloud21"]="ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/equity/alpaca_md/A/AAPL/${yr} | tail -3"
+    Commands["cloud21"]=""
-    Commands["cloud21"]+="; echo"
+    for sym in ${CheckSymbols}; do
-    Commands["cloud21"]+="; ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/equity/alpaca_md/N/NVDA/${yr} | tail -3"
+        Commands["cloud21"]+="ssh cvtt@cloud21.cvtt.vpn ls -l /opt/store/cvtt/md_archive/equity/alpaca_md/${yr}/${sym} | tail -3; "
+    done
+    Commands["cloud21"]+="echo"
 
     Commands["gpushnik"]="ssh oleg@gpushnik.cvtt.vpn 'ls -l /opt/jupyter_gpu/data/eqty_md | tail -10'"
 
     for name in $(printf "%s\n" "${!Commands[@]}" | sort); do
-        Cmd=${Commands[${name}]}
         echo "------- ${name}"
+        Cmd=${Commands[${name}]}
         echo ${Cmd}
         eval ${Cmd}
     done

scripts/set_version.sh

@@ -4,7 +4,7 @@
 # ----- Settings
 LocalSoftwareDir=${HOME}/software/cvtt2
 
-ProdDir=${HOME}/prod
+ProdDir=$(pwd)
 
 ReleaseHosts=("cloud21.cvtt.vpn")
 ReleasePorts=("22")
@@ -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 ${*}"