move out save_final_enhanced_image_only from adv_params

mrhan1993 · mrhan1993 · commit f3c778ffb298 · 2024-08-15T17:13:48.000+08:00
update version
update doc
diff --git a/README.md b/README.md
@@ -19,17 +19,6 @@
 - [License](#license)
 - [Thanks :purple\_heart:](#thanks-purple_heart)
 
-If this is the first time to use it, it is recommended to use a rewritten new project [FooocusAPI](https://github.com/mrhan1993/FooocusAPI)
-
-A migration guide is provided [here](./docs/migrate.md).
-
-# :warning: Compatibility warning :warning:
-
-When upgrading from version 3.x to version 4.0, please read the following incompatibility notes:
-
-1. If you are using an external Fooocus model (that is, the model is not located in the `repositories` directory), delete the `repositories` directory directly, and then update the `git pull`.
-2. If not, move the `repositories` directory to any directory, delete the `repositories` directory, then update the `git pull`, and move the `models` directory back to its original location when it is finished.
-
 # Introduction
 
 FastAPI powered API for [Fooocus](https://github.com/lllyasviel/Fooocus).
diff --git a/README_zh.md b/README_zh.md
@@ -19,22 +19,11 @@
 - [License](#license)
 - [感谢 :purple\_heart:](#感谢-purple_heart)
 
-如果是第一次使用，推荐使用重写后的新项目 [FooocusAPI](https://github.com/mrhan1993/FooocusAPI)
-
-我还准备了一个[迁移指南](./docs/migrate_zh.md)
-
-# :warning: 兼容性警告 :warning:
-
-如果是从 0.3.x 版本升级到 0.4.0 版本，请务必阅读以下兼容性说明：
-
-1. 如果你使用的是外部 Fooocus 模型（即模型不是位于 `repositories/Fooocus/models` 目录下），直接删除 `repositories` 目录，然后执行 `git pull` 更新即可
-2. 如果不是上述方式，将 `repositories/Fooocus/models` 目录移动到任意目录，删除 `repositories` 目录，然后执行 `git pull` 更新，完成后将 `models` 目录移动回原位置
-
 # 简介
 
 使用 FastAPI 构建的 [Fooocus](https://github.com/lllyasviel/Fooocus) 的 API。
 
-当前支持的 Fooocus 版本: [2.3.1](https://github.com/lllyasviel/Fooocus/blob/main/update_log.md)。
+当前支持的 Fooocus 版本: [2.5.3](https://github.com/lllyasviel/Fooocus/blob/main/update_log.md)。
 
 ## Fooocus
 
diff --git a/docs/change_logs.md b/docs/change_logs.md
@@ -1,9 +1,13 @@
 # ChangeLog for Fooocus-API
 
-## [UNRELEASE]
+## [v0.5.0.1]
 ### Changed
+- Fooocus to v2.5.3
+- Add enhance image endpoint
+- Add generate mask endpoint
+- Influenced by Fooocus, the worker.py was reconstructed
 - Update docs
-- Returnd base64 str now include identifier like this `data:image/jpeg;base64,`
+- Returned base64 str now include identifier like this `data:image/jpeg;base64,`
 
 ### Fixed
 - Issue #375
diff --git a/docs/change_logs_zh.md b/docs/change_logs_zh.md
@@ -1,7 +1,11 @@
 # ChangeLog for Fooocus-API
 
-## [UNRELEASE]
+## [v0.5.0.1]
 ### Changed
+- 合并到 Fooocus 2.5.3
+- 增加图像增强接口
+- 增加遮罩生成接口
+- 受 Fooocus 影响，重构了 worker.py
 - 更新文档
 - 返回数据中的 base64 字符串现在包含图像标识符，比如 `data:image/jpeg;base64,`
 
diff --git a/fooocus_api_version.py b/fooocus_api_version.py
@@ -1 +1 @@
-version = '0.4.1.1'
+version = '0.5.0.1'
diff --git a/fooocusapi/parameters.py b/fooocusapi/parameters.py
@@ -38,6 +38,7 @@ def __init__(
         enhance_uov_method: str,
         enhance_uov_processing_order,
         enhance_uov_prompt_type,
+        save_final_enhanced_image_only,
         enhance_ctrlnets: List[EnhanceCtrlNets],
         image_prompts: List[Tuple[np.ndarray, float, float, str]],
         read_wildcards_in_order: bool,
@@ -77,6 +78,7 @@ def __init__(
         self.enhance_uov_method = enhance_uov_method
         self.enhance_uov_processing_order = enhance_uov_processing_order
         self.enhance_uov_prompt_type = enhance_uov_prompt_type
+        self.save_final_enhanced_image_only = save_final_enhanced_image_only
         self.enhance_ctrlnets = enhance_ctrlnets[:config.default_enhance_tabs] if len(enhance_ctrlnets) > config.default_enhance_tabs else enhance_ctrlnets
         self.current_tab = None
         self.read_wildcards_in_order = read_wildcards_in_order
diff --git a/fooocusapi/sql_client.py b/fooocusapi/sql_client.py
@@ -285,12 +285,21 @@ def add_history(
     params["result_url"] = result_url
     params["finish_reason"] = finish_reason
 
+    del params["enhance_input_image"]
+    del params["enhance_checkbox"]
+    del params["enhance_uov_method"]
+    del params["enhance_uov_processing_order"]
+    del params["enhance_uov_prompt_type"]
+    del params["save_final_enhanced_image_only"]
+    del params["enhance_ctrlnets"]
     del params["inpaint_input_image"]
     del params["uov_input_image"]
     del params["save_extension"]
     del params["save_meta"]
     del params["save_name"]
     del params["meta_scheme"]
+    del params["read_wildcards_in_order"]
+    del params["current_tab"]
 
     db.store_history(params)
 
diff --git a/fooocusapi/utils/api_utils.py b/fooocusapi/utils/api_utils.py
@@ -186,11 +186,21 @@ def req_to_params(req: Text2ImgRequest) -> ImageGenerationParams:
         dp = (None, 0.5, 0.6, 'ImagePrompt')
         image_prompts += [dp] * (config.default_controlnet_image_count - len(image_prompts))
 
-    enhance_input_image = None if not isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)) else read_input_image(req.enhance_input_image)
-    enhance_checkbox = True
-    enhance_uov_method = flags.disabled if not isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)) else req.enhance_uov_method
-    enhance_uov_processing_order = "Before First Enhancement" if not isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)) else req.enhance_uov_processing_order
-    enhance_uov_prompt_type = "Original Prompts" if not isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)) else req.enhance_uov_prompt_type
+    if isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)):
+        enhance_checkbox = True
+        enhance_input_image = read_input_image(req.enhance_input_image)
+        enhance_uov_method = req.enhance_uov_method
+        enhance_uov_processing_order = req.enhance_uov_processing_order
+        enhance_uov_prompt_type = req.enhance_uov_prompt_type
+        save_final_enhanced_image_only = True
+    else:
+        enhance_checkbox = False
+        enhance_input_image = None
+        enhance_uov_method = flags.disabled
+        enhance_uov_processing_order = "Before First Enhancement"
+        enhance_uov_prompt_type = "Original Prompts"
+        save_final_enhanced_image_only = False
+
     if not isinstance(req, (ImageEnhanceRequest, ImageEnhanceRequestJson)):
         enhance_ctrlnets = [EnhanceCtrlNets()] * config.default_enhance_tabs
     else:
@@ -247,6 +257,7 @@ def req_to_params(req: Text2ImgRequest) -> ImageGenerationParams:
         enhance_uov_method=enhance_uov_method,
         enhance_uov_processing_order=enhance_uov_processing_order,
         enhance_uov_prompt_type=enhance_uov_prompt_type,
+        save_final_enhanced_image_only=save_final_enhanced_image_only,
         enhance_ctrlnets=enhance_ctrlnets,
         read_wildcards_in_order=req.read_wildcards_in_order,
         image_prompts=image_prompts,
diff --git a/fooocusapi/worker.py b/fooocusapi/worker.py
@@ -124,7 +124,7 @@ def __init__(self, args: ImageGenerationParams):
         self.inpaint_advanced_masking_checkbox = adp.inpaint_advanced_masking_checkbox
         self.invert_mask_checkbox = adp.invert_mask_checkbox
         self.inpaint_erode_or_dilate = adp.inpaint_erode_or_dilate
-        self.save_final_enhanced_image_only = adp.save_final_enhanced_image_only if not args_manager.args.disable_image_log else False
+        self.save_final_enhanced_image_only = args.save_final_enhanced_image_only if not args_manager.args.disable_image_log else False
         self.save_metadata_to_images = args.save_meta
         self.metadata_scheme = MetadataScheme(
             args.meta_scheme) if not args_manager.args.disable_metadata else MetadataScheme.FOOOCUS

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-version = '0.4.1.1'`
	`1`	`+version = '0.5.0.1'`