From 7635bbeac2af630e25fa42e90e7f64c1d65e35bd Mon Sep 17 00:00:00 2001 From: Georges-Antoine Assi Date: Fri, 24 May 2024 16:59:54 -0400 Subject: [PATCH] run trunk fixes --- backend/endpoints/responses/rom.py | 1 - backend/endpoints/tests/test_heartbeat.py | 1 - backend/handler/database/firmware_handler.py | 2 +- backend/handler/database/platforms_handler.py | 6 +++--- backend/handler/database/roms_handler.py | 5 +++-- backend/utils/__init__.py | 1 + frontend/src/__generated__/models/HeartbeatResponse.ts | 10 +++++----- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/endpoints/responses/rom.py b/backend/endpoints/responses/rom.py index f1e685e77..c12c61d70 100644 --- a/backend/endpoints/responses/rom.py +++ b/backend/endpoints/responses/rom.py @@ -5,7 +5,6 @@ from typing import Optional, get_type_hints from endpoints.responses.assets import SaveSchema, ScreenshotSchema, StateSchema from fastapi import Request from fastapi.responses import StreamingResponse -from handler.database import db_user_handler from handler.metadata.igdb_handler import IGDBMetadata from handler.metadata.moby_handler import MobyMetadata from handler.socket_handler import socket_handler diff --git a/backend/endpoints/tests/test_heartbeat.py b/backend/endpoints/tests/test_heartbeat.py index a6b18e631..33378aebd 100644 --- a/backend/endpoints/tests/test_heartbeat.py +++ b/backend/endpoints/tests/test_heartbeat.py @@ -1,6 +1,5 @@ from fastapi.testclient import TestClient from main import app - from utils import get_version client = TestClient(app) diff --git a/backend/handler/database/firmware_handler.py b/backend/handler/database/firmware_handler.py index 9f2d9b4f7..bf1cdbad5 100644 --- a/backend/handler/database/firmware_handler.py +++ b/backend/handler/database/firmware_handler.py @@ -1,6 +1,6 @@ from decorators.database import begin_session from models.firmware import Firmware -from sqlalchemy import update, delete, and_, select +from sqlalchemy import and_, delete, select, update from sqlalchemy.orm import Session from .base_handler import DBBaseHandler diff --git a/backend/handler/database/platforms_handler.py b/backend/handler/database/platforms_handler.py index 9c3efcc5c..57981f2b0 100644 --- a/backend/handler/database/platforms_handler.py +++ b/backend/handler/database/platforms_handler.py @@ -1,10 +1,10 @@ import functools -from sqlalchemy import delete, or_, select -from sqlalchemy.orm import Session, Query, selectinload from decorators.database import begin_session from models.platform import Platform from models.rom import Rom +from sqlalchemy import delete, or_, select +from sqlalchemy.orm import Query, Session, selectinload from .base_handler import DBBaseHandler @@ -44,7 +44,7 @@ class DBPlatformsHandler(DBBaseHandler): session.scalar(query.filter_by(id=id).limit(1)) if id else ( - session.scalars(select(Platform).order_by(Platform.name.asc())) + session.scalars(select(Platform).order_by(Platform.name.asc())) # type: ignore[attr-defined] .unique() .all() ) diff --git a/backend/handler/database/roms_handler.py b/backend/handler/database/roms_handler.py index af439c6e6..5dfcffa9c 100644 --- a/backend/handler/database/roms_handler.py +++ b/backend/handler/database/roms_handler.py @@ -1,8 +1,9 @@ import functools + from decorators.database import begin_session from models.rom import Rom, RomNote -from sqlalchemy import and_, delete, func, select, update, or_, Select -from sqlalchemy.orm import Session, Query, selectinload +from sqlalchemy import and_, delete, func, or_, select, update +from sqlalchemy.orm import Query, Session, selectinload from .base_handler import DBBaseHandler diff --git a/backend/utils/__init__.py b/backend/utils/__init__.py index d53ea788b..4d3c83144 100644 --- a/backend/utils/__init__.py +++ b/backend/utils/__init__.py @@ -1,5 +1,6 @@ from __version__ import __version__ + def get_version() -> str: """Returns current version tag""" if not __version__ == "": diff --git a/frontend/src/__generated__/models/HeartbeatResponse.ts b/frontend/src/__generated__/models/HeartbeatResponse.ts index 628487398..a661f01e8 100644 --- a/frontend/src/__generated__/models/HeartbeatResponse.ts +++ b/frontend/src/__generated__/models/HeartbeatResponse.ts @@ -8,9 +8,9 @@ import type { SchedulerDict } from "./SchedulerDict"; import type { WatcherDict } from "./WatcherDict"; export type HeartbeatResponse = { - VERSION: string; - WATCHER: WatcherDict; - SCHEDULER: SchedulerDict; - ANY_SOURCE_ENABLED: boolean; - METADATA_SOURCES: MetadataSourcesDict; + VERSION: string; + WATCHER: WatcherDict; + SCHEDULER: SchedulerDict; + ANY_SOURCE_ENABLED: boolean; + METADATA_SOURCES: MetadataSourcesDict; };