Fetch model and chat node fixes

Author: metaspartan

client/src/App.tsx

@@ -4,47 +4,43 @@ import { useEffect } from "react";
 import { useStore } from "@/lib/store";
 import { defaultLocalModels, modelService } from "./lib/localmodels";
 import { PRESET_ENDPOINTS } from "./lib/constants";
-import { CustomModel } from "./lib/types";
+import { CustomModel, GlobalSettings } from "./lib/types";
 
 function App() {
-  const { settings, setSettings } = useStore();
+  const { settings, updateCustomModels } = useStore();
 
   useEffect(() => {
     const fetchModels = async () => {
       console.log('fetching models');
-      // Get all endpoints from settings
       const endpoints = PRESET_ENDPOINTS.map(e => ({
         url: e.url,
         provider: 'openai'
       }));
-  
-      // Fetch models from all configured endpoints
+
       const modelPromises = endpoints.map(e => 
         modelService.getAvailableModels(e.url)
       );
-  
+
       try {
         const modelLists = await Promise.allSettled(modelPromises);
         const allModels = modelLists
           .filter((result): result is PromiseFulfilledResult<CustomModel[]> => 
             result.status === 'fulfilled'
           )
           .flatMap(result => result.value);
-  
-        // Merge with defaults, removing duplicates
+
         const existingIds = new Set(defaultLocalModels.map(m => m.id));
         const newModels = allModels.filter(m => !existingIds.has(m.id));
-  
-        setSettings({
-          ...settings,
-          customModels: [
-            ...settings.customModels.filter(m => 
-              !endpoints.some(e => m.endpoint === e.url)
-            ),
-            ...defaultLocalModels,
-            ...newModels
-          ]
-        });
+
+        const updatedModels = [
+          ...settings.customModels.filter(m => 
+            !endpoints.some(e => m.endpoint === e.url)
+          ),
+          ...defaultLocalModels,
+          ...newModels
+        ];
+
+        updateCustomModels(updatedModels);
       } catch (error) {
         // console.error('Error fetching models:', error);
       }
@@ -53,7 +49,7 @@ function App() {
     fetchModels();
     const interval = setInterval(fetchModels, 120000); // 2 minutes
     return () => clearInterval(interval);
-  }, []);
+  }, [updateCustomModels]);
 
   useEffect(() => {
     document.documentElement.style.setProperty('--primary-color', settings.primaryColor);

client/src/components/ChatNode.tsx

@@ -20,7 +20,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { AIModel, APIResponseMetrics, CustomModel, Message, availableModels } from "@/lib/types";
-import { cn } from "@/lib/utils";
+import { cn, sanitizeChatMessages } from "@/lib/utils";
 import { useStore } from "@/lib/store";
 import { Copy, Check } from "lucide-react";
 import { oneDark } from "react-syntax-highlighter/dist/esm/styles/prism";
@@ -278,10 +278,11 @@ export function ChatNode({ id, data: initialData }: NodeProps) {
         const response = await anthropic.messages.create({
           model: model,
           system: enhancedSystemPrompt,
-          messages: allMessages.map(msg => ({
+          messages: 
+          sanitizeChatMessages(allMessages.map(msg => ({
             role: msg.role === "user" ? "user" : "assistant",
             content: msg.content
-          })),
+          }))),
           max_tokens: 8192,
           ...filterAnthropicAISettings(settings),
         });
@@ -324,11 +325,11 @@ export function ChatNode({ id, data: initialData }: NodeProps) {
           },
           body: JSON.stringify({
             model,
-            messages: [
+            messages: sanitizeChatMessages([
               { role: 'system', content: enhancedSystemPrompt },
               ...allMessages.slice(0, -1),
               { role: "user", content: messageContent }
-            ].filter(m => m.content),
+            ]).filter(m => m.content),
             // we shouldnt pass any of these unless they are changed from the defaults
             ...filterAISettings(settings),
           }),

client/src/components/SettingsDialog.tsx

@@ -78,7 +78,7 @@ export function SettingsDialog({ open, onOpenChange }: SettingsDialogProps) {
 
             <div className="flex justify-center">
             <img src={logo} alt="Curiso.ai" title="Curiso.ai" className="w-12 h-12" /></div>
-            <div className="flex justify-center"><p className="text-sm text-muted-foreground justify-center mb-2">Version v1.1.0 by Carsen Klock</p></div>
+            <div className="flex justify-center"><p className="text-sm text-muted-foreground justify-center mb-2">Version v1.1.1 by Carsen Klock</p></div>
             <strong>Curiso.ai</strong> is an infinite canvas for your thoughts—a platform that seamlessly connects nodes and AI services so you can explore ideas in depth without repeating yourself. By guiding the direction of each conversation, Curiso.ai empowers advanced users to unlock richer, more accurate AI interactions.
             </div>
             <div className="space-y-2 mt-2">

client/src/lib/store.ts

@@ -1,6 +1,6 @@
 import { create } from 'zustand';
 import { persist, type StorageValue } from 'zustand/middleware';
-import type { GlobalSettings } from './types';
+import type { CustomModel, GlobalSettings } from './types';
 import { SecureStorage, StorageKey } from './secureStorage';
 import { nanoid } from 'nanoid';
 import { themeColors } from './constants';
@@ -129,13 +129,20 @@ interface StoreState {
   settings: GlobalSettings;
   setSettings: (settings: GlobalSettings) => void;
   clearAllData: () => Promise<void>;
+  updateCustomModels: (models: CustomModel[]) => void;
 }
 
 export const useStore = create<StoreState>()(
   persist(
     (set) => ({
       settings: defaultSettings,
       setSettings: (settings) => set({ settings }),
+      updateCustomModels: (models) => set((state) => ({
+        settings: {
+          ...state.settings,
+          customModels: models
+        }
+      })),
       clearAllData: async () => {
         const storage = await getSecureStorage();
         storage.clear();

client/src/lib/utils.ts

@@ -4,3 +4,15 @@ import { twMerge } from "tailwind-merge"
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
 }
+
+export function sanitizeChatMessage(message: any) {
+  return {
+    role: message.role,
+    content: message.content,
+    ...(message.name ? { name: message.name } : {})
+  };
+}
+
+export function sanitizeChatMessages(messages: any[]) {
+  return messages.map(sanitizeChatMessage);
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "curiso.ai",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Carsen Klock",
   "type": "module",
   "license": "MIT",

src-tauri/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "curiso-ai"
-version = "1.1.0"
+version = "1.1.1"
 description = "Curiso AI Desktop"
 authors = ["Carsen Klock"]
 license = "MIT"

src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 {
     "identifier": "com.curiso.ai",
     "productName": "Curiso AI",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "build": {
       "beforeBuildCommand": "npm run build",
       "beforeDevCommand": "npm run dev",