Combined pre-AGU GUI and Calibration Message Work

docker/main/dataservice/entrypoint.sh

@@ -62,7 +62,7 @@ if [ -d ${UPDATED_PACKAGES_DIR:=/updated_packages} ]; then
         for srv in $(pip -qq freeze | grep dmod | awk -F= '{print $1}' | awk -F- '{print $2}'); do
             if [ $(ls ${UPDATED_PACKAGES_DIR} | grep dmod.${srv}- | wc -l) -eq 1 ]; then
                 pip uninstall -y --no-input $(pip -qq freeze | grep dmod.${srv} | awk -F= '{print $1}')
-                pip install $(ls ${UPDATED_PACKAGES_DIR}/*.whl | grep dmod.${srv}-)
+                pip install --no-deps $(ls ${UPDATED_PACKAGES_DIR}/*.whl | grep dmod.${srv}-)
             fi
         done
         #pip install ${UPDATED_PACKAGES_DIR}/*.whl

docker/main/docker-deploy.yml

@@ -88,6 +88,9 @@ services:
       - DATA_SERVICE_ENDPOINT_HOST=${DOCKER_REQUESTS_DATASERVICE_ENDPOINT_HOST:-data-service}
       - DATA_SERVICE_ENDPOINT_PORT=${DOCKER_DATASERVICE_CONTAINER_PORT:-3015}
       - DATA_SERVICE_CLIENT_SSL_DIR=${DOCKER_REQUESTS_CONTAINER_DATASERVICE_CLIENT_SSL_DIR:-/ssl/dataservice}
+      - EVALUATION_SERVICE_ENDPOINT_HOST=${DOCKER_REQUESTS_EVALUATIONSERVICE_ENDPOINT_HOST:-evaluation-service}
+      - EVALUATION_SERVICE_ENDPOINT_PORT=${DOCKER_EVALUATIONSERVICE_CONTAINER_PORT:-3015}
+      - EVALUATION_SERVICE_CLIENT_SSL_DIR=${DOCKER_REQUESTS_CONTAINER_EVALUATIONSERVICE_CLIENT_SSL_DIR:-/ssl/evaluationservice}
       - PARTITIONER_SERVICE_ENDPOINT_HOST=${DOCKER_REQUESTS_PARTITIONERSERVICE_ENDPOINT_HOST:-partitioner-service}
       - PARTITIONER_SERVICE_ENDPOINT_PORT=${DOCKER_PARTITIONER_SERVICE_CONTAINER_PORT:-3014}
       - PARTITIONER_SERVICE_CLIENT_SSL_DIR=${DOCKER_REQUESTS_CONTAINER_PARTITIONERSERVICE_CLIENT_SSL_DIR:-/ssl/partitionerservice}
@@ -114,7 +117,9 @@ services:
     ports:
       - ${DOCKER_SUBSET_API_PORT:-5001}:${DOCKER_SUBSET_CONTAINER_PORT:-5001}
     volumes:
-      - ${HYDROFABRIC_DATA_DIR:?Please set HYDROFABRIC_DATA_DIR for Docker environment in .env config file}:/hydrofabric_data
+      # TODO: even if this works, need to make it configurable
+      - hydrofabric:/hydrofabric_data/${DMOD_HYDROFABRIC_VOLUME:?}
+      #- ${HYDROFABRIC_DATA_DIR:?Please set HYDROFABRIC_DATA_DIR for Docker environment in .env config file}:/hydrofabric_data
       # This typically needs to be commented out; intended for development use (see related 'environment' config above)
       #- updated_packages:${UPDATED_PACKAGES_CONTAINER_DIR:?Check if updated packages directory should be used}
     deploy:
@@ -128,6 +133,9 @@ services:
       - LISTEN_PORT=${DOCKER_SUBSET_CONTAINER_PORT:-5000}
       - SERVICE_PACKAGE_NAME=${PYTHON_PACKAGE_NAME_SUBSET_SERVICE:?}
       - FILES_DIRECTORY=/hydrofabric_data
+      - PYCHARM_REMOTE_DEBUG_ACTIVE=${PYCHARM_REMOTE_DEBUG_SUBSET_SERVICE_ACTIVE:-false}
+      - PYCHARM_REMOTE_DEBUG_SERVER_HOST=${PYCHARM_REMOTE_DEBUG_SERVER_HOST:-host.docker.internal}
+      - PYCHARM_REMOTE_DEBUG_SERVER_PORT=${PYCHARM_REMOTE_DEBUG_SERVER_PORT_SUBSET_SERVICE:-55874}
       # This typically needs to be commented out; intended for development use (see related 'volume' config below)
       #- UPDATED_PACKAGES_DIR=${UPDATED_PACKAGES_CONTAINER_DIR:?Updated packages directory not set, make sure this should be active}
     entrypoint: ["python3", "-m", "${PYTHON_PACKAGE_NAME_SUBSET_SERVICE:?}"]
@@ -226,6 +234,9 @@ volumes:
   # configs above for several services)
   updated_packages:
     external: true
+  hydrofabric:
+    name: ${DMOD_HYDROFABRIC_VOLUME:?}
+    external: true
 
 secrets:
   myredis_pass:

docker/main/ngen-calibration/Dockerfile

@@ -0,0 +1,38 @@
+ARG DOCKER_INTERNAL_REGISTRY
+
+FROM ${DOCKER_INTERNAL_REGISTRY}/ngen:latest
+
+ARG WORKDIR=/ngen
+ARG USER=mpi
+ARG NGEN_CAL_BRANCH=master
+ARG NGEN_CAL_COMMIT
+
+ENV USER=${USER} USER_HOME=/home/${USER}
+
+WORKDIR ${WORKDIR}
+USER ${USER}
+
+# try NGEN_CAL_COMMIT, if not set or empty, use NGEN_CAL_BRANCH
+RUN pip install "git+https://github.com/noaa-owp/ngen-cal@${NGEN_CAL_COMMIT:-${NGEN_CAL_BRANCH}}#egg=ngen_cal&subdirectory=python/ngen_cal"
+
+COPY --chown=${USER} entrypoint.sh ${WORKDIR}
+
+# Change permissions for entrypoint and make sure dataset volume mount parent directories exists
+RUN chmod +x ${WORKDIR}/entrypoint.sh \
+    && for d in ${DATASET_DIRECTORIES}; do mkdir -p /dmod/datasets/${d}; done \
+    && for d in noah-owp-modular topmodel cfe sloth 'evapotranspiration/evapotranspiration'; do \
+        if [ -d ${WORKDIR}/ngen/extern/${d}/cmake_build ]; then \
+            cp -a ${WORKDIR}/ngen/extern/${d}/cmake_build/*.so* /dmod/shared_libs/.; \
+        fi; \
+    done \
+    && ( cp -a ${WORKDIR}/ngen/cmake_build_parallel/ngen /dmod/bin/ngen-parallel || true ) \
+    && ( cp -a ${WORKDIR}/ngen/cmake_build_serial/ngen /dmod/bin/ngen-serial || true ) \
+    && ( cp -a ${WORKDIR}/ngen/cmake_build/partitionGenerator /dmod/bin/partitionGenerator || true ) \
+    && pushd /dmod/bin \
+    # NOTE use of `ln -sf`. \
+    && ( ( stat ngen-parallel && ln -sf ngen-parallel ngen ) || ( stat ngen-serial && ln -sf ngen-serial ngen ) ) \
+    && popd 
+
+ENV PATH=${WORKDIR}:$PATH
+ENTRYPOINT ["entrypoint.sh"]
+CMD [""]

docker/main/ngen-calibration/entrypoint.sh

@@ -0,0 +1,119 @@
+#!/bin/sh
+# Managed by the _generate_docker_cmd_args function in scheduler.py of dmod.scheduler
+#
+# $1 will have the number of nodes associated with this run
+# $2 will have comma-delimited host strings in MPI form; e.g., hostname:N,hostname:M
+# $3 will have the unique job id
+# $4 is the worker index
+# $5 will be the name of the output dataset (which will imply a directory location)
+# $6 will be the name of the hydrofabric dataset (which will imply a directory location)
+# $7 will be the name of the realization configuration dataset (which will imply a directory location)
+# $8 will be the name of the BMI configuration dataset (which will imply a directory location)
+# $9 will be the name of the partition configuration dataset (which will imply a directory location)
+# TODO: wire up $10
+# $10 will be the name of the calibration configuration dataset (which will imply a directory location)
+
+# Not yet supported
+# no-op
+MPI_NODE_COUNT="${1:?No MPI node count given}"
+# no-op
+MPI_HOST_STRING="${2:?No MPI host string given}"
+# no-op
+PARTITION_DATASET_NAME="${9:?}"
+
+JOB_ID=${3:?No Job id given}
+WORKER_INDEX=${4:?No worker index given}
+
+OUTPUT_DATASET_NAME="${5:?}"
+HYDROFABRIC_DATASET_NAME="${6:?}"
+REALIZATION_CONFIG_DATASET_NAME="${7:?}"
+BMI_CONFIG_DATASET_NAME="${8:?}"
+CALIBRATION_CONFIG_DATASET_NAME="${10:?}"
+
+ACCESS_KEY_SECRET="object_store_exec_user_name"
+SECRET_KEY_SECRET="object_store_exec_user_passwd"
+DOCKER_SECRETS_DIR="/run/secrets"
+ACCESS_KEY_FILE="${DOCKER_SECRETS_DIR}/${ACCESS_KEY_SECRET}"
+SECRET_KEY_FILE="${DOCKER_SECRETS_DIR}/${SECRET_KEY_SECRET}"
+
+NGEN_EXECUTABLE="/ngen/ngen/cmake_build/ngen"
+
+ALL_DATASET_DIR="/dmod/datasets"
+OUTPUT_DATASET_DIR="${ALL_DATASET_DIR}/output/${OUTPUT_DATASET_NAME}"
+HYDROFABRIC_DATASET_DIR="${ALL_DATASET_DIR}/hydrofabric/${HYDROFABRIC_DATASET_NAME}"
+REALIZATION_CONFIG_DATASET_DIR="${ALL_DATASET_DIR}/config/${REALIZATION_CONFIG_DATASET_NAME}"
+BMI_CONFIG_DATASET_DIR="${ALL_DATASET_DIR}/config/${BMI_CONFIG_DATASET_NAME}"
+PARTITION_DATASET_DIR="${ALL_DATASET_DIR}/config/${PARTITION_DATASET_NAME}"
+CALIBRATION_CONFIG_DATASET_DIR="${ALL_DATASET_DIR}/config/${CALIBRATION_CONFIG_DATASET_NAME}"
+
+print_date() {
+    date "+%Y-%m-%d,%H:%M:%S"
+}
+
+check_for_dataset_dir() {
+    # Dataset dir is $1
+    _CATEG="$(echo "${1}" | sed "s|${ALL_DATASET_DIR}/\([^/]*\)/.*|\1|" | awk '{print toupper($0)}')"
+    if [ ! -d "${1}" ]; then
+        echo "Error: expected ${_CATEG} dataset directory ${1} not found." 2>&1
+        exit 1
+    fi
+}
+
+load_object_store_keys_from_docker_secrets() {
+    # Read Docker Secrets files for Object Store access, if they exist
+    if [ -z "${ACCESS_KEY_FILE:-}" ]; then
+        echo "WARN: Cannot load object store access key when Docker secret file name not set"
+    elif [ -e "${ACCESS_KEY_FILE}" ]; then
+        ACCESS_KEY="$(cat "${ACCESS_KEY_FILE}")"
+    else
+        echo "WARN: Cannot load object store access key when Docker secret file does not exist"
+    fi
+
+    if [ -z "${SECRET_KEY_FILE:-}" ]; then
+        echo "WARN: Cannot load object store secret key when Docker secret file name not set"
+    elif [ -e "${SECRET_KEY_FILE}" ]; then
+        SECRET_KEY="$(cat "${SECRET_KEY_FILE}")"
+    else
+        echo "WARN: Cannot load object store secret key when Docker secret file does not exist"
+    fi
+
+    test -n "${ACCESS_KEY:-}" && test -n "${SECRET_KEY:-}"
+}
+
+start_calibration() {
+    # Start ngen calibration
+    echo "$(print_date) Starting serial ngen calibration"
+    # CALIBRATION_CONFIG_FILE=${CALIBRATION_CONFIG_DATASET_DIR}/$(basename $(find ${CALIBRATION_CONFIG_DATASET_DIR} -name "*.yaml" -maxdepth 1 | head -1))
+
+    # TODO: move this to CALIBRATION_CONFIG_DATASET_DIR
+    # NOTE: assumes that calibration dataset will be in realization config dataset AND that it is
+    # the only yaml file at the top level of that dataset.
+    CALIBRATION_CONFIG_FILE=${REALIZATION_CONFIG_DATASET_DIR}/$(basename $(find ${REALIZATION_CONFIG_DATASET_DIR} -name "*.yaml" -maxdepth 1 | head -1))
+
+    if [ -z "${CALIBRATION_CONFIG_FILE}" ]; then
+        echo "Error: NGEN calibration yaml file not found" 2>&1
+        exit 1
+    fi
+    python3 -m ngen.cal "${CALIBRATION_CONFIG_FILE}"
+
+    #Capture the return value to use as service exit code
+    NGEN_RETURN=$?
+
+    echo "$(print_date) ngen calibration finished with return value: ${NGEN_RETURN}"
+
+    # Exit with the model's exit code
+    return ${NGEN_RETURN}
+}
+
+# Sanity check that the output, hydrofabric, and config datasets are available (i.e., their directories are in place)
+check_for_dataset_dir "${REALIZATION_CONFIG_DATASET_DIR}"
+check_for_dataset_dir "${BMI_CONFIG_DATASET_DIR}"
+check_for_dataset_dir "${PARTITION_DATASET_DIR}"
+check_for_dataset_dir "${HYDROFABRIC_DATASET_DIR}"
+check_for_dataset_dir "${OUTPUT_DATASET_DIR}"
+# check_for_dataset_dir "${CALIBRATION_CONFIG_DATASET_DIR}"
+
+# Move to the output dataset mounted directory
+cd ${OUTPUT_DATASET_DIR}
+
+start_calibration

docker/main/requestservice/entrypoint.sh

@@ -54,6 +54,9 @@ python -m ${SERVICE_PACKAGE_NAME:?} \
     --data-service-host ${DATA_SERVICE_ENDPOINT_HOST:?} \
     --data-service-port ${DATA_SERVICE_ENDPOINT_PORT:?} \
     --data-service-ssl-dir ${DATA_SERVICE_CLIENT_SSL_DIR:?} \
+    --evaluation-service-host ${EVALUATION_SERVICE_ENDPOINT_HOST:?} \
+    --evaluation-service-port ${EVALUATION_SERVICE_ENDPOINT_PORT:?} \
+    --evaluation-service-ssl-dir ${EVALUATION_SERVICE_CLIENT_SSL_DIR:?} \
     --partitioner-service-host ${PARTITIONER_SERVICE_ENDPOINT_HOST:?} \
     --partitioner-service-port ${PARTITIONER_SERVICE_ENDPOINT_PORT:?} \
     --partitioner-service-ssl-dir ${PARTITIONER_SERVICE_CLIENT_SSL_DIR:?}

docker/main/s3fs-volume-helper/Dockerfile

@@ -1,8 +1,8 @@
 FROM alpine:3.15
 
-RUN apk update && apk upgrade && apk add docker bash && mkdir -p /dmod/scripts
+RUN apk update && apk upgrade && apk add docker bash && mkdir -p /dmod
 
-COPY ./scripts/* /dmod/scripts/.
+COPY ./scripts /dmod/scripts
 
 ENV OUT_OF_GIT_REPO='true'
 

docker/main/subsetservice/entrypoint.sh

@@ -12,6 +12,23 @@ if [ -n "${VENV_DIR:-}" ]; then
     pip install --update -r /code/requirements.txt
 fi
 
+# Install for debugging when appropriate
+if [ "$(echo "${PYCHARM_REMOTE_DEBUG_ACTIVE:-false}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')" = "true" ]; then
+    _DEBUG_ARG="--pycharm-remote-debug"
+fi
+
+# Handle some things in any cases when there is debugging
+if [ -n "${_DEBUG_ARG:-}" ]; then
+    # Append these as well if appropriate, though defaults are coded (and they are somewhat agnostic to the debug setup)
+    if [ -n "${PYCHARM_REMOTE_DEBUG_SERVER_HOST:-}" ]; then
+        _DEBUG_ARG="${_DEBUG_ARG:-} --remote-debug-host ${PYCHARM_REMOTE_DEBUG_SERVER_HOST}"
+    fi
+
+    if [ -n "${PYCHARM_REMOTE_DEBUG_SERVER_PORT:-}" ]; then
+        _DEBUG_ARG="${_DEBUG_ARG:-} --remote-debug-port ${PYCHARM_REMOTE_DEBUG_SERVER_PORT}"
+    fi
+fi
+
 # If we find this directory, and if there are wheels in it, then install those
 if [ -d ${UPDATED_PACKAGES_DIR:=/updated_packages} ]; then
     if [ $(ls ${UPDATED_PACKAGES_DIR}/*.whl | wc -l) -gt 0 ]; then
@@ -44,4 +61,4 @@ fi
 
 #set +e
 #export PYTHONASYNCIODEBUG=1
-python3 -m ${SERVICE_PACKAGE_NAME:?} ${args}
+python3 -m ${SERVICE_PACKAGE_NAME:?} ${_DEBUG_ARG:-} ${args}

docker/nwm_gui/app_server/Dockerfile

@@ -20,12 +20,14 @@ RUN pip install -r dependencies.txt
 ENV PYTHONUNBUFFERED 1
 
 # Slurp (or set default) wheel package names ...
+ARG core_package_name=dmod-core
 ARG comms_package_name=dmod-communication
 ARG client_package_name=dmod-client
 
 # Copy custom built packages from external sources image
 COPY --from=sources /DIST /DIST
-RUN pip install --upgrade --find-links=/DIST ${comms_package_name} \
+RUN pip install --upgrade --find-links=/DIST ${core_package_name} \
+    && pip install --upgrade --find-links=/DIST ${comms_package_name} \
     && pip install --upgrade --find-links=/DIST ${client_package_name} \
     # After eventually installing all dist files like this, clean up ... \
     && rm -rf /DIST

docker/nwm_gui/app_server/entrypoint.sh

@@ -34,6 +34,10 @@ echo "Starting dmod app"
 #Extract the DB secrets into correct ENV variables
 POSTGRES_SECRET_FILE="/run/secrets/${DOCKER_SECRET_POSTGRES_PASS:?}"
 export SQL_PASSWORD="$(cat ${POSTGRES_SECRET_FILE})"
+export DMOD_SU_PASSWORD="$(cat ${POSTGRES_SECRET_FILE})"
+
+# Execute the migration scripts on the designated database
+python manage.py migrate
 
 # Handle for debugging when appropriate
 if [ "$(echo "${PYCHARM_REMOTE_DEBUG_ACTIVE:-false}" | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]')" == "true" ]; then

docker/nwm_gui/docker-compose.yml

@@ -34,6 +34,7 @@ services:
       args:
         docker_internal_registry: ${DOCKER_INTERNAL_REGISTRY:?Missing DOCKER_INTERNAL_REGISTRY value (see 'Private Docker Registry ' section in example.env)}
         comms_package_name: ${PYTHON_PACKAGE_DIST_NAME_COMMS:?}
+        client_package_name: ${PYTHON_PACKAGE_DIST_NAME_CLIENT:?}
     networks:
       - request-listener-net
     # Call this when starting the container
@@ -42,6 +43,8 @@ services:
     restart: on-failure
     secrets:
         - postgres_password
+        - object_store_exec_user_name
+        - object_store_exec_user_passwd
     environment:
       #- VENV_DIR=${DOCKER_GUI_CONTAINER_VENV_DIR:-}
       #- CERT_PATH # used by dispatch.py
@@ -50,18 +53,29 @@ services:
       - MAAS_ENDPOINT_PORT=${DOCKER_REQUESTS_HOST_PORT:-3012}
       - MAAS_PORTAL_DEBUG_HOST=${PYCHARM_REMOTE_DEBUG_SERVER_HOST:-host.docker.internal}
       - MAAS_PORTAL_DEBUG_PORT=${PYCHARM_REMOTE_DEBUG_SERVER_PORT_GUI:-55875}
+      - GUI_SUBSET_SERVICE_API_URL=http://${DMOD_GUI_SUBSET_SERVICE_API_HOST:?}:${DOCKER_SUBSET_API_PORT:-5001}
       - PYCHARM_REMOTE_DEBUG_ACTIVE=${PYCHARM_REMOTE_DEBUG_GUI_ACTIVE:-false}
       - PYCHARM_REMOTE_DEBUG_VERSION=${PYCHARM_REMOTE_DEBUG_VERSION:-~=211.7628.24}
+      - DMOD_SU_NAME=dmod_db_admin
+      # TODO: this needs to be changed eventually
+      - [email protected]
       - SQL_ENGINE=django.db.backends.postgresql
       - SQL_DATABASE=${DMOD_GUI_POSTGRES_DB:-dmod_dev}
       - SQL_USER=${DMOD_GUI_POSTGRES_USER:?}
       - SQL_HOST=db
       - SQL_PORT=5432
+      - DMOD_SU_NAME=dmod_super_user
+      - [email protected]
       - DATABASE=postgres
       - DOCKER_SECRET_POSTGRES_PASS=postgres_password
+      - OBJECT_STORE_HOSTNAME=${EXTERNAL_OBJECT_STORE_HOSTNAME:?}
+      - OBJECT_STORE_PORT=${EXTERNAL_OBJECT_STORE_PORT:?}
+      - DMOD_GUI_CSRF_TRUSTED_ORIGINS=${DMOD_GUI_CSRF_TRUSTED_ORIGINS:?No CSRF trusted origins configured (provide '' at least)}
     volumes:
       - ${DMOD_APP_STATIC:?}:/usr/maas_portal/static
       - ${DMOD_SSL_DIR}/requestservice:/usr/maas_portal/ssl
+      # Needed only for speeding debugging
+      #- ${DOCKER_GUI_HOST_SRC:?GUI sources path not configured in environment}/MaaS:/usr/maas_portal/MaaS
       #- ${DOCKER_GUI_HOST_VENV_DIR:-/tmp/blah}:${DOCKER_GUI_CONTAINER_VENV_DIR:-/tmp/blah}
     # Expose Django's port to the internal network so that the web server may access it
     expose:
@@ -76,8 +90,10 @@ services:
     networks:
       - request-listener-net
     volumes:
-        #- ${DMOD_GUI_POSTGRES_DATA:?}:/var/lib/postgresql/data
-        - dmod_db_volume:/var/lib/postgresql/data
+        # TODO: look back later at why this was done during dev work, and whether it is still needed
+        # TODO: for now, implement by just defaulting to same Docker volume name (i.e., without bind mount) as before
+        - ${DMOD_GUI_POSTGRES_DATA_VOLUME_HOST_DIR:-dmod_db_volume}:/var/lib/postgresql/data
+        #- ${DMOD_GUI_POSTGRES_DATA_VOLUME_HOST_DIR:?}:/var/lib/postgresql/data
     secrets:
         - postgres_password
     environment:
@@ -98,6 +114,10 @@ networks:
 secrets:
   postgres_password:
     file: ../secrets/postgres_password.txt
+  object_store_exec_user_passwd:
+    file: ${DMOD_OBJECT_STORE_EXEC_USER_PASSWD_SECRET_FILE:?}
+  object_store_exec_user_name:
+    file: ${DMOD_OBJECT_STORE_EXEC_USER_NAME_SECRET_FILE:?}
 # Define persistent volumes that may be shared and persisted between containers
 volumes:
     dmod_db_volume:

docker/nwm_gui/web_server/nginx/default.conf

@@ -4,6 +4,7 @@ upstream wresgui {
 
 server {
     listen 80;
+    client_max_body_size 0;
 
     # Restrict verbs to GET, HEAD, and POST
     if ($request_method !~ ^(GET|HEAD|POST)$ )

docker/py-sources/py-deps.Dockerfile

@@ -1,4 +1,4 @@
-ARG REQUIRE="gcc g++ musl-dev gdal-dev libffi-dev openssl-dev rust cargo git proj proj-dev proj-util openblas openblas-dev lapack lapack-dev"
+ARG REQUIRE="gcc g++ musl-dev gdal-dev libffi-dev openssl-dev rust cargo git proj proj-dev proj-util openblas openblas-dev lapack lapack-dev geos-dev"
 ################################################################################################################
 ################################################################################################################
 ##### Create foundational level build stage with initial structure

example.env

@@ -108,6 +108,11 @@ TROUTE_BRANCH=ngen
 ## Python Packages Settings                                           ##
 ########################################################################
 
+## The "name" of the built client Python distribution package, for purposes of installing (e.g., via pip)
+PYTHON_PACKAGE_DIST_NAME_CLIENT=dmod-client
+## The name of the actual Python communication package (i.e., for importing or specifying as a module on the command line)
+PYTHON_PACKAGE_NAME_CLIENT=dmod.client
+
 ## The "name" of the built communication Python distribution package, for purposes of installing (e.g., via pip)
 PYTHON_PACKAGE_DIST_NAME_COMMS=dmod-communication
 ## The name of the actual Python communication package (i.e., for importing or specifying as a module on the command line)