From a759384cb968fe33236b3dfe9bb9d2ecd7975d02 Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 6 Nov 2024 16:55:02 +0200 Subject: [PATCH] UPD --- .gitignore | 3 +++ LaunchFile/app.py | 14 ++++++++------ "RequirementsFiles/requirements-\320\241PU.txt" | 2 +- RequirementsFiles/requirements.txt | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 765a2d99..e4bf153e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ .idea/ +idea/ .venv/ +venv/ .gitignore/ +gitignore/ TechnicalFiles/pip_cache/ TechnicalFiles/cache/ TechnicalFiles/temp/ diff --git a/LaunchFile/app.py b/LaunchFile/app.py index 42095751..b94b2481 100644 --- a/LaunchFile/app.py +++ b/LaunchFile/app.py @@ -19,6 +19,12 @@ temp_dir = os.path.join("TechnicalFiles/temp") os.makedirs(temp_dir, exist_ok=True) os.environ["TMPDIR"] = temp_dir +unet_path = os.path.join("inputs/image/sd_models/rembg") +os.makedirs(unet_path, exist_ok=True) +os.environ["U2NET_HOME"] = unet_path +roop_path = os.path.join("ThirdPartyRepository/insightface_models") +os.makedirs(roop_path, exist_ok=True) +os.environ["insightface"] = roop_path sys.modules['triton'] = None from threading import Thread import gradio as gr @@ -512,10 +518,6 @@ def parse_pdf(pdf_path): def remove_bg(src_img_path, out_img_path): - model_path = "inputs/image/sd_models/rembg" - os.makedirs(model_path, exist_ok=True) - - os.environ["U2NET_HOME"] = model_path with open(src_img_path, "rb") as input_file: input_data = input_file.read() @@ -6219,7 +6221,7 @@ def generate_image_ip_adapter_faceid(prompt, negative_prompt, face_image, s_scal torch_dtype = torch.float32 variant = "fp32" - app = FaceAnalysis(name="buffalo_l", providers=['CUDAExecutionProvider', 'CPUExecutionProvider']) + app = FaceAnalysis(name="buffalo_l", root=roop_path, providers=['CUDAExecutionProvider', 'CPUExecutionProvider']) app.prepare(ctx_id=0, det_size=(640, 640)) image = cv2.imread(face_image) @@ -11315,7 +11317,7 @@ def create_footer(): 🦙 llama-cpp-python: 0.3.1 🖼️ stable-diffusion-cpp-python: 0.2.1 🎵 rvc-python: 0.1.5 - ℹ️ gradio: 5.4.0 + ℹ️ gradio: 5.5.0 """ return gr.Markdown(footer_html) diff --git "a/RequirementsFiles/requirements-\320\241PU.txt" "b/RequirementsFiles/requirements-\320\241PU.txt" index 21e7d548..7b5bda6d 100644 --- "a/RequirementsFiles/requirements-\320\241PU.txt" +++ "b/RequirementsFiles/requirements-\320\241PU.txt" @@ -84,7 +84,7 @@ gitdb==4.0.11 GitPython==3.1.43 google-pasta==0.2.0 gpytoolbox==0.3.2 -gradio==5.4.0 +gradio==5.5.0 gradio_client==1.4.2 grpcio==1.62.2 gruut==2.2.3 diff --git a/RequirementsFiles/requirements.txt b/RequirementsFiles/requirements.txt index 3043f0d6..44c81727 100644 --- a/RequirementsFiles/requirements.txt +++ b/RequirementsFiles/requirements.txt @@ -86,7 +86,7 @@ GitPython==3.1.43 google-pasta==0.2.0 GPUtil==1.4.0 gpytoolbox==0.3.2 -gradio==5.4.0 +gradio==5.5.0 gradio_client==1.4.2 grpcio==1.62.2 gruut==2.2.3