Fabfile tweaks

Author: robbason

Pipfile.lock

@@ -1,5 +1,4 @@
 name: Example Docking Challenge
-#key: example_docking
 start_at: 2022-08-12 04:00:00
 end_at: 2023-09-05 22:00:00
 repo_url: https://github.com

app/config_data/docking/docking.challenge.yml

@@ -202,6 +202,8 @@ def save_score(self, submission_run, score_type, value):
         self.evaluationscore_set.create(
             submission_run=submission_run, score_type=score_type, value=float(value)
         )
+        print("EVAL SCORE COUNT:", self.evaluationscore_set.count())
+        print("Evaluation scores:", self.evaluationscore_set.all())
 
     def __str__(self):
         return f"{self.name}, is public? {self.is_public}"

app/core/models/admin_managed.py

@@ -281,6 +281,7 @@ def run_eval_or_batch(
                     models.Prediction.load_evaluation_output(
                         challenge, obj, output_type, value
                     )
+        obj.clear_old_scores()
 
         if is_batch:
             obj.batchup()
@@ -301,7 +302,6 @@ def run_eval_or_batch(
             ):
                 obj.append(log_message)
 
-        obj.clear_old_scores()
         obj.status = models.Status.SUCCESS
     except CancelledException:
         obj.status = models.Status.CANCELLED

app/referee/tasks.py

@@ -0,0 +1,15 @@
+#!/bin/bash -e
+
+sudo mv /home/ec2-user/deploy_files/set_staging.sh /var/app/current/
+
+sudo -i -u webapp << 'EOF' 
+source /var/app/current/.venv/bin/activate
+
+source /var/app/current/set_staging.sh
+
+cd /var/app/current/
+
+python manage.py createsuperuser --no-input
+
+python manage.py sample_data --delete
+EOF

deploy_files/django_initial_data.sh

@@ -1,8 +1,8 @@
 #!/bin/bash -e
 
-DEPLOY_FILES_DIR="/home/ec2-user/deploy_files"
+# DEPLOY_FILES_DIR="/home/ec2-user/deploy_files"
 
-sudo mv $DEPLOY_FILES_DIR/env /opt/env/env
+# sudo mv $DEPLOY_FILES_DIR/env /opt/env/env
 
 #sudo pkill -HUP gunicorn
 

deploy_files/restart_gunicorn.sh deploy_files/restart_processes.shdeploy_files/restart_gunicorn.sh renamed to deploy_files/restart_processes.sh

@@ -1,6 +1,9 @@
 #!/bin/bash -e
 
-sudo mv /home/ec2-user/deploy_files/set_staging.sh /var/app/current/
+if [ ! -e /var/app/current/set_staging.sh ]
+then
+    echo "set_staging.sh must be created before running this command"
+fi
 
 sudo -i -u webapp << 'EOF' 
 source /var/app/current/.venv/bin/activate
@@ -15,7 +18,4 @@ python manage.py makemigrations
 
 python manage.py migrate --no-input
 
-python manage.py createsuperuser --no-input
-
-python manage.py sample_data --delete
 EOF

deploy_files/setup_djangoapp.sh

@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 ever-given = {editable = true, path = "."}
 docker = "*"
+build = "*"
 
 [requires]
 python_version = "3.8"