From b204fb6a911c0f9cfe67d608f0d0b4e20b01a61b Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Wed, 25 Jun 2025 01:20:04 +1000 Subject: [PATCH] chore: ruff --- invokeai/app/api/routers/images.py | 4 +++- invokeai/app/services/image_records/image_records_common.py | 1 + invokeai/app/services/image_records/image_records_sqlite.py | 5 ++++- invokeai/app/services/images/images_default.py | 1 - 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/invokeai/app/api/routers/images.py b/invokeai/app/api/routers/images.py index e3187822d3..d183c614c4 100644 --- a/invokeai/app/api/routers/images.py +++ b/invokeai/app/api/routers/images.py @@ -565,7 +565,9 @@ async def get_bulk_download_item( raise HTTPException(status_code=404) -@images_router.get("/collections/counts", operation_id="get_image_collection_counts", response_model=ImageCollectionCounts) +@images_router.get( + "/collections/counts", operation_id="get_image_collection_counts", response_model=ImageCollectionCounts +) async def get_image_collection_counts( image_origin: Optional[ResourceOrigin] = Query(default=None, description="The origin of images to count."), categories: Optional[list[ImageCategory]] = Query(default=None, description="The categories of image to include."), diff --git a/invokeai/app/services/image_records/image_records_common.py b/invokeai/app/services/image_records/image_records_common.py index 231b63957b..eee3c0cd9b 100644 --- a/invokeai/app/services/image_records/image_records_common.py +++ b/invokeai/app/services/image_records/image_records_common.py @@ -208,6 +208,7 @@ def deserialize_image_record(image_dict: dict) -> ImageRecord: has_workflow=has_workflow, ) + class ImageCollectionCounts(BaseModel): starred_count: int = Field(description="The number of starred images in the collection.") unstarred_count: int = Field(description="The number of unstarred images in the collection.") diff --git a/invokeai/app/services/image_records/image_records_sqlite.py b/invokeai/app/services/image_records/image_records_sqlite.py index bf0706d426..704b99bd77 100644 --- a/invokeai/app/services/image_records/image_records_sqlite.py +++ b/invokeai/app/services/image_records/image_records_sqlite.py @@ -626,9 +626,12 @@ class SqliteImageRecordStorage(ImageRecordStorageBase): query_params.append(f"%{search_term.lower()}%") # Order by starred first, then by created_at - query += query_conditions + f"""--sql + query += ( + query_conditions + + f"""--sql ORDER BY images.starred DESC, images.created_at {order_dir.value} """ + ) cursor.execute(query, query_params) result = cast(list[sqlite3.Row], cursor.fetchall()) diff --git a/invokeai/app/services/images/images_default.py b/invokeai/app/services/images/images_default.py index 62a1262dc8..6585e7ca05 100644 --- a/invokeai/app/services/images/images_default.py +++ b/invokeai/app/services/images/images_default.py @@ -1,4 +1,3 @@ -from time import time from typing import Literal, Optional from PIL.Image import Image as PILImageType