mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00: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
53 lines
1.6 KiB
Python
53 lines
1.6 KiB
Python
# Copyright (c) 2022 Kyle Schouviller (https://github.com/kyle0654)
|
|
|
|
import asyncio
|
|
import threading
|
|
from queue import Empty, Queue
|
|
from typing import Any
|
|
|
|
from fastapi_events.dispatcher import dispatch
|
|
|
|
from ..services.events.events_base import EventServiceBase
|
|
|
|
|
|
class FastAPIEventService(EventServiceBase):
|
|
event_handler_id: int
|
|
__queue: Queue
|
|
__stop_event: threading.Event
|
|
|
|
def __init__(self, event_handler_id: int) -> None:
|
|
self.event_handler_id = event_handler_id
|
|
self.__queue = Queue()
|
|
self.__stop_event = threading.Event()
|
|
asyncio.create_task(self.__dispatch_from_queue(stop_event=self.__stop_event))
|
|
|
|
super().__init__()
|
|
|
|
def stop(self, *args, **kwargs):
|
|
self.__stop_event.set()
|
|
self.__queue.put(None)
|
|
|
|
def dispatch(self, event_name: str, payload: Any) -> None:
|
|
self.__queue.put(dict(event_name=event_name, payload=payload))
|
|
|
|
async def __dispatch_from_queue(self, stop_event: threading.Event):
|
|
"""Get events on from the queue and dispatch them, from the correct thread"""
|
|
while not stop_event.is_set():
|
|
try:
|
|
event = self.__queue.get(block=False)
|
|
if not event: # Probably stopping
|
|
continue
|
|
|
|
dispatch(
|
|
event.get("event_name"),
|
|
payload=event.get("payload"),
|
|
middleware_id=self.event_handler_id,
|
|
)
|
|
|
|
except Empty:
|
|
await asyncio.sleep(0.1)
|
|
pass
|
|
|
|
except asyncio.CancelledError as e:
|
|
raise e # Raise a proper error
|