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 branch 'main' into mm-ui

Browse Source
This commit is contained in:
blessedcoolant 2023-07-15 01:24:40 +12:00
commit 2a533b275f
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
invokeai/app/api/routers/images.py
View File

@ -19,6 +19,9 @@ from ..dependencies import ApiDependencies
images_router = APIRouter(prefix="/v1/images", tags=["images"]) images_router = APIRouter(prefix="/v1/images", tags=["images"])
# images are immutable; set a high max-age
IMAGE_MAX_AGE = 31536000
@images_router.post( @images_router.post(
"/", "/",
@ -155,12 +158,14 @@ async def get_image_full(
if not ApiDependencies.invoker.services.images.validate_path(path): if not ApiDependencies.invoker.services.images.validate_path(path):
raise HTTPException(status_code=404) raise HTTPException(status_code=404)
return FileResponse( response = FileResponse(
path, path,
media_type="image/png", media_type="image/png",
filename=image_name, filename=image_name,
content_disposition_type="inline", content_disposition_type="inline",
) )
response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
return response
except Exception as e: except Exception as e:
raise HTTPException(status_code=404) raise HTTPException(status_code=404)
@ -189,9 +194,11 @@ async def get_image_thumbnail(
if not ApiDependencies.invoker.services.images.validate_path(path): if not ApiDependencies.invoker.services.images.validate_path(path):
raise HTTPException(status_code=404) raise HTTPException(status_code=404)
return FileResponse( response = FileResponse(
path, media_type="image/webp", content_disposition_type="inline" path, media_type="image/webp", content_disposition_type="inline"
) )
response.headers["Cache-Control"] = f"max-age={IMAGE_MAX_AGE}"
return response
except Exception as e: except Exception as e:
raise HTTPException(status_code=404) raise HTTPException(status_code=404)

4
invokeai/app/invocations/latent.py
View File

@ -519,9 +519,9 @@ class ResizeLatentsInvocation(BaseInvocation):
# Inputs # Inputs
latents: Optional[LatentsField] = Field( latents: Optional[LatentsField] = Field(
description="The latents to resize") description="The latents to resize")
width: int = Field( width: Union[int, None] = Field(default=512,
ge=64, multiple_of=8, description="The width to resize to (px)") ge=64, multiple_of=8, description="The width to resize to (px)")
height: int = Field( height: Union[int, None] = Field(default=512,
ge=64, multiple_of=8, description="The height to resize to (px)") ge=64, multiple_of=8, description="The height to resize to (px)")
mode: LATENTS_INTERPOLATION_MODE = Field( mode: LATENTS_INTERPOLATION_MODE = Field(
default="bilinear", description="The interpolation mode") default="bilinear", description="The interpolation mode")