Merge pull request #34 from konieshadow/dev

Dev

README.md

@@ -99,4 +99,17 @@ Query async generation request results, return job progress and generation resul
 #### Query Job Queue Info
 > GET /v1/generation/job-queue
 
-Query job queue info, include running job count, finished job count and last job id.
+Query job queue info, include running job count, finished job count and last job id.
+
+#### Get All Model Names
+> GET /v1/engines/all-models
+
+Get all filenames of base model and lora.
+
+#### Refresh Models
+> POST /v1/engines/refresh-models
+
+#### Get All Fooocus Styles
+> GET /v1/engines/styles
+
+Get all legal Fooocus styles.

docs/openapi.json

@@ -459,10 +459,95 @@
                     }
                 }
             }
+        },
+        "/v1/engines/all-models": {
+            "get": {
+                "summary": "All Models",
+                "description": "Get all filenames of base model and lora",
+                "operationId": "all_models_v1_engines_all_models_get",
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/AllModelNamesResponse"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/v1/engines/refresh-models": {
+            "post": {
+                "summary": "Refresh Models",
+                "description": "Refresh local files and get all filenames of base model and lora",
+                "operationId": "refresh_models_v1_engines_refresh_models_post",
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/AllModelNamesResponse"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/v1/engines/styles": {
+            "get": {
+                "summary": "All Styles",
+                "description": "Get all legal Fooocus styles",
+                "operationId": "all_styles_v1_engines_styles_get",
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array",
+                                    "title": "Response All Styles V1 Engines Styles Get"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
     },
     "components": {
         "schemas": {
+            "AllModelNamesResponse": {
+                "properties": {
+                    "model_filenames": {
+                        "items": {
+                            "type": "string"
+                        },
+                        "type": "array",
+                        "title": "Model Filenames"
+                    },
+                    "lora_filenames": {
+                        "items": {
+                            "type": "string"
+                        },
+                        "type": "array",
+                        "title": "Lora Filenames"
+                    }
+                },
+                "type": "object",
+                "required": [
+                    "model_filenames",
+                    "lora_filenames"
+                ],
+                "title": "AllModelNamesResponse"
+            },
             "AspectRatio": {
                 "type": "string",
                 "enum": [

fooocus_api_version.py

@@ -1 +1 @@
-version = '0.2.2'
+version = '0.2.4'

fooocusapi/api.py

@@ -3,7 +3,7 @@
 from fastapi.params import File
 import uvicorn
 from fooocusapi.api_utils import generation_output, req_to_params
-from fooocusapi.models import AsyncJobResponse, GeneratedImageBase64, ImgInpaintOrOutpaintRequest, ImgPromptRequest, ImgUpscaleOrVaryRequest, JobQueueInfo, Text2ImgRequest
+from fooocusapi.models import AllModelNamesResponse, AsyncJobResponse, GeneratedImageBase64, ImgInpaintOrOutpaintRequest, ImgPromptRequest, ImgUpscaleOrVaryRequest, JobQueueInfo, Text2ImgRequest
 from fooocusapi.parameters import GenerationFinishReason, ImageGenerationResult
 from fooocusapi.task_queue import TaskType
 from fooocusapi.worker import process_generate, task_queue
@@ -152,6 +152,24 @@ def job_queue():
     return JobQueueInfo(running_size=len(task_queue.queue), finished_size=len(task_queue.history), last_job_id=task_queue.last_seq)
 
 
+@app.get("/v1/engines/all-models", response_model=AllModelNamesResponse, description="Get all filenames of base model and lora")
+def all_models():
+    import modules.path as path
+    return AllModelNamesResponse(model_filenames=path.model_filenames, lora_filenames=path.lora_filenames)
+
+
+@app.post("/v1/engines/refresh-models", response_model=AllModelNamesResponse, description="Refresh local files and get all filenames of base model and lora")
+def refresh_models():
+    import modules.path as path
+    path.update_all_model_names()
+    return AllModelNamesResponse(model_filenames=path.model_filenames, lora_filenames=path.lora_filenames)
+
+
+@app.get("/v1/engines/styles", response_model=List[str], description="Get all legal Fooocus styles")
+def all_styles():
+    from modules.sdxl_styles import legal_style_names
+    return legal_style_names
+
 def start_app(args):
     uvicorn.run("fooocusapi.api:app", host=args.host,
                 port=args.port, log_level=args.log_level)

fooocusapi/models.py

@@ -367,4 +367,9 @@ class AsyncJobResponse(BaseModel):
 class JobQueueInfo(BaseModel):
     running_size: int = Field(description="The current running and waiting job count")
     finished_size: int = Field(description="Finished job cound (after auto clean)")
-    last_job_id: int = Field(description="Last submit generation job id")
+    last_job_id: int = Field(description="Last submit generation job id")
+
+
+class AllModelNamesResponse(BaseModel):
+    model_filenames: List[str]
+    lora_filenames: List[str]