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

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

Browse Source
This commit is contained in:
psychedelicious 2023-10-16 13:20:05 +11:00
parent 43266b18c7
commit 5f35ad078d
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
invokeai/app/services/board_image_record_storage.py
View File

@ -55,9 +55,9 @@ class BoardImageRecordStorageBase(ABC):
class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase): class SqliteBoardImageRecordStorage(BoardImageRecordStorageBase):
_conn: sqlite3.Connection _conn: sqlite3.Connection
_cursor: sqlite3.Cursor _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__() super().__init__()
self._conn = conn self._conn = conn
# Enable row factory to get rows as dictionaries (must be done before making the cursor!) # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

4
invokeai/app/services/board_record_storage.py
View File

@ -89,9 +89,9 @@ class BoardRecordStorageBase(ABC):
class SqliteBoardRecordStorage(BoardRecordStorageBase): class SqliteBoardRecordStorage(BoardRecordStorageBase):
_conn: sqlite3.Connection _conn: sqlite3.Connection
_cursor: sqlite3.Cursor _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__() super().__init__()
self._conn = conn self._conn = conn
# Enable row factory to get rows as dictionaries (must be done before making the cursor!) # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

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

@ -150,9 +150,9 @@ class ImageRecordStorageBase(ABC):
class SqliteImageRecordStorage(ImageRecordStorageBase): class SqliteImageRecordStorage(ImageRecordStorageBase):
_conn: sqlite3.Connection _conn: sqlite3.Connection
_cursor: sqlite3.Cursor _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__() super().__init__()
self._conn = conn self._conn = conn
# Enable row factory to get rows as dictionaries (must be done before making the cursor!) # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

4
invokeai/app/services/session_queue/session_queue_sqlite.py
View File

@ -36,7 +36,7 @@ class SqliteSessionQueue(SessionQueueBase):
__invoker: Invoker __invoker: Invoker
__conn: sqlite3.Connection __conn: sqlite3.Connection
__cursor: sqlite3.Cursor __cursor: sqlite3.Cursor
__lock: threading.Lock __lock: threading.RLock
def start(self, invoker: Invoker) -> None: def start(self, invoker: Invoker) -> None:
self.__invoker = invoker self.__invoker = invoker
@ -45,7 +45,7 @@ class SqliteSessionQueue(SessionQueueBase):
local_handler.register(event_name=EventServiceBase.queue_event, _func=self._on_session_event) 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") 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__() super().__init__()
self.__conn = conn self.__conn = conn
# Enable row factory to get rows as dictionaries (must be done before making the cursor!) # Enable row factory to get rows as dictionaries (must be done before making the cursor!)

4
invokeai/app/services/sqlite.py
View File

@ -16,9 +16,9 @@ class SqliteItemStorage(ItemStorageABC, Generic[T]):
_conn: sqlite3.Connection _conn: sqlite3.Connection
_cursor: sqlite3.Cursor _cursor: sqlite3.Cursor
_id_field: str _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__() super().__init__()
self._table_name = table_name self._table_name = table_name

2
invokeai/app/services/thread.py
View File

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