From 98012b7808b981226eb165ef1603b8a57bd552b2 Mon Sep 17 00:00:00 2001 From: DonHaul Date: Fri, 7 Jun 2024 14:51:18 +0200 Subject: [PATCH] search: linted files --- .envs/docker/.django | 2 +- .pre-commit-config.yaml | 2 +- backoffice/utils/pagination.py | 5 ++--- backoffice/workflows/api/serializers.py | 3 ++- backoffice/workflows/api/views.py | 9 +++++---- config/settings/base.py | 6 ++---- config/settings/local.py | 2 +- setup.cfg | 6 ++++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.envs/docker/.django b/.envs/docker/.django index a3a92baa..cbae791d 100644 --- a/.envs/docker/.django +++ b/.envs/docker/.django @@ -14,6 +14,6 @@ CELERY_RESULT_BACKEND=redis://redis:6379/2 CELERY_FLOWER_USER=debug CELERY_FLOWER_PASSWORD=debug -#OpenSearch +# OpenSearch OPENSEARCH_HOST=opensearch:9200 OPENSEARCH_INDEX_PREFIX=backoffice-backend-local diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 743e161f..232b9090 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,4 +15,4 @@ repos: rev: "3.9.2" hooks: - id: flake8 - args: ["--config=.flake8"] + args: ["--config=setup.cfg"] diff --git a/backoffice/utils/pagination.py b/backoffice/utils/pagination.py index 71a43cca..09996c2c 100644 --- a/backoffice/utils/pagination.py +++ b/backoffice/utils/pagination.py @@ -1,5 +1,4 @@ - -#from django_elasticsearch_dsl_drf.pagination import QueryFriendlyPageNumberPagination +from django_elasticsearch_dsl_drf.pagination import QueryFriendlyPageNumberPagination from rest_framework.pagination import PageNumberPagination @@ -9,7 +8,7 @@ class StandardResultsSetPagination(PageNumberPagination): max_page_size = 100 -class OSStandardResultsSetPagination(PageNumberPagination): +class OSStandardResultsSetPagination(QueryFriendlyPageNumberPagination): page_size = 10 page_size_query_param = "page_size" max_page_size = 100 diff --git a/backoffice/workflows/api/serializers.py b/backoffice/workflows/api/serializers.py index cbb32d3a..179467cd 100644 --- a/backoffice/workflows/api/serializers.py +++ b/backoffice/workflows/api/serializers.py @@ -1,5 +1,5 @@ -from rest_framework import serializers from django_elasticsearch_dsl_drf.serializers import DocumentSerializer +from rest_framework import serializers from backoffice.workflows.documents import WorkflowDocument from backoffice.workflows.models import Workflow, WorkflowTicket @@ -16,6 +16,7 @@ class Meta: model = WorkflowTicket fields = "__all__" + class WorkflowDocumentSerializer(DocumentSerializer): class Meta: document = WorkflowDocument diff --git a/backoffice/workflows/api/views.py b/backoffice/workflows/api/views.py index fa7c3702..b36f9b9b 100644 --- a/backoffice/workflows/api/views.py +++ b/backoffice/workflows/api/views.py @@ -1,12 +1,13 @@ from django.shortcuts import get_object_or_404 +from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet from rest_framework import status, viewsets from rest_framework.response import Response -from django_elasticsearch_dsl_drf.viewsets import BaseDocumentViewSet -from backoffice.workflows.models import Workflow, WorkflowTicket -from backoffice.workflows.documents import WorkflowDocument from backoffice.utils.pagination import OSStandardResultsSetPagination -from .serializers import WorkflowSerializer, WorkflowTicketSerializer, WorkflowDocumentSerializer +from backoffice.workflows.documents import WorkflowDocument +from backoffice.workflows.models import Workflow, WorkflowTicket + +from .serializers import WorkflowDocumentSerializer, WorkflowSerializer, WorkflowTicketSerializer class WorkflowViewSet(viewsets.ModelViewSet): diff --git a/config/settings/base.py b/config/settings/base.py index 2a310294..5a507d08 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -4,9 +4,9 @@ import platform from pathlib import Path -from opensearch_dsl import connections import dj_database_url import environ +from opensearch_dsl import connections BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent # backoffice/ @@ -100,7 +100,7 @@ "allauth.socialaccount.providers.orcid", "django_prometheus", "django_opensearch_dsl", - "django_elasticsearch_dsl_drf" + "django_elasticsearch_dsl_drf", ] LOCAL_APPS = ["backoffice.users", "backoffice.workflows", "backoffice.management"] @@ -373,8 +373,6 @@ } - - # Opensearch # ------------------------------------------------------------------------------ # Name of the Opensearch index diff --git a/config/settings/local.py b/config/settings/local.py index 6a2f8b6a..0ecfc6ea 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -11,7 +11,7 @@ default="uBCAZjYhsVU3Zg8k96GM2c0GqgnTHyj0L3UhNQd4kQTktLyFztesAqb81jucXSMY", ) # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts -ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1", "host.docker.internal"] +ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1"] # CACHES # ------------------------------------------------------------------------------ diff --git a/setup.cfg b/setup.cfg index 2412f174..4f0e7b2e 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,9 +2,11 @@ # https://github.com/PyCQA/flake8/issues/234 # https://github.com/PyCQA/pycodestyle/issues/813 [flake8] -max-line-length = 119 +# E501 black takes care of the line size +max-line-length = 88 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv -extend-ignore = E203 +ignore = D401,W503,E501,E265,E203 +max-complexity = 15 [pycodestyle] max-line-length = 119