DEV-98 improved build.sh for microservices

VERSION

@@ -1 +1 @@
-0.1.7,fix relative liquidity server
+0.2.6,improved build.sh for microservices

__TBD__/buildx.sh

@@ -1,74 +0,0 @@
-#!/bin/bash
-
-echo "Script $0 does not work yet. Aborted" && exit
-
-function usage {
-    echo "Usage: ${0} <app_path (e.g. market_data/md_recorder_monitor)> <version>"
-    exit
-}
-
-AppPath=${1}
-CvttpyVersion=${2}
-
-if [ "${AppPath}" == "" ]
-then
-    usage
-fi
-
-# --- Settings
-DockerDir=$(realpath $(dirname ${0})/${AppPath})
-RootDir=$(realpath $(dirname ${0})/..)
-RegistryService=cloud21.cvtt.vpn:5500
-
-AppName=$(basename ${AppPath})
-
-ImageName=${AppName}
-ImageDir=${HOME}/docker_images
-mkdir -p ${ImageDir}
-
-Version=$(cat ${RootDir}/cvttpy/VERSION | awk -F, '{print $1}')
-
-cd ${RootDir}
-
-# Create a new builder instance
-Cmd="docker buildx create --name ${AppName}_builder"
-echo ${Cmd}
-eval ${Cmd} || exit
-
-# Switch to the newly created builder
-Cmd="docker buildx use ${AppName}_builder"
-echo ${Cmd}
-eval ${Cmd}
-
-# Ensure buildx is bootstrapped
-Cmd="docker buildx inspect ${AppName}_builder --bootstrap"
-echo ${Cmd}
-eval ${Cmd}
-
-# Build the image using buildx, tagging with both 'latest' and the version number, and pushing directly
-Cmd="docker buildx build --platform linux/amd64,linux/arm64 -t ${ImageName}:latest -t ${ImageName}:${Version} -f ${DockerDir}/Dockerfile . --push"
-echo ${Cmd}
-eval ${Cmd}
-
-# Tagging the images with the registry
-Cmd="docker tag ${ImageName}:latest ${RegistryService}/${ImageName}:latest"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="docker tag ${ImageName}:${Version} ${RegistryService}/${ImageName}:${Version}"
-echo ${Cmd}
-eval ${Cmd}
-
-# Push the images to the registry
-Cmd="docker push ${RegistryService}/${ImageName}:latest"
-echo ${Cmd}
-eval ${Cmd}
-
-Cmd="docker push ${RegistryService}/${ImageName}:${Version}"
-echo ${Cmd}
-eval ${Cmd}
-
-# Optionally, remove the builder to clean up
-Cmd="docker buildx rm ${AppName}_builder"
-echo ${Cmd}
-eval ${Cmd}

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/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/Dockerfile

@@ -6,7 +6,6 @@ COPY ${FROM_DIR}/requirements.txt /
 
 
 COPY cvttpy /cvttpy
-# COPY ${FROM_DIR}/.creds  /.creds
 COPY ${FROM_DIR}/crypto_md_day.sh /crypto_md_day.sh
 
 RUN pip install --upgrade pip --root-user-action=ignore

market_data/crypto_md_day/crypto_md_day.sh

@@ -51,16 +51,16 @@ fi
 export PYTHONPATH=/
 
 Cmd="python3.12"
-Cmd="${Cmd} cvttpy/research/utils/archive_ts_md.py"
+Cmd+=" cvttpy/research/utils/archive_ts_md.py"
-Cmd="${Cmd} --config=http://cloud23.cvtt.vpn:6789/apps/md_recorder"
+Cmd+=" --config=http://cloud16.cvtt.vpn:6789/apps/md_recorder"
-Cmd="${Cmd} --db_credentials_key=${CredKey}"
+Cmd+=" --db_credentials_key=${CredKey}"
-Cmd="${Cmd} --credentials_file=/.creds"
+Cmd+=" --credentials_file=/.creds"
-Cmd="${Cmd} --date=${Date}"
+Cmd+=" --date=${Date}"
-Cmd="${Cmd} --schemas=${Schemas}"
+Cmd+=" --schemas=${Schemas}"
-Cmd="${Cmd} --root_dir=/app/data/${DbHost}"
+Cmd+=" --root_dir=/app/data/${DbHost}"
-Cmd="${Cmd} --format=SQLite"
+Cmd+=" --format=SQLite"
-Cmd="${Cmd} --compress"
+Cmd+=" --compress"
-# Cmd="${Cmd} --log_file=/logs/%T.crypto_md_day.log"
+# Cmd+=" --log_file=/logs/%T.crypto_md_day.log"
 
 echo ${Cmd}
 eval ${Cmd}

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"
@@ -36,27 +36,27 @@ Cmd="${Cmd} --compress_log"
 Cmd="${Cmd} --instrument_group=${job}"
 Cmd="${Cmd} --log_file=/logs/%T.MD_REC.${job}.log"
 if [ "${job}" == "BNBFUT_CLD21" ] ; then
-    Cmd="${Cmd} --active_exchanges=BNBFUT"
+    Cmd="${Cmd} --exch_acct_cfgname=BNBFUT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7201"
 elif [ "${job}" == "COINBASE_CLD21" ] ; then
-    Cmd="${Cmd} --active_exchanges=COINBASE_AT"
+    Cmd="${Cmd} --exch_acct_cfgname=COINBASE_AT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7202"
 elif [ "${job}" == "BNBSPOT_CLD21" ] ; then
-    Cmd="${Cmd} --active_exchanges=BNBSPOT"
+    Cmd="${Cmd} --exch_acct_cfgname=BNBSPOT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CLD21"
     Cmd="${Cmd} --admin_port=7203"
 elif [ "${job}" == "BNBSPOT_CVTTDATA" ] ; then
-    Cmd="${Cmd} --active_exchanges=BNBSPOT"
+    Cmd="${Cmd} --exch_acct_cfgname=BNBSPOT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7204"
 elif [ "${job}" == "BNBFUT_CVTTDATA" ] ; then
-    Cmd="${Cmd} --active_exchanges=BNBFUT"
+    Cmd="${Cmd} --exch_acct_cfgname=BNBFUT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7205"
 elif [ "${job}" == "COINBASE_CVTTDATA" ] ; then
-    Cmd="${Cmd} --active_exchanges=COINBASE_AT"
+    Cmd="${Cmd} --exch_acct_cfgname=COINBASE_AT"
     Cmd="${Cmd} --db_credentials_key=TSDB_MD_CVTTDATA"
     Cmd="${Cmd} --admin_port=7206"
 else

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/.creds

@@ -0,0 +1,10 @@
+{
+    "__dummy": null
+    , "INFISICAL": {
+        "url": "https://infisical.cvtt.net"
+        , "client_id": "e330a1c4-08dc-452f-ac02-5b37fff4ab3e"
+        , "client_secret": "190554828c3c342f63517320ac029f822b6358aa6187aec266465d0bde4d6b3c"
+        , "workspace_id": "6923c950-8473-4cec-818f-10df41d8b39c"
+        , "environment": "dev"
+    }
+}

market_data/relative_liquidity/Dockerfile

@@ -1,7 +1,10 @@
 FROM python:3.12-slim
+ARG FROM_DIR=docker_dev/market_data/relative_liquidity
 
 WORKDIR /
-COPY docker_dev/market_data/relative_liquidity/requirements.txt /requirements.txt
+COPY ${FROM_DIR}/.creds  /.creds
+COPY ${FROM_DIR}/requirements.txt /requirements.txt
+
 RUN pip install --upgrade pip --root-user-action=ignore
 RUN pip install -r /requirements.txt --root-user-action=ignore
 
@@ -12,10 +15,12 @@ RUN mkdir -p /app/data
 RUN mkdir /logs
 
 ENV PYTHONPATH=/
-CMD [                                        \
+CMD [                                                            \
-    "python3.12",                            \
+    "python3.12",                                                \
-    "cvttpy/apps/md/rel_lqdt_server.py",    \
+    "cvttpy/apps/md/rel_lqdt_server.py",                         \
-    "--port=5678",                           \
+    "--config=http://cloud16.cvtt.vpn:6789/apps/minimal_md_eqt", \
+    "--credentials_file=/.creds",                                \
+    "--port=5678",                                               \
     "--db_file=/app/data/rel_liquidity.db",                      \
-    "--log_file=/logs/%T.REL_LIQUIDITY_SVC.log" \
+    "--log_file=/logs/%D.REL_LIQUIDITY_SVC.log"                  \
 ]

market_data/relative_liquidity/requirements.txt

@@ -3,4 +3,4 @@ nest-asyncio>=1.5.5
 numpy>=1.24.1
 hjson>=3.1.0
 pandas>=1.5.3
-# sortedcontainers>=2.4.0
+sortedcontainers>=2.4.0

microservices/.env

@@ -0,0 +1,18 @@
+CVTT_USER=1000:1000
+CVTT_VERSION=0.0.1
+
+# MDGW_CONFIG_FILE=config_musvc.cfg
+# MDGW_CREDS_FILE=.creds
+MDGW_LOG_FILE=%D.md_gateway.log
+MDGW_ADD_ARGS=
+
+# OEGW_CONFIG_FILE=config_musvc.cfg
+# OEGW_CREDS_FILE=.creds
+OEGW_LOG_FILE=%D.oe_gateway.log
+#OEGW_ADD_ARGS="--log_level=DEBUG --debug_mode"
+OEGW_ADD_ARGS="--debug_mode"
+
+# ACGW_CONFIG_FILE=config_musvc.cfg
+# ACGW_CREDS_FILE=.creds
+ACGW_LOG_FILE=%D.ac_gateway.log
+ACGW_ADD_ARGS=

microservices/ac_gateway/Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.12-slim
+
+COPY requirements.txt /
+
+RUN pip install --upgrade pip --root-user-action=ignore
+RUN pip install -r /requirements.txt --root-user-action=ignore
+
+COPY cvttpy /cvttpy
+
+RUN mkdir -p /logs /config
+
+SHELL ["/bin/bash", "-c"]
+
+ENV PYTHONPATH=/
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

microservices/ac_gateway/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ConfigDir=/config
+LogDir=/logs
+
+Cmd="python3.12"
+Cmd+=" cvttpy/apps/microservices/market_gateways/accounting_gateway.py"
+Cmd+=" --config=${ConfigDir}/${ACGW_CONFIG_FILE:-cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${ConfigDir}/${ACGW_CREDS_FILE:-.creds}"
+Cmd+=" --log_file=${LogDir}/${ACGW_LOG_FILE:-%T.ac_gateway.log}"
+Cmd+=" ${ACGW_ADD_ARGS}"
+echo ${Cmd}
+exec ${Cmd}
+

microservices/ac_gateway/requirements.txt

@@ -5,3 +5,5 @@ sortedcontainers>=2.4.0
 redis>=5.0.8
 python-dateutil>=2.8.2
 types-python-dateutil>=2.8.19.6
+cryptography>=43.0.0
+PyJWT>=2.10.1

microservices/build.sh

@@ -0,0 +1,79 @@
+#!/bin/bash
+
+
+usage() {
+  echo "Usage: $0 -I <image_name> -V <image_version> -L <library>:<library_version>"
+  exit 1
+}
+
+# --- Settings
+RegistryService=cloud21.cvtt.vpn:5500
+# --- Settings
+
+
+# ---------------- cmdline
+while getopts "I:V:L:" opt; do
+  case ${opt} in
+    I )
+      ImageName=$OPTARG
+      ;;
+    V )
+      ImageVersion=$OPTARG
+      ;;
+    L )
+      Library=$OPTARG
+      ;;
+    \? )
+      echo "Invalid option: -$OPTARG" >&2
+      usage
+      ;;
+    : )
+      echo "Option -$OPTARG requires an argument." >&2
+      usage
+      ;;
+  esac
+done
+# ---------------- cmdline
+
+if [ "${ImageName}" == "" ]
+then
+    usage
+fi
+
+if [ "${ImageVersion}" == "" ]
+then
+    usage
+fi
+
+Project=
+ProjectVersion=
+if  [ "${Library}" != "" ] ; then
+    IFS=':' read -ra parts <<< "${Library}"
+    Project=${parts[0]}
+    ProjectVersion=${parts[1]}
+fi
+# exit
+
+DockerDir=$(realpath $(dirname ${0})/${ImageName})
+
+cd ${DockerDir}
+
+source ../mu_svc_functions.sh
+if [ "${Project}" != "" ]; then
+    get_project_version ${Project} ${ProjectVersion}
+fi
+
+
+function cleanup {
+    cd ${DockerDir}
+    rm -rf cvttpy
+}
+trap cleanup EXIT
+
+build_docker_image ${ImageName} ${RegistryService} ${ImageVersion}
+
+
+# echo "**** D E B U G  E X I T" && exit
+echo "***** ${0}  D O N E"
+
+

microservices/docker-compose.yml

@@ -1,52 +1,58 @@
-version: "3.9"
+# CVTT Microservices
-
 services:
     md_gateway:
-        image: cloud21.cvtt.vpn:5500/md_gateway:latest
+        image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION}
         container_name: md_gateway
+        user: ${CVTT_USER:-1001:1001}
         environment:
-          - REDIS_HOST=redis
+          CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+          MDGW_CONFIG_FILE:  ${MDGW_CONFIG_FILE:-cvtt_musvc.cfg}
+          MDGW_CREDS_FILE:  ${MDGW_CONFIG_FILE:-.creds}
+          MDGW_LOG_FILE:  ${MDGW_LOG_FILE:-%T.md_gateway.log}
+          MDGW_ADD_ARGS: ${MDGW_ADD_ARGS:-}
         volumes:
-          - ./.creds:/.creds
           - ./config:/config
           - ./logs:/logs
-          - ./data:/data
         depends_on:
           - redis
 
-    tester:
+    oe_gateway:
-        image: cloud21.cvtt.vpn:5500/tester:latest
+        image: cloud21.cvtt.vpn:5500/oe_gateway:${CVTT_VERSION}
-        container_name: tester
+        container_name: oe_gateway
+        user: ${CVTT_USER:-1001:1001}
         environment:
-          - REDIS_HOST=redis
+          CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+          OEGW_CONFIG_FILE:  ${OEGW_CONFIG_FILE:-cvtt_musvc.cfg}
+          OEGW_CREDS_FILE:  ${OEGW_CONFIG_FILE:-.creds}
+          OEGW_LOG_FILE:  ${OEGW_LOG_FILE:-%T.oe_gateway.log}
+          OEGW_ADD_ARGS: ${OEGW_ADD_ARGS:-}
+        volumes:
+          - ./config:/config
+          - ./logs:/logs
+        depends_on:
+          - redis
+
+    ac_gateway:
+        image: cloud21.cvtt.vpn:5500/ac_gateway:${CVTT_VERSION}
+        container_name: ac_gateway
+        user: ${CVTT_USER:-1001:1001}
+        environment:
+          CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
+          ACGW_CONFIG_FILE:  ${ACGW_CONFIG_FILE:-cvtt_musvc.cfg}
+          ACGW_CREDS_FILE:  ${ACGW_CONFIG_FILE:-.creds}
+          ACGW_LOG_FILE:  ${ACGW_LOG_FILE:-%T.ac_gateway.log}
+          ACGW_ADD_ARGS: ${ACGW_ADD_ARGS:-}
         volumes:
           - ./config:/config
           - ./logs:/logs
-          - ./data:/data
         depends_on:
           - redis
-          - md_gateway
 
     redis:
         image: redis:latest
-        container_name: redis
+        container_name: redis-cvtt
         ports:
-          - "6379:6379"
+          - "16379:6379"
         volumes:
           - ./data/redis:/data
 
-
-#   test_program:
-#     image: your_test_program_image:latest
-#     container_name: test_program
-#     environment:
-#       - REDIS_HOST=redis
-#     volumes:
-#       - ./config:/shared/config
-#       - ./logs:/shared/logs
-#     depends_on:
-#       - market_data_gateway
-#       - redis
-
-# volumes:
-#   redis_data:

microservices/md_gateway/Dockerfile

@@ -1,25 +1,19 @@
 FROM python:3.12-slim
 
-ARG ROOT_MCRSVC_DIR=docker_dev/microservices
+COPY requirements.txt /
-ARG FROM_DIR=${ROOT_MCRSVC_DIR}/md_gateway
 
-COPY ${ROOT_MCRSVC_DIR}/requirements.txt /
 RUN pip install --upgrade pip --root-user-action=ignore
 RUN pip install -r /requirements.txt --root-user-action=ignore
 
 COPY cvttpy /cvttpy
-# COPY ${ROOT_MCRSVC_DIR}/.creds  /.creds
 
+RUN mkdir -p /logs /config
 
-COPY ${FROM_DIR}/run_mdgw.sh /run_mdgw.sh
-RUN chmod +x /run_mdgw.sh
-
-RUN mkdir /logs
-RUN mkdir -p /config
-
-
-WORKDIR /
 SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_mdgw.sh" ]
 
+ENV PYTHONPATH=/
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

microservices/md_gateway/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ConfigDir=/config
+LogDir=/logs
+
+Cmd="python3.12"
+Cmd+=" cvttpy/apps/microservices/market_gateways/md_gateway.py"
+Cmd+=" --config=${ConfigDir}/${MDGW_CONFIG_FILE:-cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${ConfigDir}/${MDGW_CREDS_FILE:-.creds}"
+Cmd+=" --log_file=${LogDir}/${MDGW_LOG_FILE:-%T.md_gateway.log}"
+Cmd+=" ${MDGW_ADD_ARGS}"
+echo ${Cmd}
+exec ${Cmd}
+

microservices/md_gateway/requirements.txt

@@ -5,3 +5,5 @@ sortedcontainers>=2.4.0
 redis>=5.0.8
 python-dateutil>=2.8.2
 types-python-dateutil>=2.8.19.6
+cryptography>=43.0.0
+PyJWT>=2.10.1

microservices/md_gateway/run_mdgw.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# runs on host to start container
-usage() {
-    echo -n "Usage: ${0}"
-    echo -n " [-c <config (/config/cvtt.cfg)>]"
-    echo -n " [-a <admin_port (7220)>]"
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-Config=/config/cvtt.cfg
-AdminPort=7220
-COMPRESS_LOG=false
-
-
-while getopts "c:a:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/microservices/market_gateways/md_gateway.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.md_gateway.log"
-if ${COMPRESS_LOG} ; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

microservices/mu_svc_functions.sh

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+get_project_version() {
+    Project=${1}
+    Version=${2}
+
+    host="cloud21.cvtt.vpn"
+    port="22"
+    user="cvttdist"
+    rel_dir="/home/cvttdist/software/cvtt2"
+
+    if [ "${Version}" == "latest" ]; then
+        echo "Checking for latest version of ${Project} on ${user}@${host}:${rel_dir}"
+        Version=$(ssh -q -p ${port} ${user}@${host} "ls -tr ${rel_dir}/${Project} | tail -1" )
+        echo "Latest version is ${Version}"
+    fi
+    echo "Checking ${user}@${host} for ${rel_dir}/${Project}/${Version} ..."
+    if ssh -q -p ${port} ${user}@${host} "test -d ${rel_dir}/${Project}/${Version}"
+    then
+        echo "Version ${Version} found..."
+        rsync_cmd="rsync -ahv -e \"ssh -p ${port}\""
+        rsync_cmd="${rsync_cmd} ${user}@${host}:${rel_dir}/${Project}/${Version}/"
+        rsync_cmd="${rsync_cmd} ./"
+        echo ${rsync_cmd}
+        eval ${rsync_cmd}
+        status=$?
+        if [ ${status} -eq 0 ]
+        then
+            echo "Loading successful..."
+            return 0
+        else
+            return 1
+        fi
+    else
+        echo "Not Found ${rel_dir}/${Project}/${Version} on ${user}@${host}"
+        return 1
+    fi
+}
+
+build_docker_image() {
+    ImageName=${1}
+    RegistryService=${2}
+    Version=${3}
+
+    Cmd="docker build"
+    Cmd+=" -t ${ImageName}"
+    Cmd+=" -t ${ImageName}:latest"
+    Cmd+=" -t ${ImageName}:${Version}"
+    Cmd+=" -f Dockerfile"
+    Cmd+=" ."
+    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
+}
+
+

microservices/oe_gateway/Dockerfile

@@ -1,25 +1,19 @@
 FROM python:3.12-slim
 
-ARG ROOT_MCRSVC_DIR=docker_dev/microservices
+COPY requirements.txt /
-ARG FROM_DIR=${ROOT_MCRSVC_DIR}/oe_gateway
 
-COPY ${ROOT_MCRSVC_DIR}/requirements.txt /
 RUN pip install --upgrade pip --root-user-action=ignore
 RUN pip install -r /requirements.txt --root-user-action=ignore
 
 COPY cvttpy /cvttpy
-COPY ${ROOT_MCRSVC_DIR}/.creds  /.creds
 
+RUN mkdir -p /logs /config
 
-COPY ${FROM_DIR}/run_oegw.sh /run_oegw.sh
-RUN chmod +x /run_oegw.sh
-
-RUN mkdir /logs
-RUN mkdir -p /config
-
-
-WORKDIR /
 SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_oegw.sh" ]
 
+ENV PYTHONPATH=/
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

microservices/oe_gateway/entrypoint.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ConfigDir=/config
+LogDir=/logs
+
+Cmd="python3.12"
+Cmd+=" cvttpy/apps/microservices/market_gateways/order_entry_gateway.py"
+Cmd+=" --config=${ConfigDir}/${OEGW_CONFIG_FILE:-cvtt_musvc.cfg}"
+Cmd+=" --credentials_file=${ConfigDir}/${OEGW_CREDS_FILE:-.creds}"
+Cmd+=" --log_file=${LogDir}/${OEGW_LOG_FILE:-%T.oe_gateway.log}"
+Cmd+=" ${OEGW_ADD_ARGS}"
+echo ${Cmd}
+exec ${Cmd}
+

microservices/oe_gateway/requirements.txt

@@ -5,3 +5,7 @@ sortedcontainers>=2.4.0
 redis>=5.0.8
 python-dateutil>=2.8.2
 types-python-dateutil>=2.8.19.6
+cryptography>=43.0.0
+PyJWT>=2.10.1
+
+

microservices/oe_gateway/run_oegw.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# runs on host to start container
-usage() {
-    echo -n "Usage: ${0}"
-    echo -n " [-c <config (/config/cvtt.cfg)>]"
-    echo -n " [-a <admin_port (7220)>]"
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-Config=/config/cvtt.cfg
-AdminPort=7220
-COMPRESS_LOG=false
-
-
-while getopts "c:a:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/microservices/market_gateways/order_entry_gateway.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.md_gateway.log"
-if ${COMPRESS_LOG} ; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

microservices/tester/Dockerfile

@@ -1,26 +0,0 @@
-FROM python:3.12-slim
-
-ARG ROOT_MUSVC_DIR=docker_dev/microservices
-ARG FROM_DIR=${ROOT_MUSVC_DIR}/tester
-
-COPY ${ROOT_MUSVC_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-# COPY ${ROOT_MUSVC_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_tester.sh /run_tester.sh
-RUN chmod +x /run_tester.sh
-
-RUN mkdir /logs
-RUN mkdir -p /config
-RUN mkdir -p /data
-
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_tester.sh" ]
-

microservices/tester/run_tester.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# runs on host to start container
-usage() {
-    echo -n "Usage: ${0}"
-    echo -n " [-c <config (/config/cvtt.cfg) >]"
-    echo -n " [-i <instruments (COINBASE:PAIR-BTC-USD,BNBFUT:PERP-BTC-USDT) >]"
-    echo -n " [-d <data types (TRADES) >]"
-    echo -n " [-a <admin_port (7221) >]"
-    echo -n " [-z (compress log (false))"]
-    echo
-    exit 1
-}
-
-Config=/config/cvtt.cfg
-AdminPort=7221
-COMPRESS_LOG=false
-Instruments="COINBASE:PAIR-BTC-USD,BNBFUT:PERP-BTC-USDT"
-DataTypes="TRADES"
-
-while getopts "a:c:d:i:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        a ) AdminPort=$OPTARG ;;
-        i ) Instruments=$OPTARG ;;
-        d ) DataTypes=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/microservices/tester/musvc_tester.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --data_types=${DataTypes}"
-Cmd="${Cmd} --instruments=${Instruments}"
-Cmd="${Cmd} --log_file=/logs/%T.tester.log"
-if ${COMPRESS_LOG} ; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

research/crypto_exch_stats/Dockerfile

@@ -18,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/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/executor/Dockerfile

@@ -1,24 +0,0 @@
-FROM python:3.12-slim
-
-
-ARG FROM_DIR=docker_dev/trading/executor
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_executor.sh /run_executor.sh
-RUN chmod +x /run_executor.sh
-
-RUN mkdir /logs
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_executor.sh" ]
-
-

trading.__DEPRECATED__/executor/requirements.txt

@@ -1,6 +0,0 @@
-aiohttp>=3.7.4.post0
-redis>=5.0.8
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-pandas>=1.5.3

trading.__DEPRECATED__/executor/run_executor.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-
-# 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 " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
-    echo -n " [-a <admin_port (7222)>"]
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-ActiveExchanges=ALPACA_SNDBX
-AdminPort=7222
-COMPRESS_LOG=false
-
-while getopts "c:e:a:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-Cmd="python3.12"
-Cmd="${Cmd} /cvttpy/apps/executor_app.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-# Cmd="${Cmd} --allow_dynamic_exch_inst"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.EXECUTOR_APP.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

trading.__DEPRECATED__/md_portal/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/md_portal/Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.12-slim
-
-ARG FROM_DIR=docker_dev/trading/md_portal
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_md_portal.sh /run_md_portal.sh
-RUN chmod +x /run_md_portal.sh
-
-RUN mkdir /logs
-
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_md_portal.sh" ]
-

trading.__DEPRECATED__/md_portal/run_md_portal.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# 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 " [-e <active_exchanges (ALPACA_SNBOX)>]"
-    echo -n " [-a <admin_port (7220)>]"
-    echo -n " [-n <portal_name (MD_PORTAL_ALPACA)>]"
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-ActiveExchanges=ALPACA_SNDBX
-PortalName=MD_PORTAL_ALPACA_SNDBX
-AdminPort=7220
-COMPRESS_LOG=false
-
-
-while getopts "c:e:a:n:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        n ) PortalName=$OPTARG ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/md/md_portal.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --portal_name=${PortalName}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.${PortalName}.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

trading.__DEPRECATED__/quant/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/quant/Dockerfile

@@ -1,24 +0,0 @@
-FROM python:3.12-slim
-
-
-ARG FROM_DIR=docker_dev/trading/quant
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_quant.sh /run_quant.sh
-RUN chmod +x /run_quant.sh
-
-RUN mkdir /logs
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_quant.sh" ]
-
-

trading.__DEPRECATED__/quant/requirements.txt

@@ -1,11 +0,0 @@
-aiohttp>=3.7.4.post0
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-pandas>=1.5.3
-#
-ta>=0.10.2
-tables>=3.9.1
-psycopg>=3.2.1
-#
-redis>=5.0.8

trading.__DEPRECATED__/quant/run_quant.sh

@@ -1,66 +0,0 @@
-#!/bin/bash
-
-# runs on host to start container
-usage() {
-    echo -n "Usage: $0"
-    echo -n " -b <book>"
-
-    echo -n " -S <strategy> (dflt: TRDALGO_001)"
-
-    echo -n " [-c <config (dflt: http://cloud23.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)"]
-    echo
-    exit 1
-}
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-ActiveExchanges=ALPACA_SNDBX-MDPORTAL
-AdminPort=7224
-Strategy=DAILY_STOCK_001
-Book=""
-COMPRESS_LOG=false
-
-
-while getopts "b:c:e:a:S:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        b ) Book=$OPTARG ;;
-        S ) Strategy=$OPTARG ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-if [ "${Book}" == "" ]; then
-    echo "Book is missing"
-    usage
-fi
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/quant_app.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --book=${Book}"
-Cmd="${Cmd} --strategy=${Strategy}"
-# Cmd="${Cmd} --allow_dynamic_exch_inst"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.QUANT.${Book}.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

trading.__DEPRECATED__/risk_mgr/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/risk_mgr/Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.12-slim
-
-ARG FROM_DIR=docker_dev/trading/risk_mgr
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_risk_mgr.sh /run_risk_mgr.sh
-RUN chmod +x /run_risk_mgr.sh
-
-RUN mkdir /logs
-
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_risk_mgr.sh" ]
-

trading.__DEPRECATED__/risk_mgr/requirements.txt

@@ -1,15 +0,0 @@
-aiohttp>=3.7.4.post0
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-pandas>=1.5.3
-#
-redis>=5.0.8
-#
-python-dateutil>=2.8.2
-types-python-dateutil>=2.8.19.6
-#
-psycopg>=3.2.1
-psycopg-binary>=3.2.1
-psycopg2-binary>=2.9.6
-

trading.__DEPRECATED__/risk_mgr/run_risk_mgr.sh

@@ -1,64 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# runs on host to start container
-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 " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
-    echo -n " [-a <admin_port (7223)>"]
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-ActiveExchanges=ALPACA_SNDBX-MDPORTAL
-AdminPort=7223
-Book=""
-COMPRESS_LOG=false
-
-
-while getopts "b:c:e:a:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        b ) Book=$OPTARG ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-if [ "${Book}" == "" ]; then
-    echo "Book is missing"
-    usage
-fi
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/risk_manager_app.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --book=${Book}"
-# Cmd="${Cmd} --allow_dynamic_exch_inst"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.RISK_MGR.${Book}.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

trading.__DEPRECATED__/service_checker/Dockerfile

@@ -1,26 +0,0 @@
-FROM python:3.12-slim
-
-ARG FROM_DIR=docker_dev/trading/service_checker
-
-RUN apt-get update && apt-get install -y telnet redis-tools
-
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_svc_checker.sh /run_svc_checker.sh
-RUN chmod +x /run_svc_checker.sh
-
-# RUN mkdir /logs
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_svc_checker.sh" ]
-# ENTRYPOINT [ "/usr/bin/bash" ]
-

trading.__DEPRECATED__/service_checker/run_svc_checker.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# runs in container
-
-# 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
-    exit 1
-}
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-
-
-while getopts ":c:" opt; do
-    case ${opt} in
-        c )
-            Config=$OPTARG
-            ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/utils/services_checker.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --log_level=ERROR"
-
-echo ${Cmd}
-eval ${Cmd}
-

trading.__DEPRECATED__/trader/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/trader/Dockerfile

@@ -1,24 +0,0 @@
-FROM python:3.12-slim
-
-
-ARG FROM_DIR=docker_dev/trading/trader
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_trader.sh /run_trader.sh
-RUN chmod +x /run_trader.sh
-
-RUN mkdir /logs
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_trader.sh" ]
-
-

trading.__DEPRECATED__/trader/requirements.txt

@@ -1,6 +0,0 @@
-aiohttp>=3.7.4.post0
-redis>=5.0.8
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-pandas>=1.5.3

trading.__DEPRECATED__/trader/run_trader.sh

@@ -1,71 +0,0 @@
-#!/bin/bash
-
-# runs in container
-# --------------------------------------------------------------------------
-
-# runs on host to start container
-usage() {
-    echo -n "Usage: $0"
-    echo -n " -b <book>"
-
-    echo -n " -A <algo> (dflt: TRDALGO_001)"
-
-    echo -n " [-c <config (dflt: http://cloud23.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)"]
-    echo
-    exit 1
-}
-
-
-
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-ActiveExchanges=ALPACA_SNDBX-MDPORTAL
-AdminPort=7226
-Algo=TRDALGO_001
-Book=""
-COMPRESS_LOG=false
-
-
-while getopts "b:c:e:a:A:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        b ) Book=$OPTARG ;;
-        A ) Algo=$OPTARG ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-if [ "${Book}" == "" ]; then
-    echo "Book is missing"
-    usage
-fi
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/trader_app.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --book=${Book}"
-Cmd="${Cmd} --algo=${Algo}"
-# Cmd="${Cmd} --allow_dynamic_exch_inst"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.TRADER.${Book}.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}
-
-

trading.__DEPRECATED__/trading_recorder/.dockerignore

@@ -1,3 +0,0 @@
-.git
-**/__pycache__
-.pipenv

trading.__DEPRECATED__/trading_recorder/Dockerfile

@@ -1,23 +0,0 @@
-FROM python:3.12-slim
-
-ARG FROM_DIR=docker_dev/trading/trading_recorder
-
-COPY ${FROM_DIR}/requirements.txt /
-RUN pip install --upgrade pip --root-user-action=ignore
-RUN pip install -r /requirements.txt --root-user-action=ignore
-
-COPY cvttpy /cvttpy
-COPY ${FROM_DIR}/.creds  /.creds
-
-
-COPY ${FROM_DIR}/run_trading_recorder.sh /run_trading_recorder.sh
-RUN chmod +x /run_trading_recorder.sh
-
-RUN mkdir /logs
-
-
-WORKDIR /
-SHELL ["/bin/bash", "-c"]
-ENV PYTHONPATH=/
-ENTRYPOINT [ "/run_trading_recorder.sh" ]
-

trading.__DEPRECATED__/trading_recorder/requirements.txt

@@ -1,15 +0,0 @@
-aiohttp>=3.7.4.post0
-nest-asyncio>=1.5.5
-hjson>=3.1.0
-sortedcontainers>=2.4.0
-pandas>=1.5.3
-#
-redis>=5.0.8
-#
-python-dateutil>=2.8.2
-types-python-dateutil>=2.8.19.6
-#
-psycopg>=3.2.1
-psycopg-binary>=3.2.1
-psycopg2-binary>=2.9.6
-

trading.__DEPRECATED__/trading_recorder/run_trading_recorder.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-
-
-
-# runs on host to start container
-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 " [-e <active_exchanges (ALPACA_SNDBX-MDPORTAL)>]"
-    echo -n " [-a <admin_port (7223)>"]
-    echo -n " [-z (compress log)"]
-    echo
-    exit 1
-}
-
-ActiveExchanges=ALPACA_SNDBX-MDPORTAL
-AdminPort=7225
-Book=""
-Config=http://cloud23.cvtt.vpn:6789/apps/cvtt_eqt_alpaca
-COMPRESS_LOG=false
-
-
-while getopts "b:c:e:a:z" opt; do
-    case ${opt} in
-        c ) Config=$OPTARG  ;;
-        e ) ActiveExchanges=$OPTARG ;;
-        a ) AdminPort=$OPTARG ;;
-        z ) COMPRESS_LOG=true ;;
-        b ) Book=$OPTARG ;;
-        \? )
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            ;;
-        : )
-            echo "Option -$OPTARG requires an argument." >&2
-            usage
-            ;;
-    esac
-done
-
-if [ "${Book}" == "" ]; then
-    echo "Book is missing"
-    usage
-fi
-
-Cmd="python3.12"
-Cmd="${Cmd} cvttpy/apps/trade_recorder.py"
-Cmd="${Cmd} --config=${Config}"
-Cmd="${Cmd} --credentials_file=/.creds"
-Cmd="${Cmd} --book=${Book}"
-# Cmd="${Cmd} --allow_dynamic_exch_inst"
-Cmd="${Cmd} --active_exchanges=${ActiveExchanges}"
-Cmd="${Cmd} --admin_port=${AdminPort}"
-Cmd="${Cmd} --log_file=/logs/%T.TRADING_RECORDER.${Book}.log"
-if ${COMPRESS_LOG}; then
-    Cmd="${Cmd} --compress_log"
-fi
-echo ${Cmd}
-eval ${Cmd}