From f003f2d9675bbe20869a6eb458e2dcda1df20b6b Mon Sep 17 00:00:00 2001 From: Manuel Nogueira Date: Wed, 9 Aug 2023 16:01:59 +0000 Subject: [PATCH 1/2] Made the backend.Datavalidation regex allow dashes --- database/Callback/backend.DataValidation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/database/Callback/backend.DataValidation.py b/database/Callback/backend.DataValidation.py index 47b4cecc..8a2b7cfc 100644 --- a/database/Callback/backend.DataValidation.py +++ b/database/Callback/backend.DataValidation.py @@ -7,7 +7,7 @@ import re try: - from dal.scopes import ScopesTree + from dal.models.scopestree import ScopesTree except ImportError: from movai.data import ScopesTree @@ -21,7 +21,7 @@ def validate_configuration(config_string): """ try: - regex = r"^\$\(config \w+(\.\w+)*\)$" + regex = r"^\$\(config [\w-]+(\.[\w-]+)*\)" matches = re.finditer(regex, config_string, re.MULTILINE) matches_size = len([x for x in matches]) if matches_size == 0: From e416369ae12d3b7fcb99458141868efa20cf122c Mon Sep 17 00:00:00 2001 From: Manuel Nogueira Date: Wed, 9 Aug 2023 16:03:07 +0000 Subject: [PATCH 2/2] Added scripts/import_callback.sh script to the project --- scripts/import_callback.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 scripts/import_callback.sh diff --git a/scripts/import_callback.sh b/scripts/import_callback.sh new file mode 100644 index 00000000..c0e8c97f --- /dev/null +++ b/scripts/import_callback.sh @@ -0,0 +1,28 @@ +#! /bin/bash + +robot_name=$1; + +if [ -z $robot_name ] +then + echo "ERROR: Robot name is required:" + echo " ./import_callback.sh " + exit 1 +fi + +backend_container="backend-${robot_name}-movai"; +echo "Attempting to enter ${backend_container}"; + +if [ ! "$(docker ps -q -f name=${backend_container})" ]; then + echo "The container ${backend_container} is not running. Please start your robot and try again." + exit 1 +fi + +docker cp -a database/ ${backend_container}:/opt/mov.ai/app +docker exec -i ${backend_container} bash <