From 63989ce6ffc784defc2a3dd29b27a98ee7183c8c Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Mon, 22 Aug 2022 10:11:54 -0400
Subject: [PATCH] tidied up scripts directory by moving the original CompViz
 scripts into a subfolder

---
 README.md                                                  | 4 ++++
 scripts/images2prompt.py                                   | 1 +
 scripts/{ => orig_scripts}/download_first_stages.sh        | 0
 scripts/{ => orig_scripts}/download_models.sh              | 0
 scripts/{ => orig_scripts}/img2img.py                      | 0
 scripts/{ => orig_scripts}/knn2img.py                      | 0
 scripts/{ => orig_scripts}/latent_imagenet_diffusion.ipynb | 0
 scripts/{ => orig_scripts}/sample_diffusion.py             | 0
 scripts/{ => orig_scripts}/train_searcher.py               | 0
 scripts/{ => orig_scripts}/txt2img.py                      | 0
 scripts/preload_models.py                                  | 0
 11 files changed, 5 insertions(+)
 mode change 100644 => 100755 scripts/images2prompt.py
 rename scripts/{ => orig_scripts}/download_first_stages.sh (100%)
 rename scripts/{ => orig_scripts}/download_models.sh (100%)
 rename scripts/{ => orig_scripts}/img2img.py (100%)
 rename scripts/{ => orig_scripts}/knn2img.py (100%)
 rename scripts/{ => orig_scripts}/latent_imagenet_diffusion.ipynb (100%)
 rename scripts/{ => orig_scripts}/sample_diffusion.py (100%)
 rename scripts/{ => orig_scripts}/train_searcher.py (100%)
 rename scripts/{ => orig_scripts}/txt2img.py (100%)
 mode change 100644 => 100755 scripts/preload_models.py

diff --git a/README.md b/README.md
index 8dcff3bc4c..9007d60a82 100644
--- a/README.md
+++ b/README.md
@@ -86,6 +86,10 @@ completely). The default is 0.75, and ranges from 0.25-0.75 give interesting res
 
 ## Changes
 
+* v1.03 (22 August 2022)
+   * The original txt2img and img2img scripts from the CompViz repository have been moved into
+     a subfolder named "orig_scripts", to reduce confusion.
+   
 * v1.02 (21 August 2022)
     * A copy of the prompt and all of its switches and options is now stored in the corresponding
     image in a tEXt metadata field named "Dream". You can read the prompt using scripts/images2prompt.py,
diff --git a/scripts/images2prompt.py b/scripts/images2prompt.py
old mode 100644
new mode 100755
index 7ba2029c70..c23eee0f75
--- a/scripts/images2prompt.py
+++ b/scripts/images2prompt.py
@@ -6,6 +6,7 @@ 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.")
     exit(-1)
 
 filenames = sys.argv[1:]
diff --git a/scripts/download_first_stages.sh b/scripts/orig_scripts/download_first_stages.sh
similarity index 100%
rename from scripts/download_first_stages.sh
rename to scripts/orig_scripts/download_first_stages.sh
diff --git a/scripts/download_models.sh b/scripts/orig_scripts/download_models.sh
similarity index 100%
rename from scripts/download_models.sh
rename to scripts/orig_scripts/download_models.sh
diff --git a/scripts/img2img.py b/scripts/orig_scripts/img2img.py
similarity index 100%
rename from scripts/img2img.py
rename to scripts/orig_scripts/img2img.py
diff --git a/scripts/knn2img.py b/scripts/orig_scripts/knn2img.py
similarity index 100%
rename from scripts/knn2img.py
rename to scripts/orig_scripts/knn2img.py
diff --git a/scripts/latent_imagenet_diffusion.ipynb b/scripts/orig_scripts/latent_imagenet_diffusion.ipynb
similarity index 100%
rename from scripts/latent_imagenet_diffusion.ipynb
rename to scripts/orig_scripts/latent_imagenet_diffusion.ipynb
diff --git a/scripts/sample_diffusion.py b/scripts/orig_scripts/sample_diffusion.py
similarity index 100%
rename from scripts/sample_diffusion.py
rename to scripts/orig_scripts/sample_diffusion.py
diff --git a/scripts/train_searcher.py b/scripts/orig_scripts/train_searcher.py
similarity index 100%
rename from scripts/train_searcher.py
rename to scripts/orig_scripts/train_searcher.py
diff --git a/scripts/txt2img.py b/scripts/orig_scripts/txt2img.py
similarity index 100%
rename from scripts/txt2img.py
rename to scripts/orig_scripts/txt2img.py
diff --git a/scripts/preload_models.py b/scripts/preload_models.py
old mode 100644
new mode 100755