Modify api docs and examples, upgrade version number

mrhan1993 · Nov 30, 2023 · 7858658 · 7858658
1 parent f73deb4
commit 7858658
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/docs/openapi.json b/docs/openapi.json
diff --git a/examples/examples.py b/examples/examples.py
@@ -81,7 +81,8 @@ class Config():
   },
   "require_base64": False,
   "async_process": False,
-  "uov_method": "Upscale (2x)",
+  "uov_method": "Upscale (Custom)",
+  "upscale_value": 3,
   "input_image": ""
 }
 
@@ -291,5 +292,5 @@ def image_prompt(img_prompt: list, params: dict) -> dict:
     }
 ]
 print(upscale_vary(image=image_base64))
-print(inpaint_outpaint(input_image=s_base64, input_mask=m_base64))
-print(image_prompt(img_prompt=img_prompt, params=img_prompt_params))
+# print(inpaint_outpaint(input_image=s_base64, input_mask=m_base64))
+# print(image_prompt(img_prompt=img_prompt, params=img_prompt_params))
diff --git a/fooocus_api_version.py b/fooocus_api_version.py
@@ -1 +1 @@
-version = '0.3.21'
+version = '0.3.22'
diff --git a/fooocusapi/models.py b/fooocusapi/models.py
@@ -122,12 +122,12 @@ class Text2ImgRequest(BaseModel):
 class ImgUpscaleOrVaryRequest(Text2ImgRequest):
     input_image: UploadFile
     uov_method: UpscaleOrVaryMethod
-    upscale_value: float
+    upscale_value: float | None
 
     @classmethod
     def as_form(cls, input_image: UploadFile = Form(description="Init image for upsacale or outpaint"),
                 uov_method: UpscaleOrVaryMethod = Form(),
-                upscale_value: float = Form(default=1.0, ge=1.0, le=5.0),
+                upscale_value: float | None = Form(None, description="Upscale custom value, None for default value", ge=1.0, le=5.0),
                 prompt: str = Form(''),
                 negative_prompt: str = Form(default_prompt_negative),
                 style_selections: List[str] = Form(defualt_styles, description="Fooocus style selections, seperated by comma"),

diff --git a/fooocusapi/parameters.py b/fooocusapi/parameters.py
@@ -93,7 +93,7 @@ def __init__(self, prompt: str,
                  loras: List[Tuple[str, float]],
                  uov_input_image: np.ndarray | None,
                  uov_method: str,
-                 upscale_value: float,
+                 upscale_value: float | None,
                  outpaint_selections: List[str],
                  outpaint_distance_left: int,
                  outpaint_distance_right: int,

diff --git a/fooocusapi/worker.py b/fooocusapi/worker.py
@@ -469,7 +469,7 @@ def yield_result(_, imgs, tasks):
             print(f'Image upscaled.')
 
             f = 1.0
-            if upscale_value > 1.0:
+            if upscale_value is not None:
                 f = upscale_value
             else:
                 pattern = r"([0-9]+(?:\.[0-9]+)?)x"