Merge f954acb into 42f069a

bothub/api/v1/serializers/repository.py

@@ -28,6 +28,7 @@ class Meta:
             'language',
             'algorithm',
             'use_competing_intents',
+            'use_name_entities',
             'categories',
             'description',
             'is_private',
@@ -67,6 +68,7 @@ class Meta:
             'algorithm',
             'use_language_model_featurizer',
             'use_competing_intents',
+            'use_name_entities',
             'categories',
             'categories_list',
             'description',

bothub/api/v2/repository/serializers.py

@@ -116,6 +116,7 @@ class Meta:
             'algorithm',
             'use_language_model_featurizer',
             'use_competing_intents',
+            'use_name_entities',
         ]
         read_only = [
             'uuid',

bothub/common/admin.py

@@ -16,6 +16,7 @@ class RepositoryUpdateInline(admin.TabularInline):
         'language',
         'algorithm',
         'use_competing_intents',
+        'use_name_entities',
         'created_at',
         'by',
         'training_started_at',

bothub/common/migrations/0030_auto_20190327_2003.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.5 on 2019-03-27 20:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0029_auto_20190126_0247'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='repository',
+            name='use_name_entities',
+            field=models.BooleanField(default=False, help_text='When enabling name entities you will receive name of people, companies and places as results of your predictions.', verbose_name='Use name entities'),
+        ),
+        migrations.AddField(
+            model_name='repositoryupdate',
+            name='use_name_entities',
+            field=models.BooleanField(default=False),
+        ),
+    ]

bothub/common/models.py

@@ -152,6 +152,12 @@ class Meta:
         help_text=_('When using competing intents the confidence of the ' +
                     'prediction is distributed in all the intents.'),
         default=False)
+    use_name_entities = models.BooleanField(
+        _('Use name entities'),
+        help_text=_('When enabling name entities you will receive name of ' +
+                    'people, companies and places as results of your ' +
+                    'predictions.'),
+        default=False)
     categories = models.ManyToManyField(
         RepositoryCategory,
         help_text=CATEGORIES_HELP_TEXT)
@@ -418,6 +424,7 @@ class Meta:
         default=Repository.ALGORITHM_STATISTICAL_MODEL,
     )
     use_competing_intents = models.BooleanField(default=False)
+    use_name_entities = models.BooleanField(default=False)
     created_at = models.DateTimeField(
         _('created at'),
         auto_now_add=True)
@@ -525,6 +532,9 @@ def ready_for_train(self):
             if previous_update.use_competing_intents is not \
                self.repository.use_competing_intents:
                 return True
+            if previous_update.use_name_entities is not \
+               self.repository.use_name_entities:
+                return True
             if previous_update.failed_at:
                 return True
 
@@ -574,12 +584,14 @@ def start_training(self, by):
         self.training_started_at = timezone.now()
         self.algorithm = self.repository.algorithm
         self.use_competing_intents = self.repository.use_competing_intents
+        self.use_name_entities = self.repository.use_name_entities
         self.save(
             update_fields=[
                 'by',
                 'training_started_at',
                 'algorithm',
                 'use_competing_intents',
+                'use_name_entities',
             ])
 
     def save_training(self, bot_data):

bothub/common/tests.py

@@ -1206,6 +1206,50 @@ def test_equal_repository_value_after_train(self):
         self.assertFalse(current_update.use_competing_intents)
 
 
+class UseNameEntitiesTestCase(TestCase):
+    def setUp(self):
+        self.language = languages.LANGUAGE_EN
+
+        self.owner = User.objects.create_user('owner@user.com', 'user')
+
+        self.repository = Repository.objects.create(
+            owner=self.owner,
+            name='Test',
+            slug='test',
+            language=self.language,
+            use_name_entities=True)
+
+        RepositoryExample.objects.create(
+            repository_update=self.repository.current_update(),
+            text='my name is Douglas',
+            intent='greet')
+        RepositoryExample.objects.create(
+            repository_update=self.repository.current_update(),
+            text='my name is John',
+            intent='greet')
+
+    def test_change_ready_for_train(self):
+        self.assertTrue(self.repository.ready_for_train)
+        current_update = self.repository.current_update()
+        current_update.start_training(self.owner)
+        current_update.save_training(b'')
+        self.assertFalse(self.repository.ready_for_train)
+        self.repository.use_name_entities = False
+        self.repository.save()
+        self.assertTrue(self.repository.ready_for_train)
+        self.repository.use_name_entities = True
+        self.repository.save()
+        self.assertFalse(self.repository.ready_for_train)
+
+    def test_equal_repository_value_after_train(self):
+        current_update = self.repository.current_update()
+        self.repository.use_name_entities = False
+        self.repository.save()
+        current_update.start_training(self.owner)
+        current_update.save_training(b'')
+        self.assertFalse(current_update.use_name_entities)
+
+
 class RepositoryUpdateWarnings(TestCase):
     def setUp(self):
         self.language = languages.LANGUAGE_EN