diff --git a/runner/app/pipelines/image_to_image.py b/runner/app/pipelines/image_to_image.py index 4080c919..84ec87f7 100644 --- a/runner/app/pipelines/image_to_image.py +++ b/runner/app/pipelines/image_to_image.py @@ -5,27 +5,18 @@ import PIL import torch -from diffusers import ( - AutoPipelineForImage2Image, - EulerAncestralDiscreteScheduler, - EulerDiscreteScheduler, - StableDiffusionInstructPix2PixPipeline, - StableDiffusionXLPipeline, - UNet2DConditionModel, -) +from app.pipelines.base import Pipeline +from app.pipelines.utils import (SafetyChecker, get_model_dir, + get_torch_device, is_lightning_model, + is_turbo_model) +from diffusers import (AutoPipelineForImage2Image, + EulerAncestralDiscreteScheduler, EulerDiscreteScheduler, + StableDiffusionInstructPix2PixPipeline, + StableDiffusionXLPipeline, UNet2DConditionModel) from huggingface_hub import file_download, hf_hub_download from PIL import ImageFile from safetensors.torch import load_file -from app.pipelines.base import Pipeline -from app.pipelines.utils import ( - SafetyChecker, - get_model_dir, - get_torch_device, - is_lightning_model, - is_turbo_model, -) - ImageFile.LOAD_TRUNCATED_IMAGES = True logger = logging.getLogger(__name__) diff --git a/runner/app/pipelines/optim/sfast.py b/runner/app/pipelines/optim/sfast.py index c449aadb..8bfa5b10 100644 --- a/runner/app/pipelines/optim/sfast.py +++ b/runner/app/pipelines/optim/sfast.py @@ -5,7 +5,8 @@ import logging -from sfast.compilers.diffusion_pipeline_compiler import CompilationConfig, compile +from sfast.compilers.diffusion_pipeline_compiler import (CompilationConfig, + compile) logger = logging.getLogger(__name__) diff --git a/runner/app/pipelines/text_to_image.py b/runner/app/pipelines/text_to_image.py index 0dc54278..6ee32647 100644 --- a/runner/app/pipelines/text_to_image.py +++ b/runner/app/pipelines/text_to_image.py @@ -6,21 +6,12 @@ import PIL import torch from app.pipelines.base import Pipeline -from app.pipelines.utils import ( - SafetyChecker, - get_model_dir, - get_torch_device, - is_lightning_model, - is_turbo_model, - split_prompt, -) -from diffusers import ( - AutoPipelineForText2Image, - EulerDiscreteScheduler, - StableDiffusion3Pipeline, - StableDiffusionXLPipeline, - UNet2DConditionModel, -) +from app.pipelines.utils import (SafetyChecker, get_model_dir, + get_torch_device, is_lightning_model, + is_turbo_model, split_prompt) +from diffusers import (AutoPipelineForText2Image, EulerDiscreteScheduler, + StableDiffusion3Pipeline, StableDiffusionXLPipeline, + UNet2DConditionModel) from diffusers.models import AutoencoderKL from huggingface_hub import file_download, hf_hub_download from safetensors.torch import load_file diff --git a/runner/app/pipelines/upscale.py b/runner/app/pipelines/upscale.py index 0cba865e..c7ee404c 100644 --- a/runner/app/pipelines/upscale.py +++ b/runner/app/pipelines/upscale.py @@ -4,19 +4,14 @@ import PIL import torch +from app.pipelines.base import Pipeline +from app.pipelines.utils import (SafetyChecker, get_model_dir, + get_torch_device, is_lightning_model, + is_turbo_model) from diffusers import StableDiffusionUpscalePipeline from huggingface_hub import file_download from PIL import ImageFile -from app.pipelines.base import Pipeline -from app.pipelines.utils import ( - SafetyChecker, - get_model_dir, - get_torch_device, - is_lightning_model, - is_turbo_model, -) - ImageFile.LOAD_TRUNCATED_IMAGES = True logger = logging.getLogger(__name__) diff --git a/runner/app/pipelines/utils/__init__.py b/runner/app/pipelines/utils/__init__.py index 844b86e9..79cc49b9 100644 --- a/runner/app/pipelines/utils/__init__.py +++ b/runner/app/pipelines/utils/__init__.py @@ -1,12 +1,6 @@ """This module contains several utility functions that are used across the pipelines module.""" -from app.pipelines.utils.utils import ( - SafetyChecker, - get_model_dir, - get_model_path, - get_torch_device, - is_lightning_model, - is_turbo_model, - split_prompt, - validate_torch_device, -) +from app.pipelines.utils.utils import (SafetyChecker, get_model_dir, + get_model_path, get_torch_device, + is_lightning_model, is_turbo_model, + split_prompt, validate_torch_device) diff --git a/runner/app/routes/audio_to_text.py b/runner/app/routes/audio_to_text.py index 5a249d9a..06d3eaad 100644 --- a/runner/app/routes/audio_to_text.py +++ b/runner/app/routes/audio_to_text.py @@ -5,7 +5,8 @@ from app.dependencies import get_pipeline from app.pipelines.base import Pipeline from app.pipelines.utils.audio import AudioConversionError -from app.routes.util import HTTPError, TextResponse, file_exceeds_max_size, http_error +from app.routes.util import (HTTPError, TextResponse, file_exceeds_max_size, + http_error) from fastapi import APIRouter, Depends, File, Form, UploadFile, status from fastapi.responses import JSONResponse from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer diff --git a/runner/app/routes/image_to_image.py b/runner/app/routes/image_to_image.py index 6a397628..efb23793 100644 --- a/runner/app/routes/image_to_image.py +++ b/runner/app/routes/image_to_image.py @@ -3,15 +3,15 @@ import random from typing import Annotated +from app.dependencies import get_pipeline +from app.pipelines.base import Pipeline +from app.routes.util import (HTTPError, ImageResponse, http_error, + image_to_data_url) from fastapi import APIRouter, Depends, File, Form, UploadFile, status from fastapi.responses import JSONResponse from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer from PIL import Image, ImageFile -from app.dependencies import get_pipeline -from app.pipelines.base import Pipeline -from app.routes.util import HTTPError, ImageResponse, http_error, image_to_data_url - ImageFile.LOAD_TRUNCATED_IMAGES = True router = APIRouter() diff --git a/runner/app/routes/image_to_video.py b/runner/app/routes/image_to_video.py index 55b32605..d6b66ebe 100644 --- a/runner/app/routes/image_to_video.py +++ b/runner/app/routes/image_to_video.py @@ -5,7 +5,8 @@ from app.dependencies import get_pipeline from app.pipelines.base import Pipeline -from app.routes.util import HTTPError, VideoResponse, http_error, image_to_data_url +from app.routes.util import (HTTPError, VideoResponse, http_error, + image_to_data_url) from fastapi import APIRouter, Depends, File, Form, UploadFile, status from fastapi.responses import JSONResponse from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer diff --git a/runner/app/routes/upscale.py b/runner/app/routes/upscale.py index 1ef6f6eb..635a80b9 100644 --- a/runner/app/routes/upscale.py +++ b/runner/app/routes/upscale.py @@ -3,15 +3,15 @@ import random from typing import Annotated +from app.dependencies import get_pipeline +from app.pipelines.base import Pipeline +from app.routes.util import (HTTPError, ImageResponse, http_error, + image_to_data_url) from fastapi import APIRouter, Depends, File, Form, UploadFile, status from fastapi.responses import JSONResponse from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer from PIL import Image, ImageFile -from app.dependencies import get_pipeline -from app.pipelines.base import Pipeline -from app.routes.util import HTTPError, ImageResponse, http_error, image_to_data_url - ImageFile.LOAD_TRUNCATED_IMAGES = True router = APIRouter() diff --git a/runner/gen_openapi.py b/runner/gen_openapi.py index 7fde5ee3..bd62d71b 100644 --- a/runner/gen_openapi.py +++ b/runner/gen_openapi.py @@ -5,14 +5,8 @@ import yaml from app.main import app, use_route_names_as_operation_ids -from app.routes import ( - audio_to_text, - health, - image_to_image, - image_to_video, - text_to_image, - upscale, -) +from app.routes import (audio_to_text, health, image_to_image, image_to_video, + text_to_image, upscale) from fastapi.openapi.utils import get_openapi # Specify Endpoints for OpenAPI schema generation. diff --git a/runner/modal_app.py b/runner/modal_app.py index 23acdf9f..3789f582 100644 --- a/runner/modal_app.py +++ b/runner/modal_app.py @@ -2,7 +2,8 @@ import os from pathlib import Path -from app.main import config_logging, load_route, use_route_names_as_operation_ids +from app.main import (config_logging, load_route, + use_route_names_as_operation_ids) from app.routes import health from modal import Image, Secret, Stub, Volume, asgi_app, enter, method