From ae8ec47f514a8788c24cc7195d990fedef767a4c Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Fri, 29 Aug 2025 03:14:14 -0700 Subject: [PATCH] more sillytavern integration improvements, default configs to .json --- package.json | 1 - src/components/UpdateAvailableModal.tsx | 2 +- src/components/screens/Download.tsx | 2 +- .../screens/Interface/TerminalTab.tsx | 3 +- .../screens/Launch/ConfigFileManager.tsx | 38 +--- src/components/screens/Launch/index.tsx | 13 +- src/components/settings/VersionsTab.tsx | 6 +- src/hooks/useAppUpdateChecker.ts | 2 +- src/hooks/useKoboldVersions.ts | 41 +--- src/hooks/useUpdateChecker.ts | 3 +- src/main/cli.ts | 19 +- src/main/ipc.ts | 23 +-- src/main/managers/KoboldCppManager.ts | 130 ++---------- src/main/managers/SillyTavernManager.ts | 71 +++---- src/main/services/HardwareService.ts | 33 +-- src/utils/assets.ts | 2 +- src/utils/download.ts | 17 ++ src/utils/linkifyTerminal.ts | 26 --- src/utils/process.ts | 42 ++++ src/utils/processUtils.ts | 100 --------- src/utils/rocm.ts | 36 ++++ src/utils/terminal.ts | 27 +++ src/utils/{downloadUtils.ts => version.ts} | 30 +-- src/utils/versionUtils.ts | 21 -- yarn.lock | 194 +----------------- 25 files changed, 235 insertions(+), 647 deletions(-) create mode 100644 src/utils/download.ts delete mode 100644 src/utils/linkifyTerminal.ts create mode 100644 src/utils/process.ts delete mode 100644 src/utils/processUtils.ts create mode 100644 src/utils/rocm.ts rename src/utils/{downloadUtils.ts => version.ts} (51%) delete mode 100644 src/utils/versionUtils.ts diff --git a/package.json b/package.json index 7f8e22d..b3388a2 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,6 @@ "@mantine/core": "^8.2.7", "@mantine/hooks": "^8.2.7", "execa": "^9.6.0", - "fkill": "^9.0.0", "got": "^14.4.7", "lucide-react": "^0.542.0", "react": "^19.1.1", diff --git a/src/components/UpdateAvailableModal.tsx b/src/components/UpdateAvailableModal.tsx index ed37abd..4095d55 100644 --- a/src/components/UpdateAvailableModal.tsx +++ b/src/components/UpdateAvailableModal.tsx @@ -12,7 +12,7 @@ import { import { Download, X, ExternalLink } from 'lucide-react'; import { useState } from 'react'; import type { InstalledVersion, DownloadItem } from '@/types/electron'; -import { getDisplayNameFromPath } from '@/utils/versionUtils'; +import { getDisplayNameFromPath } from '@/utils/version'; import { GITHUB_API } from '@/constants'; interface UpdateAvailableModalProps { diff --git a/src/components/screens/Download.tsx b/src/components/screens/Download.tsx index 4064e05..4834504 100644 --- a/src/components/screens/Download.tsx +++ b/src/components/screens/Download.tsx @@ -2,7 +2,7 @@ import { useState, useCallback, useEffect, useRef } from 'react'; import { Card, Text, Title, Loader, Stack, Container } from '@mantine/core'; import { DownloadCard } from '@/components/DownloadCard'; import { getPlatformDisplayName } from '@/utils/platform'; -import { formatDownloadSize } from '@/utils/downloadUtils'; +import { formatDownloadSize } from '@/utils/download'; import { getAssetDescription, sortDownloadsByType } from '@/utils/assets'; import { useKoboldVersions } from '@/hooks/useKoboldVersions'; import type { DownloadItem } from '@/types/electron'; diff --git a/src/components/screens/Interface/TerminalTab.tsx b/src/components/screens/Interface/TerminalTab.tsx index dc76a66..db3334a 100644 --- a/src/components/screens/Interface/TerminalTab.tsx +++ b/src/components/screens/Interface/TerminalTab.tsx @@ -9,8 +9,7 @@ import { import { ChevronDown } from 'lucide-react'; import styles from '@/styles/layout.module.css'; import { UI } from '@/constants'; -import { handleTerminalOutput } from '@/utils/terminal'; -import { processTerminalContent } from '@/utils/linkifyTerminal'; +import { handleTerminalOutput, processTerminalContent } from '@/utils/terminal'; import { useLaunchConfigStore } from '@/stores/launchConfigStore'; import type { FrontendPreference } from '@/types'; diff --git a/src/components/screens/Launch/ConfigFileManager.tsx b/src/components/screens/Launch/ConfigFileManager.tsx index 88e1865..f39f8c0 100644 --- a/src/components/screens/Launch/ConfigFileManager.tsx +++ b/src/components/screens/Launch/ConfigFileManager.tsx @@ -1,4 +1,4 @@ -import { Stack, Text, Group, Button, Select, Badge } from '@mantine/core'; +import { Stack, Text, Group, Button, Select } from '@mantine/core'; import { useState, useCallback } from 'react'; import { Save, File, Plus, Check } from 'lucide-react'; import type { ConfigFile } from '@/types'; @@ -14,33 +14,6 @@ interface ConfigFileManagerProps { onLoadConfigFiles: () => Promise; } -interface SelectItemProps { - label: string; - extension: string; -} - -const getBadgeColor = (extension: string) => { - switch (extension.toLowerCase()) { - case '.kcpps': - return 'blue'; - case '.kcppt': - return 'green'; - default: - return 'gray'; - } -}; - -const SelectItem = ({ label, extension }: SelectItemProps) => ( - - - {label} - - - {extension} - - -); - export const ConfigFileManager = ({ configFiles, selectedFile, @@ -110,15 +83,6 @@ export const ConfigFileManager = ({ leftSection={} searchable clearable={false} - renderOption={({ option }) => { - const dataItem = selectData.find( - (item) => item.value === option.value - ); - const extension = dataItem?.extension || ''; - return ( - - ); - }} />