llmasaservice-client 0.2.5 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # llmasaservice-client
 
+## 0.3.0
+
+### Minor Changes
+
+- Final onComplete and onError callbacks added to the send method
+
 ## 0.2.5
 
 ### Patch Changes

package/dist/index.js

@@ -91,7 +91,7 @@ var useLLM = (options) => {
     setIdle(true);
   };
   function send(_0) {
-    return __async(this, arguments, function* (prompt, messages = [], stream = true, abortController = new AbortController(), service = null, onCompleteCallback) {
+    return __async(this, arguments, function* (prompt, messages = [], stream = true, abortController = new AbortController(), service = null, onComplete, onError) {
       var _a, _b, _c, _d, _e;
       setResponse("");
       setIdle(false);
@@ -124,13 +124,27 @@ var useLLM = (options) => {
           const decoder = new TextDecoder("utf-8");
           setIdle(false);
           if (!stream) {
-            return yield readStream(reader, decoder, stream, {
-              signal: options2.signal
-            }, onCompleteCallback);
+            return yield readStream(
+              reader,
+              decoder,
+              stream,
+              {
+                signal: options2.signal
+              },
+              onComplete,
+              onError
+            );
           } else {
-            readStream(reader, decoder, stream, {
-              signal: options2.signal
-            }, onCompleteCallback);
+            readStream(
+              reader,
+              decoder,
+              stream,
+              {
+                signal: options2.signal
+              },
+              onComplete,
+              onError
+            );
             return reader;
           }
         }
@@ -139,12 +153,15 @@ var useLLM = (options) => {
       }
       if (errorInFetch !== "") {
         setError(errorInFetch);
+        if (onError) {
+          onError(errorInFetch);
+        }
         console.error(`Error: Error in fetch. (${errorInFetch})`);
       }
     });
   }
   function readStream(_0, _1) {
-    return __async(this, arguments, function* (reader, decoder, stream = true, { signal }, onCompleteCallback) {
+    return __async(this, arguments, function* (reader, decoder, stream = true, { signal }, onComplete, onError) {
       let errorInRead = "";
       let result = "";
       while (true) {
@@ -180,12 +197,11 @@ var useLLM = (options) => {
       if (errorInRead !== "") {
         setError(errorInRead);
         reader.cancel();
+        if (onError) onError(errorInRead);
         setIdle(true);
       }
-      console.log("about to call callback", onCompleteCallback);
-      if (onCompleteCallback) {
-        onCompleteCallback(result);
-        console.log("called callback");
+      if (onComplete) {
+        onComplete(result);
       }
       return result;
     });

package/dist/index.mjs

@@ -54,7 +54,7 @@ var useLLM = (options) => {
     setIdle(true);
   };
   function send(_0) {
-    return __async(this, arguments, function* (prompt, messages = [], stream = true, abortController = new AbortController(), service = null, onCompleteCallback) {
+    return __async(this, arguments, function* (prompt, messages = [], stream = true, abortController = new AbortController(), service = null, onComplete, onError) {
       var _a, _b, _c, _d, _e;
       setResponse("");
       setIdle(false);
@@ -87,13 +87,27 @@ var useLLM = (options) => {
           const decoder = new TextDecoder("utf-8");
           setIdle(false);
           if (!stream) {
-            return yield readStream(reader, decoder, stream, {
-              signal: options2.signal
-            }, onCompleteCallback);
+            return yield readStream(
+              reader,
+              decoder,
+              stream,
+              {
+                signal: options2.signal
+              },
+              onComplete,
+              onError
+            );
           } else {
-            readStream(reader, decoder, stream, {
-              signal: options2.signal
-            }, onCompleteCallback);
+            readStream(
+              reader,
+              decoder,
+              stream,
+              {
+                signal: options2.signal
+              },
+              onComplete,
+              onError
+            );
             return reader;
           }
         }
@@ -102,12 +116,15 @@ var useLLM = (options) => {
       }
       if (errorInFetch !== "") {
         setError(errorInFetch);
+        if (onError) {
+          onError(errorInFetch);
+        }
         console.error(`Error: Error in fetch. (${errorInFetch})`);
       }
     });
   }
   function readStream(_0, _1) {
-    return __async(this, arguments, function* (reader, decoder, stream = true, { signal }, onCompleteCallback) {
+    return __async(this, arguments, function* (reader, decoder, stream = true, { signal }, onComplete, onError) {
       let errorInRead = "";
       let result = "";
       while (true) {
@@ -143,12 +160,11 @@ var useLLM = (options) => {
       if (errorInRead !== "") {
         setError(errorInRead);
         reader.cancel();
+        if (onError) onError(errorInRead);
         setIdle(true);
       }
-      console.log("about to call callback", onCompleteCallback);
-      if (onCompleteCallback) {
-        onCompleteCallback(result);
-        console.log("called callback");
+      if (onComplete) {
+        onComplete(result);
       }
       return result;
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "llmasaservice-client",
   "license": "MIT",
-  "version": "0.2.5",
+  "version": "0.3.0",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",

package/src/useLLM.ts

@@ -46,7 +46,8 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
    * @param stream  Determines whether to stream results back in the response property as they return from the service or batch them up and return them all at once in the response property as a string.
    * @param abortController The AbortController used to abort this request once its started. This allows you to add a stop button to your UI.
    * @param service The service to use for the request. If null, load balancing will be applied. This is typically only used for testing.
-   * @param onCompleteCallback The callback function to be called once the stream completes, with the final result string.
+   * @param onComplete The callback function to be called once the stream completes, with the final result string.
+   * @param onError The callback function to be called if an error occurs, with the error string.
    * @returns a StreamReader object if stream is true, otherwise a string of the response. Typically this isn't used when streaming, the stream is exposed in the response property.
    */
   async function send(
@@ -55,7 +56,9 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
     stream: boolean = true,
     abortController: AbortController = new AbortController(),
     service: string | null = null, // null means use the default service and apply services load balancing
-    onCompleteCallback?: (result: string) => void
+    onComplete?: (result: string) => void,
+    onError?: (error: string) => void
+
   ): Promise<ReadableStreamDefaultReader<any> | string | undefined> {
     setResponse("");
     setIdle(false);
@@ -94,13 +97,27 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
         setIdle(false);
 
         if (!stream) {
-          return await readStream(reader, decoder, stream, {
-            signal: options.signal,
-          }, onCompleteCallback);
+          return await readStream(
+            reader,
+            decoder,
+            stream,
+            {
+              signal: options.signal,
+            },
+            onComplete,
+            onError
+          );
         } else {
-          readStream(reader, decoder, stream, {
-            signal: options.signal,
-          }, onCompleteCallback);
+          readStream(
+            reader,
+            decoder,
+            stream,
+            {
+              signal: options.signal,
+            },
+            onComplete,
+            onError
+          );
 
           return reader;
         }
@@ -111,6 +128,9 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
 
     if (errorInFetch !== "") {
       setError(errorInFetch);
+      if (onError) {
+        onError(errorInFetch);
+      }
       console.error(`Error: Error in fetch. (${errorInFetch})`);
     }
   }
@@ -120,7 +140,8 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
     decoder: TextDecoder,
     stream: Boolean = true,
     { signal: signal }: { signal: AbortSignal },
-    onCompleteCallback?: (result: string) => void
+    onComplete?: (result: string) => void,
+    onError?: (error: string) => void
   ): Promise<string> {
     let errorInRead = "";
     let result = "";
@@ -168,13 +189,12 @@ export const useLLM = (options?: LLMServiceType): UseLLMReturnType => {
     if (errorInRead !== "") {
       setError(errorInRead);
       reader.cancel();
+      if (onError) onError(errorInRead);
       setIdle(true);
     }
 
-    console.log("about to call callback", onCompleteCallback);
-    if (onCompleteCallback) {
-      onCompleteCallback(result);
-      console.log("called callback");
+    if (onComplete) {
+      onComplete(result);
     }
 
     return result;