fix duplicate files created during upscaling/facial reconstruction

- When --save_orig *not* provided during image generation with
  upscaling/face fixing, an extra image file was being created. This
  PR fixes the problem.

- Also generalizes the tab autocomplete for image paths such that
  autocomplete searches the output directory for all path-modifying
  options except for --outdir.

ldm/dream/readline.py

@@ -52,15 +52,15 @@ COMMANDS = (
     '!fix','!fetch',
     )
 IMG_PATH_COMMANDS = (
-    '--init_img[=\s]','-I',
+    '--outdir[=\s]',
-    '--init_mask[=\s]','-M',
-    '--init_color[=\s]',
-    '--embedding_path[=\s]',
-    '--outdir[=\s]'
     )
 IMG_FILE_COMMANDS=(
     '!fix',
     '!fetch',
+    '--init_img[=\s]','-I',
+    '--init_mask[=\s]','-M',
+    '--init_color[=\s]',
+    '--embedding_path[=\s]',
     )
 path_regexp = '('+'|'.join(IMG_PATH_COMMANDS+IMG_FILE_COMMANDS) + ')\s*\S*$'
 
@@ -178,7 +178,7 @@ class Completer:
             readline.redisplay()
             self.linebuffer = None
 
-    def _path_completions(self, text, state, extensions, shortcut_ok=False):
+    def _path_completions(self, text, state, extensions, shortcut_ok=True):
         # separate the switch from the partial path
         match = re.search('^(-\w|--\w+=?)(.*)',text)
         if match is None:

scripts/dream.py

@@ -207,7 +207,7 @@ def main_loop(gen, opt, infile):
             opt.width = model_config.width
         if not opt.height:
             opt.height = model_config.height
-        
+
         # retrieve previous value of init image if requested
         if opt.init_img is not None and re.match('^-\\d+$', opt.init_img):
             try:
@@ -219,6 +219,13 @@ def main_loop(gen, opt, infile):
                 opt.init_img = None
                 continue
 
+        # try to relativize pathnames
+        for attr in ('init_img','init_mask','init_color','embedding_path'):
+            if getattr(opt,attr) and not os.path.exists(getattr(opt,attr)):
+                basename = getattr(opt,attr)
+                path     = os.path.join(opt.outdir,basename)
+                setattr(opt,attr,path)
+
         # retrieve previous valueof seed if requested
         if opt.seed is not None and opt.seed < 0:   
             try:
@@ -261,16 +268,19 @@ def main_loop(gen, opt, infile):
             results          = []  # list of filename, prompt pairs
             grid_images      = dict()  # seed -> Image, only used if `opt.grid`
             prior_variations = opt.with_variations or []
+            prefix = file_writer.unique_prefix()
 
             def image_writer(image, seed, upscaled=False, first_seed=None, use_prefix=None):
+                print(f'DEBUG:upscaled={upscaled}, first_seed={first_seed}, use_prefix={use_prefix}')
+
+                
                 # note the seed is the seed of the current image
                 # the first_seed is the original seed that noise is added to
                 # when the -v switch is used to generate variations
                 nonlocal prior_variations
+                nonlocal prefix
                 if use_prefix is not None:
                     prefix = use_prefix
-                else:
-                    prefix           = file_writer.unique_prefix()
 
                 path = None
                 if opt.grid: