From 40a6f0d1b31685b732a9184a20dc24893fa17a24 Mon Sep 17 00:00:00 2001
From: n4ze3m <n4ze3m@gmail.com>
Date: Mon, 26 Feb 2024 14:01:09 +0530
Subject: [PATCH] Update package.json version and refactor service calls

---
 package.json                            | 2 +-
 src/components/Option/Layout.tsx        | 4 ++--
 src/components/Sidepanel/Chat/empty.tsx | 4 ++--
 src/services/ollama.ts                  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 00dc109..50f980b 100644
--- a/package.json
+++ b/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": {
diff --git a/src/components/Option/Layout.tsx b/src/components/Option/Layout.tsx
index 650fcd5..d85a1a3 100644
--- a/src/components/Option/Layout.tsx
+++ b/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
   })
 
diff --git a/src/components/Sidepanel/Chat/empty.tsx b/src/components/Sidepanel/Chat/empty.tsx
index bb99c79..4c2ed46 100644
--- a/src/components/Sidepanel/Chat/empty.tsx
+++ b/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,
diff --git a/src/services/ollama.ts b/src/services/ollama.ts
index b5b3eb2..66711af 100644
--- a/src/services/ollama.ts
+++ b/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) {