diff --git a/extensions-builtin/sdnq b/extensions-builtin/sdnq index 21d60c8c3..738613a62 160000 --- a/extensions-builtin/sdnq +++ b/extensions-builtin/sdnq @@ -1 +1 @@ -Subproject commit 21d60c8c3fbd66501adfc8b8129f0b254cedfbac +Subproject commit 738613a62cfa278b9b6312dd3755879c3671ee62 diff --git a/modules/api/api.py b/modules/api/api.py index 1410481df..a96700283 100644 --- a/modules/api/api.py +++ b/modules/api/api.py @@ -76,9 +76,9 @@ class Api: self.add_api_route("/sdapi/v1/extra-single-image", self.process.extras_single_image_api, methods=["POST"], response_model=models.ResProcessImage, tags=["Processing"]) self.add_api_route("/sdapi/v1/process-batch", self.process.extras_batch_images_api, methods=["POST"], response_model=models.ResProcessBatch, tags=["Processing"]) self.add_api_route("/sdapi/v1/extra-batch-images", self.process.extras_batch_images_api, methods=["POST"], response_model=models.ResProcessBatch, tags=["Processing"]) - self.add_api_route("/sdapi/v1/preprocess", self.process.post_preprocess, methods=["POST"], tags=["Processing"]) - self.add_api_route("/sdapi/v1/mask", self.process.post_mask, methods=["POST"], tags=["Processing"]) - self.add_api_route("/sdapi/v1/detect", self.process.post_detect, methods=["POST"], tags=["Processing"]) + self.add_api_route("/sdapi/v1/preprocess", self.process.post_preprocess, methods=["POST"], response_model=models.ResPreprocess, tags=["Processing"]) + self.add_api_route("/sdapi/v1/mask", self.process.post_mask, methods=["POST"], response_model=models.ResMask, tags=["Processing"]) + self.add_api_route("/sdapi/v1/detect", self.process.post_detect, methods=["POST"], response_model=models.ResFace, tags=["Processing"]) self.add_api_route("/sdapi/v1/detail", self.process.post_detail, methods=["POST"], response_model=models.ResDetail, tags=["Processing"]) self.add_api_route("/sdapi/v1/prompt-enhance", self.process.post_prompt_enhance, methods=["POST"], response_model=models.ResPromptEnhance, tags=["Generation"]) diff --git a/modules/api/gallery.py b/modules/api/gallery.py index f6f363f49..39c6b850a 100644 --- a/modules/api/gallery.py +++ b/modules/api/gallery.py @@ -36,6 +36,10 @@ OPTS_FOLDERS = [ class ReqFiles(BaseModel): folder: str = Field(title="Folder") +class ItemFolder(BaseModel): + path: str = Field(title="Path", description="Folder path") + label: str = Field(title="Label", description="Folder display label") + ### ws connection manager class ConnectionManager: @@ -245,7 +249,7 @@ def register_api(api): # register api log.error(f'Gallery: {folder} {e}') return [] - api.add_api_route("/sdapi/v1/browser/folders", get_folders, methods=["GET"], response_model=list[str]) + api.add_api_route("/sdapi/v1/browser/folders", get_folders, methods=["GET"], response_model=list[ItemFolder]) api.add_api_route("/sdapi/v1/browser/thumb", get_thumb, methods=["GET"], response_model=dict) api.add_api_route("/sdapi/v1/browser/files", ht_files, methods=["GET"], response_model=list)