From 8aea6f9c816fdcd30b18a17d19a0d804e2801596 Mon Sep 17 00:00:00 2001 From: Denis Rybakov Date: Fri, 17 May 2024 16:58:28 +0300 Subject: [PATCH] fix: isort issues --- .../annotation/annotations/resources.py | 19 ++++++++++++++++--- annotation/annotation/categories/resources.py | 4 +++- .../annotation/distribution/resources.py | 10 ++++++++-- annotation/annotation/filters.py | 8 +++++++- annotation/annotation/jobs/resources.py | 17 ++++++++++++++--- annotation/annotation/jobs/services.py | 14 +++++++++++--- annotation/annotation/metadata/resources.py | 4 +++- .../microservice_communication/task.py | 5 ++++- annotation/annotation/revisions/resources.py | 4 +++- annotation/annotation/tasks/resources.py | 5 ++++- annotation/annotation/tasks/services.py | 10 ++++++++-- annotation/tests/conftest.py | 13 +++++++++++-- .../tests/test_annotators_overall_load.py | 4 +++- annotation/tests/test_get_child_categories.py | 17 ++++++++++++----- annotation/tests/test_get_pages_info.py | 8 +++++++- annotation/tests/test_job_categories.py | 7 ++++++- annotation/tests/test_microservices_search.py | 7 +++++-- annotation/tests/test_post.py | 4 +++- annotation/tests/test_post_annotation.py | 15 +++++++++++---- annotation/tests/test_post_next_task.py | 13 ++++++++++--- .../tests/test_post_unassgined_files.py | 9 +++++++-- annotation/tests/test_search_kafka.py | 4 +++- annotation/tests/test_tasks_crud_cr.py | 8 ++++++-- annotation/tests/test_update_job.py | 9 +++++++-- annotation/tests/test_validation.py | 8 +++++++- jobs/alembic/env.py | 2 +- .../ef5c796d3c00_add_pipeline_engine.py | 1 - jobs/tests/conftest.py | 4 ++-- .../test_API_functions/test_change_job.py | 4 ++-- .../test_other_API_functions.py | 4 ++-- jobs/tests/test_utils.py | 2 +- 31 files changed, 187 insertions(+), 56 deletions(-) diff --git a/annotation/annotation/annotations/resources.py b/annotation/annotation/annotations/resources.py index bb7722379..1b3e6fd81 100644 --- a/annotation/annotation/annotations/resources.py +++ b/annotation/annotation/annotations/resources.py @@ -2,12 +2,23 @@ from typing import Dict, List, Optional, Set from uuid import UUID -from fastapi import APIRouter, Depends, HTTPException, Path, Query, Response, status +from fastapi import ( + APIRouter, + Depends, + HTTPException, + Path, + Query, + Response, + status, +) from sqlalchemy import and_, desc from sqlalchemy.orm import Session from tenant_dependency import TenantData -from annotation.categories.services import combine_categories, fetch_bunch_categories_db +from annotation.categories.services import ( + combine_categories, + fetch_bunch_categories_db, +) from annotation.database import get_db from annotation.errors import NoSuchRevisionsError from annotation.jobs.services import update_jobs_categories @@ -15,7 +26,9 @@ from annotation.microservice_communication.assets_communication import ( get_file_path_and_bucket, ) -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.schemas import ( AnnotatedDocSchema, BadRequestErrorSchema, diff --git a/annotation/annotation/categories/resources.py b/annotation/annotation/categories/resources.py index 40f411677..8efeb687f 100644 --- a/annotation/annotation/categories/resources.py +++ b/annotation/annotation/categories/resources.py @@ -8,7 +8,9 @@ from annotation.database import get_db from annotation.errors import NoSuchCategoryError from annotation.filters import CategoryFilter -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.schemas import ( BadRequestErrorSchema, CategoryBaseSchema, diff --git a/annotation/annotation/distribution/resources.py b/annotation/annotation/distribution/resources.py index 452abce0f..a8ef4a6ff 100644 --- a/annotation/annotation/distribution/resources.py +++ b/annotation/annotation/distribution/resources.py @@ -6,7 +6,11 @@ from tenant_dependency import TenantData from annotation.database import get_db -from annotation.distribution import distribute, find_unassigned_files, prepare_response +from annotation.distribution import ( + distribute, + find_unassigned_files, + prepare_response, +) from annotation.errors import FieldConstraintError from annotation.jobs import ( check_annotators, @@ -17,7 +21,9 @@ get_files_info, prepare_files_for_distribution, ) -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.models import File, Job, User from annotation.schemas import ( BadRequestErrorSchema, diff --git a/annotation/annotation/filters.py b/annotation/annotation/filters.py index 9b2d62d18..c1c123a07 100644 --- a/annotation/annotation/filters.py +++ b/annotation/annotation/filters.py @@ -1,6 +1,12 @@ from filter_lib import create_filter_model -from annotation.models import AnnotatedDoc, Category, Job, ManualAnnotationTask, User +from annotation.models import ( + AnnotatedDoc, + Category, + Job, + ManualAnnotationTask, + User, +) ADDITIONAL_TASK_FIELDS = ["file_name", "job_name"] diff --git a/annotation/annotation/jobs/resources.py b/annotation/annotation/jobs/resources.py index d1c8a5e43..29e80c03c 100644 --- a/annotation/annotation/jobs/resources.py +++ b/annotation/annotation/jobs/resources.py @@ -15,12 +15,16 @@ from annotation.database import get_db from annotation.distribution import distribute, redistribute from annotation.filters import CategoryFilter -from annotation.microservice_communication.assets_communication import get_files_info +from annotation.microservice_communication.assets_communication import ( + get_files_info, +) from annotation.microservice_communication.jobs_communication import ( JobUpdateException, update_job_status, ) -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.schemas import ( BadRequestErrorSchema, CategoryResponseSchema, @@ -42,7 +46,14 @@ from annotation.tags import FILES_TAG, JOBS_TAG from annotation.token_dependency import TOKEN -from ..models import AnnotatedDoc, Category, File, Job, ManualAnnotationTask, User +from ..models import ( + AnnotatedDoc, + Category, + File, + Job, + ManualAnnotationTask, + User, +) from .services import ( add_users, collect_job_names, diff --git a/annotation/annotation/jobs/services.py b/annotation/annotation/jobs/services.py index 7e5eb4c86..354e2f31a 100644 --- a/annotation/annotation/jobs/services.py +++ b/annotation/annotation/jobs/services.py @@ -12,9 +12,17 @@ from annotation.categories import fetch_bunch_categories_db from annotation.categories.services import response_object_from_db from annotation.database import Base -from annotation.errors import EnumValidationError, FieldConstraintError, WrongJobError -from annotation.microservice_communication.assets_communication import get_files_info -from annotation.microservice_communication.jobs_communication import get_job_names +from annotation.errors import ( + EnumValidationError, + FieldConstraintError, + WrongJobError, +) +from annotation.microservice_communication.assets_communication import ( + get_files_info, +) +from annotation.microservice_communication.jobs_communication import ( + get_job_names, +) from annotation.models import ( Category, File, diff --git a/annotation/annotation/metadata/resources.py b/annotation/annotation/metadata/resources.py index be013589f..f64c2aab1 100644 --- a/annotation/annotation/metadata/resources.py +++ b/annotation/annotation/metadata/resources.py @@ -1,6 +1,8 @@ from fastapi import APIRouter, status -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.schemas import EntitiesStatusesSchema from annotation.tags import METADATA_TAG, TASKS_TAG diff --git a/annotation/annotation/microservice_communication/task.py b/annotation/annotation/microservice_communication/task.py index d2c9eb5f8..87283e2b9 100644 --- a/annotation/annotation/microservice_communication/task.py +++ b/annotation/annotation/microservice_communication/task.py @@ -11,7 +11,10 @@ BEARER, HEADER_TENANT, ) -from annotation.schemas import AgreementScoreServiceInput, AgreementScoreServiceResponse +from annotation.schemas import ( + AgreementScoreServiceInput, + AgreementScoreServiceResponse, +) load_dotenv(find_dotenv()) AGREEMENT_SCORE_SERVICE_HOST = os.environ.get("AGREEMENT_SCORE_SERVICE_HOST") diff --git a/annotation/annotation/revisions/resources.py b/annotation/annotation/revisions/resources.py index 6739fb119..2bc837d27 100644 --- a/annotation/annotation/revisions/resources.py +++ b/annotation/annotation/revisions/resources.py @@ -5,7 +5,9 @@ from starlette import status from annotation.database import get_db -from annotation.microservice_communication.search import X_CURRENT_TENANT_HEADER +from annotation.microservice_communication.search import ( + X_CURRENT_TENANT_HEADER, +) from annotation.models import AnnotatedDoc from annotation.schemas import AnnotatedDocSchema, ConnectionErrorSchema from annotation.tags import ANNOTATION_TAG, REVISION_TAG diff --git a/annotation/annotation/tasks/resources.py b/annotation/annotation/tasks/resources.py index 55544e31f..ad4e07283 100644 --- a/annotation/annotation/tasks/resources.py +++ b/annotation/annotation/tasks/resources.py @@ -76,7 +76,10 @@ ValidationSchema, ) from annotation.tags import REVISION_TAG, TASKS_TAG -from annotation.tasks.validation import create_annotation_tasks, create_validation_tasks +from annotation.tasks.validation import ( + create_annotation_tasks, + create_validation_tasks, +) from annotation.token_dependency import TOKEN from ..models import File, Job, ManualAnnotationTask diff --git a/annotation/annotation/tasks/services.py b/annotation/annotation/tasks/services.py index 9a2a82e16..d38bc2732 100644 --- a/annotation/annotation/tasks/services.py +++ b/annotation/annotation/tasks/services.py @@ -23,14 +23,20 @@ ) from annotation.errors import CheckFieldError, FieldConstraintError from annotation.filters import ADDITIONAL_TASK_FIELDS, TaskFilter -from annotation.jobs import get_jobs_by_name, update_files, update_user_overall_load +from annotation.jobs import ( + get_jobs_by_name, + update_files, + update_user_overall_load, +) from annotation.logger import Logger from annotation.microservice_communication.assets_communication import ( get_file_names_by_request, get_file_path_and_bucket, get_files_by_request, ) -from annotation.microservice_communication.search import get_user_names_by_request +from annotation.microservice_communication.search import ( + get_user_names_by_request, +) from annotation.microservice_communication.task import get_agreement_score from annotation.models import ( AgreementMetrics, diff --git a/annotation/tests/conftest.py b/annotation/tests/conftest.py index 5ad09c601..b73bcce37 100644 --- a/annotation/tests/conftest.py +++ b/annotation/tests/conftest.py @@ -87,7 +87,13 @@ TASKS_TEST_PROGRESS, ) from tests.test_get_pages_info import PAGES_INFO_ENTITIES -from tests.test_get_revisions import JOBS_IDS, PAGE, PAGES_PATHS, REVISIONS, USERS_IDS +from tests.test_get_revisions import ( + JOBS_IDS, + PAGE, + PAGES_PATHS, + REVISIONS, + USERS_IDS, +) from tests.test_get_revisions_without_annotation import ( REV_WITHOUT_ANNOTATION_DOC_1, REV_WITHOUT_ANNOTATION_DOC_2, @@ -96,7 +102,10 @@ REV_WITHOUT_ANNOTATION_TASK, ) from tests.test_get_unassigned_files import UNASSIGNED_FILES_ENTITIES -from tests.test_get_users_for_job import USERS_FOR_JOB_ANNOTATORS, USERS_FOR_JOB_JOBS +from tests.test_get_users_for_job import ( + USERS_FOR_JOB_ANNOTATORS, + USERS_FOR_JOB_JOBS, +) from tests.test_job_categories import CATEGORIES_USERS, MOCK_ID from tests.test_post import POST_JOBS, TEST_POST_USERS from tests.test_post_annotation import ( diff --git a/annotation/tests/test_annotators_overall_load.py b/annotation/tests/test_annotators_overall_load.py index 6af0b3fb3..7b4515a76 100644 --- a/annotation/tests/test_annotators_overall_load.py +++ b/annotation/tests/test_annotators_overall_load.py @@ -11,7 +11,9 @@ from annotation.jobs import update_user_overall_load from annotation.main import app -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) from annotation.models import ( AnnotatedDoc, Category, diff --git a/annotation/tests/test_get_child_categories.py b/annotation/tests/test_get_child_categories.py index 20a419a11..a256c1ff7 100644 --- a/annotation/tests/test_get_child_categories.py +++ b/annotation/tests/test_get_child_categories.py @@ -6,8 +6,19 @@ from fastapi.testclient import TestClient from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm import Session +from tests.consts import CATEGORIES_PATH, POST_JOBS_PATH +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) +from tests.test_job_categories import prepare_job_body +from tests.test_post_next_task import ASSETS_RESPONSE -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) from annotation.microservice_communication.search import ( AUTHORIZATION, BEARER, @@ -15,10 +26,6 @@ ) from annotation.models import Category from annotation.schemas import CategoryTypeSchema -from tests.consts import CATEGORIES_PATH, POST_JOBS_PATH -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app -from tests.test_job_categories import prepare_job_body -from tests.test_post_next_task import ASSETS_RESPONSE # Cyclic categories have tree hierarchical structure of ids: # "1" -> "2" -> "4" -> "1" diff --git a/annotation/tests/test_get_pages_info.py b/annotation/tests/test_get_pages_info.py index be1554bb1..b48eee361 100644 --- a/annotation/tests/test_get_pages_info.py +++ b/annotation/tests/test_get_pages_info.py @@ -13,7 +13,13 @@ BEARER, HEADER_TENANT, ) -from annotation.models import AnnotatedDoc, File, Job, ManualAnnotationTask, User +from annotation.models import ( + AnnotatedDoc, + File, + Job, + ManualAnnotationTask, + User, +) from annotation.schemas import TaskStatusEnumSchema, ValidationSchema from annotation.tasks import get_task_revisions diff --git a/annotation/tests/test_job_categories.py b/annotation/tests/test_job_categories.py index 430753616..63d640108 100644 --- a/annotation/tests/test_job_categories.py +++ b/annotation/tests/test_job_categories.py @@ -6,7 +6,12 @@ from fastapi.testclient import TestClient from sqlalchemy.orm import Session from tests.consts import POST_JOBS_PATH -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) from tests.test_category_crud import prepare_category_body from annotation.microservice_communication.search import ( diff --git a/annotation/tests/test_microservices_search.py b/annotation/tests/test_microservices_search.py index 461cf7f8b..d475d10dd 100644 --- a/annotation/tests/test_microservices_search.py +++ b/annotation/tests/test_microservices_search.py @@ -2,6 +2,7 @@ import responses from fastapi import HTTPException from requests import ConnectionError, RequestException, Timeout +from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN from annotation.microservice_communication.search import ( PAGE_SIZE, @@ -11,8 +12,10 @@ get_response, ) from annotation.models import ManualAnnotationTask -from annotation.schemas import ExpandedManualAnnotationTaskSchema, TaskStatusEnumSchema -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN +from annotation.schemas import ( + ExpandedManualAnnotationTaskSchema, + TaskStatusEnumSchema, +) AMOUNT_OF_ELEMENTS = 150 diff --git a/annotation/tests/test_post.py b/annotation/tests/test_post.py index fc05a1766..4760ae5fd 100644 --- a/annotation/tests/test_post.py +++ b/annotation/tests/test_post.py @@ -8,7 +8,9 @@ from sqlalchemy.orm import Session from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, app -from annotation.microservice_communication.assets_communication import ASSETS_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_URL, +) from annotation.models import Category, File, Job, ManualAnnotationTask, User from annotation.schemas import CategoryTypeSchema, ValidationSchema diff --git a/annotation/tests/test_post_annotation.py b/annotation/tests/test_post_annotation.py index c21761016..3dbd05a87 100644 --- a/annotation/tests/test_post_annotation.py +++ b/annotation/tests/test_post_annotation.py @@ -12,6 +12,14 @@ from requests import RequestException from sqlalchemy.exc import DBAPIError, SQLAlchemyError from sqlalchemy.orm import Session +from tests.consts import ANNOTATION_PATH +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) +from tests.test_tasks_crud_ud import construct_path from annotation.annotations import ( MANIFEST, @@ -27,7 +35,9 @@ upload_pages_to_minio, ) from annotation.kafka_client import producers -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) from annotation.microservice_communication.search import ( AUTHORIZATION, BEARER, @@ -49,9 +59,6 @@ TaskStatusEnumSchema, ValidationSchema, ) -from tests.consts import ANNOTATION_PATH -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app -from tests.test_tasks_crud_ud import construct_path client = TestClient(app) diff --git a/annotation/tests/test_post_next_task.py b/annotation/tests/test_post_next_task.py index 2c3951ac3..18c7295c4 100644 --- a/annotation/tests/test_post_next_task.py +++ b/annotation/tests/test_post_next_task.py @@ -7,8 +7,17 @@ from requests import ConnectionError, RequestException, Timeout from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.orm import Session +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) +from tests.test_tasks_crud_cr import USERS_SEARCH_RESPONSE -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) from annotation.microservice_communication.search import ( AUTHORIZATION, BEARER, @@ -21,8 +30,6 @@ TaskStatusEnumSchema, ValidationSchema, ) -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app -from tests.test_tasks_crud_cr import USERS_SEARCH_RESPONSE client = TestClient(app) diff --git a/annotation/tests/test_post_unassgined_files.py b/annotation/tests/test_post_unassgined_files.py index 92da8ef47..fe70b2197 100644 --- a/annotation/tests/test_post_unassgined_files.py +++ b/annotation/tests/test_post_unassgined_files.py @@ -4,6 +4,13 @@ from fastapi.testclient import TestClient from sqlalchemy.exc import DBAPIError, SQLAlchemyError from sqlalchemy.sql.elements import not_ +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) +from tests.test_post import check_files_distributed_pages from annotation.annotations import row_to_dict from annotation.microservice_communication.search import ( @@ -17,8 +24,6 @@ TaskStatusEnumSchema, ValidationSchema, ) -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app -from tests.test_post import check_files_distributed_pages client = TestClient(app) diff --git a/annotation/tests/test_search_kafka.py b/annotation/tests/test_search_kafka.py index 21cd85b9f..e8a67eb88 100644 --- a/annotation/tests/test_search_kafka.py +++ b/annotation/tests/test_search_kafka.py @@ -8,7 +8,9 @@ from annotation.annotations import add_search_annotation_producer from annotation.kafka_client import producers -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) from annotation.models import Category, File, Job, ManualAnnotationTask, User from annotation.schemas import ( CategoryTypeSchema, diff --git a/annotation/tests/test_tasks_crud_cr.py b/annotation/tests/test_tasks_crud_cr.py index 89da82cbe..023d801e9 100644 --- a/annotation/tests/test_tasks_crud_cr.py +++ b/annotation/tests/test_tasks_crud_cr.py @@ -13,8 +13,12 @@ from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, app from tests.test_post import check_files_distributed_pages -from annotation.microservice_communication.assets_communication import ASSETS_FILES_URL -from annotation.microservice_communication.jobs_communication import JOBS_SEARCH_URL +from annotation.microservice_communication.assets_communication import ( + ASSETS_FILES_URL, +) +from annotation.microservice_communication.jobs_communication import ( + JOBS_SEARCH_URL, +) from annotation.microservice_communication.search import USERS_SEARCH_URL from annotation.microservice_communication.user import USERS_GET_USER_URL from annotation.models import Category, File, Job, ManualAnnotationTask, User diff --git a/annotation/tests/test_update_job.py b/annotation/tests/test_update_job.py index 78985b865..83bd769d6 100644 --- a/annotation/tests/test_update_job.py +++ b/annotation/tests/test_update_job.py @@ -6,6 +6,13 @@ from fastapi.testclient import TestClient from sqlalchemy import asc from sqlalchemy.exc import SQLAlchemyError +from tests.consts import POST_JOBS_PATH +from tests.override_app_dependency import ( + TEST_HEADERS, + TEST_TENANT, + TEST_TOKEN, + app, +) from annotation.annotations import row_to_dict from annotation.microservice_communication import jobs_communication @@ -28,8 +35,6 @@ TaskStatusEnumSchema, ValidationSchema, ) -from tests.consts import POST_JOBS_PATH -from tests.override_app_dependency import TEST_HEADERS, TEST_TENANT, TEST_TOKEN, app JOBS_SEARCH_URL = jobs_communication.JOBS_SEARCH_URL diff --git a/annotation/tests/test_validation.py b/annotation/tests/test_validation.py index 69e83dd5f..d402c62b9 100644 --- a/annotation/tests/test_validation.py +++ b/annotation/tests/test_validation.py @@ -11,7 +11,13 @@ from tests.test_post import check_files_distributed_pages from annotation.annotations import row_to_dict -from annotation.models import AnnotatedDoc, File, Job, ManualAnnotationTask, User +from annotation.models import ( + AnnotatedDoc, + File, + Job, + ManualAnnotationTask, + User, +) from annotation.schemas import ( AnnotationAndValidationActionsSchema, FileStatusEnumSchema, diff --git a/jobs/alembic/env.py b/jobs/alembic/env.py index d24e7391d..e4f7ea6cb 100644 --- a/jobs/alembic/env.py +++ b/jobs/alembic/env.py @@ -2,9 +2,9 @@ import os from logging.config import fileConfig +from alembic import context from sqlalchemy import engine_from_config, pool -from alembic import context from jobs.config import POSTGRESQL_JOBMANAGER_DATABASE_URI from jobs.models import Base from jobs.utils import get_test_db_url diff --git a/jobs/alembic/versions/ef5c796d3c00_add_pipeline_engine.py b/jobs/alembic/versions/ef5c796d3c00_add_pipeline_engine.py index a4e6f9e8b..0f0d952a5 100644 --- a/jobs/alembic/versions/ef5c796d3c00_add_pipeline_engine.py +++ b/jobs/alembic/versions/ef5c796d3c00_add_pipeline_engine.py @@ -7,7 +7,6 @@ """ import sqlalchemy as sa - from alembic import op # revision identifiers, used by Alembic. diff --git a/jobs/tests/conftest.py b/jobs/tests/conftest.py index bddf4bbd2..b769e1f18 100644 --- a/jobs/tests/conftest.py +++ b/jobs/tests/conftest.py @@ -4,6 +4,8 @@ from unittest.mock import patch import pytest +from alembic import command +from alembic.config import Config from fastapi.testclient import TestClient from pydantic import BaseModel from sqlalchemy import create_engine # type: ignore @@ -17,8 +19,6 @@ import jobs.db_service as service import jobs.main as main -from alembic import command -from alembic.config import Config from jobs import pipeline pytest_plugins = [ diff --git a/jobs/tests/test_API_functions/test_change_job.py b/jobs/tests/test_API_functions/test_change_job.py index cc7dd1b88..3ad3601fb 100644 --- a/jobs/tests/test_API_functions/test_change_job.py +++ b/jobs/tests/test_API_functions/test_change_job.py @@ -2,13 +2,13 @@ from unittest.mock import patch import pytest - -import jobs.schemas as schemas from tests.test_db import ( create_mock_annotation_job_in_db, create_mock_extraction_job_in_db, ) +import jobs.schemas as schemas + @pytest.mark.skip(reason="tests refactoring") def test_change_job_status_with_validation_correct_jwt_provided( diff --git a/jobs/tests/test_API_functions/test_other_API_functions.py b/jobs/tests/test_API_functions/test_other_API_functions.py index f4d5a349a..4239bd2b4 100644 --- a/jobs/tests/test_API_functions/test_other_API_functions.py +++ b/jobs/tests/test_API_functions/test_other_API_functions.py @@ -2,13 +2,13 @@ from unittest.mock import patch import pytest - -import jobs.schemas as schemas from tests.test_db import ( create_mock_annotation_job_in_db, create_mock_extraction_job_in_db, ) +import jobs.schemas as schemas + @pytest.mark.skip(reason="tests refactoring") def test_get_all_jobs_endpoint( diff --git a/jobs/tests/test_utils.py b/jobs/tests/test_utils.py index ab4c98230..1369470b8 100644 --- a/jobs/tests/test_utils.py +++ b/jobs/tests/test_utils.py @@ -3,9 +3,9 @@ import aiohttp.client_exceptions import pytest from fastapi import HTTPException +from tests.conftest import FakePipeline, patched_create_pre_signed_s3_url import jobs.utils as utils -from tests.conftest import FakePipeline, patched_create_pre_signed_s3_url # --------------TEST get_files_data_from_datasets---------------