update docker and progress monitoring

Signed-off-by: Vladimir Mandic <mandic00@live.com>

modules/api/api.py

@@ -38,6 +38,7 @@ class Api:
         self.add_api_route("/sdapi/v1/log", server.get_log_buffer, methods=["GET"], response_model=List[str])
         self.add_api_route("/sdapi/v1/start", self.get_session_start, methods=["GET"])
         self.add_api_route("/sdapi/v1/version", server.get_version, methods=["GET"])
+        self.add_api_route("/sdapi/v1/status", server.get_status, methods=["GET"], response_model=models.ResStatus)
         self.add_api_route("/sdapi/v1/platform", server.get_platform, methods=["GET"])
         self.add_api_route("/sdapi/v1/progress", server.get_progress, methods=["GET"], response_model=models.ResProgress)
         self.add_api_route("/sdapi/v1/interrupt", server.post_interrupt, methods=["POST"])

modules/api/models.py

@@ -300,6 +300,23 @@ class ResProgress(BaseModel):
     current_image: str = Field(default=None, title="Current image", description="The current image in base64 format. opts.show_progress_every_n_steps is required for this to work.")
     textinfo: str = Field(default=None, title="Info text", description="Info text used by WebUI.")
 
+class ResStatus(BaseModel):
+    status: str = Field(title="Status", description="Current status")
+    task: str = Field(title="Task", description="Current task")
+    timestamp: Optional[str] = Field(title="Timestamp", description="Timestamp of the current job")
+    id: str = Field(title="ID", description="ID of the current task")
+    job: int = Field(title="Job", description="Current job")
+    jobs: int = Field(title="Jobs", description="Total jobs")
+    total: int = Field(title="Total Jobs", description="Total jobs")
+    step: int = Field(title="Step", description="Current step")
+    steps: int = Field(title="Steps", description="Total steps")
+    queued: int = Field(title="Queued", description="Number of queued tasks")
+    uptime: int = Field(title="Uptime", description="Uptime of the server")
+    elapsed: Optional[float] = Field(title="Elapsed time")
+    eta: Optional[float] = Field(title="ETA in secs")
+    progress: Optional[float] = Field(title="Progress", description="The progress with a range of 0 to 1")
+
+
 class ReqInterrogate(BaseModel):
     image: str = Field(default="", title="Image", description="Image to work on, must be a Base64 string containing the image's data.")
     clip_model: str = Field(default="", title="CLiP Model", description="The interrogate model used.")

modules/api/server.py

@@ -1,3 +1,4 @@
+import time
 from typing import Any, Dict
 from fastapi import Depends
 from modules import shared
@@ -66,7 +67,6 @@ def get_cmd_flags():
     return vars(shared.cmd_opts)
 
 def get_progress(req: models.ReqProgress = Depends()):
-    import time
     if shared.state.job_count == 0:
         return models.ResProgress(progress=0, eta_relative=0, state=shared.state.dict(), textinfo=shared.state.textinfo)
     shared.state.do_set_current_image()
@@ -85,6 +85,9 @@ def get_progress(req: models.ReqProgress = Depends()):
     res = models.ResProgress(progress=progress, eta_relative=eta_relative, state=shared.state.dict(), current_image=current_image, textinfo=shared.state.textinfo)
     return res
 
+def get_status():
+    return shared.state.status()
+
 def post_interrupt():
     shared.state.interrupt()
     return {}