@agentica/core 0.32.9 → 0.33.1

package/src/factory/events.ts

@@ -114,16 +114,18 @@ export function createCallEvent<Model extends ILlmSchema.Model>(props: {
 }
 
 export function createJsonParseErrorEvent<Model extends ILlmSchema.Model>(props: {
-  id: string;
+  call_id: string;
   operation: AgenticaOperation<Model>;
   arguments: string;
   errorMessage: string;
   life: number;
 }): AgenticaJsonParseErrorEvent<Model> {
+  const id: string = v4();
   const created_at: string = new Date().toISOString();
   return {
     type: "jsonParseError",
-    id: props.id,
+    id,
+    call_id: props.call_id,
     created_at,
     operation: props.operation,
     arguments: props.arguments,
@@ -133,22 +135,25 @@ export function createJsonParseErrorEvent<Model extends ILlmSchema.Model>(props:
 }
 
 export function createValidateEvent<Model extends ILlmSchema.Model>(props: {
-  id: string;
+  call_id: string;
   operation: AgenticaOperation<Model>;
   result: IValidation.IFailure;
   life: number;
 }): AgenticaValidateEvent<Model> {
+  const id: string = v4();
   const created_at: string = new Date().toISOString();
   return {
     type: "validate",
-    id: props.id,
+    id,
+    call_id: props.call_id,
     created_at,
     operation: props.operation,
     result: props.result,
     life: props.life,
     toJSON: () => ({
       type: "validate",
-      id: props.id,
+      id,
+      call_id: props.call_id,
       created_at,
       operation: props.operation.toJSON(),
       result: props.result,
@@ -158,6 +163,7 @@ export function createValidateEvent<Model extends ILlmSchema.Model>(props: {
 }
 
 export function createExecuteEvent<Model extends ILlmSchema.Model>(props: {
+  call_id: string;
   operation: AgenticaOperation<Model>;
   arguments: Record<string, unknown>;
   value: unknown;
@@ -169,6 +175,7 @@ export function createExecuteEvent<Model extends ILlmSchema.Model>(props: {
     type: "execute",
     id,
     created_at,
+    call_id: props.call_id,
     protocol: props.operation.protocol as "class",
     operation: props.operation as AgenticaOperation.Class<Model>,
     arguments: props.arguments,
@@ -178,6 +185,7 @@ export function createExecuteEvent<Model extends ILlmSchema.Model>(props: {
       type: "execute",
       id,
       created_at,
+      call_id: props.call_id,
       protocol: props.operation.protocol as "class",
       operation: props.operation.toJSON(),
       arguments: props.arguments,
@@ -318,6 +326,7 @@ export function createRequestEvent(props: {
 }
 
 export function createResponseEvent(props: {
+  request_id: string;
   source: AgenticaEventSource;
   body: OpenAI.ChatCompletionCreateParamsStreaming;
   options?: OpenAI.RequestOptions | undefined;
@@ -329,6 +338,7 @@ export function createResponseEvent(props: {
   return {
     type: "response",
     id,
+    request_id: props.request_id,
     created_at,
     source: props.source,
     body: props.body,

package/src/json/IAgenticaEventJson.ts

@@ -89,11 +89,6 @@ export namespace IAgenticaEventJson {
    * Event of calling a function.
    */
   export interface ICall extends IBase<"call"> {
-    /**
-     * ID of the tool calling.
-     */
-    id: string;
-
     /**
      * Target operation to call.
      */
@@ -110,6 +105,11 @@ export namespace IAgenticaEventJson {
   }
 
   export interface IValidate extends IBase<"validate"> {
+    /**
+     * ID of the tool calling.
+     */
+    call_id: string;
+
     /**
      * Target operation to call.
      */
@@ -124,6 +124,11 @@ export namespace IAgenticaEventJson {
   }
 
   export interface IJsonParseError extends IBase<"jsonParseError"> {
+    /**
+     * ID of the tool calling.
+     */
+    call_id: string;
+
     /**
      * Target operation to call.
      */
@@ -151,7 +156,7 @@ export namespace IAgenticaEventJson {
     /**
      * ID of the tool calling.
      */
-    id: string;
+    call_id: string;
 
     /**
      * Target operation had called.

package/src/orchestrate/call.ts

@@ -85,13 +85,10 @@ export async function call<Model extends ILlmSchema.Model>(
             type: "function",
             function: {
               name: s.name,
-
               description: s.function.description,
               parameters: (
-                (
-                  "separated" in s.function
-                  && s.function.separated !== undefined
-                )
+                "separated" in s.function
+                && s.function.separated !== undefined
                   ? (s.function.separated.llm
                     ?? ({
                       type: "object",
@@ -100,7 +97,6 @@ export async function call<Model extends ILlmSchema.Model>(
                       additionalProperties: false,
                       $defs: {},
                     } satisfies IChatGptSchema.IParameters))
-
                   : s.function.parameters) as Record<string, any>,
             },
           }) as OpenAI.ChatCompletionTool,
@@ -174,7 +170,7 @@ export async function call<Model extends ILlmSchema.Model>(
 async function predicate<Model extends ILlmSchema.Model>(
   ctx: AgenticaContext<Model> | MicroAgenticaContext<Model>,
   operation: AgenticaOperation<Model>,
-  toolCall: OpenAI.ChatCompletionMessageToolCall,
+  toolCall: OpenAI.ChatCompletionMessageFunctionToolCall,
   previousValidationErrors: AgenticaValidateEvent<Model>[],
   life: number,
 ): Promise<AgenticaExecuteEvent<Model>> {
@@ -187,14 +183,14 @@ async function predicate<Model extends ILlmSchema.Model>(
     );
   await ctx.dispatch(call);
   if (call.type === "jsonParseError") {
-    return correctJsonError(ctx, call, previousValidationErrors, life - 1);
+    return correctJsonError(ctx, toolCall, call, previousValidationErrors, life - 1);
   }
 
   // CHECK TYPE VALIDATION
   const check: IValidation<unknown> = operation.function.validate(call.arguments);
   if (check.success === false) {
     const event: AgenticaValidateEvent<Model> = createValidateEvent({
-      id: toolCall.id,
+      call_id: toolCall.id,
       operation,
       result: check,
       life,
@@ -225,6 +221,7 @@ async function correctTypeError<Model extends ILlmSchema.Model>(
 ): Promise<AgenticaExecuteEvent<Model>> {
   return correctError<Model>(ctx, {
     giveUp: () => createExecuteEvent({
+      call_id: callEvent.id,
       operation: callEvent.operation,
       arguments: callEvent.arguments,
       value: {
@@ -260,12 +257,14 @@ async function correctTypeError<Model extends ILlmSchema.Model>(
 
 async function correctJsonError<Model extends ILlmSchema.Model>(
   ctx: AgenticaContext<Model> | MicroAgenticaContext<Model>,
+  toolCall: OpenAI.ChatCompletionMessageFunctionToolCall,
   parseErrorEvent: AgenticaJsonParseErrorEvent<Model>,
   previousValidationErrors: AgenticaValidateEvent<Model>[],
   life: number,
 ): Promise<AgenticaExecuteEvent<Model>> {
   return correctError<Model>(ctx, {
     giveUp: () => createExecuteEvent({
+      call_id: toolCall.id,
       operation: parseErrorEvent.operation,
       arguments: {},
       value: {
@@ -294,7 +293,7 @@ async function correctJsonError<Model extends ILlmSchema.Model>(
 
 function parseArguments<Model extends ILlmSchema.Model>(
   operation: AgenticaOperation<Model>,
-  toolCall: OpenAI.ChatCompletionMessageToolCall,
+  toolCall: OpenAI.ChatCompletionMessageFunctionToolCall,
   life: number,
 ): AgenticaCallEvent<Model> | AgenticaJsonParseErrorEvent<Model> {
   try {
@@ -307,7 +306,7 @@ function parseArguments<Model extends ILlmSchema.Model>(
   }
   catch (error) {
     return createJsonParseErrorEvent({
-      id: toolCall.id,
+      call_id: toolCall.id,
       operation,
       arguments: toolCall.function.arguments,
       errorMessage: error instanceof Error ? error.message : String(error),
@@ -366,7 +365,7 @@ async function correctError<Model extends ILlmSchema.Model>(
               name: props.operation.name,
               arguments: props.toolCall.arguments,
             },
-          } satisfies OpenAI.ChatCompletionMessageToolCall,
+          } satisfies OpenAI.ChatCompletionMessageFunctionToolCall,
         ],
       } satisfies OpenAI.ChatCompletionAssistantMessageParam,
       {
@@ -411,8 +410,9 @@ async function correctError<Model extends ILlmSchema.Model>(
   });
   const chunks: OpenAI.ChatCompletionChunk[] = await StreamUtil.readAll(stream);
   const completion: OpenAI.ChatCompletion = ChatGptCompletionMessageUtil.merge(chunks);
-
-  const toolCall: OpenAI.ChatCompletionMessageToolCall | undefined = completion.choices[0]?.message.tool_calls?.find(
+  const toolCall: OpenAI.ChatCompletionMessageFunctionToolCall | undefined = completion.choices[0]?.message.tool_calls?.filter(
+    tc => tc.type === "function",
+  ).find(
     s => s.function.name === props.operation.name,
   );
   return toolCall === undefined
@@ -448,6 +448,7 @@ async function executeFunction<Model extends ILlmSchema.Model>(
       }
     })();
     return createExecuteEvent({
+      call_id: call.id,
       operation: call.operation,
       arguments: call.arguments,
       value,
@@ -456,6 +457,7 @@ async function executeFunction<Model extends ILlmSchema.Model>(
   }
   catch (error) {
     return createExecuteEvent({
+      call_id: call.id,
       operation: call.operation,
       arguments: call.arguments,
       value: error instanceof Error

package/src/orchestrate/cancel.ts

@@ -182,7 +182,7 @@ async function step<Model extends ILlmSchema.Model>(
     const failures: IFailure[] = [];
     for (const choice of completion.choices) {
       for (const tc of choice.message.tool_calls ?? []) {
-        if (tc.function.name !== "cancelFunctions") {
+        if (tc.type !== "function" || tc.function.name !== "cancelFunctions") {
           continue;
         }
 

package/src/orchestrate/describe.ts

@@ -44,7 +44,7 @@ export async function describe<Model extends ILlmSchema.Model>(
       executes: histories,
       ...props,
     });
-    ctx.dispatch(event);
+    void ctx.dispatch(event).catch(() => {});
   }, ctx.abortSignal);
 }
 

package/src/orchestrate/initialize.ts

@@ -65,7 +65,7 @@ export async function initialize<Model extends ILlmSchema.Model>(ctx: AgenticaCo
 
   const completion = await reduceStreamingWithDispatch(completionStream, (props) => {
     const event: AgenticaAssistantMessageEvent = createAssistantMessageEvent(props);
-    ctx.dispatch(event);
+    void ctx.dispatch(event).catch(() => {});
   }, ctx.abortSignal);
 
   if (completion === null) {

package/src/orchestrate/internal/cancelFunctionFromContext.ts

@@ -31,5 +31,5 @@ export function cancelFunctionFromContext<Model extends ILlmSchema.Model>(
       reason: reference.reason,
     }),
   });
-  ctx.dispatch(event);
+  void ctx.dispatch(event).catch(() => {});
 }

package/src/orchestrate/internal/selectFunctionFromContext.ts

@@ -34,5 +34,5 @@ export function selectFunctionFromContext<
   const event: AgenticaSelectEvent<Model> = createSelectEvent({
     selection,
   });
-  ctx.dispatch(event);
+  void ctx.dispatch(event).catch(() => {});
 }

package/src/orchestrate/select.ts

@@ -226,7 +226,7 @@ async function step<Model extends ILlmSchema.Model>(
     const failures: IFailure[] = [];
     for (const choice of completion.choices) {
       for (const tc of choice.message.tool_calls ?? []) {
-        if (tc.function.name !== "selectFunctions") {
+        if (tc.type !== "function" || tc.function.name !== "selectFunctions") {
           continue;
         }
         const input: object = JsonUtil.parse(tc.function.arguments) as object;

package/src/utils/ChatGptCompletionMessageUtil.spec.ts

@@ -124,8 +124,8 @@ describe("chatGptCompletionMessageUtil", () => {
       };
 
       const result = ChatGptCompletionMessageUtil.accumulate(origin, chunk);
-      expect(result.choices[0]?.message.tool_calls?.[0]?.function.name).toBe("test_function");
-      expect(result.choices[0]?.message.tool_calls?.[0]?.function.arguments).toBe("{\"arg\": \"value\"}{\"arg2\": \"value2\"}");
+      expect(result.choices[0]?.message.tool_calls?.filter(tc => tc.type === "function")[0]?.function.name).toBe("test_function");
+      expect(result.choices[0]?.message.tool_calls?.filter(tc => tc.type === "function")[0]?.function.arguments).toBe("{\"arg\": \"value\"}{\"arg2\": \"value2\"}");
     });
 
     it("should handle usage aggregation", () => {
@@ -292,7 +292,7 @@ describe("chatGptCompletionMessageUtil", () => {
       };
 
       const result = ChatGptCompletionMessageUtil.mergeToolCalls(acc, cur);
-      expect(result.function.arguments).toBe("{\"arg\": \"value\"}{\"arg2\": \"value2\"}");
+      expect(result.type === "function" ? result.function.arguments : "custom").toBe("{\"arg\": \"value\"}{\"arg2\": \"value2\"}");
     });
 
     it("should merge tool call function name", () => {
@@ -314,7 +314,7 @@ describe("chatGptCompletionMessageUtil", () => {
       };
 
       const result = ChatGptCompletionMessageUtil.mergeToolCalls(acc, cur);
-      expect(result.function.name).toBe("test_function");
+      expect(result.type === "function" ? result.function.name : "custom").toBe("test_function");
     });
   });
 });

package/src/utils/ChatGptCompletionMessageUtil.ts

@@ -2,6 +2,7 @@ import type {
   ChatCompletion,
   ChatCompletionChunk,
   ChatCompletionMessage,
+  ChatCompletionMessageFunctionToolCall,
   ChatCompletionMessageToolCall,
 } from "openai/resources";
 
@@ -101,7 +102,7 @@ function merge(chunks: ChatCompletionChunk[]): ChatCompletion {
 
   // post-process
   result.choices.forEach((choice) => {
-    choice.message.tool_calls?.forEach((toolCall) => {
+    choice.message.tool_calls?.filter(tc => tc.type === "function").forEach((toolCall) => {
       if (toolCall.function.arguments === "") {
         toolCall.function.arguments = "{}";
       }
@@ -154,7 +155,7 @@ function mergeChoice(acc: ChatCompletion.Choice, cur: ChatCompletionChunk.Choice
 
     cur.delta.tool_calls.forEach((toolCall) => {
       const existingToolCall = toolCalls[toolCall.index];
-      if (existingToolCall != null) {
+      if (existingToolCall != null && existingToolCall.type === "function") {
         toolCalls[toolCall.index] = mergeToolCalls(
           existingToolCall,
           toolCall,
@@ -176,14 +177,12 @@ function mergeChoice(acc: ChatCompletion.Choice, cur: ChatCompletionChunk.Choice
   return acc;
 }
 
-function mergeToolCalls(acc: ChatCompletionMessageToolCall, cur: ChatCompletionChunk.Choice.Delta.ToolCall): ChatCompletionMessageToolCall {
+function mergeToolCalls(acc: ChatCompletionMessageFunctionToolCall, cur: ChatCompletionChunk.Choice.Delta.ToolCall): ChatCompletionMessageToolCall {
   if (cur.function != null) {
     acc.function.arguments += cur.function.arguments ?? "";
     acc.function.name += cur.function.name ?? "";
   }
-
   acc.id += cur.id ?? "";
-
   return acc;
 }