From 9577410be43a266668db1e1ff1e55e8e2744657a Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 5 Feb 2023 12:43:13 -0500 Subject: [PATCH 1/6] add platform-specific help instructions to installer --- installer/messages.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/installer/messages.py b/installer/messages.py index 888eb28df0..cb1a8792ce 100644 --- a/installer/messages.py +++ b/installer/messages.py @@ -38,13 +38,12 @@ else: def welcome(): console.rule() + text = _platform_specific_help() + text.append(Text('Some of the installation steps take a long time to run. Please be patient. If the script appears to hang for more than 10 minutes, please interrupt with control-C and retry.')) print( Panel( title="[bold wheat1]Welcome to the InvokeAI Installer", - renderable=Text( - "Some of the installation steps take a long time to run. Please be patient. If the script appears to hang for more than 10 minutes, please interrupt with control-C and retry.", - justify="center", - ), + renderable=text, box=box.DOUBLE, width=80, expand=False, @@ -294,3 +293,16 @@ def introduction() -> None: ) ) console.line(2) + +def _platform_specific_help()->str: + text = Text('') + if OS == 'Darwin': + text = Text.assemble(('OSX Users: ', 'bold'),'please be sure you have the ',('Xcode command-line tools','bold'),' installed before continuing. If not, cancel with control-C and follow the Xcode install instructions at https://invoke-ai.github.io/InvokeAI/INSTALL_SOURCE.\n\n') + elif OS == 'Windows': + text = Text.assemble(('Windows Users: ', 'bold'), """Before you start please do the following: + 1. Double-click on the file WinLongPathsEnabled.reg in order to + enable long path support on your system. + 2. Make sure you have the """,('Visual C++ core libraries','bold')," installed. If not, install from ", +""" https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170\n\n""") + return text + From 5de5e659d0ba804824080dbd507c9022394032a2 Mon Sep 17 00:00:00 2001 From: cosmii02 Date: Sun, 5 Feb 2023 22:18:50 +0200 Subject: [PATCH 2/6] Better AMD clarification To better clarify that AMD is supported when using linux --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 765bed663a..62b4bb58e5 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ You will need one of the following: - An NVIDIA-based graphics card with 4 GB or more VRAM memory. - An Apple computer with an M1 chip. +- An AMD-based graphics card with 4GB or more VRAM memory. (Linux only) We do not recommend the GTX 1650 or 1660 series video cards. They are unable to run in half-precision mode and do not have sufficient VRAM From f0cd1aa73655e35e880fb2d6e9a52446894407c3 Mon Sep 17 00:00:00 2001 From: Eugene Brodsky Date: Mon, 6 Feb 2023 00:57:21 -0500 Subject: [PATCH 3/6] highlight key elements of installer welcome message - help users to avoid glossing over per-platform prerequisites - better link colouring - update link to community instructions to install xcode command line tools --- installer/messages.py | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/installer/messages.py b/installer/messages.py index cb1a8792ce..dfc09dd94a 100644 --- a/installer/messages.py +++ b/installer/messages.py @@ -9,10 +9,9 @@ from pathlib import Path from prompt_toolkit import prompt from prompt_toolkit.completion import PathCompleter -from prompt_toolkit.shortcuts import CompleteStyle from prompt_toolkit.validation import Validator from rich import box, print -from rich.console import Console, Group +from rich.console import Console, Group, group from rich.panel import Panel from rich.prompt import Confirm from rich.style import Style @@ -37,16 +36,21 @@ else: def welcome(): + + @group() + def text(): + if (platform_specific := _platform_specific_help()) != "": + yield platform_specific + yield "" + yield Text.from_markup("Some of the installation steps take a long time to run. Please be patient. If the script appears to hang for more than 10 minutes, please interrupt with [i]Control-C[/] and retry.", justify="center") + console.rule() - text = _platform_specific_help() - text.append(Text('Some of the installation steps take a long time to run. Please be patient. If the script appears to hang for more than 10 minutes, please interrupt with control-C and retry.')) print( Panel( title="[bold wheat1]Welcome to the InvokeAI Installer", - renderable=text, + renderable=text(), box=box.DOUBLE, - width=80, - expand=False, + expand=True, padding=(1, 2), style=Style(bgcolor="grey23", color="orange1"), subtitle=f"[bold grey39]{OS}-{ARCH}", @@ -199,7 +203,7 @@ def graphical_accelerator(): [ f"Detected the [gold1]{OS}-{ARCH}[/] platform", "", - "See [steel_blue3]https://invoke-ai.github.io/InvokeAI/#system[/] to ensure your system meets the minimum requirements.", + "See [deep_sky_blue1]https://invoke-ai.github.io/InvokeAI/#system[/] to ensure your system meets the minimum requirements.", "", "[red3]🠶[/] [b]Your GPU drivers must be correctly installed before using InvokeAI![/] [red3]🠴[/]", ] @@ -295,14 +299,14 @@ def introduction() -> None: console.line(2) def _platform_specific_help()->str: - text = Text('') - if OS == 'Darwin': - text = Text.assemble(('OSX Users: ', 'bold'),'please be sure you have the ',('Xcode command-line tools','bold'),' installed before continuing. If not, cancel with control-C and follow the Xcode install instructions at https://invoke-ai.github.io/InvokeAI/INSTALL_SOURCE.\n\n') - elif OS == 'Windows': - text = Text.assemble(('Windows Users: ', 'bold'), """Before you start please do the following: - 1. Double-click on the file WinLongPathsEnabled.reg in order to + if OS == "Darwin": + text = Text.from_markup("""[b wheat1]macOS Users![/]\n\nPlease be sure you have the [b wheat1]Xcode command-line tools[/] installed before continuing.\nIf not, cancel with [i]Control-C[/] and follow the Xcode install instructions at [deep_sky_blue1]https://www.freecodecamp.org/news/install-xcode-command-line-tools/[/].""") + elif OS == "Windows": + text = Text.from_markup("""[b wheat1]Windows Users![/]\n\nBefore you start, please do the following: + 1. Double-click on the file [b wheat1]WinLongPathsEnabled.reg[/] in order to enable long path support on your system. - 2. Make sure you have the """,('Visual C++ core libraries','bold')," installed. If not, install from ", -""" https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170\n\n""") + 2. Make sure you have the [b wheat1]Visual C++ core libraries[/] installed. If not, install from + [deep_sky_blue1]https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170[/]""") + else: + text = "" return text - From ede7d1a8f79e1f46e96097f4cb5af855b14ddd88 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 6 Feb 2023 14:33:46 -0500 Subject: [PATCH 4/6] first draft of codeowners --- .github/CODEOWNERS | 53 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 7 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9271600ba3..324fb2d364 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,7 +1,46 @@ -ldm/invoke/pngwriter.py @CapableWeb -ldm/invoke/server_legacy.py @CapableWeb -scripts/legacy_api.py @CapableWeb -tests/legacy_tests.sh @CapableWeb -installer/ @ebr -.github/workflows/ @mauwii -docker/ @mauwii +# continuous integration +/.github/workflows/ @mauwii + +# installation and configuration +/docs/ @lstein @mauwii +/docker/ @mauwii +/scripts/ @ebr @lstein +/installer/ @ebr @lstein +ldm/invoke/config @lstein @ebr +invokeai/assets @lstein @ebr +invokeai/configs @lstein @ebr +/ldm/invoke/_version.py @lstein @blessedcoolant + +# web ui +/invokeai/frontend @blessedcoolant @psychedelicious +/invokeai/backend @blessedcoolant @psychedelicious + +# generation and model management +/ldm/*.py @lstein +/ldm/generate.py @lstein @keturn +/ldm/invoke/args.py @lstein @blessedcoolant +/ldm/invoke/ckpt* @lstein +/ldm/invoke/ckpt_generator @lstein +/ldm/invoke/CLI.py @lstein +/ldm/invoke/config @lstein @ebr @mauwii +/ldm/invoke/generator @keturn @damian0815 +/ldm/invoke/globals.py @lstein @blessedcoolant +/ldm/invoke/merge_diffusers.py @lstein +/ldm/invoke/model_manager.py @lstein @blessedcoolant +/ldm/invoke/txt2mask.py @lstein +/ldm/invoke/patchmatch.py @Kyle0654 +/ldm/invoke/restoration @lstein @blessedcoolant + +# attention, textual inversion, model configuration +/ldm/models @damian0815 @keturn +/ldm/modules @damian0815 @keturn + +# Nodes +apps/ @Kyle0654 + +# legacy REST API +# is CapableWeb still engaged? +/ldm/invoke/pngwriter.py @CapableWeb +/ldm/invoke/server_legacy.py @CapableWeb +/scripts/legacy_api.py @CapableWeb +/tests/legacy_tests.sh @CapableWeb From f3eff38f907912a23dccbc09cf3f4ff89c2196d2 Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Mon, 6 Feb 2023 14:38:42 -0500 Subject: [PATCH 5/6] add tildebyte areas --- .github/CODEOWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 324fb2d364..fb101ee48d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -2,10 +2,10 @@ /.github/workflows/ @mauwii # installation and configuration -/docs/ @lstein @mauwii +/docs/ @lstein @mauwii @tildebyte /docker/ @mauwii /scripts/ @ebr @lstein -/installer/ @ebr @lstein +/installer/ @ebr @lstein @tildebyte ldm/invoke/config @lstein @ebr invokeai/assets @lstein @ebr invokeai/configs @lstein @ebr From 5baf0ae755e1e9d9348ea716396e5437cdaae46c Mon Sep 17 00:00:00 2001 From: mauwii Date: Mon, 6 Feb 2023 20:47:20 +0100 Subject: [PATCH 6/6] add mkdocs.yml and pyproject.toml also make docs separate header --- .github/CODEOWNERS | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fb101ee48d..2f430fe008 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,10 +1,14 @@ # continuous integration /.github/workflows/ @mauwii -# installation and configuration +# documentation /docs/ @lstein @mauwii @tildebyte +mkdocs.yml @lstein @mauwii + +# installation and configuration +/pyproject.toml @mauwii @lstein @ebr /docker/ @mauwii -/scripts/ @ebr @lstein +/scripts/ @ebr @lstein /installer/ @ebr @lstein @tildebyte ldm/invoke/config @lstein @ebr invokeai/assets @lstein @ebr