Skip to content

Commit

Permalink
fix: isort issues
Browse files Browse the repository at this point in the history
  • Loading branch information
cakeinsauce committed May 17, 2024
1 parent 3d1e79c commit 8aea6f9
Show file tree
Hide file tree
Showing 31 changed files with 187 additions and 56 deletions.
19 changes: 16 additions & 3 deletions annotation/annotation/annotations/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,33 @@
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
from annotation.microservice_communication import jobs_communication
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,
Expand Down
4 changes: 3 additions & 1 deletion annotation/annotation/categories/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
10 changes: 8 additions & 2 deletions annotation/annotation/distribution/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 7 additions & 1 deletion annotation/annotation/filters.py
Original file line number Diff line number Diff line change
@@ -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"]

Expand Down
17 changes: 14 additions & 3 deletions annotation/annotation/jobs/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
14 changes: 11 additions & 3 deletions annotation/annotation/jobs/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion annotation/annotation/metadata/resources.py
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 4 additions & 1 deletion annotation/annotation/microservice_communication/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 3 additions & 1 deletion annotation/annotation/revisions/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion annotation/annotation/tasks/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions annotation/annotation/tasks/services.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 11 additions & 2 deletions annotation/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 (
Expand Down
4 changes: 3 additions & 1 deletion annotation/tests/test_annotators_overall_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
17 changes: 12 additions & 5 deletions annotation/tests/test_get_child_categories.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,26 @@
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,
HEADER_TENANT,
)
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"
Expand Down
8 changes: 7 additions & 1 deletion annotation/tests/test_get_pages_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 6 additions & 1 deletion annotation/tests/test_job_categories.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
7 changes: 5 additions & 2 deletions annotation/tests/test_microservices_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion annotation/tests/test_post.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 11 additions & 4 deletions annotation/tests/test_post_annotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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)

Expand Down
Loading

0 comments on commit 8aea6f9

Please sign in to comment.