raypi working

Author: webcoderz

Diff for: .gitignore

@@ -40,3 +40,4 @@ notification.mp3
 
 sd-data
 modules/api/raypi2.py
+modules/api/raypi3.py

Diff for: modules/api/api.py

@@ -16,6 +16,9 @@
 from fastapi.encoders import jsonable_encoder
 from secrets import compare_digest
 
+from modules import initialize
+initialize.imports()
+
 import modules.shared as shared
 from modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing, errors, restart, shared_items
 from modules.api import models
@@ -33,7 +36,9 @@
 import piexif
 import piexif.helper
 from contextlib import closing
+from ray import serve
 
+app = FastAPI()
 
 def script_name_to_index(name, scripts):
     try:
@@ -197,18 +202,28 @@ async def http_exception_handler(request: Request, e: HTTPException):
         return handle_exception(request, e)
 
 
+api_middleware(app)
+
+
+@serve.deployment(    
+    ray_actor_options={"num_gpus": 1},
+    autoscaling_config={"min_replicas": 0, "max_replicas": 2},
+    #route_prefix="/sdapi/v1",
+    )
+@serve.ingress(app)
 class Api:
-    def __init__(self, app: FastAPI, queue_lock: Lock):
+    def __init__(self):
+        initialize.initialize()
         if shared.cmd_opts.api_auth:
             self.credentials = {}
             for auth in shared.cmd_opts.api_auth.split(","):
                 user, password = auth.split(":")
                 self.credentials[user] = password
 
         self.router = APIRouter()
-        self.app = app
-        self.queue_lock = queue_lock
-        api_middleware(self.app)
+        
+        
+        
         print("API initialized")
         self.add_api_route("/sdapi/v1/txt2img", self.text2imgapi, methods=["POST"], response_model=models.TextToImageResponse)
         self.add_api_route("/sdapi/v1/img2img", self.img2imgapi, methods=["POST"], response_model=models.ImageToImageResponse)

Diff for: modules/api/ray.py

@@ -2,14 +2,10 @@
 import ray
 from fastapi import FastAPI
 from modules.api.raypi import Raypi
-from modules import initialize_util
-from modules import script_callbacks
-from modules import initialize
+from modules.api.api import Raypi
 import time
 
-from ray.serve.handle import DeploymentHandle
-from modules.call_queue import queue_lock
-from modules.shared_cmd_options import cmd_opts
+
 
 ray.init()
 #ray.init("ray://localhost:10001")
@@ -24,23 +20,31 @@
         "per worker. Ignore this if your cluster auto-scales."
     )
 
-initialize.initialize()
 app = FastAPI()
-#app.include_router(Raypi(app).router)
-initialize_util.setup_middleware(app)
-script_callbacks.before_ui_callback()
-script_callbacks.app_started_callback(None, app)
 
+@serve.deployment(    
+    ray_actor_options={"num_gpus": 1},
+    autoscaling_config={"min_replicas": 0, "max_replicas": 2},
+    #route_prefix="/sdapi/v1",
+    )
+@serve.ingress(app)
+class RayDeployment:
+    def __init__(self):
+        pass
 
 
+# 2: Deploy the deployment.
 
 
 
 
 def ray_only():
     serve.shutdown()
     serve.start()
-    serve.run(Raypi.bind(), port=8000)  #route_prefix="/sdapi/v1" # Call the launch_ray method to get the FastAPI app
+    #Raypi.deploy()
+
+    
+    serve.run(Raypi.bind(), port=8000, route_prefix="/sdapi/v1")  #route_prefix="/sdapi/v1" # Call the launch_ray method to get the FastAPI app
 
 
     print("Done setting up replicas! Now accepting requests...")

Diff for: modules/api/raypi.py

@@ -16,6 +16,9 @@
 from fastapi.encoders import jsonable_encoder
 from secrets import compare_digest
 
+from modules import initialize
+initialize.imports()
+
 import modules.shared as shared
 from modules import sd_samplers, deepbooru, sd_hijack, images, scripts, ui, postprocessing, errors, restart, shared_items
 from modules.api import models
@@ -36,8 +39,9 @@
 
 from modules import initialize_util
 from modules import script_callbacks
-from modules import initialize
 
+
+import launch
 from ray import serve
 
 app = FastAPI()
@@ -203,20 +207,31 @@ async def fastapi_exception_handler(request: Request, e: Exception):
     async def http_exception_handler(request: Request, e: HTTPException):
         return handle_exception(request, e)
 
-@serve.deployment(
-                  ray_actor_options={"num_gpus": 1},
-                  autoscaling_config={"min_replicas": 0, "max_replicas": 2},
-                 )
+
+api_middleware(app)
+
+@serve.deployment(    
+    ray_actor_options={"num_gpus": 1},
+    autoscaling_config={"min_replicas": 0, "max_replicas": 2},
+    #route_prefix="/sdapi/v1",
+    )
 @serve.ingress(app)
 class Raypi:
     def __init__(self):
+        print("Initializing API")
+        initialize.initialize()
+        print("preparing env")
+        launch.prepare_environment()
+        #app.include_router(Raypi(app).router)      
+              
         if shared.cmd_opts.api_auth:
             self.credentials = {}
             for auth in shared.cmd_opts.api_auth.split(","):
                 user, password = auth.split(":")
                 self.credentials[user] = password
-        
-        
+        print("preparing env")
+        launch.prepare_environment()
+     
         print("API initialized")
 
         self.default_script_arg_txt2img = []
@@ -785,7 +800,3 @@ def restart_webui(self):
     def stop_webui(request):
         shared.state.server_command = "stop"
         return Response("Stopping.")
-
-    def launch(self, server_name, port, root_path):
-        self.app.include_router(self.router)
-        uvicorn.run(self.app, host=server_name, port=port, timeout_keep_alive=shared.cmd_opts.timeout_keep_alive, root_path=root_path)

Diff for: modules/initialize.py

@@ -51,7 +51,7 @@ def initialize():
     initialize_util.fix_torch_version()
     initialize_util.fix_asyncio_event_loop_policy()
     initialize_util.validate_tls_options()
-    initialize_util.configure_sigint_handler()
+    #initialize_util.configure_sigint_handler()
     initialize_util.configure_opts_onchange()
 
     from modules import modelloader

Diff for: webui.py

@@ -24,6 +24,25 @@ def create_api(app):
     return api
 
 
+def ray_api():
+    from modules.api. ray import ray_only
+
+    from modules.shared_cmd_options import cmd_opts
+
+    launch_api = cmd_opts.api
+    initialize.initialize()
+
+    from modules import shared, ui_tempdir, script_callbacks, ui, progress, ui_extra_networks
+
+    script_callbacks.before_ui_callback()
+    startup_timer.record("scripts before_ui_callback")
+    shared.demo = ui.create_ui()
+    startup_timer.record("create ui")
+    if not cmd_opts.no_gradio_queue:
+        shared.demo.queue(64)
+    ray_only()
+
+
 def api_only():
     from fastapi import FastAPI
     from modules.shared_cmd_options import cmd_opts
@@ -156,11 +175,11 @@ 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()
     elif cmd_opts.ray:
-        ray_only()
+        ray_api()
     else:
         webui()