Week14

backend/Package.swift

@@ -41,6 +41,10 @@ let package = Package(
         ),
         .target(
             name: "BedrockTypes",
+            dependencies: [
+                .product(name: "AWSBedrockRuntime", package: "aws-sdk-swift"),
+                .product(name: "Smithy", package: "smithy-swift"),
+            ],
             path: "Sources/BedrockTypes"
         ),
         .testTarget(

backend/Sources/App/Application+build.swift

@@ -13,10 +13,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Hummingbird
-import Logging
 import BedrockService
 import BedrockTypes
+import Hummingbird
+import Logging
+import Foundation
 
 /// Application arguments protocol. We use a protocol so we can call
 /// `buildApplication` inside Tests as well as in the App executable.
@@ -168,18 +169,23 @@ func buildRouter(useSSO: Bool, logger: Logger) async throws -> Router<AppRequest
             guard let model = BedrockModel(rawValue: modelId) else {
                 throw HTTPError(.badRequest, message: "Invalid modelId: \(modelId).")
             }
-            guard model.hasTextModality() else {
-                throw HTTPError(.badRequest, message: "Model \(modelId) does not support text output.")
+            guard model.hasConverseModality() else {
+                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(
                 with: model,
                 prompt: input.prompt,
-                history: input.history,
+                imageFormat: input.imageFormat ?? .jpeg,  // default to simplify frontend
+                imageBytes: input.imageBytes,
+                history: input.history ?? [],
                 maxTokens: input.maxTokens,
                 temperature: input.temperature,
                 topP: input.topP,
-                stopSequences: input.stopSequences
+                stopSequences: input.stopSequences,
+                systemPrompts: input.systemPrompts,
+                tools: input.tools,
+                toolResult: input.toolResult
             )
             return ChatOutput(reply: reply, history: history)
         } catch {

backend/Sources/App/Types/Chat.swift

@@ -20,12 +20,17 @@ import BedrockTypes
 extension Message: ResponseCodable {}
 
 struct ChatInput: Codable {
-    let prompt: String
-    let history: [Message]
+    let prompt: String?
+    let history: [Message]?
+    let imageFormat: ImageBlock.Format?
+    let imageBytes: String?
     let maxTokens: Int?
     let temperature: Double?
     let topP: Double?
     let stopSequences: [String]?
+    let systemPrompts: [String]?
+    let tools: [Tool]?
+    let toolResult: ToolResultBlock?
 }
 
 struct ChatOutput: ResponseCodable {

backend/Sources/App/Types/Cohere/CohereBedrockModels.swift

@@ -0,0 +1,52 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift Foundation Models Playground open source project
+//
+// Copyright (c) 2025 Amazon.com, Inc. or its affiliates
+//                    and the Swift Foundation Models Playground project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift Foundation Models Playground project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import BedrockTypes
+import Foundation
+
+// https://docs.aws.amazon.com/bedrock/latest/userguide/model-parameters-cohere-command-r-plus.html
+typealias CohereConverse = StandardConverse
+
+extension BedrockModel {
+    public static let cohere_command_R_plus = BedrockModel(
+        id: "cohere.command-r-plus-v1:0",
+        name: "Cohere Command R+",
+        modality: CohereConverse(
+            parameters: ConverseParameters(
+                temperature: Parameter(.temperature, minValue: 0, maxValue: 1, defaultValue: 0.3),
+                maxTokens: Parameter(.maxTokens, minValue: 1, maxValue: nil, defaultValue: nil),
+                topP: Parameter(.topP, minValue: 0.01, maxValue: 0.99, defaultValue: 0.75),
+                stopSequences: StopSequenceParams(maxSequences: nil, defaultValue: []),
+                maxPromptSize: nil
+            ),
+            features: [.textGeneration, .systemPrompts, .document, .toolUse]
+        )
+    )
+
+    public static let cohere_command_R = BedrockModel(
+        id: "cohere.command-r-v1:0",
+        name: "Cohere Command R",
+        modality: CohereConverse(
+            parameters: ConverseParameters(
+                temperature: Parameter(.temperature, minValue: 0, maxValue: 1, defaultValue: 0.3),
+                maxTokens: Parameter(.maxTokens, minValue: 1, maxValue: nil, defaultValue: nil),
+                topP: Parameter(.topP, minValue: 0.01, maxValue: 0.99, defaultValue: 0.75),
+                stopSequences: StopSequenceParams(maxSequences: nil, defaultValue: []),
+                maxPromptSize: nil
+            ),
+            features: [.textGeneration, .systemPrompts, .document, .toolUse]
+        )
+    )
+}

backend/Sources/App/Types/ListModels.swift

@@ -15,6 +15,6 @@
 
 import Foundation
 import Hummingbird
-import BedrockService
+import BedrockTypes
 
 extension ModelSummary: ResponseEncodable {}