From e7848b5a9d38c894155bb12e9a1590ebdc032522 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Sat, 13 Jan 2024 14:45:32 -0500
Subject: [PATCH 1/8] Add "Manual/Copy" install mode to dependency manager

---
 src/common/pip.ts                           |   2 +-
 src/renderer/contexts/DependencyContext.tsx | 123 ++++++++++++++------
 2 files changed, 90 insertions(+), 35 deletions(-)

diff --git a/src/common/pip.ts b/src/common/pip.ts
index e9d99e301..5765e18d0 100644
--- a/src/common/pip.ts
+++ b/src/common/pip.ts
@@ -57,7 +57,7 @@ export const runPip = async (
     });
 };
 
-const getFindLinks = (dependencies: readonly PyPiPackage[]): string[] => {
+export const getFindLinks = (dependencies: readonly PyPiPackage[]): string[] => {
     const links = new Set<string>();
     for (const p of dependencies) {
         if (p.findLink) {
diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index 75bd58145..f63689580 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -21,16 +21,18 @@ import {
     ModalHeader,
     ModalOverlay,
     Progress,
+    Select,
     Spacer,
     Spinner,
-    Switch,
     Tag,
     Text,
     Textarea,
     Tooltip,
     VStack,
     useDisclosure,
+    useToast,
 } from '@chakra-ui/react';
+import { clipboard } from 'electron';
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { BsQuestionCircle, BsTerminalFill } from 'react-icons/bs';
 import { HiOutlineRefresh } from 'react-icons/hi';
@@ -46,7 +48,7 @@ import {
     Version,
 } from '../../common/common-types';
 import { log } from '../../common/log';
-import { OnStdio, runPipInstall, runPipUninstall } from '../../common/pip';
+import { OnStdio, getFindLinks, runPipInstall, runPipUninstall } from '../../common/pip';
 import { noop } from '../../common/util';
 import { versionGt } from '../../common/version';
 import { Markdown } from '../components/Markdown';
@@ -56,6 +58,12 @@ import { BackendContext } from './BackendContext';
 import { GlobalContext } from './GlobalNodeState';
 import { SettingsContext } from './SettingsContext';
 
+const installModes = {
+    NORMAL: 'Normal Install',
+    DIRECT_PIP: 'Direct Pip',
+    MANUAL_COPY: 'Manual/Copy',
+};
+
 export interface DependencyContextValue {
     openDependencyManager: () => void;
     availableUpdates: number;
@@ -382,7 +390,7 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
     const [isSystemPython] = useIsSystemPython;
 
     const [isConsoleOpen, setIsConsoleOpen] = useState(false);
-    const [usePipDirectly, setUsePipDirectly] = useState(false);
+    const [installMode, setInstallMode] = useState(installModes.NORMAL);
 
     const { data: installedPyPi, refetch: refetchInstalledPyPi } = useQuery({
         queryKey: 'dependencies',
@@ -415,6 +423,8 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
     );
     const onStdio: OnStdio = { onStderr: appendToOutput, onStdout: appendToOutput };
 
+    const toast = useToast();
+
     const changePackages = (supplier: () => Promise<void>) => {
         if (isRunningShell) throw new Error('Cannot run two pip commands at once');
 
@@ -444,25 +454,65 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
             });
     };
 
-    const installPackage = (p: Package) => {
-        setInstallingPackage(p);
+    const copyCommandToClipboard = (command: string) => {
+        clipboard.writeText(command);
+        toast({
+            title: 'Command copied to clipboard.',
+            description:
+                'Open up anm external terminal, paste the command, and run it. When it is done running, manually restart chaiNNer.',
+            status: 'success',
+            duration: 9000,
+            isClosable: true,
+        });
+    };
+
+    const installPackage = (pkg: Package) => {
+        if (installMode === installModes.MANUAL_COPY) {
+            const deps = pkg.dependencies.map((p) => `${p.pypiName}==${p.version}`);
+            const findLinks = getFindLinks(pkg.dependencies).flatMap((l) => [
+                '--extra-index-url',
+                l,
+            ]);
+            const args = [
+                pythonInfo.python,
+                '-m',
+                'pip',
+                'install',
+                '--upgrade',
+                ...deps,
+                ...findLinks,
+                '--no-cache-dir',
+                '--disable-pip-version-check',
+            ];
+            const cmd = args.join(' ');
+            copyCommandToClipboard(cmd);
+            return;
+        }
+        setInstallingPackage(pkg);
         changePackages(() =>
             runPipInstall(
                 pythonInfo,
-                p.dependencies,
-                usePipDirectly ? undefined : setProgress,
+                pkg.dependencies,
+                installMode === installModes.NORMAL ? setProgress : undefined,
                 onStdio
             )
         );
     };
 
-    const uninstallPackage = (p: Package) => {
-        setUninstallingPackage(p);
+    const uninstallPackage = (pkg: Package) => {
+        if (installMode === installModes.MANUAL_COPY) {
+            const deps = pkg.dependencies.map((p) => p.pypiName);
+            const args = [pythonInfo.python, '-m', 'pip', 'uninstall', ...deps];
+            const cmd = args.join(' ');
+            copyCommandToClipboard(cmd);
+            return;
+        }
+        setUninstallingPackage(pkg);
         changePackages(() =>
             runPipUninstall(
                 pythonInfo,
-                p.dependencies,
-                usePipDirectly ? undefined : setProgress,
+                pkg.dependencies,
+                installMode === installModes.NORMAL ? setProgress : undefined,
                 onStdio
             )
         );
@@ -531,29 +581,34 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                     Python ({pythonInfo.version}) [
                                     {isSystemPython ? 'System' : 'Integrated'}]
                                 </Text>
-                                <HStack>
+                                <HStack gap={2}>
                                     <HStack>
-                                        <Switch
-                                            isChecked={usePipDirectly}
-                                            isDisabled={isRunningShell}
-                                            onChange={() => {
-                                                setUsePipDirectly(!usePipDirectly);
-                                            }}
-                                        />
-                                        <Text>Use Pip Directly</Text>
-                                        <Tooltip
-                                            hasArrow
-                                            borderRadius={8}
-                                            label="Disable progress bars and use pip to directly download and install the packages. Use this setting if you are having issues installing normally."
-                                            maxW="auto"
-                                            openDelay={500}
-                                            px={2}
-                                            py={0}
-                                        >
-                                            <Center>
-                                                <Icon as={BsQuestionCircle} />
-                                            </Center>
-                                        </Tooltip>
+                                        <HStack>
+                                            <Select
+                                                isDisabled={isRunningShell}
+                                                size="md"
+                                                value={installMode}
+                                                onChange={(e) => {
+                                                    setInstallMode(e.target.value);
+                                                }}
+                                            >
+                                                <option>{installModes.NORMAL}</option>
+                                                <option>{installModes.DIRECT_PIP}</option>
+                                                <option>{installModes.MANUAL_COPY}</option>
+                                            </Select>
+                                            <Tooltip
+                                                hasArrow
+                                                borderRadius={8}
+                                                label="Change the dependency install mode. Normal Install is recommended, but if you are having issues, you can try using the Direct Pip mode (which will not show progress), or Manual/Copy mode, which will copy the correct install command to your clipboard for you to run in your own terminal."
+                                                openDelay={500}
+                                                px={2}
+                                                py={0}
+                                            >
+                                                <Center>
+                                                    <Icon as={BsQuestionCircle} />
+                                                </Center>
+                                            </Tooltip>
+                                        </HStack>
                                     </HStack>
                                     <Button
                                         aria-label={isConsoleOpen ? 'Hide Console' : 'View Console'}
@@ -615,7 +670,7 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                                 key={p.id}
                                                 p={p}
                                                 progress={
-                                                    !usePipDirectly &&
+                                                    installMode === installModes.NORMAL &&
                                                     isRunningShell &&
                                                     (installingPackage || uninstallingPackage)
                                                         ?.id === p.id

From cc85827539fdf99ac6fc524fe2bb16f0e886209b Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Sat, 13 Jan 2024 14:47:34 -0500
Subject: [PATCH 2/8] add notice about manually restarting

---
 src/renderer/contexts/DependencyContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index f63689580..3d9b58b5d 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -599,7 +599,7 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                             <Tooltip
                                                 hasArrow
                                                 borderRadius={8}
-                                                label="Change the dependency install mode. Normal Install is recommended, but if you are having issues, you can try using the Direct Pip mode (which will not show progress), or Manual/Copy mode, which will copy the correct install command to your clipboard for you to run in your own terminal."
+                                                label="Change the dependency install mode. Normal Install is recommended, but if you are having issues, you can try using the Direct Pip mode (which will not show progress), or Manual/Copy mode, which will copy the correct install command to your clipboard for you to run in your own terminal (restart chaiNNer manually after)."
                                                 openDelay={500}
                                                 px={2}
                                                 py={0}

From e2137509c7190d968f7958458f99038dc705a829 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <34788790+joeyballentine@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:00:34 -0500
Subject: [PATCH 3/8] Update src/renderer/contexts/DependencyContext.tsx

Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com>
---
 src/renderer/contexts/DependencyContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index 3d9b58b5d..f9d5c2cae 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -459,7 +459,7 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
         toast({
             title: 'Command copied to clipboard.',
             description:
-                'Open up anm external terminal, paste the command, and run it. When it is done running, manually restart chaiNNer.',
+                'Open up an external terminal, paste the command, and run it. When it is done running, manually restart chaiNNer.',
             status: 'success',
             duration: 9000,
             isClosable: true,

From 9bd76e4a5907824f3d3401bbc5d41437f9eae868 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <34788790+joeyballentine@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:00:41 -0500
Subject: [PATCH 4/8] Update src/renderer/contexts/DependencyContext.tsx

Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com>
---
 src/renderer/contexts/DependencyContext.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index f9d5c2cae..32fcbc09d 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -59,7 +59,7 @@ import { GlobalContext } from './GlobalNodeState';
 import { SettingsContext } from './SettingsContext';
 
 const installModes = {
-    NORMAL: 'Normal Install',
+    NORMAL: 'Normal',
     DIRECT_PIP: 'Direct Pip',
     MANUAL_COPY: 'Manual/Copy',
 };

From f94cf6c8027f974904972b4900f0aeb563f89deb Mon Sep 17 00:00:00 2001
From: Joey Ballentine <34788790+joeyballentine@users.noreply.github.com>
Date: Sat, 20 Jan 2024 20:00:48 -0500
Subject: [PATCH 5/8] Update src/renderer/contexts/DependencyContext.tsx

Co-authored-by: Michael Schmidt <mitchi5000.ms@googlemail.com>
---
 src/renderer/contexts/DependencyContext.tsx | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index 32fcbc09d..a8311aa3d 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -599,7 +599,14 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                             <Tooltip
                                                 hasArrow
                                                 borderRadius={8}
-                                                label="Change the dependency install mode. Normal Install is recommended, but if you are having issues, you can try using the Direct Pip mode (which will not show progress), or Manual/Copy mode, which will copy the correct install command to your clipboard for you to run in your own terminal (restart chaiNNer manually after)."
+                                                label={
+                                                    <Markdown nonInteractive>
+                                                        {'The dependency install mode. ChaiNNer supports 3 ways of installing packages:\n\n' +
+                                                            '- Normal: This is the default installation mode. If you are having issues, you can try using the Direct Pip mode.\n' +
+                                                            '- Direct Pip: This will invoke pip more directly, which can fix some issues, but also makes it impossible to show installation progress.\n' +
+                                                            '- Manual/Copy: Copy the pip install command to your clipboard for you to run in your own terminal. You have to manually restart chaiNner afterwards.'}
+                                                    </Markdown>
+                                                }
                                                 openDelay={500}
                                                 px={2}
                                                 py={0}

From dcea7e396dbb5536eb7bff4f0f99e13c4a0e55b5 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Sat, 20 Jan 2024 20:01:51 -0500
Subject: [PATCH 6/8] remove unneeded flags

---
 src/renderer/contexts/DependencyContext.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index a8311aa3d..0470f8175 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -481,8 +481,6 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                 '--upgrade',
                 ...deps,
                 ...findLinks,
-                '--no-cache-dir',
-                '--disable-pip-version-check',
             ];
             const cmd = args.join(' ');
             copyCommandToClipboard(cmd);

From 21cee4b0a8144c050a64046dcc577db09300ef32 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Sat, 20 Jan 2024 20:03:48 -0500
Subject: [PATCH 7/8] update tooltip text

---
 src/renderer/contexts/DependencyContext.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index 0470f8175..49d5d870d 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -600,9 +600,9 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                                 label={
                                                     <Markdown nonInteractive>
                                                         {'The dependency install mode. ChaiNNer supports 3 ways of installing packages:\n\n' +
-                                                            '- Normal: This is the default installation mode. If you are having issues, you can try using the Direct Pip mode.\n' +
-                                                            '- Direct Pip: This will invoke pip more directly, which can fix some issues, but also makes it impossible to show installation progress.\n' +
-                                                            '- Manual/Copy: Copy the pip install command to your clipboard for you to run in your own terminal. You have to manually restart chaiNner afterwards.'}
+                                                            '- Normal: This is the default installation mode. This mode manually downloads packages in order to display download progress.\n' +
+                                                            '- Direct Pip: This will invoke pip more directly, like installing python packages normally. Use this setting when having issues with Normal. Note: this makes it impossible to show installation progress.\n' +
+                                                            '- Manual/Copy: Copy the pip install command to your clipboard for you to run in your own terminal. You will have to manually restart chaiNner afterwards.'}
                                                     </Markdown>
                                                 }
                                                 openDelay={500}

From d2c1520a29f4f47d94acd3dc4384430af6f7e578 Mon Sep 17 00:00:00 2001
From: Joey Ballentine <joeyjballentine@gmail.com>
Date: Sun, 21 Jan 2024 13:09:49 -0500
Subject: [PATCH 8/8] Replace toast with popover

---
 src/renderer/contexts/DependencyContext.tsx | 73 ++++++++++++++-------
 1 file changed, 51 insertions(+), 22 deletions(-)

diff --git a/src/renderer/contexts/DependencyContext.tsx b/src/renderer/contexts/DependencyContext.tsx
index 49d5d870d..e6a30eca0 100644
--- a/src/renderer/contexts/DependencyContext.tsx
+++ b/src/renderer/contexts/DependencyContext.tsx
@@ -20,6 +20,13 @@ import {
     ModalFooter,
     ModalHeader,
     ModalOverlay,
+    Popover,
+    PopoverArrow,
+    PopoverBody,
+    PopoverCloseButton,
+    PopoverContent,
+    PopoverHeader,
+    PopoverTrigger,
     Progress,
     Select,
     Spacer,
@@ -30,7 +37,6 @@ import {
     Tooltip,
     VStack,
     useDisclosure,
-    useToast,
 } from '@chakra-ui/react';
 import { clipboard } from 'electron';
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
@@ -423,8 +429,6 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
     );
     const onStdio: OnStdio = { onStderr: appendToOutput, onStdout: appendToOutput };
 
-    const toast = useToast();
-
     const changePackages = (supplier: () => Promise<void>) => {
         if (isRunningShell) throw new Error('Cannot run two pip commands at once');
 
@@ -454,16 +458,17 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
             });
     };
 
+    const {
+        isOpen: isPopoverOpen,
+        onToggle: onPopoverToggle,
+        onClose: onPopoverClose,
+    } = useDisclosure();
     const copyCommandToClipboard = (command: string) => {
         clipboard.writeText(command);
-        toast({
-            title: 'Command copied to clipboard.',
-            description:
-                'Open up an external terminal, paste the command, and run it. When it is done running, manually restart chaiNNer.',
-            status: 'success',
-            duration: 9000,
-            isClosable: true,
-        });
+        onPopoverToggle();
+        setTimeout(() => {
+            onPopoverClose();
+        }, 5000);
     };
 
     const installPackage = (pkg: Package) => {
@@ -582,18 +587,42 @@ export const DependencyProvider = memo(({ children }: React.PropsWithChildren<un
                                 <HStack gap={2}>
                                     <HStack>
                                         <HStack>
-                                            <Select
-                                                isDisabled={isRunningShell}
-                                                size="md"
-                                                value={installMode}
-                                                onChange={(e) => {
-                                                    setInstallMode(e.target.value);
-                                                }}
+                                            <Popover
+                                                closeOnBlur={false}
+                                                colorScheme="green"
+                                                isOpen={isPopoverOpen}
+                                                placement="top"
+                                                returnFocusOnClose={false}
+                                                onClose={onPopoverClose}
                                             >
-                                                <option>{installModes.NORMAL}</option>
-                                                <option>{installModes.DIRECT_PIP}</option>
-                                                <option>{installModes.MANUAL_COPY}</option>
-                                            </Select>
+                                                <PopoverTrigger>
+                                                    <Select
+                                                        isDisabled={isRunningShell}
+                                                        size="md"
+                                                        value={installMode}
+                                                        onChange={(e) => {
+                                                            setInstallMode(e.target.value);
+                                                        }}
+                                                    >
+                                                        <option>{installModes.NORMAL}</option>
+                                                        <option>{installModes.DIRECT_PIP}</option>
+                                                        <option>{installModes.MANUAL_COPY}</option>
+                                                    </Select>
+                                                </PopoverTrigger>
+                                                <PopoverContent>
+                                                    <PopoverHeader fontWeight="semibold">
+                                                        Command copied to clipboard.
+                                                    </PopoverHeader>
+                                                    <PopoverArrow />
+                                                    <PopoverCloseButton />
+                                                    <PopoverBody>
+                                                        Open up an external terminal, paste the
+                                                        command, and run it. When it is done
+                                                        running, manually restart chaiNNer.
+                                                    </PopoverBody>
+                                                </PopoverContent>
+                                            </Popover>
+
                                             <Tooltip
                                                 hasArrow
                                                 borderRadius={8}