From 533e38c287a866a7b8713a89f0629b491020675b Mon Sep 17 00:00:00 2001 From: n4ze3m Date: Mon, 27 May 2024 21:09:16 +0530 Subject: [PATCH] chore: Update Layout component to truncate long model names --- src/components/Layouts/Layout.tsx | 4 ++-- src/libs/process-knowledge.ts | 16 +++++----------- wxt.config.ts | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/components/Layouts/Layout.tsx b/src/components/Layouts/Layout.tsx index 0fe494f..2a4f5e4 100644 --- a/src/components/Layouts/Layout.tsx +++ b/src/components/Layouts/Layout.tsx @@ -141,9 +141,9 @@ export default function OptionLayout({ label: ( + className="flex flex-row gap-3 items-center truncate"> - {model.name} + {model.name} ), value: model.model diff --git a/src/libs/process-knowledge.ts b/src/libs/process-knowledge.ts index e44bfa0..f933d85 100644 --- a/src/libs/process-knowledge.ts +++ b/src/libs/process-knowledge.ts @@ -2,7 +2,8 @@ import { getKnowledgeById, updateKnowledgeStatus } from "@/db/knowledge" import { PageAssistPDFUrlLoader } from "@/loader/pdf-url" import { defaultEmbeddingChunkOverlap, - defaultEmbeddingChunkSize + defaultEmbeddingChunkSize, + getOllamaURL } from "@/services/ollama" import { OllamaEmbeddings } from "@langchain/community/embeddings/ollama" import { RecursiveCharacterTextSplitter } from "langchain/text_splitter" @@ -10,22 +11,14 @@ import { PageAssistVectorStore } from "./PageAssistVectorStore" import { PageAssisCSVUrlLoader } from "@/loader/csv" import { PageAssisTXTUrlLoader } from "@/loader/txt" import { PageAssistDocxLoader } from "@/loader/docx" +import { cleanUrl } from "./clean-url" -const readAsArrayBuffer = (file: File): Promise => { - return new Promise((resolve, reject) => { - const reader = new FileReader() - reader.onload = () => { - resolve(reader.result as ArrayBuffer) - } - reader.onerror = reject - reader.readAsArrayBuffer(file) - }) -} export const processKnowledge = async (msg: any, id: string): Promise => { console.log(`Processing knowledge with id: ${id}`) try { const knowledge = await getKnowledgeById(id) + const ollamaUrl = await getOllamaURL() if (!knowledge) { console.error(`Knowledge with id ${id} not found`) @@ -35,6 +28,7 @@ export const processKnowledge = async (msg: any, id: string): Promise => { await updateKnowledgeStatus(id, "processing") const ollamaEmbedding = new OllamaEmbeddings({ + baseUrl: cleanUrl(ollamaUrl), model: knowledge.embedding_model }) const chunkSize = await defaultEmbeddingChunkSize() diff --git a/wxt.config.ts b/wxt.config.ts index 105c324..0e89e7a 100644 --- a/wxt.config.ts +++ b/wxt.config.ts @@ -48,7 +48,7 @@ export default defineConfig({ outDir: "build", manifest: { - version: "1.1.10", + version: "1.1.11", name: process.env.TARGET === "firefox" ? "Page Assist - A Web UI for Local AI Models"