From a893de21a7558a57c57cb37ac4e88d28223183eb Mon Sep 17 00:00:00 2001 From: green1052 Date: Tue, 22 Apr 2025 12:08:02 +0900 Subject: [PATCH 01/15] Update package.json From f15e96514cc863c543815c26df12bba5c29e2aff Mon Sep 17 00:00:00 2001 From: green1052 Date: Tue, 22 Apr 2025 12:08:24 +0900 Subject: [PATCH 02/15] Update pnpm-lock.yaml --- pnpm-lock.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c460c2c9..155294d5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -158,6 +158,9 @@ importers: ml-distance: specifier: ^4.0.1 version: 4.0.1 + mnemonist: + specifier: ^0.40.3 + version: 0.40.3 mobile-drag-drop: specifier: 3.0.0-rc.0 version: 3.0.0-rc.0 @@ -2756,6 +2759,9 @@ packages: ml-tree-similarity@1.0.0: resolution: {integrity: sha512-XJUyYqjSuUQkNQHMscr6tcjldsOoAekxADTplt40QKfwW6nd++1wHWV9AArl0Zvw/TIHgNaZZNvr8QGvE8wLRg==} + mnemonist@0.40.3: + resolution: {integrity: sha512-Vjyr90sJ23CKKH/qPAgUKicw/v6pRoamxIEDFOF8uSgFME7DqPRpHgRTejWVjkdGg5dXj0/NyxZHZ9bcjH+2uQ==} + mobile-drag-drop@3.0.0-rc.0: resolution: {integrity: sha512-f8wIDTbBYLBW/+5sei1cqUE+StyDpf/LP+FRZELlVX6tmOOmELk84r3wh1z3woxCB9G5octhF06K5COvFjGgqg==} @@ -2900,6 +2906,9 @@ packages: object-inspect@1.13.1: resolution: {integrity: sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==} + obliterator@2.0.5: + resolution: {integrity: sha512-42CPE9AhahZRsMNslczq0ctAEtqk8Eka26QofnqC346BZdHDySk3LWka23LI7ULIw11NmltpiLagIq8gBozxTw==} + ollama@0.5.0: resolution: {integrity: sha512-CRtRzsho210EGdK52GrUMohA2pU+7NbgEaBG3DcYeRmvQthDO7E2LHOkLlUUeaYUlNmEd8icbjC02ug9meSYnw==} @@ -6505,6 +6514,10 @@ snapshots: binary-search: 1.3.6 num-sort: 2.1.0 + mnemonist@0.40.3: + dependencies: + obliterator: 2.0.5 + mobile-drag-drop@3.0.0-rc.0: {} modify-values@1.0.1: {} @@ -6665,6 +6678,8 @@ snapshots: object-inspect@1.13.1: {} + obliterator@2.0.5: {} + ollama@0.5.0: dependencies: whatwg-fetch: 3.6.20 From 68372067554fc9a503a7418b2d932779de9e937d Mon Sep 17 00:00:00 2001 From: alattalatta Date: Tue, 22 Apr 2025 23:00:59 +0900 Subject: [PATCH 03/15] Allow deleting specific HypaV3 summaries if orphaned --- src/lang/cn.ts | 1 + src/lang/de.ts | 1 + src/lang/en.ts | 1 + src/lang/es.ts | 1 + src/lang/ko.ts | 1 + src/lang/vi.ts | 1 + src/lang/zh-Hant.ts | 1 + src/lib/Others/HypaV3Modal.svelte | 30 +++++++++++++++++++++++++----- 8 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 4a4116be..644299f7 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -800,6 +800,7 @@ export const languageChinese = { "noSummariesLabel": "尚无总结", "searchPlaceholder": "输入 #N、ID 或搜索关键词", "summaryNumberLabel": "总结 #{0}", + "deleteThisConfirmMessage": "删除此摘要?", "deleteAfterConfirmMessage": "删除此后的所有总结?", "deleteAfterConfirmSecondMessage": "此操作无法撤销。您确定吗?", "translationLabel": "翻译", diff --git a/src/lang/de.ts b/src/lang/de.ts index c3ac6507..d3795ab7 100644 --- a/src/lang/de.ts +++ b/src/lang/de.ts @@ -464,6 +464,7 @@ export const languageGerman = { "noSummariesLabel": "Noch keine Zusammenfassungen", "searchPlaceholder": "Geben Sie #N, ID oder Suchanfrage ein", "summaryNumberLabel": "Zusammenfassung #{0}", + "deleteThisConfirmMessage": "Diese Zusammenfassung löschen?", "deleteAfterConfirmMessage": "Alle Zusammenfassungen nach dieser löschen?", "deleteAfterConfirmSecondMessage": "Diese Aktion kann nicht rückgängig gemacht werden. Sind Sie wirklich sicher?", "translationLabel": "Übersetzung", diff --git a/src/lang/en.ts b/src/lang/en.ts index ead4740f..22410fa7 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -1036,6 +1036,7 @@ export const languageEnglish = { noSummariesLabel: "No summaries yet", searchPlaceholder: "Enter #N, ID, or query", summaryNumberLabel: "Summary #{0}", + deleteThisConfirmMessage: "Delete this summary?", deleteAfterConfirmMessage: "Delete all summaries after this one?", deleteAfterConfirmSecondMessage: "This action cannot be undone. Are you really sure?", translationLabel: "Translation", diff --git a/src/lang/es.ts b/src/lang/es.ts index af4168b1..9a306399 100644 --- a/src/lang/es.ts +++ b/src/lang/es.ts @@ -709,6 +709,7 @@ export const languageSpanish = { "noSummariesLabel": "Aún no hay resúmenes", "searchPlaceholder": "Ingrese #N, ID o búsqueda", "summaryNumberLabel": "Resumen #{0}", + "deleteThisConfirmMessage": "¿Eliminar este resumen?", "deleteAfterConfirmMessage": "¿Eliminar todos los resúmenes después de este?", "deleteAfterConfirmSecondMessage": "Esta acción no se puede deshacer. ¿Está realmente seguro?", "translationLabel": "Traducción", diff --git a/src/lang/ko.ts b/src/lang/ko.ts index 863ec86c..53b8f04e 100644 --- a/src/lang/ko.ts +++ b/src/lang/ko.ts @@ -955,6 +955,7 @@ export const languageKorean = { "noSummariesLabel": "아직 요약이 없습니다", "searchPlaceholder": "#N, ID 또는 검색어 입력", "summaryNumberLabel": "요약 #{0}", + "deleteThisConfirmMessage": "이 요약을 삭제하시겠습니까?", "deleteAfterConfirmMessage": "이 요약 이후의 모든 요약을 삭제하시겠습니까?", "deleteAfterConfirmSecondMessage": "이 작업은 되돌릴 수 없습니다. 정말 삭제하시겠습니까?", "translationLabel": "번역", diff --git a/src/lang/vi.ts b/src/lang/vi.ts index 4cbe52b2..7723075d 100644 --- a/src/lang/vi.ts +++ b/src/lang/vi.ts @@ -438,6 +438,7 @@ export const LanguageVietnamese = { "noSummariesLabel": "Chưa có tóm tắt nào", "searchPlaceholder": "Nhập #N, ID hoặc từ khóa", "summaryNumberLabel": "Tóm tắt #{0}", + "deleteThisConfirmMessage": "Xóa bản tóm tắt này?", "deleteAfterConfirmMessage": "Xóa tất cả các tóm tắt sau tóm tắt này?", "deleteAfterConfirmSecondMessage": "Hành động này không thể hoàn tác. Bạn có chắc chắn không?", "translationLabel": "Bản dịch", diff --git a/src/lang/zh-Hant.ts b/src/lang/zh-Hant.ts index 481587af..82722ec9 100644 --- a/src/lang/zh-Hant.ts +++ b/src/lang/zh-Hant.ts @@ -833,6 +833,7 @@ export const languageChineseTraditional = { "noSummariesLabel": "尚無摘要", "searchPlaceholder": "輸入 #N、ID 或搜尋關鍵字", "summaryNumberLabel": "摘要 #{0}", + "deleteThisConfirmMessage": "刪除此摘要?", "deleteAfterConfirmMessage": "刪除此摘要之後的所有摘要?", "deleteAfterConfirmSecondMessage": "此操作無法撤銷。您確定要這樣做嗎?", "translationLabel": "翻譯", diff --git a/src/lib/Others/HypaV3Modal.svelte b/src/lib/Others/HypaV3Modal.svelte index 51451563..adb2a2a4 100644 --- a/src/lib/Others/HypaV3Modal.svelte +++ b/src/lib/Others/HypaV3Modal.svelte @@ -404,23 +404,23 @@ summaryUIState.isTranslating = false; } - function isRerollable(summaryIndex: number): boolean { + function isOrphan(summaryIndex: number): boolean { const summary = hypaV3DataState.summaries[summaryIndex]; for (const chatMemo of summary.chatMemos) { if (!getMessageFromChatMemo(chatMemo)) { - return false; + return true; } } - return true; + return false; } async function toggleReroll(summaryIndex: number): Promise { const summaryUIState = summaryUIStates[summaryIndex]; if (summaryUIState.isRerolling) return; - if (!isRerollable(summaryIndex)) return; + if (isOrphan(summaryIndex)) return; summaryUIState.isRerolling = true; summaryUIState.rerolledText = "Loading..."; @@ -1074,12 +1074,32 @@ + + + +