getting closer i think

Author: webcoderz

Diff for: launch.py

@@ -22,6 +22,7 @@
 prepare_environment = launch_utils.prepare_environment
 configure_for_tests = launch_utils.configure_for_tests
 start = launch_utils.start
+ray = launch_utils.ray
 
 
 def main():
@@ -44,5 +45,24 @@ def main():
     start()
 
 
+def ray_launch():
+    if args.dump_sysinfo:
+        filename = launch_utils.dump_sysinfo()
+
+        print(f"Sysinfo saved as {filename}. Exiting...")
+
+        exit(0)
+
+    launch_utils.startup_timer.record("initial startup")
+
+    with launch_utils.startup_timer.subcategory("prepare environment"):
+        if not args.skip_prepare_environment:
+            prepare_environment()
+
+    if args.test_server:
+        configure_for_tests()
+
+    ray()
+
 if __name__ == "__main__":
     main()

Diff for: modules/api/ray.py

@@ -9,10 +9,6 @@
 
 
 
-initialize.imports()
-
-initialize.check_versions()
-
 ray.init()
 #ray.init("ray://localhost:10001")
 
@@ -24,23 +20,40 @@
         "per worker. Ignore this if your cluster auto-scales."
     )
 
-initialize.initialize()
 app = FastAPI()
-initialize_util.setup_middleware(app)
-
-
-api = Api(app)
-
-script_callbacks.before_ui_callback()
-script_callbacks.app_started_callback(None, app)
-
-
 
 @serve.deployment(
     ray_actor_options={"num_gpus": 1},
     num_replicas=NUM_REPLICAS,
 )
-@serve.ingress(api)
+@serve.ingress(app)
 class APIIngress(Api):
     def __init__(self, *args, **kwargs) -> None:
+        from launch import ray_launch
+        #from modules import sd_samplers
+        ray_launch()
+        #sd_samplers.set_samplers()
+        initialize.imports()
+        initialize.check_versions()
+
+        initialize.initialize()
+        app = FastAPI()
+        initialize_util.setup_middleware(app)
+
+
+        api = Api(app)
+
+        script_callbacks.before_ui_callback()
+        script_callbacks.app_started_callback(None, app)
+
+        print(f"Startup time: {startup_timer.summary()}.")
+        api.launch(
+            server_name="0.0.0.0" if cmd_opts.listen else "127.0.0.1",
+            port=cmd_opts.port if cmd_opts.port else 7861,
+            root_path=f"/{cmd_opts.subpath}" if cmd_opts.subpath else ""
+        )
+
         super().__init__(*args, **kwargs)
+
+
+

Diff for: modules/launch_utils.py

@@ -438,6 +438,12 @@ def start():
         webui.webui()
 
 
+def ray():
+    print(f"Launching {'API server' if '--nowebui' or '--ray' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")
+    import webui
+    webui.ray_only()
+
+
 def dump_sysinfo():
     from modules import sysinfo
     import datetime

Diff for: modules/sd_samplers.py

@@ -56,4 +56,4 @@ def visible_sampler_names():
     return [x.name for x in samplers if x.name not in samplers_hidden]
 
 
-set_samplers()
+#set_samplers()

Diff for: webui-user.sh

@@ -11,7 +11,7 @@
 
 # Commandline arguments for webui.py, for example: export COMMANDLINE_ARGS="--medvram --opt-split-attention"
 #export COMMANDLINE_ARGS=""
-export COMMANDLINE_ARGS="--data-dir sd-data --allow-code --administrator --precision full --no-half --xformers --api --enable-insecure-extension-access --cors-allow-origins * --listen --ray" #--ray
+export COMMANDLINE_ARGS="--data-dir sd-data --allow-code --administrator --precision full --no-half --xformers --api --enable-insecure-extension-access --cors-allow-origins * --listen --ray"
 
 # python3 executable
 #python_cmd="python3"