merge conflict: fix(db): use RLock instead of Lock

Author: psychedelicious

invokeai/app/services/board_image_record_storage.py

@@ -55,9 +55,9 @@ def get_image_count_for_board(
 class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
     _conn: sqlite3.Connection
     _cursor: sqlite3.Cursor
-    _lock: threading.Lock
+    _lock: threading.RLock
 
-    def __init__(self, conn: sqlite3.Connection, lock: threading.Lock) -> None:
+    def __init__(self, conn: sqlite3.Connection, lock: threading.RLock) -> None:
         super().__init__()
         self._conn = conn
         # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

invokeai/app/services/board_record_storage.py

@@ -89,9 +89,9 @@ def get_all(
 class SqliteBoardRecordStorage(BoardRecordStorageBase):
     _conn: sqlite3.Connection
     _cursor: sqlite3.Cursor
-    _lock: threading.Lock
+    _lock: threading.RLock
 
-    def __init__(self, conn: sqlite3.Connection, lock: threading.Lock) -> None:
+    def __init__(self, conn: sqlite3.Connection, lock: threading.RLock) -> None:
         super().__init__()
         self._conn = conn
         # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

invokeai/app/services/image_record_storage.py

@@ -150,9 +150,9 @@ def get_most_recent_image_for_board(self, board_id: str) -> Optional[ImageRecord
 class SqliteImageRecordStorage(ImageRecordStorageBase):
     _conn: sqlite3.Connection
     _cursor: sqlite3.Cursor
-    _lock: threading.Lock
+    _lock: threading.RLock
 
-    def __init__(self, conn: sqlite3.Connection, lock: threading.Lock) -> None:
+    def __init__(self, conn: sqlite3.Connection, lock: threading.RLock) -> None:
         super().__init__()
         self._conn = conn
         # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

invokeai/app/services/session_queue/session_queue_sqlite.py

@@ -36,7 +36,7 @@ class SqliteSessionQueue(SessionQueueBase):
     __invoker: Invoker
     __conn: sqlite3.Connection
     __cursor: sqlite3.Cursor
-    __lock: threading.Lock
+    __lock: threading.RLock
 
     def start(self, invoker: Invoker) -> None:
         self.__invoker = invoker
@@ -45,7 +45,7 @@ def start(self, invoker: Invoker) -> None:
         local_handler.register(event_name=EventServiceBase.queue_event, _func=self._on_session_event)
         self.__invoker.services.logger.info(f"Pruned {prune_result.deleted} finished queue items")
 
-    def __init__(self, conn: sqlite3.Connection, lock: threading.Lock) -> None:
+    def __init__(self, conn: sqlite3.Connection, lock: threading.RLock) -> None:
         super().__init__()
         self.__conn = conn
         # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

invokeai/app/services/sqlite.py

@@ -16,9 +16,9 @@ class SqliteItemStorage(ItemStorageABC, Generic[T]):
     _conn: sqlite3.Connection
     _cursor: sqlite3.Cursor
     _id_field: str
-    _lock: threading.Lock
+    _lock: threading.RLock
 
-    def __init__(self, conn: sqlite3.Connection, table_name: str, lock: threading.Lock, id_field: str = "id"):
+    def __init__(self, conn: sqlite3.Connection, table_name: str, lock: threading.RLock, id_field: str = "id"):
         super().__init__()
 
         self._table_name = table_name

invokeai/app/services/thread.py

@@ -1,3 +1,3 @@
 import threading
 
-lock = threading.Lock()
+lock = threading.RLock()