Some fixes

Ironclad · Dec 17, 2023 · ef0a62d · ef0a62d
1 parent 0c0138a
commit ef0a62d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 30 deletions.
diff --git a/packages/core/src/plugins/google/google.ts b/packages/core/src/plugins/google/google.ts
@@ -95,8 +95,6 @@ export async function* streamChatCompletions({
   });
   const response = await generativeModel.generateContentStream({
     contents: prompt,
-    // TODO Figure out how to abort
-    // signal: signal ?? defaultSignal,
   });
 
   let hadChunks = false;
@@ -105,7 +103,7 @@ export async function* streamChatCompletions({
     console.log('streaming google responses')
     hadChunks = true;
 
-    if (chunk.candidates[0]?.content.parts[0]?.text) {
+    if (!signal?.aborted && chunk.candidates[0]?.content.parts[0]?.text) {
       yield {
         completion: chunk.candidates[0]?.content.parts[0]?.text,
         finish_reason: chunk.candidates[0]?.finishReason as any,

diff --git a/packages/core/src/plugins/google/nodes/ChatGoogleNode.ts b/packages/core/src/plugins/google/nodes/ChatGoogleNode.ts
@@ -27,7 +27,6 @@ import { dedent } from 'ts-dedent';
 import retry from 'p-retry';
 import { match } from 'ts-pattern';
 import { coerceType, coerceTypeOptional } from '../../../utils/coerceType.js';
-import { expectTypeOptional } from '../../../utils/expectType.js';
 import { addWarning } from '../../../utils/outputs.js';
 import { getError } from '../../../utils/errors.js';
 import { pluginNodeDefinition } from '../../../model/NodeDefinition.js';
@@ -430,8 +429,7 @@ export const ChatGoogleNodeImpl: PluginNodeImpl<ChatGoogleNode> = {
           return output;
         },
         {
-          forever: true,
-          retries: 10000,
+          retries: 10,
           maxRetryTime: 1000 * 60 * 5,
           factor: 2.5,
           minTimeout: 500,
@@ -444,30 +442,6 @@ export const ChatGoogleNodeImpl: PluginNodeImpl<ChatGoogleNode> = {
             if (context.signal.aborted) {
               throw new Error('Aborted');
             }
-
-            const { retriesLeft } = err;
-
-            // TODO
-            // if (!(err instanceof OpenAIError)) {
-            //   return; // Just retry?
-            // }
-
-            // if (err.status === 429) {
-            //   if (retriesLeft) {
-            //     context.onPartialOutputs?.({
-            //       ['response' as PortId]: {
-            //         type: 'string',
-            //         value: 'OpenAI API rate limit exceeded, retrying...',
-            //       },
-            //     });
-            //     return;
-            //   }
-            // }
-
-            // // We did something wrong (besides rate limit)
-            // if (err.status >= 400 && err.status < 500) {
-            //   throw new Error(err.message);
-            // }
           },
         },
       );