ConverseReply (backend + frontend)

Author: monadierickx

backend/Sources/PlaygroundAPI/Application+build.swift

@@ -161,7 +161,7 @@ func buildRouter(useSSO: Bool, logger: Logger) async throws -> Router<AppRequest
     }
 
     // POST /foundation-models/chat/{modelId}
-    router.post("/foundation-models/chat/:modelId") { request, context -> ChatOutput in
+    router.post("/foundation-models/chat/:modelId") { request, context -> ConverseReply in
         do {
             guard let modelId = context.parameters.get("modelId") else {
                 throw HTTPError(.badRequest, message: "No modelId was given.")
@@ -173,7 +173,7 @@ func buildRouter(useSSO: Bool, logger: Logger) async throws -> Router<AppRequest
                 throw HTTPError(.badRequest, message: "Model \(modelId) does not support converse.")
             }
             let input = try await request.decode(as: ChatInput.self, context: context)
-            let (reply, history) = try await bedrock.converse(
+            return try await bedrock.converse(
                 with: model,
                 prompt: input.prompt,
                 imageFormat: input.imageFormat ?? .jpeg,  // default to simplify frontend
@@ -187,7 +187,6 @@ func buildRouter(useSSO: Bool, logger: Logger) async throws -> Router<AppRequest
                 tools: input.tools,
                 toolResult: input.toolResult
             )
-            return ChatOutput(reply: reply, history: history)
         } catch {
             logger.info(
                 "An error occured while generating chat",

backend/Sources/PlaygroundAPI/Types/Chat.swift

@@ -17,7 +17,7 @@ import BedrockTypes
 import Foundation
 import Hummingbird
 
-extension Message: ResponseCodable {}
+extension Message: @retroactive ResponseCodable {}
 
 struct ChatInput: Codable {
     let prompt: String?
@@ -33,7 +33,4 @@ struct ChatInput: Codable {
     let toolResult: ToolResultBlock?
 }
 
-struct ChatOutput: ResponseCodable {
-    let reply: String
-    let history: [Message]
-}
+extension ConverseReply: @retroactive ResponseCodable {}

backend/Sources/PlaygroundAPI/Types/ImageGeneration.swift

@@ -17,7 +17,7 @@ import BedrockTypes
 import Foundation
 import Hummingbird
 
-extension ImageGenerationOutput: ResponseCodable {}
+extension ImageGenerationOutput: @retroactive ResponseCodable {}
 
 struct ImageGenerationInput: Codable {
     let prompt: String

backend/Sources/PlaygroundAPI/Types/ListModels.swift

@@ -17,4 +17,4 @@ import BedrockTypes
 import Foundation
 import Hummingbird
 
-extension ModelSummary: ResponseEncodable {}
+extension ModelSummary: @retroactive ResponseEncodable {}

backend/Sources/PlaygroundAPI/Types/TextGeneration.swift

@@ -17,7 +17,7 @@ import BedrockTypes
 import Foundation
 import Hummingbird
 
-extension TextCompletion: ResponseCodable {}
+extension TextCompletion: @retroactive ResponseCodable {}
 
 struct TextCompletionInput: Codable {
     let prompt: String

frontend/components/chatPlayground/ChatComponent.jsx

@@ -154,7 +154,7 @@ export default function ChatContainer() {
             await response.json().then(data => {
                 setConversation(prevConversation => [...prevConversation, {
                     sender: "Assistant",
-                    message: data.reply
+                    message: data.textReply
                 }]);
                 setHistory(data.history);
             });