basic ray ingress launcher up

Author: webcoderz

Diff for: launch.py

@@ -22,7 +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,25 +44,5 @@ 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

@@ -2,16 +2,18 @@
 import ray
 from fastapi import FastAPI
 from modules.api.api import Api
-from modules.call_queue import queue_lock
+
 from modules import initialize_util
 from modules import script_callbacks
 from modules import initialize
-
+import time
 
 
 ray.init()
 #ray.init("ray://localhost:10001")
 
+
+
 NUM_REPLICAS: int = 1
 if NUM_REPLICAS > ray.available_resources()["GPU"]:
     print(
@@ -21,39 +23,25 @@
     )
 
 app = FastAPI()
+initialize_util.setup_middleware(app)
+script_callbacks.app_started_callback(None, app)
 
 @serve.deployment(
     ray_actor_options={"num_gpus": 1},
     num_replicas=NUM_REPLICAS,
 )
 @serve.ingress(app)
-class APIIngress(Api):
+class APIIngress:
     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 ""
-        )
+        pass
 
-        super().__init__(*args, **kwargs)
 
+def ray_only():
+    # Shutdown any existing Serve replicas, if they're still around.
+    serve.shutdown()
+    serve.run(APIIngress.bind(), port=8000, name="serving_stable_diffusion_template")
+    print("Done setting up replicas! Now accepting requests...")
+    while True:
+        time.sleep(1000)
 
 

Diff for: modules/launch_utils.py

@@ -430,20 +430,15 @@ def configure_for_tests():
 def start():
     print(f"Launching {'API server' if '--nowebui' or '--ray' in sys.argv else 'Web UI'} with arguments: {' '.join(sys.argv[1:])}")
     import webui
+    from modules.api.ray import ray_only
     if '--nowebui' in sys.argv:
         webui.api_only()
     elif '--ray' in sys.argv:
-        webui.ray_only()
+        ray_only()
     else:
         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: webui.py

@@ -45,15 +45,6 @@ def api_only():
         root_path=f"/{cmd_opts.subpath}" if cmd_opts.subpath else ""
     )
 
-def ray_only():
-    from modules.api.ray import APIIngress
-    from ray import serve
-
-    # Shutdown any existing Serve replicas, if they're still around.
-    serve.shutdown()
-    serve.run(APIIngress.bind(), port=8000, name="serving_stable_diffusion_template")
-    print("Done setting up replicas! Now accepting requests...")
-
 
 def webui():
     from modules.shared_cmd_options import cmd_opts
@@ -165,6 +156,7 @@ def webui():
 
 if __name__ == "__main__":
     from modules.shared_cmd_options import cmd_opts
+    from modules.api.ray import ray_only
 
     if cmd_opts.nowebui:
         api_only()