Skip to content

Commit

Permalink
enable isort for ruff
Browse files Browse the repository at this point in the history
  • Loading branch information
rroohhh authored and pajowu committed Jun 27, 2023
1 parent b0ae60b commit 4e9756e
Show file tree
Hide file tree
Showing 14 changed files with 25 additions and 15 deletions.
1 change: 1 addition & 0 deletions .ruff.toml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
line-length = 100
select = ["E", "F", "I"]
1 change: 1 addition & 0 deletions backend/transcribee_backend/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions backend/transcribee_backend/db/migrations/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion backend/transcribee_backend/helpers/tasks.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions backend/transcribee_backend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion backend/transcribee_backend/models/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
7 changes: 4 additions & 3 deletions backend/transcribee_backend/models/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions backend/transcribee_backend/routers/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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 (
Expand Down
3 changes: 2 additions & 1 deletion backend/transcribee_backend/routers/task.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion backend/transcribee_backend/routers/user.py
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion worker/transcribee_worker/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion worker/transcribee_worker/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 3 additions & 2 deletions worker/transcribee_worker/worker.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4e9756e

Please sign in to comment.