@copilotkit/runtime 1.6.0-next.1 → 1.6.0-next.10

package/src/service-adapters/openai/utils.ts

@@ -1,12 +1,14 @@
 import { Message } from "../../graphql/types/converted";
 import { ActionInput } from "../../graphql/inputs/action.input";
 import {
+  ChatCompletionAssistantMessageParam,
   ChatCompletionMessageParam,
+  ChatCompletionSystemMessageParam,
   ChatCompletionTool,
   ChatCompletionUserMessageParam,
-  ChatCompletionAssistantMessageParam,
-  ChatCompletionSystemMessageParam,
-} from "openai/resources";
+  ChatCompletionDeveloperMessageParam,
+} from "openai/resources/chat";
+import { parseJson } from "@copilotkit/shared";
 
 export function limitMessagesToTokenCount(
   messages: any[],
@@ -24,7 +26,7 @@ export function limitMessagesToTokenCount(
   maxTokens -= toolsNumTokens;
 
   for (const message of messages) {
-    if (message.role === "system") {
+    if (["system", "developer"].includes(message.role)) {
       const numTokens = countMessageTokens(model, message);
       maxTokens -= numTokens;
 
@@ -38,7 +40,7 @@ export function limitMessagesToTokenCount(
 
   const reversedMessages = [...messages].reverse();
   for (const message of reversedMessages) {
-    if (message.role === "system") {
+    if (["system", "developer"].includes(message.role)) {
       result.unshift(message);
       continue;
     } else if (cutoff) {
@@ -63,9 +65,23 @@ export function maxTokensForOpenAIModel(model: string): number {
 const DEFAULT_MAX_TOKENS = 128000;
 
 const maxTokensByModel: { [key: string]: number } = {
+  // o1
+  o1: 200000,
+  "o1-2024-12-17": 200000,
+  "o1-mini": 128000,
+  "o1-mini-2024-09-12": 128000,
+  "o1-preview": 128000,
+  "o1-preview-2024-09-12": 128000,
+  // o3-mini
+  "o3-mini": 200000,
+  "o3-mini-2025-01-31": 200000,
   // GPT-4
   "gpt-4o": 128000,
+  "chatgpt-4o-latest": 128000,
+  "gpt-4o-2024-08-06": 128000,
   "gpt-4o-2024-05-13": 128000,
+  "gpt-4o-mini": 128000,
+  "gpt-4o-mini-2024-07-18": 128000,
   "gpt-4-turbo": 128000,
   "gpt-4-turbo-2024-04-09": 128000,
   "gpt-4-0125-preview": 128000,
@@ -113,20 +129,30 @@ export function convertActionInputToOpenAITool(action: ActionInput): ChatComplet
     function: {
       name: action.name,
       description: action.description,
-      parameters: JSON.parse(action.jsonSchema),
+      parameters: parseJson(action.jsonSchema, {}),
     },
   };
 }
 
-export function convertMessageToOpenAIMessage(message: Message): ChatCompletionMessageParam {
+type UsedMessageParams =
+  | ChatCompletionUserMessageParam
+  | ChatCompletionAssistantMessageParam
+  | ChatCompletionDeveloperMessageParam
+  | ChatCompletionSystemMessageParam;
+export function convertMessageToOpenAIMessage(
+  message: Message,
+  options?: { keepSystemRole: boolean },
+): ChatCompletionMessageParam {
+  const { keepSystemRole } = options || { keepSystemRole: false };
   if (message.isTextMessage()) {
+    let role = message.role as UsedMessageParams["role"];
+    if (message.role === "system" && !keepSystemRole) {
+      role = "developer";
+    }
     return {
-      role: message.role as ChatCompletionUserMessageParam["role"],
+      role,
       content: message.content,
-    } satisfies
-      | ChatCompletionUserMessageParam
-      | ChatCompletionAssistantMessageParam
-      | ChatCompletionSystemMessageParam;
+    } satisfies UsedMessageParams;
   } else if (message.isActionExecutionMessage()) {
     return {
       role: "assistant",
@@ -153,7 +179,7 @@ export function convertMessageToOpenAIMessage(message: Message): ChatCompletionM
 export function convertSystemMessageToAssistantAPI(message: ChatCompletionMessageParam) {
   return {
     ...message,
-    ...(message.role === "system" && {
+    ...(["system", "developer"].includes(message.role) && {
       role: "assistant",
       content: "THE FOLLOWING MESSAGE IS A SYSTEM MESSAGE: " + message.content,
     }),

package/src/service-adapters/unify/unify-adapter.ts

@@ -56,7 +56,7 @@ export class UnifyAdapter implements CopilotServiceAdapter {
     });
     const forwardedParameters = request.forwardedParameters;
 
-    const messages = request.messages.map(convertMessageToOpenAIMessage);
+    const messages = request.messages.map((m) => convertMessageToOpenAIMessage(m));
 
     const stream = await openai.chat.completions.create({
       model: this.model,

package/tsconfig.json

@@ -1,12 +1,13 @@
 {
   "extends": "../../utilities/tsconfig/base.json",
   "compilerOptions": {
+    "types": ["node", "jest"],
     "lib": ["es2017", "dom"],
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "strict": false,
     "resolveJsonModule": true
   },
-  "include": ["./src/**/*.ts"],
-  "exclude": ["dist", "build", "node_modules", "**/*.test.ts", "**/*.test.tsx", "**/__tests__/*"]
+  "include": ["./src/**/*.ts", "./src/**/*.test.ts", "./src/**/__tests__/*"],
+  "exclude": ["dist", "build", "node_modules"]
 }