diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py index cc53d7e8434fbb745996cf3f332e18cacbb9744d..681c18784b415653205e8e5342372f99390af0fa 100644 --- a/ippisite/ippidb/models.py +++ b/ippisite/ippidb/models.py @@ -1495,21 +1495,14 @@ class ContributionManager(models.Manager): if current_user.is_anonymous: qs = qs.exclude(validated=False) elif not current_user.is_superuser: - qs = qs.exclude( - Q(validated=False), - ~Q(contributor=current_user), - ) + qs = qs.exclude(Q(validated=False), ~Q(contributor=current_user),) return qs def validated(self): """ Get validated contributions """ - return ( - super() - .get_queryset() - .exclude(validated=False) - ) + return super().get_queryset().exclude(validated=False) class Contribution(models.Model): @@ -1814,9 +1807,7 @@ def update_compound_cached_properties(compounds_queryset=None): ) .values("_bindtest_av")[:1] ), - pktest_av=Exists( - CompoundPKResult.objects.filter(id=OuterRef("id")) - ), + pktest_av=Exists(CompoundPKResult.objects.filter(id=OuterRef("id"))), cytoxtest_av=Exists( CompoundCytotoxicityResult.objects.filter(id=OuterRef("id")) ), diff --git a/ippisite/ippidb/tasks.py b/ippisite/ippidb/tasks.py index 676af40f7b13eb816fd53968e8fc337fca0d6eb3..fa8088d24708d6aff5258267a5776e43096cd33a 100644 --- a/ippisite/ippidb/tasks.py +++ b/ippisite/ippidb/tasks.py @@ -625,7 +625,7 @@ def launch_validate_contributions(contribution_ids: List[int]): run_update_compound_cached_properties.s(), run_compute_drugbank_similarity.s(), run_validate.s(), - ) + ), ) contribution_jobs.append(compounds_properties_computation_group) # compounds_properties_computation_group.delay() diff --git a/ippisite/ippidb/tests/tests_utils.py b/ippisite/ippidb/tests/tests_utils.py index 5c73f34e75dc2ebeb17c8b63d4eb9470b7da2a0b..21bc5614c6ec2aba6b50981b3e1a1f1719e21696 100644 --- a/ippisite/ippidb/tests/tests_utils.py +++ b/ippisite/ippidb/tests/tests_utils.py @@ -6,7 +6,14 @@ import re from django.test import TestCase from openbabel import vectorUnsignedInt, OBFingerprint -from ippidb.utils import FingerPrinter, mol2smi, smi2mol, smi2inchi, smi2inchikey, smi2sdf +from ippidb.utils import ( + FingerPrinter, + mol2smi, + smi2mol, + smi2inchi, + smi2inchikey, + smi2sdf, +) class MolSmiTestCase(TestCase): diff --git a/ippisite/ippidb/views/about.py b/ippisite/ippidb/views/about.py index 27069fd751835d90531e2f8460375c6cf434ce3b..323bfce6a72c84f4b4780e4b8e533981da42cfe4 100644 --- a/ippisite/ippidb/views/about.py +++ b/ippisite/ippidb/views/about.py @@ -106,7 +106,10 @@ def about_pharmacology(request): drugbank_compounds_per_ppi_family = convert_to_bar_chart_data( drugbank_compounds_per_ppi_family_raw ) - ppi_family_labels = {entry['name']: entry['id'] for entry in PpiFamily.objects.values(*['id', 'name'])} + ppi_family_labels = { + entry["name"]: entry["id"] + for entry in PpiFamily.objects.values(*["id", "name"]) + } context = { "biochemical_tests_count_by_name": biochemical_tests_count_by_name, "cellular_tests_count_by_name": cellular_tests_count_by_name, diff --git a/ippisite/ippidb/views/contribute.py b/ippisite/ippidb/views/contribute.py index f0483c0f9ed104baea6ca8a820335b8b02f31692..308fb4742a011d8b4860ac591800f213935c7a4f 100644 --- a/ippisite/ippidb/views/contribute.py +++ b/ippisite/ippidb/views/contribute.py @@ -561,9 +561,7 @@ class IppiWizard( f"Congratulations! Dear {contribution.contributor.username}," f" thank you for your contribution.", ) - return redirect( - reverse("contribution-detail", kwargs={"pk": contribution.pk}) - ) + return redirect(reverse("contribution-detail", kwargs={"pk": contribution.pk})) def get(self, *args, **kwargs): """ diff --git a/ippisite/ippidb/ws.py b/ippisite/ippidb/ws.py index e954562c4fa395bba2aff2d557dc4d5ecc9fb10e..341fac3ba146b5792f5607d34a75e8da6f74bd66 100644 --- a/ippisite/ippidb/ws.py +++ b/ippisite/ippidb/ws.py @@ -397,7 +397,7 @@ def get_pdb_pfam_mapping(pdb_id: str) -> dict: resp = requests.get( "https://www.ebi.ac.uk/pdbe/api/mappings/pfam/{}".format(pdb_id.lower()) ) - if "application/json" not in resp.headers.get('content-type'): + if "application/json" not in resp.headers.get("content-type"): raise EntryNotFoundError(pdb_id, resp.status_code) all_pfam = resp.json()[pdb_id]["Pfam"] for pfam in all_pfam.values(): diff --git a/ippisite/ippisite/decorator.py b/ippisite/ippisite/decorator.py index 865d8bd1ae65c25bb1fec0ca775fad84da4d1fd0..0316c59d33870341e62d23ed005e7a784e8c475a 100644 --- a/ippisite/ippisite/decorator.py +++ b/ippisite/ippisite/decorator.py @@ -21,7 +21,8 @@ class MonitorTask(Task): tasks = TaskResult.objects.filter( task_name=self.request.task, status__in=[states.STARTED, states.PENDING, states.RETRY, states.RECEIVED], - task_args=str(args), task_kwargs=str(kwargs) + task_args=str(args), + task_kwargs=str(kwargs), ) count_tasks = tasks.count() if not count_tasks: