Removed "success_log" and "error_log"

bothub/api/v2/evaluate/filters.py

@@ -1,6 +1,5 @@
 from django.utils.translation import gettext as _
 from django.core.exceptions import ValidationError as DjangoValidationError
-from django.db.models import Q
 from django_filters import rest_framework as filters
 
 from rest_framework.exceptions import PermissionDenied
@@ -118,9 +117,7 @@ class Meta:
         help_text=_('Repository\'s UUID'))
 
     def filter_evaluate_text(self, queryset, name, value):
-        return queryset.filter(
-            Q(success_log__icontains=value) | Q(error_log__contains=value)
-        )
+        return queryset.filter(log__icontains=value)
 
     def filter_repository_uuid(self, queryset, name, value):
         request = self.request

bothub/api/v2/evaluate/serializers.py

@@ -169,22 +169,19 @@ class Meta:
             'created_at',
             'matrix_chart',
             'confidence_chart',
-            'success_log',
-            'error_log',
+            'log',
             'intents_list',
             'entities_list',
             'intent_results',
             'entity_results'
 
         ]
 
-    success_log = serializers.SerializerMethodField()
-    error_log = serializers.SerializerMethodField()
-    intent_results = RepositoryEvaluateResultScore(read_only=True)
-    entity_results = RepositoryEvaluateResultScore(read_only=True)
-
+    log = serializers.SerializerMethodField()
     intents_list = serializers.SerializerMethodField()
     entities_list = serializers.SerializerMethodField()
+    intent_results = RepositoryEvaluateResultScore(read_only=True)
+    entity_results = RepositoryEvaluateResultScore(read_only=True)
 
     def get_intents_list(self, obj):
         return RepositoryEvaluateResultIntentSerializer(
@@ -194,8 +191,5 @@ def get_entities_list(self, obj):
         return RepositoryEvaluateResultEntitySerializer(
             obj.evaluate_result_entity.all(), many=True).data
 
-    def get_success_log(self, obj):
-        return json.loads(obj.success_log)
-
-    def get_error_log(self, obj):
-        return json.loads(obj.error_log)
+    def get_log(self, obj):
+        return json.loads(obj.log)

bothub/common/management/commands/fill_db_using_fake_data.py

@@ -199,41 +199,42 @@ def handle(self, *args, **kwargs):
                 accuracy=0.978,
             )
 
-            success_log = [
+            evaluate_log = [
                 {
                     "text": "hey",
                     "intent": "greet",
                     "intent_prediction": {
                         "name": "greet",
                         "confidence": 0.9263743763408538
-                    }
+                    },
+                    "status": "success"
                 },
                 {
                     "text": "howdy",
                     "intent": "greet",
                     "intent_prediction": {
                         "name": "greet",
                         "confidence": 0.8099720606047796
-                    }
+                    },
+                    "status": "success"
                 },
                 {
                     "text": "hey there",
                     "intent": "greet",
                     "intent_prediction": {
                         "name": "greet",
                         "confidence": 0.8227075176309955
-                    }
-                }
-            ]
-
-            error_log = [
+                    },
+                    "status": "success"
+                },
                 {
                     "text": "test with nlu",
                     "intent": "restaurant_search",
                     "intent_prediction": {
                         "name": "goodbye",
                         "confidence": 0.3875259420712092
-                    }
+                    },
+                    "status": "error"
                 }
             ]
 
@@ -244,8 +245,7 @@ def handle(self, *args, **kwargs):
                 entity_results=entity_results,
                 matrix_chart='{}/confmat.png'.format(sample_url),
                 confidence_chart='{}/hist.png'.format(sample_url),
-                success_log=json.dumps(success_log),
-                error_log=json.dumps(error_log),
+                log=json.dumps(evaluate_log),
             )
 
             intent_score_1 = RepositoryEvaluateResultScore.objects.create(

bothub/common/migrations/0032_auto_20190430_2125.py → bothub/common/migrations/0031_auto_20190502_1732.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.1.5 on 2019-04-30 21:25
+# Generated by Django 2.1.5 on 2019-05-02 17:32
 
 import django.core.validators
 from django.db import migrations, models
@@ -9,18 +9,49 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('common', '0031_repositoryevaluate_repositoryevaluateentity'),
+        ('common', '0030_auto_20190327_2003'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='RepositoryEvaluate',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('text', models.TextField(help_text='Evaluate test text', verbose_name='text')),
+                ('intent', models.CharField(default='no_intent', help_text='Evaluate intent reference', max_length=64, validators=[django.core.validators.RegexValidator(re.compile('^[-a-z0-9_]+\\Z'), 'Enter a valid value consisting of lowercase letters, numbers, underscores or hyphens.', 'invalid')], verbose_name='intent')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
+                ('deleted_in', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='deleted_evaluate', to='common.RepositoryUpdate')),
+                ('repository_update', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, related_name='added_evaluate', to='common.RepositoryUpdate')),
+            ],
+            options={
+                'verbose_name': 'repository evaluate test',
+                'verbose_name_plural': 'repository evaluate tests',
+                'db_table': 'common_repository_evaluate',
+                'ordering': ['-created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='RepositoryEvaluateEntity',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('start', models.PositiveIntegerField(help_text='Start index of entity value in example text', verbose_name='start')),
+                ('end', models.PositiveIntegerField(help_text='End index of entity value in example text', verbose_name='end')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
+                ('entity', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='common.RepositoryEntity')),
+                ('repository_evaluate', models.ForeignKey(editable=False, help_text='evaluate object', on_delete=django.db.models.deletion.CASCADE, related_name='entities', to='common.RepositoryEvaluate')),
+            ],
+            options={
+                'db_table': 'common_repository_evaluate_entity',
+            },
+        ),
         migrations.CreateModel(
             name='RepositoryEvaluateResult',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('matrix_chart', models.URLField(editable=False, verbose_name='Intent Confusion Matrix Chart')),
                 ('confidence_chart', models.URLField(editable=False, verbose_name='Intent Prediction Confidence Distribution')),
-                ('success_log', models.TextField(blank=True, editable=False, verbose_name='Success Log')),
-                ('error_log', models.TextField(blank=True, editable=False, verbose_name='Error Log')),
+                ('log', models.TextField(blank=True, editable=False, verbose_name='Evaluate Log')),
+                ('version', models.IntegerField(default=0, editable=False, verbose_name='Version')),
                 ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
             ],
             options={

bothub/common/models.py

@@ -1366,13 +1366,8 @@ class Meta:
         verbose_name=_('Intent Prediction Confidence Distribution'),
         editable=False)
 
-    success_log = models.TextField(
-        verbose_name=_('Success Log'),
-        blank=True,
-        editable=False)
-
-    error_log = models.TextField(
-        verbose_name=_('Error Log'),
+    log = models.TextField(
+        verbose_name=_('Evaluate Log'),
         blank=True,
         editable=False)