Skip to content

Commit

Permalink
running black
Browse files Browse the repository at this point in the history
  • Loading branch information
mldzs committed Feb 24, 2021
1 parent 7df40bc commit 7ced68d
Show file tree
Hide file tree
Showing 3 changed files with 74 additions and 48 deletions.
13 changes: 6 additions & 7 deletions bothub/api/v2/tests/test_nlp.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,7 @@ def request(self, token, repository_version=""):
authorization_header = {"HTTP_AUTHORIZATION": "Bearer {}".format(token)}
request = self.factory.get(
"/v2/repository/nlp/authorization/info/{}/".format(token),
{
"repository_version": repository_version
},
{"repository_version": repository_version},
**authorization_header
)
response = RepositoryAuthorizationInfoViewSet.as_view({"get": "retrieve"})(
Expand All @@ -209,13 +207,12 @@ def test_list_all_repository_intents(self):
def test_list_repository_intents_with_filter_version(self):
response, content_data = self.request(
str(self.repository_authorization.uuid),
repository_version=self.repository_version.pk
repository_version=self.repository_version.pk,
)
self.assertEqual(len(response.data.get("intents")), 1)

response, content_data = self.request(
str(self.repository_authorization.uuid),
repository_version="0"
str(self.repository_authorization.uuid), repository_version="0"
)
self.assertEqual(len(response.data.get("intents")), 0)

Expand All @@ -235,7 +232,9 @@ def setUp(self):
)

self.repository_authorization = RepositoryAuthorization.objects.create(
user=self.user, repository=self.repository, role=RepositoryAuthorization.ROLE_ADMIN
user=self.user,
repository=self.repository,
role=RepositoryAuthorization.ROLE_ADMIN,
)

self.repository_version = RepositoryVersion.objects.create(
Expand Down
32 changes: 19 additions & 13 deletions bothub/common/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -396,20 +396,30 @@ def have_at_least_three_examples_for_each_intent(self, language: str) -> bool:

def validate_if_can_run_manual_evaluate(self, language: str) -> None:
if not self.have_at_least_one_test_phrase_registered(language=language):
raise ValidationError(_("You need to have at least " + "one registered test phrase"))
raise ValidationError(
_("You need to have at least " + "one registered test phrase")
)

if not self.have_at_least_two_intents_registered():
raise ValidationError(_("You need to have at least " + "two registered intents"))
raise ValidationError(
_("You need to have at least " + "two registered intents")
)

def validate_if_can_run_automatic_evaluate(self, language: str) -> None:
if not self.have_at_least_two_intents_registered():
raise ValidationError(_("You need to have at least " + "two registered intents"))
raise ValidationError(
_("You need to have at least " + "two registered intents")
)

if not self.have_at_least_fifteen_examples_registered(language=language):
raise ValidationError(_("You need to have at least " + "fifteen registered train phrases"))
raise ValidationError(
_("You need to have at least " + "fifteen registered train phrases")
)

if not self.have_at_least_three_examples_for_each_intent(language=language):
raise ValidationError(_("You need to have at least " + "three train phrases for each intent"))
raise ValidationError(
_("You need to have at least " + "three train phrases for each intent")
)

def request_nlp_train(self, user_authorization, data):
try: # pragma: no cover
Expand Down Expand Up @@ -563,11 +573,9 @@ def request_nlp_manual_evaluate(self, user_authorization, data):
data = {
"language": data.get("language"),
"repository_version": data.get("repository_version"),
"cross_validation": False
}
headers = {
"Authorization": f"Bearer {user_authorization.uuid}"
"cross_validation": False,
}
headers = {"Authorization": f"Bearer {user_authorization.uuid}"}
r = requests.post(url, data=json.dumps(data), headers=headers)

return r # pragma: no cover
Expand All @@ -585,11 +593,9 @@ def request_nlp_automatic_evaluate(self, user_authorization, data):
data = {
"language": data.get("language"),
"repository_version": data.get("repository_version"),
"cross_validation": True
}
headers = {
"Authorization": f"Bearer {user_authorization.uuid}"
"cross_validation": True,
}
headers = {"Authorization": f"Bearer {user_authorization.uuid}"}
r = requests.post(url, data=json.dumps(data), headers=headers)

return r # pragma: no cover
Expand Down
77 changes: 49 additions & 28 deletions bothub/common/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,12 @@
from . import languages
from .exceptions import DoesNotHaveTranslation
from .exceptions import TrainingNotAllowed
from .models import Repository, RepositoryIntent, RepositoryEvaluate, RepositoryQueueTask
from .models import (
Repository,
RepositoryIntent,
RepositoryEvaluate,
RepositoryQueueTask,
)
from .models import RepositoryAuthorization
from .models import RepositoryEntity
from .models import RepositoryEntityGroup
Expand Down Expand Up @@ -235,7 +240,7 @@ def setUp(self):
languages.LANGUAGE_EN
),
intent=self.example_intent_1,
text="test"
text="test",
)

def test_languages_status(self):
Expand Down Expand Up @@ -338,12 +343,16 @@ def test_not_blank_value_in_intents(self):
self.assertNotIn("", self.repository.intents())

def test_have_at_least_one_test_phrase_registered(self):
self.assertFalse(self.repository.have_at_least_one_test_phrase_registered(
language=languages.LANGUAGE_PT_BR
))
self.assertTrue(self.repository.have_at_least_one_test_phrase_registered(
language=languages.LANGUAGE_EN
))
self.assertFalse(
self.repository.have_at_least_one_test_phrase_registered(
language=languages.LANGUAGE_PT_BR
)
)
self.assertTrue(
self.repository.have_at_least_one_test_phrase_registered(
language=languages.LANGUAGE_EN
)
)

def test_have_at_least_two_intents_registered(self):
self.assertFalse(self.repository.have_at_least_two_intents_registered())
Expand All @@ -360,9 +369,11 @@ def test_have_at_least_two_intents_registered(self):
self.assertTrue(self.repository.have_at_least_two_intents_registered())

def test_have_at_least_fifteen_examples_registered(self):
self.assertFalse(self.repository.have_at_least_fifteen_examples_registered(
language=languages.LANGUAGE_EN
))
self.assertFalse(
self.repository.have_at_least_fifteen_examples_registered(
language=languages.LANGUAGE_EN
)
)
for i in range(0, 15):
RepositoryExample.objects.create(
repository_version_language=self.repository.current_version(
Expand All @@ -371,14 +382,18 @@ def test_have_at_least_fifteen_examples_registered(self):
text=f"test{i}",
intent=self.example_intent_1,
)
self.assertTrue(self.repository.have_at_least_fifteen_examples_registered(
language=languages.LANGUAGE_EN
))
self.assertTrue(
self.repository.have_at_least_fifteen_examples_registered(
language=languages.LANGUAGE_EN
)
)

def test_have_at_least_three_examples_for_each_intent(self):
self.assertFalse(self.repository.have_at_least_three_examples_for_each_intent(
language=languages.LANGUAGE_EN
))
self.assertFalse(
self.repository.have_at_least_three_examples_for_each_intent(
language=languages.LANGUAGE_EN
)
)
for i in range(0, 3):
RepositoryExample.objects.create(
repository_version_language=self.repository.current_version(
Expand All @@ -387,17 +402,23 @@ def test_have_at_least_three_examples_for_each_intent(self):
text=f"test{i}",
intent=self.example_intent_1,
)
self.assertTrue(self.repository.have_at_least_three_examples_for_each_intent(
language=languages.LANGUAGE_EN
))
self.assertTrue(
self.repository.have_at_least_three_examples_for_each_intent(
language=languages.LANGUAGE_EN
)
)

def test_validate_if_can_run_manual_evaluate(self):
with self.assertRaises(ValidationError):
self.repository.validate_if_can_run_manual_evaluate(language=languages.LANGUAGE_EN)
self.repository.validate_if_can_run_manual_evaluate(
language=languages.LANGUAGE_EN
)

def test_validate_if_can_run_automatic_evaluate(self):
with self.assertRaises(ValidationError):
self.repository.validate_if_can_run_automatic_evaluate(language=languages.LANGUAGE_EN)
self.repository.validate_if_can_run_automatic_evaluate(
language=languages.LANGUAGE_EN
)

@requests_mock.Mocker()
def test_request_nlp_manual_evaluate(self, request_mock):
Expand All @@ -420,16 +441,16 @@ def test_request_nlp_manual_evaluate(self, request_mock):
"repository_version": self.repository_version.pk,
"evaluate_id": None,
"evaluate_version": None,
"cross_validation": False
"cross_validation": False,
}
request_mock.post(url=url, json=json)

response = self.repository.request_nlp_manual_evaluate(
user_authorization=self.repository.get_user_authorization(self.owner),
data={
"language": languages.LANGUAGE_EN,
"repository_version": self.repository_version.pk
}
"repository_version": self.repository_version.pk,
},
)
self.assertEqual(json, response.json())

Expand Down Expand Up @@ -463,16 +484,16 @@ def test_request_nlp_automatic_evaluate(self, request_mock):
"repository_version": self.repository_version.pk,
"evaluate_id": None,
"evaluate_version": None,
"cross_validation": True
"cross_validation": True,
}
request_mock.post(url=url, json=json)

response = self.repository.request_nlp_automatic_evaluate(
user_authorization=self.repository.get_user_authorization(self.owner),
data={
"language": languages.LANGUAGE_EN,
"repository_version": self.repository_version.pk
}
"repository_version": self.repository_version.pk,
},
)
self.assertEqual(json, response.json())

Expand Down

0 comments on commit 7ced68d

Please sign in to comment.