Update launch.py

launch.py

@@ -1,70 +1,73 @@
-import subprocess
-import sys
-import logging
 import os
-import binascii  # 用于将文本转换为十六进制
-import re  # 用于正则表达式
+import subprocess
+from modules import launch_utils
+import pyngrok
+from pathlib import Path
+
 
-# 检查是否存在 logs_run.txt 文件，如果存在则删除它
-log_file = '/bushu/logs_run.txt'
-if os.path.exists(log_file):
-    os.remove(log_file)
+#ngrok穿透
+ngrok_use = True
+ngrokTokenFile='/bushu/Authtoken.txt' # 非必填 存放ngrokToken的文件的路径
 
-# 检查是否存在 url.txt 文件，如果存在则删除它
-url_file = '/bushu/url.txt'
-if os.path.exists(url_file):
-    os.remove(url_file)
+#ngrok
+def ngrok_start(ngrokTokenFile: str, port: int, address_name: str, should_run: bool):
+    if not should_run:
+        print('Skipping ngrok start')
+        return
+    if Path(ngrokTokenFile).exists():
+        with open(ngrokTokenFile, encoding="utf-8") as nkfile:
+            ngrokToken = nkfile.readline()
+        print('use nrgok')
+        from pyngrok import conf, ngrok
+        conf.get_default().auth_token = ngrokToken
+        conf.get_default().monitor_thread = False
+        ssh_tunnels = ngrok.get_tunnels(conf.get_default())
+        if len(ssh_tunnels) == 0:
+            ssh_tunnel = ngrok.connect(port, bind_tls=True)
+            print(f'{address_name}：' + ssh_tunnel.public_url)
+        else:
+            print(f'{address_name}：' + ssh_tunnels[0].public_url)
+    else:
+        print('skip start ngrok')
 
-# 配置日志
-logging.basicConfig(filename=log_file, level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
 
-# 创建一个将输出同时发送到控制台和日志文件的处理程序
-console_handler = logging.StreamHandler(sys.stdout)
-console_handler.setLevel(logging.INFO)
-formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-console_handler.setFormatter(formatter)
-logging.getLogger().addHandler(console_handler)
+args = launch_utils.args
+python = launch_utils.python
+git = launch_utils.git
+index_url = launch_utils.index_url
+dir_repos = launch_utils.dir_repos
 
-# 重定向标准输出和标准错误到日志文件和控制台
-sys.stdout = logging.getLogger().handlers[0].stream
-sys.stderr = logging.getLogger().handlers[0].stream
+commit_hash = launch_utils.commit_hash
+git_tag = launch_utils.git_tag
 
-# 更改当前工作目录为 /bushu/ui
-os.chdir('/bushu/ui')
+run = launch_utils.run
+is_installed = launch_utils.is_installed
+repo_dir = launch_utils.repo_dir
 
-try:
-    # 在 try 块中运行 /bushu/ui/launch.py，并将输出重定向到日志文件
-    with open(log_file, 'a') as log_file_handle, open(url_file, 'a') as url_file_handle:
-        process = subprocess.Popen(['python', '/bushu/ui/launch.py', '--port 8081'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True)
+run_pip = launch_utils.run_pip
+check_run_python = launch_utils.check_run_python
+git_clone = launch_utils.git_clone
+git_pull_recursive = launch_utils.git_pull_recursive
+list_extensions = launch_utils.list_extensions
+run_extension_installer = launch_utils.run_extension_installer
+prepare_environment = launch_utils.prepare_environment
+configure_for_tests = launch_utils.configure_for_tests
+start = launch_utils.start
 
-        url_pattern = re.compile(r'https?://\S+')
+def run_command(command):
+    subprocess.run(command, shell=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
-        for line in process.stdout:
-            if "Public" in line or "Application" in line:
-                # 将包含 "Public" 或 "Application" 的行转换为十六进制并写入 url.txt
-                hex_line = binascii.hexlify(line.encode()).decode()
-                url_file_handle.write(hex_line + '\n')
-            else:
-                # 查找行中的 URL 地址并将匹配的行转换为十六进制后写入 url.txt
-                urls = url_pattern.findall(line)
-                if urls:
-                    for url in urls:
-                        hex_url = binascii.hexlify(url.encode()).decode()
-                        url_file_handle.write(hex_url + '\n')
+def main():
+    ngrok_start(ngrokTokenFile,7860,'use ngrok',ngrok_use)
+    if not args.skip_prepare_environment:
+        launch_utils.prepare_environment()
+        run_command(f"""sed -i -e ''"s/dict()))/dict())).cuda()/g"'' /bushu/ui/repositories/stable-diffusion-stability-ai/ldm/util.py""")
+        run_command(f"""sed -i -e ''"s/stable/dict()))/dict())).cuda()/g"'' /bushu/ui/repositories/diffusion-stability-stable/ldm/util.py""")
 
-                # 将其他行写入日志文件
-                log_file_handle.write(line)
-                log_file_handle.flush()
+    if args.test_server:
+        launch_utils.configure_for_tests()
 
-        process.wait()
+    launch_utils.start()
 
-except subprocess.CalledProcessError as e:
-    # 捕获异常并记录到日志文件
-    logging.exception(f"程序发生异常: {e}")
-except Exception as e:
-    # 捕获其他异常并记录到日志文件
-    logging.exception(f"程序发生异常: {e}")
-finally:
-    # 最后，关闭日志处理程序，以确保所有日志都被写入到日志文件
-    logging.getLogger().removeHandler(console_handler)
-    console_handler.close()
+if __name__ == "__main__":
+    main()