Merge pull request #138 from diging/develop

Story/vgnwb 257 (#137)

.gitignore

@@ -65,3 +65,6 @@ target/
 *.rdb
 
 node_modules
+.DS_STORE
+.env
+.vscode

annotations/migrations/0033_relationtemplate_use_in_mass_assignment.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.6 on 2019-03-13 20:19
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('annotations', '0032_auto_20170523_1753'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='relationtemplate',
+            name='use_in_mass_assignment',
+            field=models.BooleanField(default=False),
+        ),
+    ]

annotations/models.py

@@ -998,6 +998,10 @@ class RelationTemplate(models.Model):
     """Pattern for representing the relation in normal language."""
 
     _terminal_nodes = models.TextField(blank=True, null=True)
+    use_in_mass_assignment = models.BooleanField(default=False)
+
+    def __str__(self):
+        return self.name
 
     def _get_terminal_nodes(self):
         return self._terminal_nodes

annotations/relations.py

@@ -326,8 +326,6 @@ def generate_expression(template, relations):
     expression_keys = [k[1].replace('_', '') for k in Formatter().parse(template.expression)
                        if k[1] is not None]
     expression_data = {}
-    print expression_keys
-    print relations
     for key in expression_keys:
         try:
             relation = relations[int(key[0])]

annotations/serializers.py

@@ -53,19 +53,21 @@ class Meta:
 class TextSerializer(serializers.ModelSerializer):
     class Meta:
         model = Text
-        fields = ('id', 'uri', 'title', 'created', 'added',
-                  'addedBy', 'source', 'annotators', 'annotation_count')
+        fields = ('id', 'uri', 'title', 'created', 'added', 'addedBy',
+                  'source', 'annotators', 'annotation_count')
 
     def create(self, validated_data):
         repository = Repository.objects.get(pk=validated_data['source'])
         # TODO: Make retrieval/tokenization/other processing asynchronous.
-        tokenizedContent = tokenize(retrieve(repository, validated_data['uri']))
-
-        text = Text(uri=validated_data['uri'],
-                    title=validated_data['title'],
-                    source=repository,
-                    addedBy=self.context['request'].user,
-                    tokenizedContent=tokenizedContent)
+        tokenizedContent = tokenize(
+            retrieve(repository, validated_data['uri']))
+
+        text = Text(
+            uri=validated_data['uri'],
+            title=validated_data['title'],
+            source=repository,
+            addedBy=self.context['request'].user,
+            tokenizedContent=tokenizedContent)
         text.save()
         return HttpResponse(text.id)
 
@@ -92,7 +94,6 @@ class Meta:
                   'startPos', 'stringRep', 'tokenIds', 'interpretation_label',
                   'interpretation_type_label', 'position', 'project')
 
-
 class AppellationPOSTSerializer(serializers.ModelSerializer):
     position = DocumentPositionSerializer(required=False)
     tokenIds = serializers.CharField(required=False)
@@ -105,14 +106,12 @@ class Meta:
                   'startPos', 'stringRep', 'tokenIds', 'interpretation_label',
                   'interpretation_type_label', 'position', 'project')
 
-
 class TypeSerializer(serializers.ModelSerializer):
     class Meta:
         model = Type
         fields = ('id', 'url', 'uri', 'label', 'authority', 'typed',
                   'description')
 
-
 class RelationSetSerializer(serializers.ModelSerializer):
     appellations = AppellationSerializer(many=True)
     date_appellations = DateAppellationSerializer(many=True)
@@ -121,8 +120,9 @@ class RelationSetSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = RelationSet
-        fields = ('id', 'label', 'created', 'template', 'createdBy', 'occursIn',
-                  'appellations', 'concepts', 'project', 'representation', 'date_appellations' )    #
+        fields = ('id', 'label', 'created', 'template', 'createdBy',
+                  'occursIn', 'appellations', 'concepts', 'project',
+                  'representation', 'date_appellations')  #
 
 
 class TemporalBoundsSerializer(serializers.ModelSerializer):
@@ -131,8 +131,20 @@ class Meta:
         fields = '__all__'
 
 
-
 class TextCollectionSerializer(serializers.ModelSerializer):
     class Meta:
         model = TextCollection
         fields = '__all__'
+
+
+class TemplatePartSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = RelationTemplate
+        fields = ('id', 'name', 'description')
+
+
+class TemplateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = RelationTemplate
+        fields = ('id', 'name', 'description', 'template_parts')
+        depth = 1