From c279314cf51fff409fe28d589cce0364e6e79716 Mon Sep 17 00:00:00 2001
From: Eugene Brodsky <ebr@users.noreply.github.com>
Date: Mon, 9 Jan 2023 22:19:38 -0500
Subject: [PATCH] (installer) use plumbum for better stdout streaming

---
 installer/installer.py | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/installer/installer.py b/installer/installer.py
index bf1adbb169..6862468eae 100644
--- a/installer/installer.py
+++ b/installer/installer.py
@@ -11,7 +11,7 @@ from pathlib import Path
 from tempfile import TemporaryDirectory, TemporaryFile
 
 SUPPORTED_PYTHON = ">=3.9.0,<3.11"
-INSTALLER_REQS = ["rich", "semver", "requests"]
+INSTALLER_REQS = ["rich", "semver", "requests", "plumbum"]
 
 OS = platform.uname().system
 ARCH = platform.uname().machine
@@ -150,6 +150,8 @@ class Installer:
 
         self.instance.deploy()
 
+        self.instance.configure()
+
 
 class InvokeAiInstance:
     """
@@ -183,33 +185,33 @@ class InvokeAiInstance:
         ### this is all very rough for now as a PoC
         ### source installer basically
 
-        proc = subprocess.Popen(
-            [
-                self.pip,
+        from plumbum import local, FG
+
+        pip = local[self.pip]
+
+        (
+            pip[
                 "install",
                 "--require-virtualenv",
                 "-r",
                 (Path(__file__).parents[1] / "environments-and-requirements/requirements-base.txt")
                 .expanduser()
                 .resolve(),
-            ],
-            stdout=subprocess.PIPE,
+            ]
+            & FG
         )
-        for c in iter(lambda: proc.stdout.read(1).decode(), ""):
-            sys.stdout.write(c)
 
-        proc = subprocess.Popen(
-            [self.pip, "install", "--require-virtualenv", Path(__file__).parents[1].expanduser().resolve()],
-            stdout=subprocess.PIPE,
-        )
-        for c in iter(lambda: proc.stdout.read(1).decode(), ""):
-            sys.stdout.write(c)
+        (pip["install", "--require-virtualenv", Path(__file__).parents[1].expanduser().resolve()] & FG)
 
     def configure(self):
         """
         Configure the InvokeAI runtime directory
         """
 
+        from ldm.invoke.configuration import configure
+
+        configure.main()
+
     def update(self):
         pass