π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Align desktop Ensu Packs with mobile
setalp887eff3ad0a7
diff --git a/rust/apps/ensu/src-tauri/src/commands/chat_db.rs b/rust/apps/ensu/src-tauri/src/commands/chat_db.rsindex f680a29989..8cf483d8e8 100644--- a/rust/apps/ensu/src-tauri/src/commands/chat_db.rs+++ b/rust/apps/ensu/src-tauri/src/commands/chat_db.rs@@ -357,7 +357,19 @@ pub async fn chat_db_insert_message(let sender = normalize_sender(&input.sender)?;let attachments = convert_attachments(input.attachments)?;let text = if sender == "other" {- finalize_assistant_text(&input.text, input.citations.unwrap_or_default())?+ match finalize_assistant_text(&input.text, input.citations.unwrap_or_default()) {+ Ok(text) => text,+ Err(error) => {+ logging::log(+ "ChatDb",+ format!(+ "assistant source finalization failed error={}",+ error.message+ ),+ );+ finalize_assistant_text(&input.text, Vec::new())?+ }+ }} else {input.text};diff --git a/rust/apps/ensu/src-tauri/src/commands/knowledge.rs b/rust/apps/ensu/src-tauri/src/commands/knowledge.rsindex e12f72d01b..a828121b18 100644--- a/rust/apps/ensu/src-tauri/src/commands/knowledge.rs+++ b/rust/apps/ensu/src-tauri/src/commands/knowledge.rs@@ -83,7 +83,7 @@ pub struct KnowledgePackDto {stable_id: String,label: String,download_size_bytes: i64,- status: KnowledgePackStatusDto,+ status: Option<KnowledgePackStatusDto>,attribution: AttributionDto,}@@ -225,13 +225,13 @@ fn reconcile_and_open(fn pack_dto(dataset: KnowledgeDatasetConfig,- reconciliation: retrieval::KnowledgeReconciliation,+ reconciliation: Option<retrieval::KnowledgeReconciliation>,) -> KnowledgePackDto {KnowledgePackDto {stable_id: dataset.stable_id,label: dataset.label,download_size_bytes: dataset.download_size_bytes,- status: reconciliation.status.into(),+ status: reconciliation.map(|result| result.status.into()),attribution: dataset.attribution.into(),}}@@ -240,10 +240,19 @@ fn pack_dto(pub async fn knowledge_catalog(model_state: TauriState<'_, ModelDownloadState>,knowledge_state: TauriState<'_, State>,+ reconcile_stable_ids: Option<Vec<String>>,) -> Result<Vec<KnowledgePackDto>, ApiError> {let store = model_state.store();+ let selected = reconcile_stable_ids.map(|ids| ids.into_iter().collect::<HashSet<_>>());let mut packs = Vec::new();for dataset in ente_ensu::config::defaults().knowledge_datasets {+ if selected+ .as_ref()+ .is_some_and(|ids| !ids.contains(&dataset.stable_id))+ {+ packs.push(pack_dto(dataset, None));+ continue;+ }let lifecycle = knowledge_state.pack_lifecycle(&dataset.stable_id);let _lifecycle = lifecycle.lock().await;let indexes = Arc::clone(&knowledge_state.indexes);@@ -275,7 +284,7 @@ pub async fn knowledge_catalog(}}};- packs.push(pack_dto(dataset, reconciliation));+ packs.push(pack_dto(dataset, Some(reconciliation)));}Ok(packs)}@@ -384,7 +393,7 @@ pub async fn knowledge_download_pack());}- Ok(pack_dto(dataset, reconciliation))+ Ok(pack_dto(dataset, Some(reconciliation)))}#[tauri::command]diff --git a/web/apps/ensu/src/components/chat/ChatDialogs.tsx b/web/apps/ensu/src/components/chat/ChatDialogs.tsxindex 93407d2110..2890736ad5 100644--- a/web/apps/ensu/src/components/chat/ChatDialogs.tsx+++ b/web/apps/ensu/src/components/chat/ChatDialogs.tsx@@ -771,7 +771,9 @@ export const ChatDialogs = memo({knowledgePacks.map((pack) => {const progress =knowledgeDownloadProgress[pack.stableId];- const installed = pack.status !== "download";+ const installed =+ pack.status === "ready" ||+ pack.status === "updateAvailable";const isMutating = progress !== undefined;const enabled =enabledKnowledgePackIds.has(diff --git a/web/apps/ensu/src/pages/chat.tsx b/web/apps/ensu/src/pages/chat.tsxindex c930c1a51d..f10f3bdd63 100644--- a/web/apps/ensu/src/pages/chat.tsx+++ b/web/apps/ensu/src/pages/chat.tsx@@ -692,6 +692,9 @@ const Page: React.FC = () => {const knowledgeCatalogPromiseRef = useRef<Promise<KnowledgePack[]> | null>(null,);+ const knowledgeBootstrapPromiseRef = useRef<Promise<+ KnowledgePack[]+ > | null>(null);const generationStartingRef = useRef(false);const generationStoppingRef = useRef(false);const pendingGenerationStopsRef = useRef(0);@@ -780,6 +783,15 @@ const Page: React.FC = () => {return knowledgeCatalogPromiseRef.current;}, []);+ const loadEnabledKnowledgeCatalogOnce = useCallback(() => {+ if (!knowledgeBootstrapPromiseRef.current) {+ knowledgeBootstrapPromiseRef.current = loadKnowledgeCatalog([+ ...loadEnabledKnowledgePacks(),+ ]);+ }+ return knowledgeBootstrapPromiseRef.current;+ }, []);+const refreshKnowledgeCatalog = useCallback(async () => {if (!isTauriRuntime) return;setKnowledgeCatalogLoading(true);@@ -982,8 +994,45 @@ const Page: React.FC = () => {useEffect(() => {if (!isTauriRuntime) return;- void refreshKnowledgeCatalog();- }, [isTauriRuntime, refreshKnowledgeCatalog]);+ setKnowledgeCatalogLoading(true);+ setKnowledgeCatalogError(null);+ void loadEnabledKnowledgeCatalogOnce()+ .then((packs) => {+ setKnowledgePacks(packs);+ const enabled = loadEnabledKnowledgePacks();+ const disabledStableIds = packs+ .filter((pack) => !enabled.has(pack.stableId))+ .map((pack) => pack.stableId);+ if (disabledStableIds.length === 0) return;+ void loadKnowledgeCatalog(disabledStableIds)+ .then((updates) => {+ setKnowledgePacks((current) => {+ const currentById = new Map(+ current.map((pack) => [pack.stableId, pack]),+ );+ return updates.map((pack) =>+ pack.status+ ? pack+ : (currentById.get(pack.stableId) ?? pack),+ );+ });+ })+ .catch((error: unknown) => {+ setKnowledgeCatalogError(knowledgeErrorMessage(error));+ log.error(+ "Failed to refresh disabled Ensu Packs",+ error,+ );+ });+ })+ .catch((error: unknown) => {+ setKnowledgeCatalogError(knowledgeErrorMessage(error));+ log.error("Failed to bootstrap enabled Ensu Packs", error);+ })+ .finally(() => {+ setKnowledgeCatalogLoading(false);+ });+ }, [isTauriRuntime, loadEnabledKnowledgeCatalogOnce]);useEffect(() => {if (typeof window === "undefined") return;@@ -1741,11 +1790,10 @@ const Page: React.FC = () => {const showImageAttachment = isTauriRuntime;const showDownloadProgress =!!downloadStatus?.status && downloadStatus.status !== "Ready";- const showModelGate = isTauriRuntime- ? modelGateStatus !== "ready"- : modelGateStatus === "missing" ||- modelGateStatus === "error" ||- modelGateStatus === "downloading";+ const showModelGate =+ modelGateStatus === "missing" ||+ modelGateStatus === "error" ||+ modelGateStatus === "downloading";const hideMessagesForModelGate = isTauriRuntime && showModelGate;const downloadSizeLabel = useMemo(() => {@@ -3030,7 +3078,7 @@ const Page: React.FC = () => {readyPacks.length === 0) {try {- readyPacks = await loadKnowledgeCatalogOnce();+ readyPacks = await loadEnabledKnowledgeCatalogOnce();if (!isActiveGeneration()) return;setKnowledgePacks(readyPacks);} catch (error) {@@ -3043,7 +3091,8 @@ const Page: React.FC = () => {const enabledReadyPackIds = readyPacks.filter((pack) =>- pack.status !== "download" &&+ (pack.status === "ready" ||+ pack.status === "updateAvailable") &&enabledKnowledgePackIds.has(pack.stableId),).map((pack) => pack.stableId);@@ -3317,7 +3366,7 @@ const Page: React.FC = () => {isTauriRuntime,enabledKnowledgePackIds,knowledgePacks,- loadKnowledgeCatalogOnce,+ loadEnabledKnowledgeCatalogOnce,],);diff --git a/web/apps/ensu/src/services/knowledge.ts b/web/apps/ensu/src/services/knowledge.tsindex 0943690087..891c678785 100644--- a/web/apps/ensu/src/services/knowledge.ts+++ b/web/apps/ensu/src/services/knowledge.ts@@ -17,7 +17,7 @@ export interface KnowledgePack {stableId: string;label: string;downloadSizeBytes: number;- status: KnowledgePackStatus;+ status: KnowledgePackStatus | null;attribution: KnowledgeAttribution;}@@ -52,8 +52,10 @@ const invokeKnowledge = async <T>(return invoke<T>(command, args);};-export const loadKnowledgeCatalog = () =>- invokeKnowledge<KnowledgePack[]>("knowledge_catalog");+export const loadKnowledgeCatalog = (reconcileStableIds?: string[]) =>+ invokeKnowledge<KnowledgePack[]>("knowledge_catalog", {+ reconcileStableIds,+ });export const downloadKnowledgePack = async (stableId: string,