feat: 加入完整的版本更新功能

ChuanhuChatbot.py

@@ -13,6 +13,7 @@ from modules.utils import *
 from modules.presets import *
 from modules.overwrites import *
 from modules.webui import *
+from modules.repo import *
 from modules.models.models import get_model
 
 logging.getLogger("httpx").setLevel(logging.WARNING)
@@ -42,7 +43,7 @@ with gr.Blocks(theme=small_and_beautiful_theme) as demo:
     with gr.Row(elem_id="float-display"):
         user_info = gr.Markdown(value="getting user info...", elem_id="user-info")
         update_info = gr.HTML(get_html("update.html").format(
-            current_version=repo_html(),
+            current_version=repo_tag_html(),
             version_time=version_time(),
             cancel_btn=i18n("取消"),
             update_btn=i18n("更新"),

modules/repo.py

@@ -0,0 +1,215 @@
+# -*- coding:utf-8 -*-
+import os
+import sys
+import subprocess
+from functools import lru_cache
+import logging
+import gradio as gr
+import datetime
+
+# This file is mainly used to describe repo version info, execute the git command, python pip command, shell command, etc.
+# Part of the code in this file is referenced from stable-diffusion-webui/modules/launch_utils.py
+
+python = sys.executable
+pip = os.environ.get('PIP', "pip")
+git = os.environ.get('GIT', "git")
+
+# Pypi index url
+index_url = os.environ.get('INDEX_URL', "")
+
+# Whether to default to printing command output
+default_command_live = True
+
+
+def run(command, desc=None, errdesc=None, custom_env=None, live: bool = default_command_live) -> str:
+    if desc is not None:
+        print(desc)
+    run_kwargs = {
+        "args": command,
+        "shell": True,
+        "env": os.environ if custom_env is None else custom_env,
+        "encoding": 'utf8',
+        "errors": 'ignore',
+    }
+
+    if not live:
+        run_kwargs["stdout"] = run_kwargs["stderr"] = subprocess.PIPE
+
+    result = subprocess.run(**run_kwargs)
+    if result.returncode != 0:
+        error_bits = [
+            f"{errdesc or 'Error running command'}.",
+            f"Command: {command}",
+            f"Error code: {result.returncode}",
+        ]
+        if result.stdout:
+            error_bits.append(f"stdout: {result.stdout}")
+        if result.stderr:
+            error_bits.append(f"stderr: {result.stderr}")
+        raise RuntimeError("\n".join(error_bits))
+
+    return (result.stdout or "")
+
+
+def run_pip(command, desc=None, live=default_command_live):
+    # if args.skip_install:
+    #     return
+
+    index_url_line = f' --index-url {index_url}' if index_url != '' else ''
+    return run(
+        f'"{python}" -m pip {command} --prefer-binary{index_url_line}', 
+        desc=f"Installing {desc}...", 
+        errdesc=f"Couldn't install {desc}", 
+        live=live
+    )
+
+
+@lru_cache()
+def commit_hash():
+    try:
+        return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()
+    except Exception:
+        return "<none>"
+
+def commit_html():
+    commit = commit_hash()
+    if commit != "<none>":
+        short_commit = commit[0:7]
+        commit_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/commit/{short_commit}">{short_commit}</a>'
+    else:
+        commit_info = "unknown \U0001F615"
+    return commit_info
+
+@lru_cache()
+def tag_html():
+    try:
+        latest_tag = run(f"{git} describe --tags --abbrev=0", live=False).strip()
+        try:
+            # tag = subprocess.check_output([git, "describe", "--tags", "--exact-match"], shell=False, encoding='utf8').strip()
+            tag = run(f"{git} describe --tags --exact-match", live=False).strip()
+        except Exception: 
+            tag = "<edited>"
+    except Exception:
+        tag = "<none>"
+
+    if tag == "<none>":
+        tag_info = "unknown \U0001F615"
+    elif tag == "<edited>":
+        tag_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/releases/tag/{latest_tag}">{latest_tag}</a><span style="font-size:smaller">*</span>'
+    else:
+        tag_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/releases/tag/{tag}">{tag}</a>'
+ 
+    return tag_info
+
+def repo_tag_html():
+    commit_version = commit_html()
+    tag_version = tag_html()
+    return tag_version if tag_version != "unknown \U0001F615" else commit_version
+
+def versions_html():
+    python_version = ".".join([str(x) for x in sys.version_info[0:3]])
+    repo_version = repo_tag_html()
+    return f"""
+        Python: <span title="{sys.version}">{python_version}</span>
+         • 
+        Gradio: {gr.__version__}
+         • 
+        <a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT">ChuanhuChat</a>: {repo_version}
+        """
+
+def version_time():
+    try:
+        commit_time = subprocess.check_output(f"TZ=UTC {git} log -1 --format=%cd --date='format-local:%Y-%m-%dT%H:%M:%SZ'", shell=True, encoding='utf8').strip()
+        # commit_time = run(f"TZ=UTC {git} log -1 --format=%cd --date='format-local:%Y-%m-%dT%H:%M:%SZ'").strip()
+    except Exception:
+        commit_time = "unknown"
+    return commit_time
+
+
+
+def get_current_branch():
+    try:
+        # branch = run(f"{git} rev-parse --abbrev-ref HEAD").strip()
+        branch = subprocess.check_output([git, "rev-parse", "--abbrev-ref", "HEAD"], shell=False, encoding='utf8').strip()
+    except Exception:
+        branch = "<none>"
+    return branch
+
+
+def get_latest_release():
+    try:
+        import requests
+        release = requests.get("https://api.github.com/repos/GaiZhenbiao/ChuanhuChatGPT/releases/latest").json()
+        tag = release["tag_name"]
+        release_note = release["body"]
+        need_pip = release_note.find("requirements reinstall needed") != -1
+    except Exception:
+        tag = "<none>"
+        release_note = ""
+        need_pip = False
+    return {"tag": tag, "release_note": release_note, "need_pip": need_pip}
+
+def get_tag_commit_hash(tag):
+    try:
+        import requests
+        tags = requests.get("https://api.github.com/repos/GaiZhenbiao/ChuanhuChatGPT/tags").json()
+        commit_hash = [x["commit"]["sha"] for x in tags if x["name"] == tag][0]
+    except Exception:
+        commit_hash = "<none>"
+    return commit_hash
+
+def background_update():
+    # {git} fetch --all && ({git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f || ({git} stash && {git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f && {git} stash pop)) && {pip} install -r requirements.txt")
+    try:
+        latest_release = get_latest_release()
+        latest_release_tag = latest_release["tag"]
+        latest_release_hash = get_tag_commit_hash(latest_release_tag)
+        need_pip = latest_release["need_pip"]
+
+        current_branch = get_current_branch()
+        updater_branch = f'tmp_{datetime.datetime.now().strftime("%Y%m%d%H%M%S")}'
+        track_repo = "https://github.com/GaiZhenbiao/ChuanhuChatGPT.git"
+        try:
+            try:
+                run(f"{git} fetch {track_repo}", desc="Fetching from github...", live=False)
+            except Exception:
+                logging.error(f"Update failed in fetching")
+                return "failed"
+            
+            run(f'{git} stash save -a "updater-tmp"')
+
+            run(f"{git} checkout -b {updater_branch}", live=False)
+            run(f"{git} reset --hard FETCH_HEAD", live=False)
+            run(f"{git} reset --hard {latest_release_hash}", desc=f'Checking out {latest_release_tag}...')
+            run(f"{git} checkout {current_branch}", live=False)
+            
+            try:
+                run(f"{git} merge {updater_branch} -q", desc="Trying to apply latest update...")
+            except Exception:
+                logging.error(f"Update failed in merging")
+                try:
+                    run(f"{git} merge --abort", desc="Canceling update...")
+                    run(f"{git} reset --hard {current_branch}", live=False)
+                    run(f"{git} stash pop", live=False)
+                    run(f"{git} branch -D -f {updater_branch}", live=False)
+                    logging.error(f"Update failed, but your file was safely reset to the state before the update.")
+                    return "failed"
+                except Exception as e:
+                    logging.error(f"!!!Update failed in resetting, try to reset your files manually.")
+                    return "failed"
+                
+            run(f"{git} stash pop", live=False)
+            run(f"{git} branch -D -f {updater_branch}", live=False)
+        except Exception as e:
+            logging.error(f"Update failed: {e}")
+            return "failed"
+        if need_pip:
+            try: 
+                run_pip(f"install -r requirements.txt", "requirements") 
+            except Exception:
+                logging.error(f"Update failed in pip install")
+                return "failed"
+        return "success"
+    except Exception as e:
+        logging.error(f"Update failed: {e}")
+        return "failed" 

modules/utils.py

@@ -539,88 +539,16 @@ def transfer_input(inputs):
     )
 
 
-
-def run(command, desc=None, errdesc=None, custom_env=None, live=False):
-    if desc is not None:
-        print(desc)
-    if live:
-        result = subprocess.run(command, shell=True, env=os.environ if custom_env is None else custom_env)
-        if result.returncode != 0:
-            raise RuntimeError(f"""{errdesc or 'Error running command'}.
-                Command: {command}
-                Error code: {result.returncode}""")
-
-        return ""
-    result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, env=os.environ if custom_env is None else custom_env)
-    if result.returncode != 0:
-        message = f"""{errdesc or 'Error running command'}.
-            Command: {command}
-            Error code: {result.returncode}
-            stdout: {result.stdout.decode(encoding="utf8", errors="ignore") if len(result.stdout)>0 else '<empty>'}
-            stderr: {result.stderr.decode(encoding="utf8", errors="ignore") if len(result.stderr)>0 else '<empty>'}
-            """
-        raise RuntimeError(message)
-    return result.stdout.decode(encoding="utf8", errors="ignore")
-
-def commit_html():
-    git = os.environ.get('GIT', "git")
-    try:
-        commit_hash = run(f"{git} rev-parse HEAD").strip()
-    except Exception:
-        commit_hash = "<none>"
-    if commit_hash != "<none>":
-        short_commit = commit_hash[0:7]
-        commit_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/commit/{short_commit}">{short_commit}</a>'
-    else:
-        commit_info = "unknown \U0001F615"
-    return commit_info
-
-def tag_html():
-    git = os.environ.get('GIT', "git")
-    try:
-        tag = run(f"{git} describe --tags --exact-match").strip()
-    except Exception:
-        tag = "<none>"
-    if tag != "<none>":
-        tag_info = f'<a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT/releases/tag/{tag}">{tag}</a>'
-    else:
-        tag_info = "unknown \U0001F615"
-    return tag_info
-
-def repo_html():
-    commit_version = commit_html()
-    tag_version = tag_html()
-    return tag_version if tag_version != "unknown \U0001F615" else commit_version
-
-def versions_html():
-    python_version = ".".join([str(x) for x in sys.version_info[0:3]])
-    repo_version = repo_html()
-    return f"""
-        Python: <span title="{sys.version}">{python_version}</span>
-         • 
-        Gradio: {gr.__version__}
-         • 
-        <a style="text-decoration:none;color:inherit" href="https://github.com/GaiZhenbiao/ChuanhuChatGPT">ChuanhuChat</a>: {repo_version}
-        """
-
-def version_time():
-    git = os.environ.get('GIT', "git")
-    try:
-        commit_time = run(f"TZ=UTC {git} log -1 --format=%cd --date='format-local:%Y-%m-%dT%H:%M:%SZ'").strip()
-    except Exception:
-        commit_time = "unknown"
-    return commit_time
-
 def update_chuanhu():
-    git = os.environ.get('GIT', "git")
-    pip = os.environ.get('PIP', "pip")
-    try:
-        run(f"{git} fetch --all && ({git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f || ({git} stash && {git} pull https://github.com/GaiZhenbiao/ChuanhuChatGPT.git main -f && {git} stash pop)) && {pip} install -r requirements.txt")
-        logging.info("Successfully updated")
+    from .repo import background_update
+
+    print("Trying to update...")
+    update_status = background_update()
+    if update_status == "success":
+        print("Successfully updated, restart needed")
         status = '<span id="update-status" class="hideK">success</span>'
         return gr.Markdown.update(value=i18n("更新成功，请重启本程序")+status)
-    except Exception:
-        logging.info("Failed to update")
+    else:
         status = '<span id="update-status" class="hideK">failure</span>'
         return gr.Markdown.update(value=i18n("更新失败，请尝试[手动更新](https://github.com/GaiZhenbiao/ChuanhuChatGPT/wiki/使用教程#手动更新)")+status)
 

web_assets/javascript/updater.js

@@ -51,10 +51,13 @@ var releaseNoteElement = document.getElementById('release-note-content');
 var updatingInfoElement = document.getElementById('updating-info');
 async function updateLatestVersion() {
     const currentVersionElement = document.getElementById('current-version');
+    const reVersion = /<a[^>]*>([^<]*)<\/a>/g;
+    const versionMatch = reVersion.exec(currentVersionElement.innerHTML);
+    const currentVersion = versionMatch ? versionMatch[1] : null;
     const latestVersionElement = document.getElementById('latest-version-title');
     releaseNoteElement = document.getElementById('release-note-content');
     updatingInfoElement = document.getElementById('updating-info');
-    const currentVersion = currentVersionElement.textContent;
+    
     const versionTime = document.getElementById('version-time').innerText;
     const localVersionTime = versionTime !== "unknown" ? (new Date(versionTime)).getTime() : 0;
     updateInfoGotten = true; //无论成功与否都只执行一次，否则容易api超限...
@@ -65,18 +68,31 @@ async function updateLatestVersion() {
             releaseNoteElement.innerHTML = marked.parse(releaseNote, {mangle: false, headerIds: false});
         }
         const latestVersion = data.tag_name;
-        const latestVersionTime = (new Date(data.created_at)).getTime();
-        if (latestVersionTime) {
-            if (localVersionTime < latestVersionTime) {
+        if (currentVersion) {
+            if (latestVersion <= currentVersion) {
+                noUpdate();
+            } else {
                 latestVersionElement.textContent = latestVersion;
                 console.log(`New version ${latestVersion} found!`);
-                if (!isInIframe) {openUpdateToast();}      
-            } else {
-                noUpdate();
+                if (!isInIframe) openUpdateToast();
+            }
+        } else { //如果当前版本号获取失败，使用时间比较
+            const latestVersionTime = (new Date(data.created_at)).getTime();
+            if (latestVersionTime) {
+                if (localVersionTime == 0) {
+                    latestVersionElement.textContent = "Local version check failed. But latest revision is " + latestVersion;
+                    console.log(`New version ${latestVersion} found!`);
+                } else if (localVersionTime < latestVersionTime) {
+                    latestVersionElement.textContent = "Local version check failed, it seems to be a local rivision. But latest revision is " + latestVersion;
+                    console.log(`New version ${latestVersion} found!`);
+                    // if (!isInIframe) openUpdateToast();
+                } else {
+                    noUpdate("Local version check failed, it seems to be a local rivision. But your revision is newer than the latest release.");
+                }
             }
-            currentTime = new Date().getTime();
-            localStorage.setItem('lastCheckTime', currentTime);
         }
+        currentTime = new Date().getTime();
+        localStorage.setItem('lastCheckTime', currentTime);
     } catch (error) {
         console.error(error);
     }
@@ -124,18 +140,22 @@ function manualCheckUpdate() {
     currentTime = new Date().getTime();
     localStorage.setItem('lastCheckTime', currentTime);
 }
-function noUpdate() {
+function noUpdate(message="") {
     localStorage.setItem('isLatestVersion', 'true');
     isLatestVersion = true;
-    noUpdateHtml();
+    noUpdateHtml(message);
 }
-function noUpdateHtml() {
+function noUpdateHtml(message="") {
     const versionInfoElement = document.getElementById('version-info-title');
     const gotoUpdateBtn = document.getElementById('goto-update-btn');
     const closeUpdateBtn = document.getElementById('close-update-btn');
     const releaseNoteWrap = document.getElementById('release-note-wrap');
     releaseNoteWrap.style.setProperty('display', 'none');
-    versionInfoElement.textContent = i18n(usingLatest_i18n)
+    if (message === "") {
+        versionInfoElement.textContent = i18n(usingLatest_i18n)
+    } else {
+        versionInfoElement.textContent = message;
+    }
     gotoUpdateBtn.classList.add('hideK');
     closeUpdateBtn.classList.remove('hideK');
 }