Merge pull request #694 from n4ze3m/next

v1.5.27

Author: n4ze3m

src/components/Option/Sidebar.tsx

@@ -44,6 +44,7 @@ import {
 } from "@/db/dexie/helpers"
 import { UploadedFile } from "@/db/dexie/types"
 import { isDatabaseClosedError } from "@/utils/ff-error"
+import { updatePageTitle } from "@/utils/update-page-title"
 
 type Props = {
   onClose: () => void
@@ -203,6 +204,7 @@ export const Sidebar = ({
       })
       if (historyId === history_id) {
         clearChat()
+        updatePageTitle()
       }
     }
   })
@@ -407,6 +409,7 @@ export const Sidebar = ({
                           const session = await getSessionFiles(chat.id)
                           setContext(session)
                         }
+                        updatePageTitle(chat.title)
                         navigate("/")
                         onClose()
                       }}>

src/db/dexie/models.ts

@@ -487,6 +487,30 @@ export const dynamicFetchOllama2 = async ({
   providerId: string
   customHeaders?: { key: string; value: string }[]
 }) => {
+  if (baseUrl.includes("ollama.com")) {
+    // ollama.com is turbo pro something it only have 2 models
+    // we are currenly hardcoding it i don't why
+    const models = [
+      {
+        name: "gpt-oss:20b",
+        id: "gpt-oss:20b"
+      },
+      {
+        name: "gpt-oss:120b",
+        id: "gpt-oss:120b"
+      }
+    ]
+
+    return models.map((e) => {
+      return {
+        name: e?.name || e?.id,
+        id: `${e?.id}_ollama2_${providerId}`,
+        provider: providerId,
+        lookup: `${e?.id}_${providerId}`,
+        provider_id: providerId
+      }
+    })
+  }
   const models = await getAllOpenAIModels({ baseUrl, customHeaders })
   const ollama2Models = models.map((e) => {
     return {

src/db/models.ts

@@ -447,6 +447,8 @@ export const dynamicFetchOllama2 = async ({
   providerId: string
   customHeaders?: { key: string; value: string }[]
 }) => {
+ 
+
   const models = await getAllOpenAIModels({ baseUrl, customHeaders })
   const ollama2Models = models.map((e) => {
     return {

src/hooks/chat-helper/index.ts

@@ -10,6 +10,7 @@ import {
 import { ChatDocuments } from "@/models/ChatTypes"
 import { generateTitle } from "@/services/title"
 import { ChatHistory } from "@/store/option"
+import { updatePageTitle } from "@/utils/update-page-title"
 
 export const saveMessageOnError = async ({
   e,
@@ -107,6 +108,7 @@ export const saveMessageOnError = async ({
     } else {
       const title = await generateTitle(selectedModel, userMessage, userMessage)
       const newHistoryId = await saveHistory(title, false, message_source)
+      updatePageTitle(title)
       if (!isRegenerating) {
         await saveMessage({
           history_id: newHistoryId.id,
@@ -242,6 +244,7 @@ export const saveMessageOnSuccess = async ({
     return historyId
   } else {
     const title = await generateTitle(selectedModel, message, message)
+    updatePageTitle(title)
     const newHistoryId = await saveHistory(title, false, message_source)
 
     await saveMessage(

src/hooks/useMessage.tsx

@@ -46,6 +46,7 @@ import {
   createSaveMessageOnError,
   createSaveMessageOnSuccess
 } from "./utils/messageHelpers"
+import { updatePageTitle } from "@/utils/update-page-title"
 
 export const useMessage = () => {
   const {
@@ -124,6 +125,7 @@ export const useMessage = () => {
     setIsLoading(false)
     setIsProcessing(false)
     setStreaming(false)
+    updatePageTitle() 
     currentChatModelSettings.reset()
     if (defaultInternetSearchOn) {
       setWebSearch(true)

src/hooks/useMessageOption.tsx

@@ -30,6 +30,7 @@ import { tabChatMode } from "./chat-modes/tabChatMode"
 import { documentChatMode } from "./chat-modes/documentChatMode"
 import { generateID } from "@/db/dexie/helpers"
 import { UploadedFile } from "@/db/dexie/types"
+import { updatePageTitle } from "@/utils/update-page-title"
 
 export const useMessageOption = () => {
   const {
@@ -163,7 +164,7 @@ export const useMessageOption = () => {
     setIsProcessing(false)
     setStreaming(false)
     setContextFiles([])
-    console.log("clearChat", contextFiles)
+    updatePageTitle()
     currentChatModelSettings.reset()
     // textareaRef?.current?.focus()
     if (defaultInternetSearchOn) {