diff --git a/src/components/Option/Playground/PlaygroundEmpty.tsx b/src/components/Option/Playground/PlaygroundEmpty.tsx
index 4e23d7d..0b772f6 100644
--- a/src/components/Option/Playground/PlaygroundEmpty.tsx
+++ b/src/components/Option/Playground/PlaygroundEmpty.tsx
@@ -39,6 +39,13 @@ export const PlaygroundEmpty = () => {
enabled: checkOllamaStatus
})
+ useEffect(() => {
+ if (ollamaInfo?.ollamaURL) {
+ setOllamaURL(ollamaInfo.ollamaURL)
+ }
+ }, [ollamaInfo])
+
+
if (!checkOllamaStatus) {
return (
diff --git a/src/components/Option/Settings/general-settings.tsx b/src/components/Option/Settings/general-settings.tsx
index f615236..c471fd4 100644
--- a/src/components/Option/Settings/general-settings.tsx
+++ b/src/components/Option/Settings/general-settings.tsx
@@ -27,6 +27,11 @@ export const GeneralSettings = () => {
false
)
+ const [webUIResumeLastChat, setWebUIResumeLastChat] = useStorage(
+ "webUIResumeLastChat",
+ false
+ )
+
const [restoreLastChatModel, setRestoreLastChatModel] = useStorage(
"restoreLastChatModel",
false
@@ -113,6 +118,17 @@ export const GeneralSettings = () => {
onChange={(checked) => setCopilotResumeLastChat(checked)}
/>
+
+
+
+ {t("generalSettings.settings.webUIResumeLastChat.label")}
+
+
+
setWebUIResumeLastChat(checked)}
+ />
+
diff --git a/src/components/Option/Settings/model-settings.tsx b/src/components/Option/Settings/model-settings.tsx
index 40523f7..18015ba 100644
--- a/src/components/Option/Settings/model-settings.tsx
+++ b/src/components/Option/Settings/model-settings.tsx
@@ -2,7 +2,7 @@ import { BetaTag } from "@/components/Common/Beta"
import { SaveButton } from "@/components/Common/SaveButton"
import { getAllModelSettings, setModelSetting } from "@/services/model-settings"
import { useQuery, useQueryClient } from "@tanstack/react-query"
-import { Form, Skeleton, Input, InputNumber, Collapse } from "antd"
+import { Form, Skeleton, Input, InputNumber, Collapse, Switch } from "antd"
import React from "react"
import { useTranslation } from "react-i18next"
@@ -78,13 +78,13 @@ export const ModelSettings = () => {
/>
-
-
+ name="numPredict"
+ label={t("modelSettings.form.numPredict.label")}>
+
+
{
+
+
+
)
}
diff --git a/src/components/Option/Settings/search-mode.tsx b/src/components/Option/Settings/search-mode.tsx
index 53f391b..69ae112 100644
--- a/src/components/Option/Settings/search-mode.tsx
+++ b/src/components/Option/Settings/search-mode.tsx
@@ -3,7 +3,7 @@ import { getSearchSettings, setSearchSettings } from "@/services/search"
import { SUPPORTED_SERACH_PROVIDERS } from "@/utils/search-provider"
import { useForm } from "@mantine/form"
import { useQuery, useQueryClient } from "@tanstack/react-query"
-import { Select, Skeleton, Switch, InputNumber } from "antd"
+import { Select, Skeleton, Switch, InputNumber, Input } from "antd"
import { useTranslation } from "react-i18next"
export const SearchModeSettings = () => {
@@ -14,7 +14,9 @@ export const SearchModeSettings = () => {
isSimpleInternetSearch: false,
searchProvider: "",
totalSearchResults: 0,
- visitSpecificWebsite: false
+ visitSpecificWebsite: false,
+ searxngURL: "",
+ searxngJSONMode: false
}
})
@@ -62,6 +64,23 @@ export const SearchModeSettings = () => {
/>
+ {form.values.searchProvider === "searxng" && (
+ <>
+
+
+ {t("generalSettings.webSearch.searxng.url.label")}
+
+
+
+
+
+
+ )}
{t("generalSettings.webSearch.searchMode.label")}
diff --git a/src/db/index.ts b/src/db/index.ts
index da837b2..6cab3ef 100644
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -356,11 +356,11 @@ export const updateMessageByIndex = async (
message: string
) => {
try {
- const db = new PageAssitDatabase()
- const chatHistory = (await db.getChatHistory(history_id)).reverse()
- chatHistory[index].content = message
- await db.db.set({ [history_id]: chatHistory.reverse() })
- } catch(e) {
+ const db = new PageAssitDatabase()
+ const chatHistory = (await db.getChatHistory(history_id)).reverse()
+ chatHistory[index].content = message
+ await db.db.set({ [history_id]: chatHistory.reverse() })
+ } catch (e) {
// temp chat will break
}
}
@@ -515,6 +515,20 @@ export const getRecentChatFromCopilot = async () => {
return { history, messages }
}
+export const getRecentChatFromWebUI = async () => {
+ const db = new PageAssitDatabase()
+ const chatHistories = await db.getChatHistories()
+ if (chatHistories.length === 0) return null
+ const history = chatHistories.find(
+ (history) => history.message_source === "web-ui"
+ )
+ if (!history) return null
+
+ const messages = await db.getChatHistory(history.id)
+
+ return { history, messages }
+}
+
export const getTitleById = async (id: string) => {
const db = new PageAssitDatabase()
const title = await db.getChatHistoryTitleById(id)
diff --git a/src/hooks/useMessage.tsx b/src/hooks/useMessage.tsx
index eb17f3e..c95554d 100644
--- a/src/hooks/useMessage.tsx
+++ b/src/hooks/useMessage.tsx
@@ -139,7 +139,9 @@ export const useMessage = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -271,7 +273,10 @@ export const useMessage = () => {
userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ??
+ userDefaultModelSettings?.useMMap
})
const response = await questionOllama.invoke(promptForQuestion)
query = response.content.toString()
@@ -482,7 +487,9 @@ export const useMessage = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -526,7 +533,7 @@ export const useMessage = () => {
const prompt = await systemPromptForNonRag()
const selectedPrompt = await getPromptById(selectedSystemPrompt)
- const applicationChatHistory = generateHistory(history, selectedModel)
+ const applicationChatHistory = []
const data = await getScreenshotFromCurrentTab()
console.log(
@@ -716,7 +723,9 @@ export const useMessage = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -944,7 +953,9 @@ export const useMessage = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -1023,7 +1034,10 @@ export const useMessage = () => {
userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ??
+ userDefaultModelSettings?.useMMap
})
const response = await questionOllama.invoke(promptForQuestion)
query = response.content.toString()
@@ -1211,7 +1225,9 @@ export const useMessage = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
diff --git a/src/hooks/useMessageOption.tsx b/src/hooks/useMessageOption.tsx
index 322287c..d687344 100644
--- a/src/hooks/useMessageOption.tsx
+++ b/src/hooks/useMessageOption.tsx
@@ -130,7 +130,9 @@ export const useMessageOption = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -209,7 +211,10 @@ export const useMessageOption = () => {
userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ??
+ userDefaultModelSettings?.useMMap
})
const response = await questionOllama.invoke(promptForQuestion)
query = response.content.toString()
@@ -429,7 +434,9 @@ export const useMessageOption = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -667,7 +674,9 @@ export const useMessageOption = () => {
currentChatModelSettings?.numGpu ?? userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ?? userDefaultModelSettings?.useMMap
})
let newMessage: Message[] = []
@@ -762,7 +771,10 @@ export const useMessageOption = () => {
userDefaultModelSettings?.numGpu,
numPredict:
currentChatModelSettings?.numPredict ??
- userDefaultModelSettings?.numPredict
+ userDefaultModelSettings?.numPredict,
+ useMMap:
+ currentChatModelSettings?.useMMap ??
+ userDefaultModelSettings?.useMMap
})
const response = await questionOllama.invoke(promptForQuestion)
query = response.content.toString()
diff --git a/src/models/index.ts b/src/models/index.ts
index 135025f..3481d52 100644
--- a/src/models/index.ts
+++ b/src/models/index.ts
@@ -16,6 +16,7 @@ export const pageAssistModel = async ({
seed,
numGpu,
numPredict,
+ useMMap
}: {
model: string
baseUrl: string
@@ -27,6 +28,7 @@ export const pageAssistModel = async ({
seed?: number
numGpu?: number
numPredict?: number
+ useMMap?: boolean
}) => {
if (model === "chrome::gemini-nano::page-assist") {
@@ -73,7 +75,8 @@ export const pageAssistModel = async ({
seed,
model,
numGpu,
- numPredict
+ numPredict,
+ useMMap,
})
diff --git a/src/services/app.ts b/src/services/app.ts
index bbae388..647abab 100644
--- a/src/services/app.ts
+++ b/src/services/app.ts
@@ -39,6 +39,10 @@ export const copilotResumeLastChat = async () => {
return await storage.get("copilotResumeLastChat")
}
+export const webUIResumeLastChat = async () => {
+ return await storage.get("webUIResumeLastChat")
+}
+
export const defaultSidebarOpen = async () => {
const sidebarOpen = await storage.get("sidebarOpen")
if (!sidebarOpen || sidebarOpen === "") {
diff --git a/src/services/search.ts b/src/services/search.ts
index f548cfe..66fb5cf 100644
--- a/src/services/search.ts
+++ b/src/services/search.ts
@@ -62,20 +62,45 @@ export const setTotalSearchResults = async (totalSearchResults: number) => {
await storage.set("totalSearchResults", totalSearchResults.toString())
}
+export const getSearxngURL = async () => {
+ const searxngURL = await storage.get("searxngURL")
+ return searxngURL || ""
+}
+
+export const isSearxngJSONMode = async () => {
+ const searxngJSONMode = await storage.get("searxngJSONMode")
+ return searxngJSONMode ?? false
+}
+
+export const setSearxngJSONMode = async (searxngJSONMode: boolean) => {
+ await storage.set("searxngJSONMode", searxngJSONMode)
+}
+
+export const setSearxngURL = async (searxngURL: string) => {
+ await storage.set("searxngURL", searxngURL)
+}
+
export const getSearchSettings = async () => {
- const [isSimpleInternetSearch, searchProvider, totalSearchResult, visitSpecificWebsite] =
+ const [isSimpleInternetSearch, searchProvider, totalSearchResult, visitSpecificWebsite,
+ searxngURL,
+ searxngJSONMode
+ ] =
await Promise.all([
getIsSimpleInternetSearch(),
getSearchProvider(),
totalSearchResults(),
- getIsVisitSpecificWebsite()
+ getIsVisitSpecificWebsite(),
+ getSearxngURL(),
+ isSearxngJSONMode()
])
return {
isSimpleInternetSearch,
searchProvider,
totalSearchResults: totalSearchResult,
- visitSpecificWebsite
+ visitSpecificWebsite,
+ searxngURL,
+ searxngJSONMode
}
}
@@ -83,17 +108,23 @@ export const setSearchSettings = async ({
isSimpleInternetSearch,
searchProvider,
totalSearchResults,
- visitSpecificWebsite
+ visitSpecificWebsite,
+ searxngJSONMode,
+ searxngURL
}: {
isSimpleInternetSearch: boolean
searchProvider: string
totalSearchResults: number
visitSpecificWebsite: boolean
+ searxngURL: string
+ searxngJSONMode: boolean
}) => {
await Promise.all([
setIsSimpleInternetSearch(isSimpleInternetSearch),
setSearchProvider(searchProvider),
setTotalSearchResults(totalSearchResults),
- setIsVisitSpecificWebsite(visitSpecificWebsite)
+ setIsVisitSpecificWebsite(visitSpecificWebsite),
+ setSearxngJSONMode(searxngJSONMode),
+ setSearxngURL(searxngURL)
])
}
diff --git a/src/utils/search-provider.ts b/src/utils/search-provider.ts
index d623df2..404c13f 100644
--- a/src/utils/search-provider.ts
+++ b/src/utils/search-provider.ts
@@ -14,5 +14,9 @@ export const SUPPORTED_SERACH_PROVIDERS = [
{
label: "Brave",
value: "brave"
+ },
+ {
+ label: "Searxng",
+ value: "searxng"
}
]
\ No newline at end of file
diff --git a/src/web/search-engines/searxng.ts b/src/web/search-engines/searxng.ts
new file mode 100644
index 0000000..0dc2e64
--- /dev/null
+++ b/src/web/search-engines/searxng.ts
@@ -0,0 +1,158 @@
+import { urlRewriteRuntime } from "~/libs/runtime"
+import { cleanUrl } from "~/libs/clean-url"
+import { getSearxngURL, isSearxngJSONMode, getIsSimpleInternetSearch, totalSearchResults } from "@/services/search"
+import { pageAssistEmbeddingModel } from "@/models/embedding"
+import type { Document } from "@langchain/core/documents"
+import { RecursiveCharacterTextSplitter } from "langchain/text_splitter"
+import { MemoryVectorStore } from "langchain/vectorstores/memory"
+import { PageAssistHtmlLoader } from "~/loader/html"
+import {
+ defaultEmbeddingChunkOverlap,
+ defaultEmbeddingChunkSize,
+ defaultEmbeddingModelForRag,
+ getOllamaURL
+} from "~/services/ollama"
+
+interface SearxNGJSONResult {
+ title: string
+ url: string
+ content: string
+}
+
+interface SearxNGJSONResponse {
+ results: SearxNGJSONResult[]
+}
+
+export const searxngSearch = async (query: string) => {
+ const searxngURL = await getSearxngURL()
+ if (!searxngURL) {
+ throw new Error("SearXNG URL not configured")
+ }
+
+ const isJSONMode = await isSearxngJSONMode()
+ const results = isJSONMode
+ ? await searxngJSONSearch(searxngURL, query)
+ : await searxngWebSearch(searxngURL, query)
+
+ const TOTAL_SEARCH_RESULTS = await totalSearchResults()
+ const searchResults = results.slice(0, TOTAL_SEARCH_RESULTS)
+
+ const isSimpleMode = await getIsSimpleInternetSearch()
+
+ if (isSimpleMode) {
+ await getOllamaURL()
+ return searchResults.map((result) => {
+ return {
+ url: result.link,
+ content: result.content
+ }
+ })
+ }
+
+ const docs: Document>[] = []
+ try {
+ for (const result of searchResults) {
+ const loader = new PageAssistHtmlLoader({
+ html: "",
+ url: result.link
+ })
+
+ const documents = await loader.loadByURL()
+ documents.forEach((doc) => {
+ docs.push(doc)
+ })
+ }
+ } catch (error) {
+ console.error(error)
+ }
+
+ const ollamaUrl = await getOllamaURL()
+ const embeddingModel = await defaultEmbeddingModelForRag()
+ const ollamaEmbedding = await pageAssistEmbeddingModel({
+ model: embeddingModel || "",
+ baseUrl: cleanUrl(ollamaUrl)
+ })
+
+ const chunkSize = await defaultEmbeddingChunkSize()
+ const chunkOverlap = await defaultEmbeddingChunkOverlap()
+ const textSplitter = new RecursiveCharacterTextSplitter({
+ chunkSize,
+ chunkOverlap
+ })
+
+ const chunks = await textSplitter.splitDocuments(docs)
+ const store = new MemoryVectorStore(ollamaEmbedding)
+ await store.addDocuments(chunks)
+
+ const resultsWithEmbeddings = await store.similaritySearch(query, 3)
+
+ const searchResult = resultsWithEmbeddings.map((result) => {
+ return {
+ url: result.metadata.url,
+ content: result.pageContent
+ }
+ })
+
+ return searchResult
+}
+
+const searxngJSONSearch = async (baseURL: string, query: string) => {
+ const searchURL = `${cleanUrl(baseURL)}?q=${encodeURIComponent(query)}&format=json`
+
+ const abortController = new AbortController()
+ setTimeout(() => abortController.abort(), 20000)
+
+ try {
+ const response = await fetch(searchURL, {
+ signal: abortController.signal,
+ headers: {
+ 'Accept': 'application/json'
+ }
+ })
+
+ if (!response.ok) {
+ throw new Error(`SearXNG search failed: ${response.statusText}`)
+ }
+
+ const data = await response.json() as SearxNGJSONResponse
+
+ return data.results.map(result => ({
+ title: result.title,
+ link: result.url,
+ content: result.content
+ }))
+ } catch (error) {
+ console.error('SearXNG JSON search failed:', error)
+ return []
+ }
+}
+
+const searxngWebSearch = async (baseURL: string, query: string) => {
+ const searchURL = `${cleanUrl(baseURL)}?q=${encodeURIComponent(query)}`
+
+ await urlRewriteRuntime(cleanUrl(searchURL), "searxng")
+
+ const abortController = new AbortController()
+ setTimeout(() => abortController.abort(), 10000)
+
+ try {
+ const htmlString = await fetch(searchURL, {
+ signal: abortController.signal
+ }).then(response => response.text())
+
+ const parser = new DOMParser()
+ const doc = parser.parseFromString(htmlString, "text/html")
+
+ const searchResults = Array.from(doc.querySelectorAll("article.result")).map(result => {
+ const title = result.querySelector("h3")?.textContent?.trim()
+ const link = result.querySelector("a.url_header")?.getAttribute("href")
+ const content = result.querySelector("p.content")?.textContent?.trim()
+ return { title, link, content }
+ }).filter(result => result.title && result.link && result.content)
+
+ return searchResults
+ } catch (error) {
+ console.error('SearXNG web search failed:', error)
+ return []
+ }
+}
diff --git a/src/web/web.ts b/src/web/web.ts
index 88aabc4..6c48f1b 100644
--- a/src/web/web.ts
+++ b/src/web/web.ts
@@ -5,6 +5,7 @@ import { getIsVisitSpecificWebsite, getSearchProvider } from "@/services/search"
import { webSogouSearch } from "./search-engines/sogou"
import { webBraveSearch } from "./search-engines/brave"
import { getWebsiteFromQuery, processSingleWebsite } from "./website"
+import { searxngSearch } from "./search-engines/searxng"
const getHostName = (url: string) => {
try {
@@ -23,6 +24,8 @@ const searchWeb = (provider: string, query: string) => {
return webSogouSearch(query)
case "brave":
return webBraveSearch(query)
+ case "searxng":
+ return searxngSearch(query)
default:
return webGoogleSearch(query)
}
@@ -51,7 +54,6 @@ export const getSystemPromptForWeb = async (query: string) => {
}
-
const search_results = search
.map(
(result, idx) =>
diff --git a/wxt.config.ts b/wxt.config.ts
index 18b2a44..abf8cda 100644
--- a/wxt.config.ts
+++ b/wxt.config.ts
@@ -50,7 +50,7 @@ export default defineConfig({
outDir: "build",
manifest: {
- version: "1.3.5",
+ version: "1.3.6",
name:
process.env.TARGET === "firefox"
? "Page Assist - A Web UI for Local AI Models"