Merge branch 'master' of https://github.com/chakki-works/doccano into authentification and resolves the two little conflicts

Author: Guillim

.coveragerc

@@ -5,6 +5,8 @@ omit =
   app/server/migrations/*
   app/server/templatetags/*
   app/server/tests/*
+  app/api/migrations/*
+  app/api/tests/*
   app/authentification/tests/*
   app/authentification/templatetags/*
 

Dockerfile

@@ -29,18 +29,21 @@ RUN cd /doccano \
 
 FROM python:${PYTHON_VERSION}-slim AS runtime
 
+RUN useradd -ms /bin/sh doccano
+
 COPY --from=builder /deps /deps
 RUN pip install --no-cache-dir /deps/*.whl
 
-COPY --from=cleaner /doccano /doccano
+COPY --from=cleaner --chown=doccano:doccano /doccano /doccano
 
 ENV DEBUG="True"
 ENV SECRET_KEY="change-me-in-production"
-ENV PORT="80"
+ENV PORT="8000"
 ENV WORKERS="2"
 ENV GOOGLE_TRACKING_ID=""
 ENV AZURE_APPINSIGHTS_IKEY=""
 
+USER doccano
 WORKDIR /doccano
 EXPOSE ${PORT}
 

README.md

@@ -95,6 +95,7 @@ docker pull chakkiworks/doccano
 First we need to install the dependencies. Run the following commands:
 
 ```bash
+sudo apt-get install libpq-dev
 pip install -r requirements.txt
 cd app
 ```
@@ -129,7 +130,7 @@ Depending on your installation method, there are two options:
 First, run a Docker container:
 
 ```bash
-docker run -d --name doccano -p 8000:80 chakkiworks/doccano
+docker run -d --name doccano -p 8000:8000 chakkiworks/doccano
 ```
 
 Then, execute `create-admin.sh` script for creating a superuser.

app/api/__init__.py

@@ -0,0 +1,52 @@
+from django.contrib import admin
+
+from .models import Label, Document, Project
+from .models import DocumentAnnotation, SequenceAnnotation, Seq2seqAnnotation
+from .models import TextClassificationProject, SequenceLabelingProject, Seq2seqProject
+
+
+class LabelAdmin(admin.ModelAdmin):
+    list_display = ('text', 'project', 'text_color', 'background_color')
+    ordering = ('project',)
+    search_fields = ('project',)
+
+
+class DocumentAdmin(admin.ModelAdmin):
+    list_display = ('text', 'project', 'meta')
+    ordering = ('project',)
+    search_fields = ('project',)
+
+
+class ProjectAdmin(admin.ModelAdmin):
+    list_display = ('name', 'description', 'project_type', 'randomize_document_order')
+    ordering = ('project_type',)
+    search_fields = ('name',)
+
+
+class SequenceAnnotationAdmin(admin.ModelAdmin):
+    list_display = ('document', 'label', 'start_offset', 'user')
+    ordering = ('document',)
+    search_fields = ('document',)
+
+
+class DocumentAnnotationAdmin(admin.ModelAdmin):
+    list_display = ('document', 'label', 'user')
+    ordering = ('document',)
+    search_fields = ('document',)
+
+
+class Seq2seqAnnotationAdmin(admin.ModelAdmin):
+    list_display = ('document', 'text', 'user')
+    ordering = ('document',)
+    search_fields = ('document',)
+
+
+admin.site.register(DocumentAnnotation, DocumentAnnotationAdmin)
+admin.site.register(SequenceAnnotation, SequenceAnnotationAdmin)
+admin.site.register(Seq2seqAnnotation, Seq2seqAnnotationAdmin)
+admin.site.register(Label, LabelAdmin)
+admin.site.register(Document, DocumentAdmin)
+admin.site.register(Project, ProjectAdmin)
+admin.site.register(TextClassificationProject, ProjectAdmin)
+admin.site.register(SequenceLabelingProject, ProjectAdmin)
+admin.site.register(Seq2seqProject, ProjectAdmin)

app/api/admin.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ApiConfig(AppConfig):
+    name = 'api'

app/api/apps.py

@@ -1,5 +1,6 @@
 from django.db.models import Count, Q
 from django_filters.rest_framework import FilterSet, BooleanFilter
+
 from .models import Document
 
 

app/server/exceptions.py renamed to app/api/exceptions.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.7 on 2019-03-31 12:43
+# Generated by Django 2.1.7 on 2019-06-21 06:05
 
 from django.conf import settings
 from django.db import migrations, models
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
                 ('manual', models.BooleanField(default=False)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
-                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='doc_annotations', to='server.Document')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='doc_annotations', to='api.Document')),
             ],
         ),
         migrations.CreateModel(
@@ -59,6 +59,7 @@ class Migration(migrations.Migration):
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('project_type', models.CharField(choices=[('DocumentClassification', 'document classification'), ('SequenceLabeling', 'sequence labeling'), ('Seq2seq', 'sequence to sequence')], max_length=30)),
+                ('randomize_document_order', models.BooleanField(default=False)),
             ],
             options={
                 'abstract': False,
@@ -74,7 +75,7 @@ class Migration(migrations.Migration):
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('text', models.TextField()),
-                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seq2seq_annotations', to='server.Document')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seq2seq_annotations', to='api.Document')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
@@ -88,48 +89,48 @@ class Migration(migrations.Migration):
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('start_offset', models.IntegerField()),
                 ('end_offset', models.IntegerField()),
-                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seq_annotations', to='server.Document')),
-                ('label', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='server.Label')),
+                ('document', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seq_annotations', to='api.Document')),
+                ('label', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.Label')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
         migrations.CreateModel(
             name='Seq2seqProject',
             fields=[
-                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='server.Project')),
+                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='api.Project')),
             ],
             options={
                 'abstract': False,
                 'base_manager_name': 'objects',
             },
-            bases=('server.project',),
+            bases=('api.project',),
         ),
         migrations.CreateModel(
             name='SequenceLabelingProject',
             fields=[
-                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='server.Project')),
+                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='api.Project')),
             ],
             options={
                 'abstract': False,
                 'base_manager_name': 'objects',
             },
-            bases=('server.project',),
+            bases=('api.project',),
         ),
         migrations.CreateModel(
             name='TextClassificationProject',
             fields=[
-                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='server.Project')),
+                ('project_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='api.Project')),
             ],
             options={
                 'abstract': False,
                 'base_manager_name': 'objects',
             },
-            bases=('server.project',),
+            bases=('api.project',),
         ),
         migrations.AddField(
             model_name='project',
             name='polymorphic_ctype',
-            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_server.project_set+', to='contenttypes.ContentType'),
+            field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_api.project_set+', to='contenttypes.ContentType'),
         ),
         migrations.AddField(
             model_name='project',
@@ -139,12 +140,12 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='label',
             name='project',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labels', to='server.Project'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='labels', to='api.Project'),
         ),
         migrations.AddField(
             model_name='documentannotation',
             name='label',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='server.Label'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.Label'),
         ),
         migrations.AddField(
             model_name='documentannotation',
@@ -154,7 +155,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='document',
             name='project',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='server.Project'),
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='api.Project'),
         ),
         migrations.AlterUniqueTogether(
             name='sequenceannotation',
@@ -166,7 +167,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='label',
-            unique_together={('project', 'prefix_key', 'suffix_key'), ('project', 'text')},
+            unique_together={('project', 'text'), ('project', 'prefix_key', 'suffix_key')},
         ),
         migrations.AlterUniqueTogether(
             name='documentannotation',

app/server/filters.py renamed to app/api/filters.py

@@ -0,0 +1,21 @@
+# Generated by Django 2.1.7 on 2019-06-26 13:24
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('api', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='document',
+            name='annotations_approved_by',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+    ]