Merge pull request #1 from stanfordnmbl/update-latest

Updated with latest changes.

Author: AlbertoCasasOrtiz

.dockerignore

@@ -0,0 +1,2 @@
+.env
+data

.github/workflows/deploy.yml

@@ -0,0 +1,26 @@
+name: Deploy to EC2
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: SSH into EC2 and deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            cd motionlab
+            git pull
+            make run

.gitignore

@@ -0,0 +1,12 @@
+__pycache__
+db.sqlite3
+*.pyc
+*~
+\#*
+.env
+sendgrid.env
+keys
+.idea
+inputs
+*.log
+node_modules

Dockerfile

@@ -56,7 +56,8 @@ ENV DJANGO_SETTINGS_MODULE=motionlab.settings
 # Call collectstatic (customize the following line with the minimal environment variables needed for manage.py to run):
 # RUN DATABASE_URL='' python manage.py collectstatic --noinput
 
-RUN mkdir data ; python manage.py migrate ; python manage.py loaddata fixtures/startup-data.json
+RUN mkdir data ; python manage.py migrate ;
+# python manage.py loaddata fixtures/startup-data.json
 
 # Tell uWSGI where to find your wsgi file (change this):
 ENV UWSGI_WSGI_FILE=motionlab/wsgi.py

Makefile

@@ -8,14 +8,18 @@ push:
 
 .PHONY: stop
 stop:
-	docker kill motionlab_openpose 2> /dev/null
-	docker rm motionlab_openpose 2> /dev/null
+	if [ -n "$$(docker ps -q -f name=motionlab_openpose)" ]; then \
+		docker kill motionlab_openpose 2> /dev/null; \
+	fi
+	if [ -n "$$(docker ps -aq -f name=motionlab_openpose)" ]; then \
+		docker rm motionlab_openpose 2> /dev/null; \
+	fi
 	docker-compose down
 
 .PHONY: start
 start:
 	docker-compose up -d
-# -v $(pwd)/.env:/code/.env
-	docker run --name motionlab_openpose --link motionlab_redis_1:redis --link motionlab_www_1:www --net motionlab_default --gpus all -d --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 stanfordnmbl/motionlab-worker /bin/sh -c 'celery -A worker worker --loglevel=info --concurrency=1 --pool=solo'
+        # -v $(pwd)/.env:/code/.env
+	docker run --name motionlab_openpose --link motionlab_redis_1:redis --link motionlab_www_1:www --net motionlab_default -d --shm-size=1g --ulimit memlock=-1 --ulimit stack=67108864 stanfordnmbl/motionlab-worker /bin/sh -c 'celery -A worker worker --loglevel=info --concurrency=1 --pool=solo'
 
 run: docker stop start

README.md

@@ -6,16 +6,16 @@
 
 The platform is developped in django so it can be deployed as any other django application
 
-1. Install requirements with 
+1. Install requirements with:
 ```
 pip install -r requirements.txt
 ```
 2. Check settings in `motionlab/settings.py`. In particular, make sure to configure it to run on your database and AWS S3 servers.
-3. Migrate the database with
+3. Migrate the database with (you may need to manually create a folder called "data" to store the local database):
 ```
 python manage.py migrate
 ```
-4. Start the server with
+4. Start the server with:
 ```
 python manage.py runserver
 ```

motionlab/__init__.py

@@ -5,3 +5,19 @@
 from .celery import app as celery_app
 
 __all__ = ('celery_app',)
+
+# app/__init__.py
+from django.template.defaultfilters import register
+
+# Import your custom filter
+from motionlab.templatetags.custom_filters import get_slugs, index, num_processed, get_json_value
+
+# Register the custom filter
+register.filter('get_slugs', get_slugs)
+# Register the custom filter
+register.filter('index', index)
+# Register the custom filter
+register.filter('num_processed', num_processed)
+# Register the custom filter
+register.filter('get_json_value', get_json_value)
+

motionlab/converters.py

@@ -0,0 +1,10 @@
+from django.urls import converters
+
+class SlugsConverter:
+    regex = r'[-\w]+(?:,[-\w]+)*'
+
+    def to_python(self, value):
+        return value.split(',')
+
+    def to_url(self, value):
+        return ','.join(value)

motionlab/forms.py

@@ -4,6 +4,8 @@
 from django import forms
 from django.utils.safestring import mark_safe
 from django.forms import ModelForm, FileInput
+from captcha.fields import CaptchaField
+import uuid
 
 class VideoForm(ModelForm):
 #    terms_confirmed = forms.BooleanField(label=mark_safe("I've read and accept <a href='#license'>the terms of use</a>."))
@@ -15,10 +17,20 @@ class Meta:
 #            'file': FileInput(attrs={'class': "dropzone"}),
         }
 
+
+class MultipleVideosForm(ModelForm):
+    class Meta:
+        model = Video
+        fields = ["file", "recordid"]
+        widgets = {
+            "file": forms.FileInput(attrs={'multiple': True})  # Add 'multiple' attribute to the widget
+        }
+
 class ContactForm(forms.Form):
     your_email = forms.EmailField(required=True)
     subject = forms.CharField(required=True)
     message = forms.CharField(widget=forms.Textarea(attrs={'style': 'min-height: 7em;'}), required=True)
+    # captcha = CaptchaField()
 
 class ApplicationForm(forms.Form):
     your_name = forms.CharField(required=True)

motionlab/settings.py

@@ -24,7 +24,7 @@
 SECRET_KEY = 'ieq1!ik0pt*j)pag5o%%(iy$jn!bj6iwe!x$-3pf5$va+cs#45'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True #False
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 
@@ -39,6 +39,7 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'captcha',
     'motionlab',
     'randomslugfield',
 #    'corsheaders',
@@ -107,6 +108,12 @@
     },
 ]
 
+# Max file size.
+# Set FILE_UPLOAD_MAX_MEMORY_SIZE to 1 GB
+FILE_UPLOAD_MAX_MEMORY_SIZE = 1 * 1024 * 1024 * 1024  # 51 GB
+
+# Set DATA_UPLOAD_MAX_MEMORY_SIZE to 1 GB
+DATA_UPLOAD_MAX_MEMORY_SIZE = 1 * 1024 * 1024 * 1024  # 1 GB
 
 # Internationalization
 # https://docs.djangoproject.com/en/3.0/topics/i18n/