From f62db4d5c753bc32d2ae166606ce41f4c5fa5c43 Mon Sep 17 00:00:00 2001
From: evshiron <evshiron@gmail.com>
Date: Sun, 30 Oct 2022 03:55:43 +0800
Subject: [PATCH] fix progress response model

---
 modules/api/api.py    | 30 ------------------------------
 modules/api/models.py |  8 ++++----
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/modules/api/api.py b/modules/api/api.py
index e93cddcb5..7e8522a2a 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -1,33 +1,3 @@
-# import time
-
-# from modules.api.models import StableDiffusionTxt2ImgProcessingAPI, StableDiffusionImg2ImgProcessingAPI
-# from modules.processing import StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images
-# from modules.sd_samplers import all_samplers
-# from modules.extras import run_pnginfo
-# import modules.shared as shared
-# from modules import devices
-# import uvicorn
-# from fastapi import Body, APIRouter, HTTPException
-# from fastapi.responses import JSONResponse
-# from pydantic import BaseModel, Field, Json
-# from typing import List
-# import json
-# import io
-# import base64
-# from PIL import Image
-
-# sampler_to_index = lambda name: next(filter(lambda row: name.lower() == row[1].name.lower(), enumerate(all_samplers)), None)
-
-# class TextToImageResponse(BaseModel):
-#     images: List[str] = Field(default=None, title="Image", description="The generated image in base64 format.")
-#     parameters: Json
-#     info: Json
-
-# class ImageToImageResponse(BaseModel):
-#     images: List[str] = Field(default=None, title="Image", description="The generated image in base64 format.")
-#     parameters: Json
-#     info: Json
-
 import time
 import uvicorn
 from gradio.processing_utils import encode_pil_to_base64, decode_base64_to_file, decode_base64_to_image
diff --git a/modules/api/models.py b/modules/api/models.py
index 8d4abc394..e1762fb9f 100644
--- a/modules/api/models.py
+++ b/modules/api/models.py
@@ -1,6 +1,6 @@
 import inspect
 from click import prompt
-from pydantic import BaseModel, Field, create_model
+from pydantic import BaseModel, Field, Json, create_model
 from typing import Any, Optional
 from typing_extensions import Literal
 from inflection import underscore
@@ -158,6 +158,6 @@ class PNGInfoResponse(BaseModel):
     info: str = Field(title="Image info", description="A string with all the info the image had")
 
 class ProgressResponse(BaseModel):
-    progress: float
-    eta_relative: float
-    state: dict
+    progress: float = Field(title="Progress", description="The progress with a range of 0 to 1")
+    eta_relative: float = Field(title="ETA in secs")
+    state: Json
-- 
GitLab