rename all modules from ldm.dream to ldm.invoke

- scripts and documentation updated to match
- ran preflight checks on both web and CLI and seems to be working

scripts/images2prompt.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
-'''This script reads the "Dream" Stable Diffusion prompt embedded in files generated by dream.py'''
+'''This script reads the "Invoke" Stable Diffusion prompt embedded in files generated by invoke.py'''
 
 import sys
 from PIL import Image,PngImagePlugin
 
 if len(sys.argv) < 2:
     print("Usage: file2prompt.py <file1.png> <file2.png> <file3.png>...")
-    print("This script opens up the indicated dream.py-generated PNG file(s) and prints out the prompt used to generate them.")
+    print("This script opens up the indicated invoke.py-generated PNG file(s) and prints out the prompt used to generate them.")
     exit(-1)
 
 filenames = sys.argv[1:]

scripts/invoke.py

@@ -10,11 +10,11 @@ import warnings
 import time
 import traceback
 sys.path.append('.')    # corrects a weird problem on Macs
-from ldm.dream.readline import get_completer
-from ldm.dream.args import Args, metadata_dumps, metadata_from_png, dream_cmd_from_png
-from ldm.dream.pngwriter import PngWriter, retrieve_metadata, write_metadata
-from ldm.dream.image_util import make_grid
-from ldm.dream.log import write_log
+from ldm.invoke.readline import get_completer
+from ldm.invoke.args import Args, metadata_dumps, metadata_from_png, dream_cmd_from_png
+from ldm.invoke.pngwriter import PngWriter, retrieve_metadata, write_metadata
+from ldm.invoke.image_util import make_grid
+from ldm.invoke.log import write_log
 from omegaconf import OmegaConf
 from backend.invoke_ai_web_server import InvokeAIWebServer
 
@@ -45,7 +45,7 @@ def main():
     try:
         gfpgan, codeformer, esrgan = None, None, None
         if opt.restore or opt.esrgan:
-            from ldm.dream.restoration import Restoration
+            from ldm.invoke.restoration import Restoration
             restoration = Restoration()
             if opt.restore:
                 gfpgan, codeformer = restoration.load_face_restore_models(opt.gfpgan_dir, opt.gfpgan_model_path)
@@ -256,7 +256,7 @@ def main_loop(gen, opt, infile):
         if opt.with_variations is not None:
             opt.with_variations = split_variations(opt.with_variations)
 
-        if opt.prompt_as_dir:
+        if opt.prompt_as_dir and operation == 'generate':
             # sanitize the prompt to a valid folder name
             subdir = path_filter.sub('_', opt.prompt)[:name_max].rstrip(' .')
 
@@ -275,6 +275,12 @@ def main_loop(gen, opt, infile):
                 os.makedirs(opt.outdir)
             current_outdir = opt.outdir
 
+        # write out the history at this point
+        if operation == 'postprocess':
+            completer.add_history(f'!fix {command}')
+        else:
+            completer.add_history(command)
+
         # Here is where the images are actually generated!
         last_results = []
         try:
@@ -380,13 +386,9 @@ def main_loop(gen, opt, infile):
             continue
 
         print('Outputs:')
-        log_path = os.path.join(current_outdir, 'dream_log')
+        log_path = os.path.join(current_outdir, 'invoke_log')
         output_cntr = write_log(results, log_path ,('txt', 'md'), output_cntr)
         print()
-        if operation == 'postprocess':
-            completer.add_history(f'!fix {command}')
-        else:
-            completer.add_history(command)
 
     print('goodbye!')
 
@@ -422,6 +424,7 @@ def do_postprocess (gen, opt, callback):
             opt                 = opt,
         )
     except OSError:
+        print(traceback.format_exc(), file=sys.stderr)
         print(f'** {file_path}: file could not be read')
         return
     except (KeyError, AttributeError):

scripts/orig_scripts/img2img.py

@@ -18,7 +18,7 @@ from pytorch_lightning import seed_everything
 from ldm.util import instantiate_from_config
 from ldm.models.diffusion.ddim import DDIMSampler
 from ldm.models.diffusion.plms import PLMSSampler
-from ldm.dream.devices         import choose_torch_device
+from ldm.invoke.devices         import choose_torch_device
 
 
 def chunk(it, size):

scripts/orig_scripts/inpaint.py

@@ -6,7 +6,7 @@ import numpy as np
 import torch
 from main import instantiate_from_config
 from ldm.models.diffusion.ddim import DDIMSampler
-from ldm.dream.devices import choose_torch_device
+from ldm.invoke.devices import choose_torch_device
 
 def make_batch(image, mask, device):
     image = np.array(Image.open(image).convert("RGB"))

scripts/orig_scripts/txt2img.py

@@ -18,7 +18,7 @@ import torch.nn as nn
 from ldm.util                  import instantiate_from_config
 from ldm.models.diffusion.ddim import DDIMSampler
 from ldm.models.diffusion.plms import PLMSSampler
-from ldm.dream.devices         import choose_torch_device
+from ldm.invoke.devices         import choose_torch_device
 
 def chunk(it, size):
     it = iter(it)

scripts/preload_models.py

@@ -97,7 +97,7 @@ print('preloading CodeFormer model file...',end='')
 try:
         import urllib.request
         model_url  = 'https://github.com/sczhou/CodeFormer/releases/download/v0.1.0/codeformer.pth'
-        model_dest = 'ldm/dream/restoration/codeformer/weights/codeformer.pth'
+        model_dest = 'ldm/invoke/restoration/codeformer/weights/codeformer.pth'
         if not os.path.exists(model_dest):
             print('Downloading codeformer model file...')
             os.makedirs(os.path.dirname(model_dest), exist_ok=True)

scripts/sd-metadata.py

@@ -2,11 +2,11 @@
 
 import sys
 import json
-from ldm.dream.pngwriter import retrieve_metadata
+from ldm.invoke.pngwriter import retrieve_metadata
 
 if len(sys.argv) < 2:
     print("Usage: file2prompt.py <file1.png> <file2.png> <file3.png>...")
-    print("This script opens up the indicated dream.py-generated PNG file(s) and prints out their metadata.")
+    print("This script opens up the indicated invoke.py-generated PNG file(s) and prints out their metadata.")
     exit(-1)
 
 filenames = sys.argv[1:]