fix: remove unused type, do not add tool calls in user messages

ggml-org · samolego · May 7, 2025 · May 8, 2025 · May 8, 2025 · May 12, 2025
commit c9ec6fabcf3fcff254584bd270f25eabdbd4ee09
@@ -48,7 +48,7 @@ export const CONFIG_DEFAULT = {
  ...Object.fromEntries(
    Array.from(AVAILABLE_TOOLS.values()).map((tool: AgentTool) => [
      `tool_${tool.id}_enabled`,
-      false, // Default value for tool enabled state (e.g., false for opt-in)
+      false,
    ])
  ),
 };

@@ -1,10 +1,10 @@
-import { ToolCallType } from '../../utils/types';
+import { ToolCallRequest } from '../../utils/types';

 export const ToolCallArgsDisplay = ({
  toolCall,
  baseClassName = 'collapse bg-base-200 collapse-arrow mb-4',
 }: {
-  toolCall: ToolCallType;
+  toolCall: ToolCallRequest;
  baseClassName?: string;
 }) => {
  return (

@@ -62,11 +62,15 @@ export const copyStr = (textToCopy: string) => {
 export function normalizeMsgsForAPI(messages: Readonly<Message[]>) {
  return messages.map((msg) => {
    if (msg.role !== 'user' || !msg.extra) {
-      return {
+      const apiMessage = {
        role: msg.role,
        content: msg.content,
-        tool_calls: msg.tool_calls,
      } as APIMessage;
+
+      if (msg.tool_calls && msg.tool_calls.length > 0) {
+        apiMessage.tool_calls = msg.tool_calls;
+      }
+      return apiMessage;
    }

    // extra content first, then user text message in the end

@@ -1,4 +1,3 @@
-import StorageUtils from '../storage';
 import { ToolCallRequest, ToolCallOutput, ToolCallParameters } from '../types';
 import { AgentTool } from './agent_tool';


@@ -133,9 +133,6 @@ export interface ToolCallSpec {
    parameters: ToolCallParameters;
  };
 }
-export type ToolCallType = NonNullable<
-  (Message | PendingMessage)['tool_calls']
->[number];

 export interface ToolCallParameters {
  type: 'object';