fix

doc/crypto_md.txt

@@ -30,12 +30,11 @@ C R Y P T O  M A R K E T   D A T A
 ==========
  Storage
 ==========
-    |       created by crontabs:
+    |       created by crontab cvttdata:
-    |       cvttdata:
+    |           /home/cvtt/prod/utils/sync_market_data.sh (ops/utls)
-    |              TBD
     |       stored in:
-    |         homestore:/works/cvtt/md_archive/crypto/  (cvttdata and cloud21)
+    |         homestore:/works/cvtt/md_archive/equity/alpaca_md
-    |         cloud21:/opt/store/cvtt/md_archive/crypto/  (cvttdata and cloud21)
+    |         cloud21:/opt/store/cvtt/md_archive/equity/alpaca_md
     |
     v
 ==========

doc/equity_md.txt

@@ -19,28 +19,15 @@ E Q U I T Y  M A R K E T   D A T A
     |       created by crontab on cvttdata:
     |         /home/cvtt/prod/run/alpaca_md.sh
     |       stored in:
-    |         cvttdata:/home/cvtt/prod/archive/md_archive/equities/alpaca_md   (TBD)
+    |         cvttdata:/home/cvtt/prod/archive/md_archive/equity/alpaca_md 
     |
     v
-
-
-
-
-
-    
 ==========
  Storage
 ==========
-    |       created by crontabs:
+    |       created by crontab cvttdata:
-    |       cvttdata:
+    |           /home/cvtt/prod/utils/sync_market_data.sh
-    |
     |       stored in:
-    |         homestore:/works/cvtt/md_archive/crypto/cvttdata
+    |         homestore:/works/cvtt/md_archive/equity/alpaca_md
-    |         homestore:/works/cvtt/md_archive/crypto/cloud21
+    |         cloud21:/opt/store/cvtt/md_archive/equity/alpaca_md
-    |       backed up in:
+____V_______
-    |         cloud21:/opt/store/cvtt/md_archive/crypto/cvttdata
-    |         cloud21:/opt/store/cvtt/md_archive/crypto/cloud21
-    v
-==========
- Usage
-==========

release_version.txt

@@ -1 +1 @@
-0.8.9
+1.0.8

scripts/ad-hoc/rearrange_alpaca_md.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+pushd () {
+    command pushd "$@" > /dev/null
+}
+
+popd () {
+    command popd "$@" > /dev/null
+}
+
+SourceRoot=/works/cvtt/md_archive/equity/alpaca_md.2
+TargetRoot=/works/cvtt/md_archive/equity/alpaca_md.NEW
+
+mkdir -p ${TargetDir}
+
+unalias ls
+cd ${SourceRoot}
+
+for year in $(ls -d 2*)
+do
+    echo $year
+    pushd $year
+    for letter in $(ls -d ?)
+    do
+        pushd ${letter}
+
+        echo "${year}/${letter}"
+        for symbol in $(ls -d ${letter}*)
+        do
+           pushd $symbol
+
+           echo "${year}/${letter}/${symbol}/* --> ${letter}/${symbol}/${year}/"
+           mkdir -p ${TargetRoot}/${letter}/${symbol}/${year}
+           mv ${SourceRoot}/${year}/${letter}/${symbol}/* ${TargetRoot}/${letter}/${symbol}/${year}/
+
+           popd
+        done
+
+        popd
+    done
+    popd
+done

scripts/alpaca_hist_md/alpaca_md.sh

@@ -49,17 +49,9 @@ export Python=/home/cvtt/.pyenv/python3.10-venv/bin/python3
 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/equities/alpaca_md # Local
+export OutputDir=/home/cvtt/prod/archive/md_archive/equity/alpaca_md # Local
 export LogDir=/home/cvtt/prod/logs/alpaca_md
 
-# ----- T E M P
-# export PYTHONPATH=/home/oleg/develop/cvtt2
-# export Python=/home/oleg/.pyenv/python3.10-venv/bin/python3
-# export Config=http://cloud16.cvtt.vpn:6789/apps/minimal_md
-# export PyScript=/home/oleg/develop/cvtt2/cvttpy/exchanges/alpaca/hist_md/hist_md_bars.py
-# export OutputDir=/home/oleg/develop/cvtt2/tmp # Local
-# export LogDir=/home/oleg/develop/cvtt2/tmp
-
 mkdir -p ${LogDir}
 
 run_proc() {
@@ -113,3 +105,10 @@ for ((ii=0; ii <${#Instruments[@]}; ii+=slice_size)); do
 
     parallel -j ${NumJobs} run_proc {} ${Start} ${End} ::: "${InstSlice[@]}"
 done
+
+echo "Compressing"
+for file in $(find ${OutputDir} -type f -name '*db' -print )
+do
+    echo "Compressing ${file}"
+    gzip ${file}
+done

scripts/alpaca_hist_md/alpaca_md_day.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+date_to_load=${1}
+
+DockerRegistry=cloud21.cvtt.vpn:5500
+DockerImage=${DockerRegistry}/alpaca_md_day #:latest
+LastDayFile=/home/cvtt/prod/logs/last_alpaca_hist_day
+ContainerName=alpaca_md_day
+
+is_container_running() {
+    local container_name=$1
+
+    if [ "$(docker ps --filter "name=^/${container_name}$" --filter "status=running" -q)" ]; then
+        return 0  # true
+    else
+        return 1  # false
+    fi
+}
+
+
+if [ -z ${date_to_load} ] ; then
+    echo "Yesterday data has priority. Running historical container will be killed"
+    docker kill ${ContainerName}
+else
+    echo "Historical run ${date_to_load}"
+    if is_container_running "$ContainerName"; then
+        echo "Container ${ContainerName} is already running."
+        exit 3
+    fi
+    if [ "${date_to_load}" == "next" ] ; then
+        if [ ! -e ${LastDayFile} ]; then
+            echo "File ${LastDayFile} does not exist. Will try to use prev file."
+            if [ ! -e ${LastDayFile}.prev ]; then
+                echo "File ${LastDayFile}.prev does not exist. Aborted."
+                exit 2
+            fi
+            mv ${LastDayFile}.prev ${LastDayFile}
+        fi
+        last_date=$(cat ${LastDayFile} | xargs)
+        if [ -z "${last_date}" ] ; then
+            echo "File ${LastDayFile} returned an empty last day. Will try to use prev file."
+            if [ ! -e ${LastDayFile}.prev ]; then
+                echo "File ${LastDayFile}.prev does not exist. Aborted."
+                exit 2
+            fi
+            mv ${LastDayFile}.prev ${LastDayFile}
+            last_date=$(cat ${LastDayFile} | xargs)
+            if [ -z "${last_date}" ] ; then
+                echo "Unable to obtain last_date. Aborted"
+                exit 3
+            fi
+            echo "No last date_to_load in ${LastDayFile}"
+            exit 1
+        fi
+        mv ${LastDayFile} ${LastDayFile}.prev
+        date_to_load=$(date -d "${last_date} - 1 day" "+%Y-%m-%d")
+    fi
+    echo "Historical Data for ${date_to_load}"
+fi
+
+Cmd="docker run"
+Cmd="${Cmd} --pull=always"
+Cmd="${Cmd} --network=host"
+Cmd="${Cmd} --name=${ContainerName}"
+Cmd="${Cmd} --rm"
+Cmd="${Cmd} ${DockerImage}"
+Cmd="${Cmd} ${date_to_load}"
+
+echo $Cmd
+eval $Cmd
+
+if [ "$?" != "0" ] ; then
+    exit 1 # if killed we do not save last day
+fi
+
+# truncate to avoid false positive
+date_to_load=$(echo "${date_to_load}" | xargs)
+if [ -n "${date_to_load}" ]; then
+    echo "Saving date_to_load to ${LastDayFile}"
+    echo ${date_to_load} >  ${LastDayFile}
+fi

scripts/crypto_hist_md/crypto_md_day.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+host=${1}
+date=${2}
+
+DockerRegistry=cloud21.cvtt.vpn:5500
+DockerImage=${DockerRegistry}/crypto_md_day
+
+if [ -z ${date} ] ; then
+    date=$(date -d "yesterday" +%Y%m%d)
+fi
+
+Cmd="docker run"
+Cmd="${Cmd} --pull=always"
+Cmd="${Cmd} --network=host"
+Cmd="${Cmd} --name=crypto_md_day.${host}.${date}"
+Cmd="${Cmd} --rm"
+Cmd="${Cmd} ${DockerImage}"
+Cmd="${Cmd} -h ${host}"
+Cmd="${Cmd} -d ${date}"
+Cmd="${Cmd} -s coinbase,bnbspot,bnbfut"
+
+echo $Cmd
+eval $Cmd

utils/prune_data.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+
+Src=${1}
+Days=${2}
+
+if [ -z "$Days" ] || [ -z "$Src" ]; then
+    echo "Usage: $0 <source_dir> <num_days>"
+    exit 1
+fi
+
+# Add / if Src does not have it (symlinks)
+if [ "${Src: -1}" != "/" ]; then
+    Src="${Src}/"
+fi
+
+declare -A Settings=()
+Settings[Src]=${Src}
+Settings[PruneDate]=$(date -d "${Days} days ago" '+%Y-%m-%d')
+
+src=${Settings[Src]}
+prune_date=${Settings[PruneDate]}
+
+
+echo "Finding files older than ${prune_date} in ${Src} ..."
+Cmd="find ${src} -type f ! -newermt \"${prune_date}\""
+echo ${Cmd}
+files=($(eval ${Cmd}))
+total_files=${#files[*]}
+
+if [[ ${total_files} == 0 ]]
+then
+    echo "No files found to be pruned. Bye..."
+    exit 0
+fi
+
+echo Before Pruning....
+duf ${src}
+
+echo "The following files will be removed:"
+echo "===================================="
+for f in $files ; do  ls -l $f; done
+echo "===================================="
+echo "Total files to be pruned: ${total_files}"
+
+echo "Removing files..."
+Cmd="${Cmd} -print -delete"
+echo ${Cmd}
+eval ${Cmd}
+
+echo "Removing empty directories..."
+Cmd="find ${src} -type d -empty -print -delete"
+echo ${Cmd}
+eval ${Cmd}
+
+echo After Pruning....
+duf ${src}
+
+echo $0 Done

utils/sync_market_data.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+Source=/home/cvtt/prod/archive/md_archive/
+Targets=
+Targets="${Targets} oleg@homestore.cvtt.vpn:/works/cvtt/md_archive/"
+Targets="${Targets} cvtt@cloud21.cvtt.vpn:/opt/store/cvtt/md_archive/"
+
+
+for tgt in ${Targets}
+do
+    Cmd="/usr/bin/rsync -ahv ${Source} ${tgt}"
+    echo $Cmd
+    eval $Cmd
+done