@alpic80/rivet-core 1.19.1-aidon.3 → 1.24.0-aidon.1

package/dist/esm/model/nodes/UserInputNode.js

@@ -5,6 +5,7 @@ import {} from '../../index.js';
 import { dedent } from 'ts-dedent';
 import { nodeDefinition } from '../NodeDefinition.js';
 import { coerceType } from '../../utils/coerceType.js';
+import {} from '../ProcessContext.js';
 export class UserInputNodeImpl extends NodeImpl {
     static create() {
         const chartNode = {
@@ -89,21 +90,18 @@ export class UserInputNodeImpl extends NodeImpl {
             group: ['Input/Output'],
         };
     }
-    async process() {
+    async process(inputs, context) {
+        const questions = this.data.useInput ? coerceType(inputs['questions'], 'string[]') : [this.data.prompt];
+        const renderingFormat = this.data.renderingFormat === 'preformatted' ? 'text' : 'markdown';
+        const response = await context.requestUserInput(questions, renderingFormat);
         return {
-            ['output']: undefined,
-            ['questionsAndAnswers']: undefined,
-        };
-    }
-    getOutputValuesFromUserInput(questions, answers) {
-        const questionsList = this.data.useInput
-            ? coerceType(questions['questions'], 'string[]')
-            : [this.data.prompt];
-        return {
-            ['output']: answers,
+            ['output']: {
+                type: 'string[]',
+                value: response.value,
+            },
             ['questionsAndAnswers']: {
                 type: 'string[]',
-                value: zip(questionsList, answers.value).map(([q, a]) => `${q}\n${a}`),
+                value: zip(questions, response.value).map(([q, a]) => `${q}\n${a}`),
             },
         };
     }

package/dist/esm/plugins/aidon/nodes/ChatAidonNode.js

@@ -84,7 +84,7 @@ class ChatAidonNodeImpl extends ChatNodeImpl {
         const customHeaders = schemaDetail.headers; // Moved this line up to the loop
         // Check if custom headers are set and are of type string
         if (customHeaders && typeof customHeaders === "string") {
-            let parsedCustomHeaders = JSON.parse(customHeaders);
+            const parsedCustomHeaders = JSON.parse(customHeaders);
             headers = {
                 ...headers,
                 ...parsedCustomHeaders
@@ -129,7 +129,7 @@ class ChatAidonNodeImpl extends ChatNodeImpl {
             //call the tool(s) to get the results to add to the message
             for (const functionCall of functionCalls) {
                 // Find the schema detail that contains the function name
-                const toolSchema = toolSchemas.find(detail => detail.name == functionCall.name);
+                const toolSchema = toolSchemas.find(detail => detail.name === functionCall.name);
                 if (!toolSchema) {
                     throw new Error(`Function ${functionCall.name} not found in any schema`);
                 }

package/dist/esm/plugins/anthropic/anthropic.js

@@ -56,7 +56,7 @@ export const anthropicModels = {
         },
         displayName: 'Claude 3 Opus',
     },
-    'claude-3-5-sonnet-20240620': {
+    'claude-3-5-sonnet-latest': {
         maxTokens: 200_000,
         cost: {
             prompt: 3e-6,
@@ -64,19 +64,36 @@ export const anthropicModels = {
         },
         displayName: 'Claude 3.5 Sonnet',
     },
+    'claude-3-5-haiku-latest': {
+        maxTokens: 200_000,
+        cost: {
+            prompt: 0.8e-6,
+            completion: 4e-6,
+        },
+        displayName: 'Claude 3.5 Haiku',
+    },
+    'claude-3-7-sonnet-latest': {
+        maxTokens: 200_000,
+        cost: {
+            prompt: 3e-6,
+            completion: 15e-6,
+        },
+        displayName: 'Claude 3.7 Sonnet',
+    },
 };
 export const anthropicModelOptions = Object.entries(anthropicModels).map(([id, { displayName }]) => ({
     value: id,
     label: displayName,
 }));
-export async function* streamChatCompletions({ apiKey, signal, ...rest }) {
+export async function* streamChatCompletions({ apiEndpoint, apiKey, signal, ...rest }) {
     const defaultSignal = new AbortController().signal;
-    const response = await fetchEventSource('https://api.anthropic.com/v1/complete', {
+    const response = await fetchEventSource(`${apiEndpoint}/completions`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             'x-api-key': apiKey,
             'anthropic-version': '2023-06-01',
+            'anthropic-dangerous-direct-browser-access': 'true',
         },
         body: JSON.stringify({
             ...rest,
@@ -110,15 +127,16 @@ export async function* streamChatCompletions({ apiKey, signal, ...rest }) {
         throw new AnthropicError(`No chunks received. Response: ${JSON.stringify(responseJson)}`, response, responseJson);
     }
 }
-export async function callMessageApi({ apiKey, signal, tools, ...rest }) {
+export async function callMessageApi({ apiEndpoint, apiKey, signal, tools, beta, ...rest }) {
     const defaultSignal = new AbortController().signal;
-    const response = await fetch('https://api.anthropic.com/v1/messages', {
+    const response = await fetch(`${apiEndpoint}/messages`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             'x-api-key': apiKey,
             'anthropic-version': '2023-06-01',
-            'anthropic-beta': tools ? 'tools-2024-04-04' : 'messages-2023-12-15',
+            'anthropic-dangerous-direct-browser-access': 'true',
+            ...(beta ? { 'anthropic-beta': beta } : {}),
         },
         body: JSON.stringify({
             ...rest,
@@ -133,16 +151,17 @@ export async function callMessageApi({ apiKey, signal, tools, ...rest }) {
     }
     return responseJson;
 }
-export async function* streamMessageApi({ apiKey, signal, ...rest }) {
+export async function* streamMessageApi({ apiEndpoint, apiKey, signal, beta, ...rest }) {
     // Use the Messages API for Claude 3 models
     const defaultSignal = new AbortController().signal;
-    const response = await fetchEventSource('https://api.anthropic.com/v1/messages', {
+    const response = await fetchEventSource(`${apiEndpoint}/messages`, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             'x-api-key': apiKey,
             'anthropic-version': '2023-06-01',
-            'anthropic-beta': 'messages-2023-12-15',
+            'anthropic-dangerous-direct-browser-access': 'true',
+            ...(beta ? { 'anthropic-beta': beta } : {}),
         },
         body: JSON.stringify({
             ...rest,
@@ -157,7 +176,7 @@ export async function* streamMessageApi({ apiKey, signal, ...rest }) {
         if (chunk === '[message_stop]') {
             return;
         }
-        else if (/\[\w+\]/.test(chunk)) {
+        else if (/^\[\w+\]$/.test(chunk)) {
             nextDataType = chunk.slice(1, -1);
             continue;
         }

package/dist/esm/plugins/anthropic/fetchEventSource.js

@@ -1,3 +1,4 @@
+import { DEFAULT_CHAT_NODE_TIMEOUT } from '../../utils/defaults.js';
 // https://github.com/openai/openai-node/issues/18#issuecomment-1518715285
 export class EventSourceResponse extends Response {
     name;
@@ -24,7 +25,7 @@ export class EventSourceResponse extends Response {
         const reader = this.streams.eventStream.getReader();
         try {
             while (true) {
-                const { done, value } = await this.raceWithTimeout(reader.read());
+                const { done, value } = await this.raceWithTimeout(reader.read(), DEFAULT_CHAT_NODE_TIMEOUT);
                 if (done) {
                     break;
                 }
@@ -36,7 +37,7 @@ export class EventSourceResponse extends Response {
         }
     }
     async raceWithTimeout(promise, timeout = 5000) {
-        // eslint-disable-next-line no-async-promise-executor -- Error handled correctly
+        // eslint-disable-next-line no-async-promise-executor,@typescript-eslint/no-misused-promises -- Error handled correctly
         return new Promise(async (resolve, reject) => {
             const timer = setTimeout(() => {
                 reject(new Error('Timeout: API response took too long.'));