Merge pull request #8 from n4ze3m/next

Update package.json version and refactor service calls

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pageassist",
   "displayName": "Page Assist - A Web UI for Local AI Models",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Use your locally running AI models to assist you in your web browsing.",
   "author": "n4ze3m",
   "scripts": {

src/components/Option/Layout.tsx

@@ -4,7 +4,7 @@ import { useLocation, NavLink } from "react-router-dom"
 import { Sidebar } from "./Sidebar"
 import { Drawer, Layout, Modal, Select, Tooltip } from "antd"
 import { useQuery } from "@tanstack/react-query"
-import { fetchChatModels } from "~services/ollama"
+import {  getAllModels } from "~services/ollama"
 import { useMessageOption } from "~hooks/useMessageOption"
 import { Settings } from "./Settings"
 import { BrainCircuit, ChevronLeft, CogIcon, GithubIcon, PanelLeftIcon, SquarePen } from "lucide-react"
@@ -24,7 +24,7 @@ export default function OptionLayout({
     isFetching: isModelsFetching
   } = useQuery({
     queryKey: ["fetchModel"],
-    queryFn: fetchChatModels,
+    queryFn: getAllModels,
     refetchInterval: 15000
   })
 

src/components/Sidepanel/Chat/empty.tsx

@@ -4,7 +4,7 @@ import { RotateCcw } from "lucide-react"
 import { useEffect, useState } from "react"
 import { useMessage } from "~hooks/useMessage"
 import {
-  fetchChatModels,
+  getAllModels,
   getOllamaURL,
   isOllamaRunning,
   setOllamaURL as saveOllamaURL
@@ -22,7 +22,7 @@ export const EmptySidePanel = () => {
     queryFn: async () => {
       const ollamaURL = await getOllamaURL()
       const isOk = await isOllamaRunning()
-      const models = await fetchChatModels()
+      const models = await getAllModels()
 
       return {
         isOk,

src/services/ollama.ts

@@ -126,8 +126,8 @@ export const fetchChatModels = async () => {
     }[]
     return models.filter((model) => {
       return (
-        !model.details.families.includes("bert") &&
-        !model.details.families.includes("nomic-bert")
+        !model?.details?.families?.includes("bert") &&
+        !model?.details?.families?.includes("nomic-bert")
       )
     })
   } catch (e) {