feat: simplify isPendingAtom

jotaijs · Mar 1, 2024 · 7eaa76e · 7eaa76e
1 parent 2937ef3
commit 7eaa76e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/examples/llamaindex-straming/app/components/chat-section.tsx b/examples/llamaindex-straming/app/components/chat-section.tsx
@@ -65,6 +65,7 @@ export default function ChatSection () {
   const [input, handleInputChange] = useAtom(inputAtom)
   const handleSubmit = useSetAtom(submitAtom)
   const isLoading = useAtomValue(isLoadingAtom)
+  console.log('isLoading', isLoading)
 
   return (
     <div className="space-y-4 max-w-5xl w-full">

diff --git a/examples/llamaindex-straming/package.json b/examples/llamaindex-straming/package.json
@@ -2,7 +2,7 @@
   "name": "llamaindex-straming",
   "private": true,
   "scripts": {
-    "dev": "next dev",
+    "dev": "next dev --port 3001",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"

diff --git a/src/chatAtoms.ts b/src/chatAtoms.ts
@@ -73,7 +73,6 @@ export function chatAtoms (
 
   const abortControllerAtom = atom<AbortController>(new AbortController())
   const isLoadingAtom = atom(false)
-  const isPendingAtom = atom(false)
 
   type Metadata = {
     credentials?: RequestCredentials;
@@ -125,7 +124,6 @@ export function chatAtoms (
     })
 
     if (chatOptions.onResponse) {
-      set(isPendingAtom, false)
       try {
         await chatOptions.onResponse(
           get,
@@ -250,7 +248,6 @@ export function chatAtoms (
   ) {
     const onFunctionCall = chatOptions.experimental_onFunctionCall
     try {
-      set(isPendingAtom, true)
       set(isLoadingAtom, true)
       const abortController = new AbortController()
       set(abortControllerAtom, abortController)
@@ -327,7 +324,6 @@ export function chatAtoms (
         }
       }
     } finally {
-      set(isPendingAtom, false)
       set(isLoadingAtom, false)
     }
   }
@@ -385,7 +381,13 @@ export function chatAtoms (
       }),
     dataAtom: atom(get => get(dataAtom)),
     isLoadingAtom: atom(get => get(isLoadingAtom)),
-    isPendingAtom: atom(get => get(isPendingAtom)),
+    isPendingAtom: atom(get => {
+      const messages = get(messagesAtom)
+      if (isPromiseLike(messages)) {
+        return messages.then((messages)=> messages.at(-1)?.role !== 'assistant')
+      }
+      return messages.at(-1)?.role !== 'assistant'
+    }),
     inputAtom: atom(
       get => get(inputBaseAtom),
       (get, set, event: {