2023-05-17 09:13:53 +00:00
|
|
|
import os
|
|
|
|
|
|
feat: refactor services folder/module structure
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
2023-09-24 08:11:07 +00:00
|
|
|
from .urls_base import UrlServiceBase
|
2023-05-17 09:13:53 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
class LocalUrlService(UrlServiceBase):
|
2024-03-06 18:15:33 +00:00
|
|
|
def __init__(self, base_url: str = "api/v1", base_url_v2: str = "api/v2"):
|
2023-05-17 09:13:53 +00:00
|
|
|
self._base_url = base_url
|
2024-03-06 18:15:33 +00:00
|
|
|
self._base_url_v2 = base_url_v2
|
2023-05-17 09:13:53 +00:00
|
|
|
|
2023-06-14 11:40:09 +00:00
|
|
|
def get_image_url(self, image_name: str, thumbnail: bool = False) -> str:
|
2023-05-17 09:13:53 +00:00
|
|
|
image_basename = os.path.basename(image_name)
|
2023-05-23 12:57:29 +00:00
|
|
|
|
|
|
|
|
# These paths are determined by the routes in invokeai/app/api/routers/images.py
|
2023-05-21 12:44:16 +00:00
|
|
|
if thumbnail:
|
2023-07-31 08:16:52 +00:00
|
|
|
return f"{self._base_url}/images/i/{image_basename}/thumbnail"
|
2023-05-17 09:13:53 +00:00
|
|
|
|
2023-07-31 08:16:52 +00:00
|
|
|
return f"{self._base_url}/images/i/{image_basename}/full"
|
2024-03-06 03:57:05 +00:00
|
|
|
|
|
|
|
|
def get_model_image_url(self, model_key: str) -> str:
|
2024-03-06 19:05:27 +00:00
|
|
|
return f"{self._base_url_v2}/models/i/{model_key}/image"
|
