mirror of
https://github.com/invoke-ai/InvokeAI
synced 2024-08-30 20:32:17 +00:00
a1773197e9
- remove `image_origin` from most places where we interact with images - consolidate image file storage into a single `images/` dir Images have an `image_origin` attribute but it is not actually used when retrieving images, nor will it ever be. It is still used when creating images and helps to differentiate between internally generated images and uploads. It was included in eg API routes and image service methods as a holdover from the previous app implementation where images were not managed in a database. Now that we have images in a db, we can do away with this and simplify basically everything that touches images. The one potentially controversial change is to no longer separate internal and external images on disk. If we retain this separation, we have to keep `image_origin` around in a number of spots and it getting image paths on disk painful. So, I am have gotten rid of this organisation. Images are now all stored in `images`, regardless of their origin. As we improve the image management features, this change will hopefully become transparent.
26 lines
799 B
Python
26 lines
799 B
Python
import os
|
|
from abc import ABC, abstractmethod
|
|
|
|
|
|
class UrlServiceBase(ABC):
|
|
"""Responsible for building URLs for resources."""
|
|
|
|
@abstractmethod
|
|
def get_image_url(self, image_name: str, thumbnail: bool = False) -> str:
|
|
"""Gets the URL for an image or thumbnail."""
|
|
pass
|
|
|
|
|
|
class LocalUrlService(UrlServiceBase):
|
|
def __init__(self, base_url: str = "api/v1"):
|
|
self._base_url = base_url
|
|
|
|
def get_image_url(self, image_name: str, thumbnail: bool = False) -> str:
|
|
image_basename = os.path.basename(image_name)
|
|
|
|
# These paths are determined by the routes in invokeai/app/api/routers/images.py
|
|
if thumbnail:
|
|
return f"{self._base_url}/images/{image_basename}/thumbnail"
|
|
|
|
return f"{self._base_url}/images/{image_basename}"
|