minor API changes

Author: sebsto

swift-bedrock-library/Sources/BedrockService/Converse/BedrockService+ConverseStreaming.swift

@@ -124,7 +124,7 @@ extension BedrockService {
             let reply = ConverseReplyStream(sdkStream)
 
             // this time, a different stream is created from the previous one, this one has the following elements
-            // - content segment: this contains a ContentSegment, an enum which can currently only be a .text(Int, String),
+            // - content segment: this contains a ContentSegment, an enum which can be a .text(Int, String),
             //   the integer is the id for the content block that the content segment is a part of,
             //   the String is the part of text that is send from the model.
             // - content block complete: this includes the id of the completed content block and the complete content block itself

swift-bedrock-library/Sources/BedrockTypes/Converse/ConverseReply.swift

@@ -32,7 +32,9 @@ public struct ConverseReply: Codable, CustomStringConvertible {
     }
 
     // MARK: Initializers
-
+    public init(withMessage msg: Message) throws {
+        try self.init([msg])
+    }
     public init(_ history: History) throws {
         guard let lastMessage = history.last else {
             throw BedrockServiceError.invalidConverseReply("The provided history is not allowed to be empty.")

swift-bedrock-library/Sources/BedrockTypes/Converse/Message.swift

@@ -97,6 +97,36 @@ public struct Message: Codable, CustomStringConvertible, Sendable {
 
     // MARK - public functions
 
+    public func hasToolUse() -> Bool {
+        return content.contains { $0.isToolUse() }
+    }
+    public func getToolUse() -> ToolUseBlock? {
+        let content = content.first(where: { $0.isToolUse() })
+        if case .toolUse(let block) = content {
+            return block
+        } else {
+            return nil
+        }
+    }
+    public func hasTextContent() -> Bool {
+        return content.contains { $0.isText() }
+    }
+    public func hasImageContent() -> Bool {
+        return content.contains { $0.isImage() }
+    }
+    public func hasVideoContent() -> Bool {
+        return content.contains { $0.isVideo() }
+    }
+    public func hasReasoningContent() -> Bool {
+        return content.contains { $0.isReasoning() }
+    }
+    public func hasEncryptedReasoningContent() -> Bool {
+        return content.contains { $0.isEncryptedReasoning() }
+    }
+    public func hasToolResult() -> Bool {
+        return content.contains { $0.isToolResult() }
+    }
+
     public func getSDKMessage() throws -> BedrockRuntimeClientTypes.Message {
         let contentBlocks: [BedrockRuntimeClientTypes.ContentBlock] = try content.map {
             content -> BedrockRuntimeClientTypes.ContentBlock in

swift-bedrock-library/Sources/BedrockTypes/Converse/Streaming/ConverseReplyStream.swift

@@ -30,6 +30,8 @@ package struct ConverseReplyStream {
                 do {
                     for try await output in inputStream {
                         switch output {
+                        case .messagestart(_):
+                            continuation.yield(.messageStart)
                         case .contentblockstart(let event):
                             guard let index = event.contentBlockIndex else {
                                 throw BedrockServiceError.invalidSDKType(
@@ -51,7 +53,9 @@ package struct ConverseReplyStream {
                                 )
                             }
                             if !indexes.contains(index) {
+                                //some models do not send ContentBlockStart before ContentBlockDelta
                                 indexes.append(index)
+                                // continuation.yield(.messageStart)
                             }
                             guard let delta = event.delta else {
                                 throw BedrockServiceError.invalidSDKType("No delta found in ContentBlockDelta")

swift-bedrock-library/Sources/BedrockTypes/Converse/Streaming/ConverseStreamElement.swift

@@ -14,6 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 public enum ConverseStreamElement: Sendable {
+    case messageStart
     case contentSegment(ContentSegment)
     case contentBlockComplete(Int, Content)
     case messageComplete(Message)