Minor fixes

Author: semjon00

README.md

@@ -23,6 +23,7 @@ images generated by [@semjon00](https://github.com/semjon00) from CC0 photos, mo
 ## Changelog
 * v0.4.0 large code refactor
     * UI improvements
+    * improved Batch from Directory, Clip and renormalize DepthMap
     * slightly changed the behaviour of various options
     * extension may partially work even if some of the dependencies are unmet
 * v0.3.12

scripts/depthmap.py

@@ -136,6 +136,7 @@ def main_ui_panel(is_depth_tab):
                                                                value='u2net', type="value")
 
         with gr.Box():
+            gr.HTML(f"{SCRIPT_FULL_NAME}<br/>")
             gr.HTML("Information, comment and share @ <a "
                     "href='https://github.com/thygate/stable-diffusion-webui-depthmap-script'>"
                     "https://github.com/thygate/stable-diffusion-webui-depthmap-script</a>")
@@ -480,6 +481,8 @@ def run_generate(*inputs):
         outpath = opts.outdir_samples or opts.outdir_extras_samples
 
     if depthmap_mode == '0':  # Single image
+        if depthmap_input_image is None:
+            return [], None, None, "Please select an input image!", ""
         inputimages.append(depthmap_input_image)
         inputnames.append(None)
         if custom_depthmap:
@@ -490,6 +493,8 @@ def run_generate(*inputs):
         else:
             inputdepthmaps.append(None)
     if depthmap_mode == '1':  # Batch Process
+        if image_batch is None:
+            return [], None, None, "Please select input images!", ""
         for img in image_batch:
             image = Image.open(os.path.abspath(img.name))
             inputimages.append(image)

src/core.py

@@ -98,7 +98,7 @@ def core_generation_funnel(outpath, inputimages, inputdepthmaps, inputnames, inp
     stereo_separation = inp["stereo_separation"]
 
     # TODO: ideally, run_depthmap should not save meshes - that makes the function not pure
-    print(f"{SCRIPT_NAME} {SCRIPT_VERSION} ({get_commit_hash()})")
+    print(SCRIPT_FULL_NAME)
 
     unload_sd_model()
 
@@ -649,24 +649,6 @@ def batched_background_removal(inimages, model_name):
     return outimages
 
 
-def ensure_file_downloaded(filename, url, sha256_hash_prefix=None):
-    # Do not check the hash every time - it is somewhat time-consuming
-    if os.path.exists(filename):
-        return
-
-    if type(url) is not list:
-        url = [url]
-    for cur_url in url:
-        try:
-            print("Downloading", cur_url, "to", filename)
-            torch.hub.download_url_to_file(cur_url, filename, sha256_hash_prefix)
-            if os.path.exists(filename):
-                return  # The correct model was downloaded, no need to try more
-        except:
-            pass
-    raise RuntimeError('Download failed. Try again later or manually download the file to that location.')
-
-
 def pano_depth_to_world_points(depth):
     """
     360 depth to world points

src/main.py

@@ -3,23 +3,21 @@
 import pathlib
 import torch
 
+def get_commit_hash():
+    try:
+        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]
+    except Exception:
+        return "<none>"
+
+
 SCRIPT_NAME = "DepthMap"
 SCRIPT_VERSION = "v0.4.0"
-
-commit_hash = None  # TODO: understand why it would spam to stderr if changed to ... = get_commit_hash()
-def get_commit_hash():
-    global commit_hash
-    if commit_hash is None:
-        try:
-            commit_hash = 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]
-        except Exception:
-            commit_hash = "<none>"
-    return commit_hash
+SCRIPT_FULL_NAME = f"{SCRIPT_NAME} {SCRIPT_VERSION} ({get_commit_hash()})"
 
 
 def ensure_file_downloaded(filename, url, sha256_hash_prefix=None):