Standalone mode improvements

* Make standalone mode more self-aware if installed as webui extension
* Fix commit retrieval for standalone mode if not installed as webui extension
* Improved output saving

Author: semjonsona

main.py

@@ -3,11 +3,37 @@
 # you may want to change the working directory to the stable-diffusion-webui root.
 
 import argparse
-import src.common_ui
+import os
+import pathlib
+import builtins
+
+import src.misc
+
+def maybe_chdir():
+    """Detects if DepthMap was installed as a stable-diffusion-webui script, but run without current directory set to
+    the stable-diffusion-webui root. Changes current directory if needed, to aviod clutter."""
+    try:
+        file_path = pathlib.Path(__file__)
+        path = file_path.parts
+        while len(path) > 0 and path[-1] != src.misc.REPOSITORY_NAME:
+            path = path[:-1]
+        if len(path) >= 2 and path[-1] == src.misc.REPOSITORY_NAME and path[-2] == "extensions":
+            path = path[:-2]
+        listdir = os.listdir(str(pathlib.Path(*path)))
+        if 'launch.py' in listdir and 'webui.py':
+            os.chdir(str(pathlib.Path(**path)))
+    except:
+        pass
+
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument("--listen", help="Create public link")
+    parser.add_argument("--no_chdir", help="Do not try to use the root of stable-diffusion-webui")
     args = parser.parse_args()
 
+    print(f"{src.misc.SCRIPT_FULL_NAME} running in standalone mode!")
+    import src.common_ui
+    if not args.no_chdir:
+        maybe_chdir()
     src.common_ui.on_ui_tabs().launch(share=args.listen)

src/backbone.py

@@ -1,6 +1,8 @@
 # DepthMap can be run inside stable-duiffusion-webui, but also separately.
 # All the stable-duiffusion-webui stuff that the DepthMap relies on
 # must be resided in this file (or in the scripts folder).
+import pathlib
+from datetime import datetime
 
 try:
     # stable-duiffusion-webui backbone
@@ -61,15 +63,21 @@ def get_hide_dirs():
         return modules.shared.hide_dirs
 except:
     # Standalone backbone
-    print("DepthMap did not detect stable-duiffusion-webui; launching with the standalone backbone.\n"
-          "The standalone backbone is not on par with the stable-duiffusion-webui backbone.\n"
-          "Some features may be missing or work differently. Please report bugs.\n")
+    print(  # "  DepthMap did not detect stable-duiffusion-webui; launching with the standalone backbone.\n"
+          "  The standalone mode is not on par with the stable-duiffusion-webui mode.\n"
+          "  Some features may be missing or work differently. Please report bugs.\n")
 
     def save_image(image, path, basename, **kwargs):
         import os
         os.makedirs(path, exist_ok=True)
-        fullfn = os.path.join(path, f"{get_next_sequence_number()}-{basename}.{kwargs['extension']}")
-        image.save(fullfn, format=get_opt('samples_format', 'png'))
+        if 'suffix' not in kwargs or len(kwargs['suffix']) == 0:
+            kwargs['suffix'] = ''
+        else:
+            kwargs['suffix'] = f"-{kwargs['suffix']}"
+        format = get_opt('samples_format', kwargs['extension'])
+        fullfn = os.path.join(
+            path, f"{basename}-{get_next_sequence_number(path, basename)}{kwargs['suffix']}.{format}")
+        image.save(fullfn, format=format)
 
     def torch_gc():
         # TODO: is this really sufficient?
@@ -79,11 +87,13 @@ def torch_gc():
                 torch.cuda.empty_cache()
                 torch.cuda.ipc_collect()
 
+    launched_at = int(datetime.now().timestamp())
+    backbone_current_seq_number = 0
+
     def get_next_sequence_number(outpath=None, basename=None):
-        # Don't really care what the number will be... As long as it is unique.
-        from datetime import datetime, timezone
-        import random
-        return int(f"{int(datetime.now(timezone.utc).timestamp())}{random.randint(1000,9999)}")
+        global backbone_current_seq_number
+        backbone_current_seq_number += 1
+        return int(f"{launched_at}{backbone_current_seq_number:04}")
 
     def wrap_gradio_gpu_call(f): return f  # Displaying various stats is not supported
 
@@ -99,7 +109,7 @@ def get_cmd_opt(name, default): return default  # Configuring is not supported
 
     def gather_ops(): return {}  # Configuring is not supported
 
-    def get_outpath(): return '.'
+    def get_outpath(): return str(pathlib.Path('.', 'outputs'))
 
     def unload_sd_model(): pass  # Not needed
 

src/depthmap_generation.py

@@ -6,6 +6,7 @@
 import numpy as np
 import skimage.measure
 from PIL import Image
+import torch
 from torchvision.transforms import Compose, transforms
 
 # midas imports

src/misc.py

@@ -1,27 +1,36 @@
 import subprocess
 import os
 import pathlib
-import torch
+import builtins
 
 def get_commit_hash():
-    try:
+    def call_git(dir):
         return subprocess.check_output(
             [os.environ.get("GIT", "git"), "rev-parse", "HEAD"],
-            cwd=pathlib.Path.cwd().joinpath('extensions/stable-diffusion-webui-depthmap-script/'),
-            shell=False,
-            stderr=subprocess.DEVNULL,
-            encoding='utf8').strip()[0:8]
+            cwd=dir, shell=False, stderr=subprocess.DEVNULL, encoding='utf8').strip()[0:8]
+
+    try:
+        file_path = pathlib.Path(__file__)
+        path = file_path.parts
+        while len(path) > 0 and path[-1] != REPOSITORY_NAME:
+            path = path[:-1]
+        if len(path) >= 2 and path[-1] == REPOSITORY_NAME and path[-2] == "extensions":
+            return call_git(str(pathlib.Path(*path)))
+
+        return call_git(pathlib.Path.cwd().joinpath('extensions/stable-diffusion-webui-depthmap-script/'))
     except Exception:
         return "<none>"
 
 
+REPOSITORY_NAME = "stable-diffusion-webui-depthmap-script"
 SCRIPT_NAME = "DepthMap"
 SCRIPT_VERSION = "v0.4.1"
 SCRIPT_FULL_NAME = f"{SCRIPT_NAME} {SCRIPT_VERSION} ({get_commit_hash()})"
 
 
 def ensure_file_downloaded(filename, url, sha256_hash_prefix=None):
-    # Do not check the hash every time - it is somewhat time-consuming
+    import torch
+    # Do not check the hash every time - it is somewhat time-consumin
     if os.path.exists(filename):
         return