diff --git a/civiclens/deploy/launch.py b/civiclens/deploy/launch.py index 9e2f5b3..ea91c5d 100644 --- a/civiclens/deploy/launch.py +++ b/civiclens/deploy/launch.py @@ -1,7 +1,7 @@ """Script to autodeploy CivicLens NLP jobs""" import pydo -from civiclens.utils.constants import DIGITAL_OCEAN, SSH_ID +from civiclens.utils.constants import DIGITAL_OCEAN do_client = pydo.Client(token=DIGITAL_OCEAN) @@ -15,7 +15,6 @@ "size": "s-4vcpu-8gb", "image": "ubuntu-24-04-x64", "user_data": cloud_config, - "ssh_keys": [SSH_ID], "monitoring": True, } diff --git a/civiclens/deploy/run_civiclens_nlp.sh b/civiclens/deploy/run_civiclens_nlp.sh index 15ed1f7..366b429 100644 --- a/civiclens/deploy/run_civiclens_nlp.sh +++ b/civiclens/deploy/run_civiclens_nlp.sh @@ -1,10 +1,7 @@ #!/bin/bash -# set paths for logging nlp batch info -LOG_DIR="/home/civiclens-nlp/CivicLens/civiclens/log" -LAST_UPDATE_FILE="${LOG_DIR}/nlp_batch.csv" +# set paths PROJECT_DIR="/home/civiclens-nlp/CivicLens/" -VENV_PATH="/home/civiclens-nlp/CivicLens/.venv/bin/activate" # fetch droplet ID for instance deletion DROPLET_ID=$(curl "http://169.254.169.254/metadata/v1/id") echo "export DROPLET_ID=$DROPLET_ID" >> ~/.zshenv @@ -13,11 +10,6 @@ source ~/.zshenv echo "====================================" echo "Running NLP Update..." -# make sure logging directory exists -if [ ! -d "$LOG_DIR" ]; then - mkdir -p "$LOG_DIR" -fi - # go to project directory if exists if [ -d "$PROJECT_DIR" ]; then cd "$PROJECT_DIR" @@ -30,11 +22,4 @@ fi poetry install # Run NLP update -if poetry run python3 -m civiclens.nlp.pipeline --cloud; then - # Log success - echo "$(date +'%Y-%m-%d %H:%M:%S'), SUCCESS, NLP updated completed successfully" >> "$LAST_UPDATE_FILE" -else - # Log failure - echo "$(date +'%Y-%m-%d %H:%M:%S'), ERROR, NLP update failed" >> "$LAST_UPDATE_FILE" - exit 1 -fi +poetry run python3 -m civiclens.nlp.pipeline --cloud diff --git a/civiclens/utils/constants.py b/civiclens/utils/constants.py index 0bbfc4b..6c52cfa 100644 --- a/civiclens/utils/constants.py +++ b/civiclens/utils/constants.py @@ -19,7 +19,6 @@ DATABASE_TEST = os.environ.get("DATBASE_TEST") DIGITAL_OCEAN = os.environ.get("DIGITAL_OCEAN") DROPLET_ID = os.environ.get("DROPLET_ID") -SSH_ID = os.environ.get("SSH_ID") # Regulations.GOV REG_GOV_API_KEY = os.environ.get("REG_GOV_API_KEY")