Skip to content

Commit

Permalink
Version FIlter
Browse files Browse the repository at this point in the history
  • Loading branch information
dyohan9 committed Dec 4, 2019
1 parent 7e43182 commit b477238
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 4 deletions.
8 changes: 8 additions & 0 deletions bothub/api/v2/examples/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ class Meta:
method="filter_entity",
help_text=_("Filter for examples with entity."),
)
update_id = filters.CharFilter(
field_name="repository_update",
method="filter_repository_update",
help_text=_("Filter for examples with update_id."),
)

def filter_repository_uuid(self, queryset, name, value):
request = self.request
Expand All @@ -63,6 +68,9 @@ def filter_repository_uuid(self, queryset, name, value):
except DjangoValidationError:
raise NotFound(_("Invalid repository_uuid"))

def filter_repository_update(self, queryset, name, value):
return queryset.filter(repository_update__pk__lte=value, repository_update__version=True)

def filter_language(self, queryset, name, value):
return queryset.filter(repository_update__language=value)

Expand Down
23 changes: 23 additions & 0 deletions bothub/common/migrations/0040_auto_20191204_2035.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 2.1.11 on 2019-12-04 20:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('common', '0039_auto_20191114_2018'),
]

operations = [
migrations.AddField(
model_name='repositoryupdate',
name='selected',
field=models.BooleanField(default=False),
),
migrations.AddField(
model_name='repositoryupdate',
name='version',
field=models.BooleanField(default=False),
),
]
13 changes: 9 additions & 4 deletions bothub/common/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,14 @@ def language_status(self, language):
},
}

def current_update(self, language=None):
def current_update(self, language=None, update_id=None):
language = language or self.language
repository_update, created = self.updates.get_or_create(
language=language, training_started_at=None
)
if update_id is None:
repository_update, created = self.updates.get_or_create(
language=language, training_started_at=None
)
else:
repository_update = self.updates.filter(pk=update_id).first()
return repository_update

def last_trained_update(self, language=None):
Expand Down Expand Up @@ -471,6 +474,8 @@ class Meta:
failed_at = models.DateTimeField(_("failed at"), blank=True, null=True)
training_log = models.TextField(_("training log"), blank=True, editable=False)
use_analyze_char = models.BooleanField(default=False)
selected = models.BooleanField(default=False)
version = models.BooleanField(default=False)

@property
def examples(self):
Expand Down

0 comments on commit b477238

Please sign in to comment.