From ff96358cb3f8c31314f86432bb4955e32807c019 Mon Sep 17 00:00:00 2001 From: majick Date: Sun, 16 Oct 2022 17:03:11 -0700 Subject: [PATCH 1/7] Correct typo in the subtitle of the project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * “Formally” means that there is a formality such as a rule or declaration, “formerly” refers to a prior state. The latter is almost certainly what is meant here. --- docs/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.md b/docs/index.md index c9a19a18ce..25ab1bd48e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -12,7 +12,7 @@ title: Home -->
-# ^^**InvokeAI: A Stable Diffusion Toolkit**^^ :tools:
Formally known as lstein/stable-diffusion +# ^^**InvokeAI: A Stable Diffusion Toolkit**^^ :tools:
Formerly known as lstein/stable-diffusion ![project logo](assets/logo.png) From 9910a0b004b26ab45769c3a9a4b361b30eb13b02 Mon Sep 17 00:00:00 2001 From: majick Date: Sun, 16 Oct 2022 17:06:07 -0700 Subject: [PATCH 2/7] Fix broken links to CLI.md * Looks like there was a bad paste --- docs/index.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 25ab1bd48e..e0dabf00cb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -112,13 +112,13 @@ You wil need one of the following: - Support in both WebGUI and CLI for post-processing of previously-generated images using facial reconstruction, ESRGAN upscaling, outcropping (similar to DALL-E infinite canvas), and "embiggen" upscaling. See the `!fix` command. -- New `--hires` option on `invoke>` line allows larger images to be created without duplicating elements, at the cost of some performance. +- New `--hires` option on `invoke>` line allows larger images to be created without duplicating elements, at the cost of some performance. - New `--perlin` and `--threshold` options allow you to add and control variation during image generation (see Thresholding and Perlin Noise Initialization - Extensive metadata now written into PNG files, allowing reliable regeneration of images and tweaking of previous settings. - Command-line completion in `invoke.py` now works on Windows, Linux and Mac platforms. -- Improved command-line completion behavior. +- Improved command-line completion behavior. New commands added: * List command-line history with `!history` * Search command-line history with `!search` From d65948c4237286030bed41c315a9c9c1adc857b9 Mon Sep 17 00:00:00 2001 From: spezialspezial <75758219+spezialspezial@users.noreply.github.com> Date: Mon, 17 Oct 2022 11:00:03 +0200 Subject: [PATCH 3/7] Update gitignore to ignore codeformer weights at new location Eventually making it slightly more flexible --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0c3bd66d95..e556c5ebe6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ # ignore default image save location and model symbolic link outputs/ models/ldm/stable-diffusion-v1/model.ckpt -ldm/dream/restoration/codeformer/weights +**/restoration/codeformer/weights # ignore the Anaconda/Miniconda installer used while building Docker image anaconda.sh From 2d68eae16bf890f987b6633b802f540ea53933b4 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 17 Oct 2022 12:05:42 -0400 Subject: [PATCH 4/7] Second try at getting GitHub to register license --- LICENSE.md | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000000..9cf5fec238 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,29 @@ +MIT License + +Copyright (c) 2022 InvokeAI Team + +This software is derived from a fork of the source code available from +https://github.com/pesser/stable-diffusion and +https://github.com/CompViz/stable-diffusion. They carry the following +copyrights: + +Copyright (c) 2022 Machine Vision and Learning Group, LMU Munich +Copyright (c) 2022 Robin Rombach and Patrick Esser and contributors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From 39ea2a257c12382e77354077b6f8190b38b88f70 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 17 Oct 2022 12:07:00 -0400 Subject: [PATCH 5/7] remove additional copyrights from license file Trying to get GitHub to recognize our MIT license. Perhaps the additional copyrights are confusing it. --- LICENSE.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 9cf5fec238..cb9631b9f6 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,14 +2,6 @@ MIT License Copyright (c) 2022 InvokeAI Team -This software is derived from a fork of the source code available from -https://github.com/pesser/stable-diffusion and -https://github.com/CompViz/stable-diffusion. They carry the following -copyrights: - -Copyright (c) 2022 Machine Vision and Learning Group, LMU Munich -Copyright (c) 2022 Robin Rombach and Patrick Esser and contributors - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights From 891678b65659e247e8f824cab69f4ad1d675b56c Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 17 Oct 2022 12:08:09 -0400 Subject: [PATCH 6/7] remove license files temporarily --- LICENSE | 32 -------------------------------- LICENSE.md | 21 --------------------- 2 files changed, 53 deletions(-) delete mode 100644 LICENSE delete mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE deleted file mode 100644 index d39808bfa0..0000000000 --- a/LICENSE +++ /dev/null @@ -1,32 +0,0 @@ -MIT License - -Copyright (c) 2022 Lincoln Stein and InvokeAI Organization - -This software is derived from a fork of the source code available from -https://github.com/pesser/stable-diffusion and -https://github.com/CompViz/stable-diffusion. They carry the following -copyrights: - -Copyright (c) 2022 Machine Vision and Learning Group, LMU Munich -Copyright (c) 2022 Robin Rombach and Patrick Esser and contributors - -Please see individual source code files for copyright and authorship -attributions. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index cb9631b9f6..0000000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2022 InvokeAI Team - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From e5ab07091d50f7f6949bb9487f843188575dbf23 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 17 Oct 2022 12:09:24 -0400 Subject: [PATCH 7/7] adding license using GitHub template Did not attempt to add additional copyright information. --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..cb9631b9f6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 InvokeAI Team + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.