restoring some stuff back to normal

Author: webcoderz

modules/api/api.py

@@ -16,9 +16,6 @@
 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,9 +33,7 @@
 import piexif
 import piexif.helper
 from contextlib import closing
-from ray import serve
 
-app = FastAPI()
 
 def script_name_to_index(name, scripts):
     try:
@@ -202,29 +197,18 @@ 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):
-        initialize.initialize()
+    def __init__(self, app: FastAPI, queue_lock: Lock):
         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()
-        
-        
-        
-        print("API initialized")
+        self.app = app
+        self.queue_lock = queue_lock
+        api_middleware(self.app)
         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)
         self.add_api_route("/sdapi/v1/extra-single-image", self.extras_single_image_api, methods=["POST"], response_model=models.ExtrasSingleImageResponse)
@@ -268,7 +252,6 @@ def __init__(self):
         self.default_script_arg_txt2img = []
         self.default_script_arg_img2img = []
 
-
     def add_api_route(self, path: str, endpoint, **kwargs):
         if shared.cmd_opts.api_auth:
             return self.app.add_api_route(path, endpoint, dependencies=[Depends(self.auth)], **kwargs)
@@ -802,4 +785,3 @@ def restart_webui(self):
     def stop_webui(request):
         shared.state.server_command = "stop"
         return Response("Stopping.")
-

modules/shared_items.py

@@ -120,4 +120,4 @@ def __reduce__(self):
         # The arguments are the current values of the sd_model property
         return (self.__class__, (self.sd_model,))
 
-#sys.modules['modules.shared'].__class__ = Shared
+sys.modules['modules.shared'].__class__ = Shared

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"
+export COMMANDLINE_ARGS="--data-dir sd-data --allow-code --administrator --precision full --no-half --xformers --api --enable-insecure-extension-access --cors-allow-origins * --listen"
 
 # python3 executable
 #python_cmd="python3"

webui.py

@@ -19,8 +19,8 @@ def create_api(app):
     from modules.api.api import Api
     from modules.call_queue import queue_lock
 
-    api = Api(app)
-    #api = Api(app, queue_lock)
+    
+    api = Api(app, queue_lock)
     return api