Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tidy(db): tidy image_record_storage.py

Browse Source
This commit is contained in:
psychedelicious
2023-06-21 20:11:09 +10:00
parent 083a0fc4cf
commit e2ee8102c2
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
invokeai/app/services/image_record_storage.py
View File

@ -273,7 +273,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
raise ImageRecordSaveException from e raise ImageRecordSaveException from e
finally: finally:
self._lock.release() self._lock.release()
def get_many( def get_many(
self, self,
offset: int = 0, offset: int = 0,
@ -287,11 +287,6 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
self._lock.acquire() self._lock.acquire()
# Manually build two queries - one for the count, one for the records # Manually build two queries - one for the count, one for the records
# count_query = """--sql
# SELECT COUNT(*) FROM images WHERE 1=1
# """
count_query = """--sql count_query = """--sql
SELECT COUNT(*) SELECT COUNT(*)
FROM images FROM images
@ -306,10 +301,6 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
WHERE 1=1 WHERE 1=1
""" """
# images_query = """--sql
# SELECT * FROM images WHERE 1=1
# """
query_conditions = "" query_conditions = ""
query_params = [] query_params = []
@ -320,7 +311,7 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
query_params.append(image_origin.value) query_params.append(image_origin.value)
if categories is not None: if categories is not None:
## Convert the enum values to unique list of strings # Convert the enum values to unique list of strings
category_strings = list(map(lambda c: c.value, set(categories))) category_strings = list(map(lambda c: c.value, set(categories)))
# Create the correct length of placeholders # Create the correct length of placeholders
placeholders = ",".join("?" * len(category_strings)) placeholders = ",".join("?" * len(category_strings))
@ -337,13 +328,14 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
query_conditions += """--sql query_conditions += """--sql
AND images.is_intermediate = ? AND images.is_intermediate = ?
""" """
query_params.append(is_intermediate) query_params.append(is_intermediate)
if board_id is not None: if board_id is not None:
query_conditions += """--sql query_conditions += """--sql
AND board_images.board_id = ? AND board_images.board_id = ?
""" """
query_params.append(board_id) query_params.append(board_id)
query_pagination = """--sql query_pagination = """--sql
@ -457,7 +449,9 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
finally: finally:
self._lock.release() self._lock.release()
def get_most_recent_image_for_board(self, board_id: str) -> Union[ImageRecord, None]: def get_most_recent_image_for_board(
self, board_id: str
) -> Union[ImageRecord, None]:
try: try:
self._lock.acquire() self._lock.acquire()
self._cursor.execute( self._cursor.execute(
@ -477,5 +471,5 @@ class SqliteImageRecordStorage(ImageRecordStorageBase):
self._lock.release() self._lock.release()
if result is None: if result is None:
return None return None
return deserialize_image_record(dict(result)) return deserialize_image_record(dict(result))