@copilotkit/runtime 1.8.12-next.2 → 1.8.12-next.4

package/dist/index.js

@@ -44,7 +44,7 @@ var require_package = __commonJS({
       publishConfig: {
         access: "public"
       },
-      version: "1.8.12-next.2",
+      version: "1.8.12-next.4",
       sideEffects: false,
       main: "./dist/index.js",
       module: "./dist/index.mjs",
@@ -64,6 +64,7 @@ var require_package = __commonJS({
         "unlink:global": "pnpm unlink --global"
       },
       devDependencies: {
+        "@jest/globals": "^29.7.0",
         "@swc/core": "1.5.28",
         "@types/express": "^4.17.21",
         "@types/jest": "^29.5.12",
@@ -374,7 +375,23 @@ var OpenAIAdapter = class {
     const { threadId: threadIdFromRequest, model = this.model, messages, actions, eventSource, forwardedParameters } = request;
     const tools = actions.map(convertActionInputToOpenAITool);
     const threadId = threadIdFromRequest ?? (0, import_shared2.randomUUID)();
-    let openaiMessages = messages.map((m) => convertMessageToOpenAIMessage(m, {
+    const validToolUseIds = /* @__PURE__ */ new Set();
+    for (const message of messages) {
+      if (message.isActionExecutionMessage()) {
+        validToolUseIds.add(message.id);
+      }
+    }
+    const filteredMessages = messages.filter((message) => {
+      if (message.isResultMessage()) {
+        if (!validToolUseIds.has(message.actionExecutionId)) {
+          return false;
+        }
+        validToolUseIds.delete(message.actionExecutionId);
+        return true;
+      }
+      return true;
+    });
+    let openaiMessages = filteredMessages.map((m) => convertMessageToOpenAIMessage(m, {
       keepSystemRole: this.keepSystemRole
     }));
     openaiMessages = limitMessagesToTokenCount(openaiMessages, tools, model);
@@ -387,91 +404,101 @@ var OpenAIAdapter = class {
         }
       };
     }
-    const stream = this.openai.beta.chat.completions.stream({
-      model,
-      stream: true,
-      messages: openaiMessages,
-      ...tools.length > 0 && {
-        tools
-      },
-      ...(forwardedParameters == null ? void 0 : forwardedParameters.maxTokens) && {
-        max_tokens: forwardedParameters.maxTokens
-      },
-      ...(forwardedParameters == null ? void 0 : forwardedParameters.stop) && {
-        stop: forwardedParameters.stop
-      },
-      ...toolChoice && {
-        tool_choice: toolChoice
-      },
-      ...this.disableParallelToolCalls && {
-        parallel_tool_calls: false
-      },
-      ...(forwardedParameters == null ? void 0 : forwardedParameters.temperature) && {
-        temperature: forwardedParameters.temperature
-      }
-    });
-    eventSource.stream(async (eventStream$) => {
-      var _a, _b;
-      let mode = null;
-      let currentMessageId;
-      let currentToolCallId;
-      for await (const chunk of stream) {
-        if (chunk.choices.length === 0) {
-          continue;
-        }
-        const toolCall = (_a = chunk.choices[0].delta.tool_calls) == null ? void 0 : _a[0];
-        const content = chunk.choices[0].delta.content;
-        if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
-          mode = null;
-          eventStream$.sendTextMessageEnd({
-            messageId: currentMessageId
-          });
-        } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
-          mode = null;
-          eventStream$.sendActionExecutionEnd({
-            actionExecutionId: currentToolCallId
-          });
+    try {
+      const stream = this.openai.beta.chat.completions.stream({
+        model,
+        stream: true,
+        messages: openaiMessages,
+        ...tools.length > 0 && {
+          tools
+        },
+        ...(forwardedParameters == null ? void 0 : forwardedParameters.maxTokens) && {
+          max_tokens: forwardedParameters.maxTokens
+        },
+        ...(forwardedParameters == null ? void 0 : forwardedParameters.stop) && {
+          stop: forwardedParameters.stop
+        },
+        ...toolChoice && {
+          tool_choice: toolChoice
+        },
+        ...this.disableParallelToolCalls && {
+          parallel_tool_calls: false
+        },
+        ...(forwardedParameters == null ? void 0 : forwardedParameters.temperature) && {
+          temperature: forwardedParameters.temperature
         }
-        if (mode === null) {
-          if (toolCall == null ? void 0 : toolCall.id) {
-            mode = "function";
-            currentToolCallId = toolCall.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              parentMessageId: chunk.id,
-              actionName: toolCall.function.name
-            });
-          } else if (content) {
-            mode = "message";
-            currentMessageId = chunk.id;
-            eventStream$.sendTextMessageStart({
+      });
+      eventSource.stream(async (eventStream$) => {
+        var _a, _b;
+        let mode = null;
+        let currentMessageId;
+        let currentToolCallId;
+        try {
+          for await (const chunk of stream) {
+            if (chunk.choices.length === 0) {
+              continue;
+            }
+            const toolCall = (_a = chunk.choices[0].delta.tool_calls) == null ? void 0 : _a[0];
+            const content = chunk.choices[0].delta.content;
+            if (mode === "message" && (toolCall == null ? void 0 : toolCall.id)) {
+              mode = null;
+              eventStream$.sendTextMessageEnd({
+                messageId: currentMessageId
+              });
+            } else if (mode === "function" && (toolCall === void 0 || (toolCall == null ? void 0 : toolCall.id))) {
+              mode = null;
+              eventStream$.sendActionExecutionEnd({
+                actionExecutionId: currentToolCallId
+              });
+            }
+            if (mode === null) {
+              if (toolCall == null ? void 0 : toolCall.id) {
+                mode = "function";
+                currentToolCallId = toolCall.id;
+                eventStream$.sendActionExecutionStart({
+                  actionExecutionId: currentToolCallId,
+                  parentMessageId: chunk.id,
+                  actionName: toolCall.function.name
+                });
+              } else if (content) {
+                mode = "message";
+                currentMessageId = chunk.id;
+                eventStream$.sendTextMessageStart({
+                  messageId: currentMessageId
+                });
+              }
+            }
+            if (mode === "message" && content) {
+              eventStream$.sendTextMessageContent({
+                messageId: currentMessageId,
+                content
+              });
+            } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
+              eventStream$.sendActionExecutionArgs({
+                actionExecutionId: currentToolCallId,
+                args: toolCall.function.arguments
+              });
+            }
+          }
+          if (mode === "message") {
+            eventStream$.sendTextMessageEnd({
               messageId: currentMessageId
             });
+          } else if (mode === "function") {
+            eventStream$.sendActionExecutionEnd({
+              actionExecutionId: currentToolCallId
+            });
           }
+        } catch (error) {
+          console.error("[OpenAI] Error processing stream:", error);
+          throw error;
         }
-        if (mode === "message" && content) {
-          eventStream$.sendTextMessageContent({
-            messageId: currentMessageId,
-            content
-          });
-        } else if (mode === "function" && ((_b = toolCall == null ? void 0 : toolCall.function) == null ? void 0 : _b.arguments)) {
-          eventStream$.sendActionExecutionArgs({
-            actionExecutionId: currentToolCallId,
-            args: toolCall.function.arguments
-          });
-        }
-      }
-      if (mode === "message") {
-        eventStream$.sendTextMessageEnd({
-          messageId: currentMessageId
-        });
-      } else if (mode === "function") {
-        eventStream$.sendActionExecutionEnd({
-          actionExecutionId: currentToolCallId
-        });
-      }
-      eventStream$.complete();
-    });
+        eventStream$.complete();
+      });
+    } catch (error) {
+      console.error("[OpenAI] Error during API call:", error);
+      throw error;
+    }
     return {
       threadId
     };
@@ -4361,23 +4388,6 @@ function convertMessageToAnthropicMessage(message) {
   }
 }
 __name(convertMessageToAnthropicMessage, "convertMessageToAnthropicMessage");
-function groupAnthropicMessagesByRole(messageParams) {
-  return messageParams.reduce((acc, message) => {
-    const lastGroup = acc[acc.length - 1];
-    if (lastGroup && lastGroup.role === message.role) {
-      lastGroup.content = lastGroup.content.concat(message.content);
-    } else {
-      acc.push({
-        role: message.role,
-        content: [
-          ...message.content
-        ]
-      });
-    }
-    return acc;
-  }, []);
-}
-__name(groupAnthropicMessagesByRole, "groupAnthropicMessagesByRole");
 
 // src/service-adapters/anthropic/anthropic-adapter.ts
 var import_shared16 = require("@copilotkit/shared");
@@ -4402,9 +4412,32 @@ var AnthropicAdapter = class {
     ];
     const instructionsMessage = messages.shift();
     const instructions = instructionsMessage.isTextMessage() ? instructionsMessage.content : "";
-    let anthropicMessages = messages.map(convertMessageToAnthropicMessage);
-    anthropicMessages = limitMessagesToTokenCount2(anthropicMessages, tools, model);
-    anthropicMessages = groupAnthropicMessagesByRole(anthropicMessages);
+    const validToolUseIds = /* @__PURE__ */ new Set();
+    for (const message of messages) {
+      if (message.isActionExecutionMessage()) {
+        validToolUseIds.add(message.id);
+      }
+    }
+    const anthropicMessages = messages.map((message) => {
+      if (message.isResultMessage()) {
+        if (!validToolUseIds.has(message.actionExecutionId)) {
+          return null;
+        }
+        validToolUseIds.delete(message.actionExecutionId);
+        return {
+          role: "user",
+          content: [
+            {
+              type: "tool_result",
+              content: message.result,
+              tool_use_id: message.actionExecutionId
+            }
+          ]
+        };
+      }
+      return convertMessageToAnthropicMessage(message);
+    }).filter(Boolean);
+    const limitedMessages = limitMessagesToTokenCount2(anthropicMessages, tools, model);
     let toolChoice = forwardedParameters == null ? void 0 : forwardedParameters.toolChoice;
     if ((forwardedParameters == null ? void 0 : forwardedParameters.toolChoice) === "function") {
       toolChoice = {
@@ -4412,82 +4445,93 @@ var AnthropicAdapter = class {
         name: forwardedParameters.toolChoiceFunctionName
       };
     }
-    const stream = this.anthropic.messages.create({
-      system: instructions,
-      model: this.model,
-      messages: anthropicMessages,
-      max_tokens: (forwardedParameters == null ? void 0 : forwardedParameters.maxTokens) || 1024,
-      ...(forwardedParameters == null ? void 0 : forwardedParameters.temperature) ? {
-        temperature: forwardedParameters.temperature
-      } : {},
-      ...tools.length > 0 && {
-        tools
-      },
-      ...toolChoice && {
-        tool_choice: toolChoice
-      },
-      stream: true
-    });
-    eventSource.stream(async (eventStream$) => {
-      let mode = null;
-      let didOutputText = false;
-      let currentMessageId = (0, import_shared16.randomId)();
-      let currentToolCallId = (0, import_shared16.randomId)();
-      let filterThinkingTextBuffer = new FilterThinkingTextBuffer();
-      for await (const chunk of await stream) {
-        if (chunk.type === "message_start") {
-          currentMessageId = chunk.message.id;
-        } else if (chunk.type === "content_block_start") {
-          if (chunk.content_block.type === "text") {
-            didOutputText = false;
-            filterThinkingTextBuffer.reset();
-            mode = "message";
-          } else if (chunk.content_block.type === "tool_use") {
-            currentToolCallId = chunk.content_block.id;
-            eventStream$.sendActionExecutionStart({
-              actionExecutionId: currentToolCallId,
-              actionName: chunk.content_block.name,
-              parentMessageId: currentMessageId
-            });
-            mode = "function";
-          }
-        } else if (chunk.type === "content_block_delta") {
-          if (chunk.delta.type === "text_delta") {
-            const text = filterThinkingTextBuffer.onTextChunk(chunk.delta.text);
-            if (text.length > 0) {
-              if (!didOutputText) {
-                eventStream$.sendTextMessageStart({
-                  messageId: currentMessageId
+    try {
+      const createParams = {
+        system: instructions,
+        model: this.model,
+        messages: limitedMessages,
+        max_tokens: (forwardedParameters == null ? void 0 : forwardedParameters.maxTokens) || 1024,
+        ...(forwardedParameters == null ? void 0 : forwardedParameters.temperature) ? {
+          temperature: forwardedParameters.temperature
+        } : {},
+        ...tools.length > 0 && {
+          tools
+        },
+        ...toolChoice && {
+          tool_choice: toolChoice
+        },
+        stream: true
+      };
+      const stream = await this.anthropic.messages.create(createParams);
+      eventSource.stream(async (eventStream$) => {
+        let mode = null;
+        let didOutputText = false;
+        let currentMessageId = (0, import_shared16.randomId)();
+        let currentToolCallId = (0, import_shared16.randomId)();
+        let filterThinkingTextBuffer = new FilterThinkingTextBuffer();
+        try {
+          for await (const chunk of stream) {
+            if (chunk.type === "message_start") {
+              currentMessageId = chunk.message.id;
+            } else if (chunk.type === "content_block_start") {
+              if (chunk.content_block.type === "text") {
+                didOutputText = false;
+                filterThinkingTextBuffer.reset();
+                mode = "message";
+              } else if (chunk.content_block.type === "tool_use") {
+                currentToolCallId = chunk.content_block.id;
+                eventStream$.sendActionExecutionStart({
+                  actionExecutionId: currentToolCallId,
+                  actionName: chunk.content_block.name,
+                  parentMessageId: currentMessageId
+                });
+                mode = "function";
+              }
+            } else if (chunk.type === "content_block_delta") {
+              if (chunk.delta.type === "text_delta") {
+                const text = filterThinkingTextBuffer.onTextChunk(chunk.delta.text);
+                if (text.length > 0) {
+                  if (!didOutputText) {
+                    eventStream$.sendTextMessageStart({
+                      messageId: currentMessageId
+                    });
+                    didOutputText = true;
+                  }
+                  eventStream$.sendTextMessageContent({
+                    messageId: currentMessageId,
+                    content: text
+                  });
+                }
+              } else if (chunk.delta.type === "input_json_delta") {
+                eventStream$.sendActionExecutionArgs({
+                  actionExecutionId: currentToolCallId,
+                  args: chunk.delta.partial_json
+                });
+              }
+            } else if (chunk.type === "content_block_stop") {
+              if (mode === "message") {
+                if (didOutputText) {
+                  eventStream$.sendTextMessageEnd({
+                    messageId: currentMessageId
+                  });
+                }
+              } else if (mode === "function") {
+                eventStream$.sendActionExecutionEnd({
+                  actionExecutionId: currentToolCallId
                 });
-                didOutputText = true;
               }
-              eventStream$.sendTextMessageContent({
-                messageId: currentMessageId,
-                content: text
-              });
-            }
-          } else if (chunk.delta.type === "input_json_delta") {
-            eventStream$.sendActionExecutionArgs({
-              actionExecutionId: currentToolCallId,
-              args: chunk.delta.partial_json
-            });
-          }
-        } else if (chunk.type === "content_block_stop") {
-          if (mode === "message") {
-            if (didOutputText) {
-              eventStream$.sendTextMessageEnd({
-                messageId: currentMessageId
-              });
             }
-          } else if (mode === "function") {
-            eventStream$.sendActionExecutionEnd({
-              actionExecutionId: currentToolCallId
-            });
           }
+        } catch (error) {
+          console.error("[Anthropic] Error processing stream:", error);
+          throw error;
         }
-      }
-      eventStream$.complete();
-    });
+        eventStream$.complete();
+      });
+    } catch (error) {
+      console.error("[Anthropic] Error during API call:", error);
+      throw error;
+    }
     return {
       threadId: threadId || (0, import_shared16.randomUUID)()
     };