Merge pull request #1 from rapidrabbit76/develop

fix: CORS, Update: pipeline

Author: rapidrabbit76

.github/ISSUE_TEMPLATE/BUG_ISSUE.md

@@ -0,0 +1,14 @@
+---
+name: Bug Report Template
+about: 버그 리포트 템플릿
+title: ""
+assignees: "yslee"
+---
+
+# System info
+
+# Describe of bug
+
+# Code example
+
+# Log or Screenshot

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -0,0 +1,15 @@
+---
+name: Feature Request Template
+about: 기능 및 추가 요청을 위한 템플릿
+title: ""
+assignees: "yslee"
+---
+
+# Description
+
+# TODO
+
+- [ ] todo
+- [ ] todo
+
+# ETC

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+# Summary
+
+content
+
+# Work
+
+content
+
+# Related issues [optional]
+
+write related issues

api/__init__.py

@@ -1 +1,2 @@
-from .stable_diffusion import StableDiffusionRouter
+from .stable_diffusion import router as StableDiffusionRouter
+from .home import router as HomeRouter

api/home/__init__.py

@@ -0,0 +1 @@
+from .router import router

api/home/router.py

@@ -0,0 +1,20 @@
+from datetime import datetime
+from fastapi import Response
+from fastapi_restful.cbv import cbv
+from fastapi_restful.inferring_router import InferringRouter
+
+from core.settings import get_settings
+
+
+router = InferringRouter()
+env = get_settings()
+
+
+@cbv(router)
+class Home:
+    @router.get("/")
+    async def index(self):
+        """ELB check"""
+        current_time = datetime.utcnow()
+        msg = f"Notification API (UTC: {current_time.strftime('%Y.%m.%d %H:%M:%S')})"
+        return Response(msg)

api/stable_diffusion/__init__.py

@@ -1 +1 @@
-from .router import router as StableDiffusionRouter
+from .router import router 

app/server.py

@@ -1,13 +1,12 @@
-from datetime import datetime
 from fastapi.staticfiles import StaticFiles
+import typing as T
 
 from fastapi import FastAPI, Response
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.middleware import Middleware
 
 import api
-from core.settings import get_settings
-
-env = get_settings()
+from core.settings import env
 
 
 def init_router(app: FastAPI):
@@ -17,28 +16,30 @@ def init_router(app: FastAPI):
         name="result image",
     )
     app.include_router(api.StableDiffusionRouter)
+    app.include_router(api.HomeRouter)
     app.router.redirect_slashes = False
 
 
 def create_app() -> FastAPI:
-    app = FastAPI(redoc_url=None)
-
-    init_cors(app)
-    init_middleware(app)
+    app = FastAPI(
+        redoc_url=None,
+        middleware=init_middleware(),
+    )
     init_router(app)
-    init_settings(app)
     return app
 
 
-def init_cors(app: FastAPI):
-    app.add_middleware(
-        CORSMiddleware,
-        allow_origins=env.CORS_ALLOW_ORIGINS,
-    )
-
-
-def init_middleware(app: FastAPI):
-    pass
+def init_middleware() -> T.List[Middleware]:
+    middleware = [
+        Middleware(
+            CORSMiddleware,
+            allow_origins=env.CORS_ALLOW_ORIGINS,
+            allow_credentials=env.CORS_CREDENTIALS,
+            allow_methods=env.CORS_ALLOW_METHODS,
+            allow_headers=env.CORS_ALLOW_HEADERS,
+        ),
+    ]
+    return middleware
 
 
 def init_settings(app: FastAPI):
@@ -50,12 +51,6 @@ def startup_event():
     def shutdown_event():
         pass
 
-    @app.get("/")
-    async def index():
-        """ELB check"""
-        current_time = datetime.utcnow()
-        msg = f"Notification API (UTC: {current_time.strftime('%Y.%m.%d %H:%M:%S')})"
-        return Response(msg)
-
 
 app = create_app()
+init_settings(app)

app/stable_diffusion/manager/manager.py

@@ -1,6 +1,8 @@
 from functools import lru_cache
 import typing as T
 import torch
+import sys
+from random import randint
 from service_streamer import ThreadedStreamer
 from app.stable_diffusion.model import (
     build_text2image_pipeline,
@@ -13,7 +15,6 @@
     Image2ImageTask,
 )
 from core.settings import get_settings
-from core.decorator.singleton import singleton
 
 env = get_settings()
 
@@ -24,7 +25,6 @@
 ]
 
 
-@singleton
 class StableDiffusionManager:
     def __init__(self):
         self.text2image = build_text2image_pipeline()
@@ -44,9 +44,11 @@ def predict(
             images = self.predict_inpaint(task)
         return [images]
 
-    def _get_generator(self, task, device):
+    def _get_generator(self, task: _StableDiffusionTask, device: str):
         generator = torch.Generator(device=device)
-        generator.manual_seed(task.seed)
+        seed = task.seed
+        seed = seed if seed else randint(1, sys.maxsize)
+        generator.manual_seed(seed)
         return generator
 
     def predict_text2image(self, task: Text2ImageTask):

app/stable_diffusion/manager/schema.py

@@ -9,7 +9,7 @@ class Text2ImageTask(BaseModel):
     guidance_scale: float = Field(..., ge=0.0)
     height: int
     width: int
-    seed: int = Field(..., gt=0)
+    seed: T.Optional[int] = Field(..., gt=0)
 
     @validator("height", "width")
     def size_constraint(cls, size):
@@ -25,7 +25,7 @@ class Image2ImageTask(BaseModel):
     strength: float = Field(..., ge=0.0, le=1.0)
     num_inference_steps: int = Field(..., gt=0)
     guidance_scale: float = Field(..., ge=0.0)
-    seed: int = Field(..., gt=0)
+    seed: T.Optional[int] = Field(..., gt=0)
 
 
 class InpaintTask(BaseModel):
@@ -35,4 +35,4 @@ class InpaintTask(BaseModel):
     strength: float = Field(..., ge=0.0, le=1.0)
     num_inference_steps: int = Field(..., gt=0)
     guidance_scale: float = Field(..., ge=0.0)
-    seed: int = Field(..., gt=0)
+    seed: T.Optional[int] = Field(..., gt=0)