clearing up standalone api

Author: graemeniedermayer

main.py

@@ -29,6 +29,7 @@ def maybe_chdir():
     parser = argparse.ArgumentParser()
     parser.add_argument("--share", help="Create public link", action='store_true')
     parser.add_argument("--listen", help="Create public link", action='store_true')
+    parser.add_argument("--api", help="start-up api", action='store_true')
     parser.add_argument("--no_chdir", help="Do not try to use the root of stable-diffusion-webui", action='store_true')
     args = parser.parse_args()
 
@@ -37,4 +38,18 @@ def maybe_chdir():
         maybe_chdir()
     server_name = "0.0.0.0" if args.listen else None
     import src.common_ui
-    src.common_ui.on_ui_tabs().launch(share=args.share, server_name=server_name)
+
+    ui_block = src.common_ui.on_ui_tabs()
+    
+    if args.api is not True:
+        ui_block.launch(share=args.share, server_name=server_name)
+    else:
+        app, _, _ = ui_block.launch(share=args.share, server_name=server_name, prevent_thread_lock=True)
+        print(f"starting depth api")
+        from src.api.api_standalone import init_api
+        init_api(ui_block, app)
+        while True:
+            pass
+
+
+    

src/api/api_core.py

@@ -66,7 +66,7 @@ def api_gen(input_images, client_options):
     #TODO try-catch type errors here
     for key, value in client_options.items():
         if key == "model_type":
-            default_options[key] = models_to_index(value)
+            default_options[key] = models_to_index[value]
             continue
         default_options[key] = value
 

src/api/api_routes.py

@@ -13,8 +13,9 @@
 from src.common_constants import GenerationOptions as go
 from src.misc import SCRIPT_VERSION
 from src.api.api_constants import api_options, models_to_index
-from api.api_core import api_gen, encode_to_base64
+from src.api.api_core import api_gen, encode_to_base64
 
+# gr.Blocks is needed for auto1111 extensions
 def depth_api(_: gr.Blocks, app: FastAPI):
     @app.get("/depth/version")
     async def version():

src/api/api_standalone.py

@@ -0,0 +1,22 @@
+from fastapi import FastAPI
+import uvicorn
+from fastapi import FastAPI
+from src.api.api_routes import depth_api
+
+import gradio as gr
+
+#TODO very primitive
+
+#TODO add CORS
+
+#TODO enable easy SSL. right now completely unsecured.
+
+def init_api_no_webui():
+    app = FastAPI()
+    print("setting up endpoints")
+    depth_api( gr.Blocks(), app)
+    uvicorn.run('src.api.api_standalone:depth_api', port=7860, host="127.0.0.1")
+
+def init_api(block, app):
+    print("setting up endpoints")
+    depth_api( block, app)