Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: sort imports using isort #142

Merged
merged 1 commit into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 8 additions & 17 deletions runner/app/pipelines/image_to_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
3 changes: 2 additions & 1 deletion runner/app/pipelines/optim/sfast.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)

Expand Down
21 changes: 6 additions & 15 deletions runner/app/pipelines/text_to_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 4 additions & 9 deletions runner/app/pipelines/upscale.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__)
Expand Down
14 changes: 4 additions & 10 deletions runner/app/pipelines/utils/__init__.py
Original file line number Diff line number Diff line change
@@ -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)
3 changes: 2 additions & 1 deletion runner/app/routes/audio_to_text.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions runner/app/routes/image_to_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
3 changes: 2 additions & 1 deletion runner/app/routes/image_to_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions runner/app/routes/upscale.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
10 changes: 2 additions & 8 deletions runner/gen_openapi.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion runner/modal_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down