Updated for new Gecko version

Author: strelok2012

app/app/settings.py

@@ -98,7 +98,7 @@
 
 STATICFILES_DIRS = [
     os.path.join(BASE_DIR, 'server/static'),
-    os.path.join(BASE_DIR, 'server/node_modules/gecko/build')
+    os.path.join(BASE_DIR, 'server/node_modules/gecko/build_external')
 ]
 
 STATICFILES_STORAGE = 'app.storage.CompressedManifestStaticFilesStorage'
@@ -180,18 +180,6 @@
         }  
     }
 
-DATABASES = {    
-        'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'doccano',
-        'USER': 'postgres',
-        'PASSWORD': 'admin',
-        'HOST': 'localhost',
-        'PORT': 5432,
-        'CONN_MAX_AGE': 60
-    }  
-}
-
 # Password validation
 # https://docs.djangoproject.com/en/2.0/ref/settings/#auth-password-validators
 

app/server/migrations/0023_merge_20200604_0909.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.5 on 2020-06-04 09:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('server', '0021_auto_20191105_1553'),
+        ('server', '0022_auto_20200317_0301'),
+    ]
+
+    operations = [
+    ]

app/server/migrations/0024_auto_20200607_1709.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.1.5 on 2020-06-07 17:09
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('server', '0023_merge_20200604_0909'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='audiolabelingannotation',
+            name='additional_data',
+            field=models.TextField(default='{}'),
+        ),
+        migrations.AlterField(
+            model_name='project',
+            name='project_type',
+            field=models.CharField(choices=[('DocumentClassification', 'document classification'), ('SequenceLabelingAlt', 'sequence labeling Alt'), ('SequenceLabeling', 'sequence labeling'), ('Seq2seq', 'sequence to sequence'), ('ImageClassification', 'image classification'), ('ImageCaptioning', 'image captioning'), ('AudioLabeling', 'audio labeling (Gecko test)'), ('ConversationClassification', 'conversation classification')], max_length=30),
+        ),
+        migrations.AlterUniqueTogether(
+            name='audiolabelingannotation',
+            unique_together={('document', 'user', 'file_path')},
+        ),
+    ]

app/server/models.py

@@ -107,6 +107,10 @@ def get_documents_kwargs(self, user, labels=None):
             ret["seq_annotations__user"] = user
             if (labels):
                 ret[ "seq_annotations__label__in"] = labels
+        elif self.is_type_of(Project.AudioLabeling):
+            ret["audio_labeling_annotations__user"] = user
+            if (labels):
+                ret[ "audio_labeling_annotations__label__in"] = labels
         else:
             print('Project type: '+self.project_type)
             raise ValueError('Invalid project_type')
@@ -562,4 +566,4 @@ class AudioLabelingAnnotation(Annotation):
     data = models.TextField(blank=True)
 
     class Meta:
-        unique_together = ('document', 'user')
+        unique_together = ('document', 'user', 'file_path')

app/server/package.json

@@ -13,7 +13,7 @@
     "chart.js": "^2.7.2",
     "custom-event-polyfill": "^1.0.7",
     "element-matches": "^0.1.2",
-    "gecko": "github:strelok2012/gecko#doccano-integration",
+    "gecko": "github:strelok2012/gecko#gecko-doccano",
     "vue": "^2.6.10",
     "vue-chartjs": "^3.4.0",
     "vue-good-table": "^2.16.4",