From 4e9756e67652bf4f651b321dd26e47e3d04c998c Mon Sep 17 00:00:00 2001 From: Robin Ole Heinemann Date: Tue, 27 Jun 2023 17:02:01 +0200 Subject: [PATCH] enable isort for ruff --- .ruff.toml | 1 + backend/transcribee_backend/auth.py | 1 + backend/transcribee_backend/db/migrations/env.py | 1 + .../db/migrations/versions/6392770332cd_add_taskattempt.py | 4 ++-- backend/transcribee_backend/helpers/tasks.py | 2 +- backend/transcribee_backend/main.py | 1 + backend/transcribee_backend/models/document.py | 3 ++- backend/transcribee_backend/models/task.py | 7 ++++--- backend/transcribee_backend/routers/document.py | 5 +++-- backend/transcribee_backend/routers/task.py | 3 ++- backend/transcribee_backend/routers/user.py | 3 ++- worker/transcribee_worker/api_client.py | 2 +- worker/transcribee_worker/document.py | 2 +- worker/transcribee_worker/worker.py | 5 +++-- 14 files changed, 25 insertions(+), 15 deletions(-) diff --git a/.ruff.toml b/.ruff.toml index 71de8682..ccec3955 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -1 +1,2 @@ line-length = 100 +select = ["E", "F", "I"] diff --git a/backend/transcribee_backend/auth.py b/backend/transcribee_backend/auth.py index 71b83967..869d5e01 100644 --- a/backend/transcribee_backend/auth.py +++ b/backend/transcribee_backend/auth.py @@ -9,6 +9,7 @@ from fastapi import Depends, Header, HTTPException from sqlmodel import Session, select + from transcribee_backend.db import get_session from transcribee_backend.exceptions import UserAlreadyExists, UserDoesNotExist from transcribee_backend.helpers.time import now_tz_aware diff --git a/backend/transcribee_backend/db/migrations/env.py b/backend/transcribee_backend/db/migrations/env.py index efd0a628..1d55ad83 100644 --- a/backend/transcribee_backend/db/migrations/env.py +++ b/backend/transcribee_backend/db/migrations/env.py @@ -3,6 +3,7 @@ from alembic import context from sqlalchemy import MetaData, engine_from_config, pool from sqlmodel import SQLModel + from transcribee_backend.db import DATABASE_URL from transcribee_backend.models import * # noqa diff --git a/backend/transcribee_backend/db/migrations/versions/6392770332cd_add_taskattempt.py b/backend/transcribee_backend/db/migrations/versions/6392770332cd_add_taskattempt.py index a52660c8..87c3a6bc 100644 --- a/backend/transcribee_backend/db/migrations/versions/6392770332cd_add_taskattempt.py +++ b/backend/transcribee_backend/db/migrations/versions/6392770332cd_add_taskattempt.py @@ -9,10 +9,10 @@ import uuid import sqlalchemy as sa -from sqlalchemy.sql.operators import is_ -import sqlmodel.sql.sqltypes import sqlmodel +import sqlmodel.sql.sqltypes from alembic import op +from sqlalchemy.sql.operators import is_ from transcribee_backend.config import settings from transcribee_backend.helpers.time import now_tz_aware diff --git a/backend/transcribee_backend/helpers/tasks.py b/backend/transcribee_backend/helpers/tasks.py index 905dc4c8..adb59c72 100644 --- a/backend/transcribee_backend/helpers/tasks.py +++ b/backend/transcribee_backend/helpers/tasks.py @@ -1,7 +1,7 @@ import datetime from typing import Iterable, Optional -from sqlmodel import Session, select, col +from sqlmodel import Session, col, select from transcribee_backend.config import settings from transcribee_backend.db import SessionContextManager from transcribee_backend.helpers.time import now_tz_aware diff --git a/backend/transcribee_backend/main.py b/backend/transcribee_backend/main.py index 7a471c83..3b6ab6b3 100644 --- a/backend/transcribee_backend/main.py +++ b/backend/transcribee_backend/main.py @@ -2,6 +2,7 @@ from fastapi import FastAPI from fastapi.middleware.cors import CORSMiddleware + from transcribee_backend.config import settings from transcribee_backend.helpers.periodic_tasks import run_periodic from transcribee_backend.helpers.tasks import timeout_attempts diff --git a/backend/transcribee_backend/models/document.py b/backend/transcribee_backend/models/document.py index e09b948c..29983060 100644 --- a/backend/transcribee_backend/models/document.py +++ b/backend/transcribee_backend/models/document.py @@ -3,10 +3,11 @@ from typing import List, Optional from sqlmodel import Column, DateTime, Field, Relationship, SQLModel -from transcribee_backend import media_storage from transcribee_proto.api import Document as ApiDocument from transcribee_proto.api import DocumentMedia as ApiDocumentMedia +from transcribee_backend import media_storage + from .user import User diff --git a/backend/transcribee_backend/models/task.py b/backend/transcribee_backend/models/task.py index 03c238f1..2781af82 100644 --- a/backend/transcribee_backend/models/task.py +++ b/backend/transcribee_backend/models/task.py @@ -5,13 +5,14 @@ from sqlmodel import JSON, Column, Field, ForeignKey, Relationship, SQLModel, col from sqlmodel.sql.sqltypes import GUID +from transcribee_proto.api import Document as ApiDocument +from transcribee_proto.api import TaskType +from typing_extensions import Self + from transcribee_backend.config import settings from transcribee_backend.helpers.time import now_tz_aware from transcribee_backend.models.document import Document from transcribee_backend.models.worker import Worker -from transcribee_proto.api import Document as ApiDocument -from transcribee_proto.api import TaskType -from typing_extensions import Self class TaskState(enum.Enum): diff --git a/backend/transcribee_backend/routers/document.py b/backend/transcribee_backend/routers/document.py index f6c8a097..8c98d529 100644 --- a/backend/transcribee_backend/routers/document.py +++ b/backend/transcribee_backend/routers/document.py @@ -17,7 +17,9 @@ ) from pydantic import BaseModel from sqlalchemy.sql.expression import desc -from sqlmodel import Session, select, col +from sqlmodel import Session, col, select +from transcribee_proto.api import Document as ApiDocument + from transcribee_backend.auth import ( get_authorized_worker, validate_user_authorization, @@ -28,7 +30,6 @@ from transcribee_backend.helpers.sync import DocumentSyncConsumer from transcribee_backend.helpers.time import now_tz_aware from transcribee_backend.models.task import TaskAttempt, TaskResponse -from transcribee_proto.api import Document as ApiDocument from .. import media_storage from ..models import ( diff --git a/backend/transcribee_backend/routers/task.py b/backend/transcribee_backend/routers/task.py index ad0c8720..f07a62ef 100644 --- a/backend/transcribee_backend/routers/task.py +++ b/backend/transcribee_backend/routers/task.py @@ -6,12 +6,13 @@ from sqlalchemy.orm import aliased from sqlalchemy.sql.operators import is_ from sqlmodel import Session, col, select +from transcribee_proto.api import KeepaliveBody + from transcribee_backend.auth import get_authorized_task, get_authorized_worker from transcribee_backend.db import get_session from transcribee_backend.helpers.tasks import finish_current_attempt from transcribee_backend.helpers.time import now_tz_aware from transcribee_backend.models.task import TaskState -from transcribee_proto.api import KeepaliveBody from ..models import ( AssignedTaskResponse, diff --git a/backend/transcribee_backend/routers/user.py b/backend/transcribee_backend/routers/user.py index 835b940d..80426dc3 100644 --- a/backend/transcribee_backend/routers/user.py +++ b/backend/transcribee_backend/routers/user.py @@ -1,5 +1,7 @@ from fastapi import APIRouter, Depends, HTTPException from sqlmodel import Session, select +from transcribee_proto.api import LoginResponse + from transcribee_backend.auth import ( NotAuthorized, authorize_user, @@ -10,7 +12,6 @@ from transcribee_backend.db import get_session from transcribee_backend.exceptions import UserAlreadyExists from transcribee_backend.models import CreateUser, User, UserBase, UserToken -from transcribee_proto.api import LoginResponse user_router = APIRouter() diff --git a/worker/transcribee_worker/api_client.py b/worker/transcribee_worker/api_client.py index e9adc606..88e80675 100644 --- a/worker/transcribee_worker/api_client.py +++ b/worker/transcribee_worker/api_client.py @@ -5,8 +5,8 @@ from typing import AsyncGenerator import requests -from websockets.client import connect from transcribee_worker.document import SyncedDocument +from websockets.client import connect class ApiClient: diff --git a/worker/transcribee_worker/document.py b/worker/transcribee_worker/document.py index 449c300f..95305779 100644 --- a/worker/transcribee_worker/document.py +++ b/worker/transcribee_worker/document.py @@ -5,9 +5,9 @@ from typing import AsyncGenerator import automerge -from websockets.client import WebSocketClientProtocol from transcribee_proto.document import Document as EditorDocument from transcribee_proto.sync import SyncMessageType +from websockets.client import WebSocketClientProtocol class UnsupportedDocumentVersion(Exception): diff --git a/worker/transcribee_worker/worker.py b/worker/transcribee_worker/worker.py index 21d0b683..ca9607ac 100644 --- a/worker/transcribee_worker/worker.py +++ b/worker/transcribee_worker/worker.py @@ -11,14 +11,15 @@ import automerge import numpy.typing as npt from pydantic import parse_raw_as -from transcribee_proto.api import AlignTask, AssignedTask -from transcribee_proto.api import Document as ApiDocument from transcribee_proto.api import ( + AlignTask, + AssignedTask, ReencodeTask, SpeakerIdentificationTask, TaskType, TranscribeTask, ) +from transcribee_proto.api import Document as ApiDocument from transcribee_proto.document import Document as EditorDocument from transcribee_worker.api_client import ApiClient from transcribee_worker.config import settings