From ef9aabc847f8c0204f6360d06b2f3290cc8d34af Mon Sep 17 00:00:00 2001 From: dr413677671 <413677671@qq.com> Date: Sun, 6 Aug 2023 01:27:06 +0800 Subject: [PATCH] fix extention arg fix extension arg fi --- paste_this_to_webui_scripts_folder/prompt_gallery.py | 12 ++++++------ scripts/prompt_gallery.py | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/paste_this_to_webui_scripts_folder/prompt_gallery.py b/paste_this_to_webui_scripts_folder/prompt_gallery.py index 3ab22ae..f759c56 100644 --- a/paste_this_to_webui_scripts_folder/prompt_gallery.py +++ b/paste_this_to_webui_scripts_folder/prompt_gallery.py @@ -17,7 +17,7 @@ import io from PIL import Image import mimetypes - +from modules.paths_internal import extensions_dir mimetypes.init() mimetypes.add_type('application/javascript', '.js') @@ -35,16 +35,16 @@ else: root_path = os.path.abspath(shared.script_path) -rela_path = os.path.join( 'extensions') +rela_path = os.path.join('extensions') try: - with open( os.path.join( rela_path, 'prompt_gallery_name.json') ) as fd: + with open(os.path.join(extensions_dir, 'prompt_gallery_name.json')) as fd: extension_name = json.load(fd)['name'] except: extension_name = "Prompt Gallery" - -OUTPATH_SAMPLES = os.path.join(rela_path, extension_name, 'assets', 'preview') -OUTPATH_GRIDS = os.path.join(rela_path, extension_name, 'assets', 'grid') + +OUTPATH_SAMPLES = os.path.join(extensions_dir, extension_name, 'assets', 'preview') +OUTPATH_GRIDS = os.path.join(extensions_dir, extension_name, 'assets', 'grid') BATCH_SIZE = 2 N_ITER = 2 diff --git a/scripts/prompt_gallery.py b/scripts/prompt_gallery.py index d2d42db..f25c40c 100644 --- a/scripts/prompt_gallery.py +++ b/scripts/prompt_gallery.py @@ -7,6 +7,7 @@ import modules.ui from modules.shared import opts, cmd_opts from modules import shared, scripts +from modules.paths_internal import extensions_dir from modules import script_callbacks from pathlib import Path from typing import List, Tuple @@ -31,11 +32,11 @@ def on_ui_settings(): global pg_ip - with open("./extensions/prompt_gallery_name.json") as fd: + with open(os.path.join(extensions_dir, 'prompt_gallery_name.json')) as fd: name = json.load(fd)['name'] # os.chmod('./extensions/'+name, stat.S_IRWXO) app = FastAPI() - app.mount('/', StaticFiles(directory='./extensions/'+name,html=True)) + app.mount('/', StaticFiles(directory=extensions_dir+"/"+name,html=True)) config = Config(app=app, host=pg_ip,port=pg_port, log_level="info", loop="asyncio", limit_max_requests=1) app.add_middleware( CORSMiddleware,