Remove id from ToolCallResponse

Author: intitni

Core/Sources/ChatGPTChatTab/Chat.swift

@@ -329,7 +329,7 @@ struct Chat: ReducerProtocol {
 
                     for call in message.toolCalls ?? [] {
                         all.append(.init(
-                            id: message.id + call.response.id,
+                            id: message.id + call.id,
                             role: .tool,
                             text: call.response.summary ?? call.response.content,
                             references: []

Tool/Sources/OpenAIService/ChatGPTService.swift

@@ -610,7 +610,7 @@ extension ChatGPTService {
                     all.append(ChatCompletionsRequestBody.Message(
                         role: .tool,
                         content: call.response.content,
-                        toolCallId: call.response.id
+                        toolCallId: call.id
                     ))
                 } else {
                     all.append(ChatCompletionsRequestBody.Message(

Tool/Sources/OpenAIService/Memory/AutoManagedChatGPTMemoryStrategy/AutoManagedChatGPTMemoryOpenAIStrategy.swift

@@ -45,7 +45,7 @@ extension TokenEncoder {
                 encodingContent.append(toolCall.function.arguments)
                 total += 4
                 encodingContent.append(toolCall.response.content)
-                encodingContent.append(toolCall.response.id)
+                encodingContent.append(toolCall.id)
             }
         }
         total += await withTaskGroup(of: Int.self, body: { group in

Tool/Sources/OpenAIService/Models.swift

@@ -40,16 +40,14 @@ public struct ChatMessage: Equatable, Codable {
             self.id = id
             self.type = type
             self.function = function
-            self.response = response ?? .init(id: id, content: "", summary: nil)
+            self.response = response ?? .init(content: "", summary: nil)
         }
     }
 
     public struct ToolCallResponse: Codable, Equatable {
-        public var id: String
         public var content: String
         public var summary: String?
-        public init(id: String, content: String, summary: String?) {
-            self.id = id
+        public init(content: String, summary: String?) {
             self.content = content
             self.summary = summary
         }

Tool/Tests/OpenAIServiceTests/ChatGPTStreamTests.swift

@@ -133,7 +133,7 @@ final class ChatGPTStreamTests: XCTestCase {
                             id: "id",
                             type: "function",
                             function: .init(name: "function", arguments: "{\n\"foo\": 1\n}"),
-                            response: .init(id: "id", content: "Function is called.", summary: nil)
+                            response: .init(content: "Function is called.", summary: nil)
                         ),
                     ]
                 ),
@@ -254,19 +254,19 @@ final class ChatGPTStreamTests: XCTestCase {
                             id: "id",
                             type: "function",
                             function: .init(name: "function", arguments: "{\n\"foo\": 1\n}"),
-                            response: .init(id: "id", content: "Function is called.", summary: nil)
+                            response: .init(content: "Function is called.", summary: nil)
                         ),
                         .init(
                             id: "id2",
                             type: "function",
                             function: .init(name: "function", arguments: "{\n\"foo\": 1\n}"),
-                            response: .init(id: "id2", content: "Function is called.", summary: nil)
+                            response: .init(content: "Function is called.", summary: nil)
                         ),
                         .init(
                             id: "id3",
                             type: "function",
                             function: .init(name: "function", arguments: "{\n\"foo\": 1\n}"),
-                            response: .init(id: "id3", content: "Function is called.", summary: nil)
+                            response: .init(content: "Function is called.", summary: nil)
                         ),
                     ]
                 ),
@@ -360,7 +360,7 @@ final class ChatGPTStreamTests: XCTestCase {
                             id: "id",
                             type: "function",
                             function: .init(name: "function", arguments: "{\n\"foo\": 1\n}"),
-                            response: .init(id: "id", content: "Function is called.", summary: nil)
+                            response: .init(content: "Function is called.", summary: nil)
                         ),
                     ]
                 ),

Tool/Tests/OpenAIServiceTests/ReformatPromptToBeGoogleAICompatibleTests.swift

@@ -110,7 +110,7 @@ class ReformatPromptToBeGoogleAICompatibleTests: XCTestCase {
                         id: "id",
                         type: "function",
                         function: .init(name: "ping", arguments: "{ \"ip\": \"127.0.0.1\" }"),
-                        response: .init(id: "id", content: "42ms", summary: nil)
+                        response: .init(content: "42ms", summary: nil)
                     ),
                 ]
             ),