Skip to content

fix(database): improve SQLite error handling and logging in images.py and folders.py #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dotify71 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(database): improve SQLite error handling and logging in images.py and folders.py #1316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ad6e62
fix(database): improve SQLite error handling and logging in images.py…
Dotify71 Jun 12, 2026
d8e33d6
fix(database): add logger.error() before rollback in folders.py excep…
Dotify71 Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions backend/app/database/folders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def db_insert_folders_batch(folders_data: List[FolderData]) -> None:
folders_data,
)
conn.commit()
except Exception as e:
except sqlite3.Error as e:
conn.rollback()
raise e
Comment thread
coderabbitai[bot] marked this conversation as resolved.
finally:
Expand Down Expand Up @@ -180,7 +180,7 @@ def db_delete_folders_batch(folder_ids: List[FolderId]) -> int:
deleted_count = cursor.rowcount
conn.commit()
return deleted_count
except Exception as e:
except sqlite3.Error as e:
conn.rollback()
raise e
finally:
Expand Down Expand Up @@ -309,7 +309,7 @@ def db_update_ai_tagging_batch(
updated_count = cursor.rowcount
conn.commit()
return updated_count
except Exception as e:
except sqlite3.Error as e:
conn.rollback()
raise e
finally:
Expand Down
24 changes: 12 additions & 12 deletions backend/app/database/images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ def db_bulk_insert_images(image_records: List[ImageRecord]) -> bool:
)
conn.commit()
return True
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error inserting image records: {e}")
conn.rollback()
return False
Expand Down Expand Up @@ -244,7 +244,7 @@ def db_get_all_images(tagged: Union[bool, None] = None) -> List[dict]:

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting all images: {e}")
return []
finally:
Expand Down Expand Up @@ -319,7 +319,7 @@ def db_update_image_tagged_status(image_id: ImageId, is_tagged: bool = True) ->
)
conn.commit()
return cursor.rowcount > 0
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error updating image tagged status: {e}")
conn.rollback()
return False
Expand Down Expand Up @@ -353,7 +353,7 @@ def db_insert_image_classes_batch(image_class_pairs: List[ImageClassPair]) -> bo
)
conn.commit()
return True
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error inserting image classes: {e}")
conn.rollback()
return False
Expand Down Expand Up @@ -391,7 +391,7 @@ def db_get_images_by_folder_ids(
folder_ids,
)
return cursor.fetchall()
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting images by folder IDs: {e}")
return []
finally:
Expand Down Expand Up @@ -425,7 +425,7 @@ def db_delete_images_by_ids(image_ids: List[ImageId]) -> bool:
conn.commit()
logger.info(f"Deleted {cursor.rowcount} obsolete image(s) from database")
return True
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error deleting images: {e}")
conn.rollback()
return False
Expand All @@ -450,7 +450,7 @@ def db_toggle_image_favourite_status(image_id: str) -> bool:
)
conn.commit()
return cursor.rowcount > 0
except Exception as e:
except sqlite3.Error as e:
logger.error(f"Database error: {e}")
conn.rollback()
return False
Expand Down Expand Up @@ -565,7 +565,7 @@ def db_get_images_by_date_range(

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting images by date range: {e}")
return []
finally:
Expand Down Expand Up @@ -659,7 +659,7 @@ def db_get_images_near_location(

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting images near location: {e}")
return []
finally:
Expand Down Expand Up @@ -730,7 +730,7 @@ def db_get_images_by_year_month(year: int, month: int) -> List[dict]:

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting images by year/month: {e}")
return []
finally:
Expand Down Expand Up @@ -797,7 +797,7 @@ def db_get_images_with_location() -> List[dict]:

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error fetching images with location: {e}")
return []
finally:
Expand Down Expand Up @@ -862,7 +862,7 @@ def db_get_all_images_for_memories() -> List[dict]:

return images

except Exception as e:
except sqlite3.Error as e:
logger.error(f"Error getting images from database: {e}")
return []
finally:
Expand Down
Loading