mirror of
https://github.com/invoke-ai/InvokeAI.git
synced 2026-02-02 17:45:07 -05:00
402cf9b0ee
Refactor services folder/module structure.
**Motivation**
While working on our services I've repeatedly encountered circular imports and a general lack of clarity regarding where to put things. The structure introduced goes a long way towards resolving those issues, setting us up for a clean structure going forward.
**Services**
Services are now in their own folder with a few files:
- `services/{service_name}/__init__.py`: init as needed, mostly empty now
- `services/{service_name}/{service_name}_base.py`: the base class for the service
- `services/{service_name}/{service_name}_{impl_type}.py`: the default concrete implementation of the service - typically one of `sqlite`, `default`, or `memory`
- `services/{service_name}/{service_name}_common.py`: any common items - models, exceptions, utilities, etc
Though it's a bit verbose to have the service name both as the folder name and the prefix for files, I found it is _extremely_ confusing to have all of the base classes just be named `base.py`. So, at the cost of some verbosity when importing things, I've included the service name in the filename.
There are some minor logic changes. For example, in `InvocationProcessor`, instead of assigning the model manager service to a variable to be used later in the file, the service is used directly via the `Invoker`.
**Shared**
Things that are used across disparate services are in `services/shared/`:
- `default_graphs.py`: previously in `services/`
- `graphs.py`: previously in `services/`
- `paginatation`: generic pagination models used in a few services
- `sqlite`: the `SqliteDatabase` class, other sqlite-specific things
45 lines
1.5 KiB
Python
45 lines
1.5 KiB
Python
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
|
|
|
|
import time
|
|
from queue import Queue
|
|
from typing import Optional
|
|
|
|
from .invocation_queue_base import InvocationQueueABC
|
|
from .invocation_queue_common import InvocationQueueItem
|
|
|
|
|
|
class MemoryInvocationQueue(InvocationQueueABC):
|
|
__queue: Queue
|
|
__cancellations: dict[str, float]
|
|
|
|
def __init__(self):
|
|
self.__queue = Queue()
|
|
self.__cancellations = dict()
|
|
|
|
def get(self) -> InvocationQueueItem:
|
|
item = self.__queue.get()
|
|
|
|
while (
|
|
isinstance(item, InvocationQueueItem)
|
|
and item.graph_execution_state_id in self.__cancellations
|
|
and self.__cancellations[item.graph_execution_state_id] > item.timestamp
|
|
):
|
|
item = self.__queue.get()
|
|
|
|
# Clear old items
|
|
for graph_execution_state_id in list(self.__cancellations.keys()):
|
|
if self.__cancellations[graph_execution_state_id] < item.timestamp:
|
|
del self.__cancellations[graph_execution_state_id]
|
|
|
|
return item
|
|
|
|
def put(self, item: Optional[InvocationQueueItem]) -> None:
|
|
self.__queue.put(item)
|
|
|
|
def cancel(self, graph_execution_state_id: str) -> None:
|
|
if graph_execution_state_id not in self.__cancellations:
|
|
self.__cancellations[graph_execution_state_id] = time.time()
|
|
|
|
def is_canceled(self, graph_execution_state_id: str) -> bool:
|
|
return graph_execution_state_id in self.__cancellations
|