Merge pull request #13210 from AUTOMATIC1111/fetch-version-info-when-webui_dir-is-not-work_dir-

fix issues when webui_dir is not work_dir

4 files changed, 7 insertions, 6 deletions

diff --git a/modules/launch_utils.py b/modules/launch_utils.py
index 6e54d063..8cdbafa5 100644
--- a/modules/launch_utils.py
+++ b/modules/launch_utils.py
@@ -64,7 +64,7 @@ Use --skip-python-version-check to suppress this warning.
 @lru_cache()

 def commit_hash():

     try:

-        return subprocess.check_output([git, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

+        return subprocess.check_output([git, "-C", script_path, "rev-parse", "HEAD"], shell=False, encoding='utf8').strip()

     except Exception:

         return "<none>"

 

@@ -72,7 +72,7 @@ def commit_hash():
 @lru_cache()

 def git_tag():

     try:

-        return subprocess.check_output([git, "describe", "--tags"], shell=False, encoding='utf8').strip()

+        return subprocess.check_output([git, "-C", script_path, "describe", "--tags"], shell=False, encoding='utf8').strip()

     except Exception:

         try:

 

diff --git a/modules/paths.py b/modules/paths.py
index 25052339..187b9496 100644
--- a/modules/paths.py
+++ b/modules/paths.py
@@ -1,6 +1,6 @@
 import os

 import sys

-from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir  # noqa: F401

+from modules.paths_internal import models_path, script_path, data_path, extensions_dir, extensions_builtin_dir, cwd  # noqa: F401

 

 import modules.safe  # noqa: F401

 

diff --git a/modules/paths_internal.py b/modules/paths_internal.py
index 005a9b0a..89131a54 100644
--- a/modules/paths_internal.py
+++ b/modules/paths_internal.py
@@ -8,6 +8,7 @@ import shlex
 commandline_args = os.environ.get('COMMANDLINE_ARGS', "")

 sys.argv += shlex.split(commandline_args)

 

+cwd = os.getcwd()

 modules_path = os.path.dirname(os.path.realpath(__file__))

 script_path = os.path.dirname(modules_path)

 

diff --git a/modules/ui_gradio_extensions.py b/modules/ui_gradio_extensions.py
index b824b113..0d368f8b 100644
--- a/modules/ui_gradio_extensions.py
+++ b/modules/ui_gradio_extensions.py
@@ -2,12 +2,12 @@ import os
 import gradio as gr

 

 from modules import localization, shared, scripts

-from modules.paths import script_path, data_path

+from modules.paths import script_path, data_path, cwd

 

 

 def webpath(fn):

-    if fn.startswith(script_path):

-        web_path = os.path.relpath(fn, script_path).replace('\\', '/')

+    if fn.startswith(cwd):

+        web_path = os.path.relpath(fn, cwd)

     else:

         web_path = os.path.abspath(fn)