diff --git a/modules/api/api.py b/modules/api/api.py index eeff16e10..d4d85e118 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -81,7 +81,6 @@ class Api: self.add_api_route("/sdapi/v1/upscalers", endpoints.get_upscalers, methods=["GET"], response_model=List[models.ItemUpscaler]) self.add_api_route("/sdapi/v1/sd-models", endpoints.get_sd_models, methods=["GET"], response_model=List[models.ItemModel]) self.add_api_route("/sdapi/v1/controlnets", endpoints.get_controlnets, methods=["GET"], response_model=List[str]) - self.add_api_route("/sdapi/v1/face-restorers", endpoints.get_restorers, methods=["GET"], response_model=List[models.ItemDetailer]) self.add_api_route("/sdapi/v1/detailers", endpoints.get_detailers, methods=["GET"], response_model=List[models.ItemDetailer]) self.add_api_route("/sdapi/v1/prompt-styles", endpoints.get_prompt_styles, methods=["GET"], response_model=List[models.ItemStyle]) self.add_api_route("/sdapi/v1/embeddings", endpoints.get_embeddings, methods=["GET"], response_model=models.ResEmbeddings) diff --git a/modules/api/endpoints.py b/modules/api/endpoints.py index 8b9b47258..60aa47ea4 100644 --- a/modules/api/endpoints.py +++ b/modules/api/endpoints.py @@ -48,9 +48,6 @@ def get_controlnets(model_type: Optional[str] = None): from modules.control.units.controlnet import api_list_models return api_list_models(model_type) -def get_restorers(): - return [{"name":x.name(), "path": getattr(x, "cmd_dir", None)} for x in shared.face_restorers] - def get_detailers(): shared.yolo.enumerate() return [{"name": k, "path": v} for k, v in shared.yolo.list.items()] diff --git a/modules/api/models.py b/modules/api/models.py index 7276d42f8..e4534b591 100644 --- a/modules/api/models.py +++ b/modules/api/models.py @@ -268,9 +268,6 @@ class FileData(BaseModel): class ReqProcess(BaseModel): resize_mode: float = Field(default=0, title="Resize Mode", description="Sets the resize mode: 0 to upscale by upscaling_resize amount, 1 to upscale up to upscaling_resize_h x upscaling_resize_w.") show_extras_results: bool = Field(default=True, title="Show results", description="Should the backend return the generated image?") - gfpgan_visibility: float = Field(default=0, title="GFPGAN Visibility", ge=0, le=1, allow_inf_nan=False, description="Sets the visibility of GFPGAN, values should be between 0 and 1.") - codeformer_visibility: float = Field(default=0, title="CodeFormer Visibility", ge=0, le=1, allow_inf_nan=False, description="Sets the visibility of CodeFormer, values should be between 0 and 1.") - codeformer_weight: float = Field(default=0, title="CodeFormer Weight", ge=0, le=1, allow_inf_nan=False, description="Sets the weight of CodeFormer, values should be between 0 and 1.") upscaling_resize: float = Field(default=2, title="Upscaling Factor", ge=1, le=8, description="By how much to upscale the image, only used when resize_mode=0.") upscaling_resize_w: int = Field(default=512, title="Target Width", ge=1, description="Target width for the upscaler to hit. Only used when resize_mode=1.") upscaling_resize_h: int = Field(default=512, title="Target Height", ge=1, description="Target height for the upscaler to hit. Only used when resize_mode=1.") diff --git a/modules/postprocessing.py b/modules/postprocessing.py index 1f04905c5..b624e3a7e 100644 --- a/modules/postprocessing.py +++ b/modules/postprocessing.py @@ -100,7 +100,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp return outputs, info, params -def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, gfpgan_visibility, codeformer_visibility, codeformer_weight, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, save_output: bool = True): +def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_dir, show_extras_results, upscaling_resize, upscaling_resize_w, upscaling_resize_h, upscaling_crop, extras_upscaler_1, extras_upscaler_2, extras_upscaler_2_visibility, save_output: bool = True): """old handler for API""" args = scripts_manager.scripts_postproc.create_args_for_run({ @@ -114,13 +114,6 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_ "upscaler_2_name": extras_upscaler_2, "upscaler_2_visibility": extras_upscaler_2_visibility, }, - "GFPGAN": { - "gfpgan_visibility": gfpgan_visibility, - }, - "CodeFormer": { - "codeformer_visibility": codeformer_visibility, - "codeformer_weight": codeformer_weight, - }, }) return run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir, show_extras_results, *args, save_output=save_output)