fix concurrency problems for Swift 6

fumito-ito · fumito-ito · commit dca08b26571a · 2025-06-25T22:39:41.000+09:00
diff --git a/Package.swift b/Package.swift
@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "AnthropicSwiftSDK",
     platforms: [
-        .iOS(.v17),
+        .iOS(.v18),
         .macOS(.v15)
     ],
     products: [
diff --git a/Sources/AnthropicSwiftSDK-TestUtils/HTTPMock.swift b/Sources/AnthropicSwiftSDK-TestUtils/HTTPMock.swift
@@ -16,7 +16,7 @@ public enum MockInspectType {
 }
 
 public class HTTPMock: URLProtocol {
-    public static var inspectType: MockInspectType = .none
+    nonisolated(unsafe) public static var inspectType: MockInspectType = .none
 
     public override class func canInit(with request: URLRequest) -> Bool {
         return true
diff --git a/Sources/AnthropicSwiftSDK/AnthropicAPIError.swift b/Sources/AnthropicSwiftSDK/AnthropicAPIError.swift
@@ -10,7 +10,7 @@ import Foundation
 /// The error returned from the Anthropic API
 ///
 /// for more detail, see https://docs.anthropic.com/claude/reference/errors
-public enum AnthropicAPIError: String, Decodable, Error {
+public enum AnthropicAPIError: String, Decodable, Error, Sendable {
     case invalidRequestError = "invalid_request_error"
     case authenticationError = "authentication_error"
     case permissionError = "permission_error"
diff --git a/Sources/AnthropicSwiftSDK/ClientError.swift b/Sources/AnthropicSwiftSDK/ClientError.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 /// Errors in swift SDK
-public enum ClientError: Error {
+public enum ClientError: Error, @unchecked Sendable {
     /// Received unknown event in Stream.
     case unknownStreamingEvent(String)
     /// Received in Stream with unknown line type.
diff --git a/Sources/AnthropicSwiftSDK/Entity/Batch/BatchRequestCounts.swift b/Sources/AnthropicSwiftSDK/Entity/Batch/BatchRequestCounts.swift
@@ -12,7 +12,7 @@ public struct BatchRequestCounts: Decodable {
     /// Number of requests in the Message Batch that have completed successfully.
     ///
     /// This is zero until processing of the entire Message Batch has ended.
-    let succeeeded: Int
+    let succeeded: Int
     /// Number of requests in the Message Batch that encountered an error.
     ///
     /// This is zero until processing of the entire Message Batch has ended.
diff --git a/Sources/AnthropicSwiftSDK/Entity/Content/Content.swift b/Sources/AnthropicSwiftSDK/Entity/Content/Content.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 /// Type of content block.
-public enum ContentType: String {
+public enum ContentType: String, Sendable {
     /// single string
     case text
     /// image content
@@ -26,7 +26,7 @@ public enum ContentType: String {
 /// Each input message `content` may be either a single `string` or an array of content blocks, where each block has a specific `type`. Using a `string` for `content` is shorthand for an array of one content block of type `text`.
 ///
 /// Starting with Claude 3 models, you can also send `image` content blocks.
-public enum Content {
+public enum Content: Sendable {
     /// a single string
     case text(String, cacheControl: CacheControl? = nil)
     /// currently supported the `base64` source type for images, and the `image/jpeg`, `image/png`, `image/gif`, and `image/webp` media types.
diff --git a/Sources/AnthropicSwiftSDK/Entity/Content/DocumentContent.swift b/Sources/AnthropicSwiftSDK/Entity/Content/DocumentContent.swift
@@ -6,12 +6,12 @@
 //
 import Foundation
 
-public struct DocumentContent {
-    public enum DocumentContentType: String, Codable {
+public struct DocumentContent: Sendable {
+    public enum DocumentContentType: String, Codable, Sendable {
         case base64
     }
 
-    public enum DocumentContentMediaType: String, Codable {
+    public enum DocumentContentMediaType: String, Codable, Sendable {
         case pdf = "application/pdf"
     }
 
diff --git a/Sources/AnthropicSwiftSDK/Entity/Content/ImageContent.swift b/Sources/AnthropicSwiftSDK/Entity/Content/ImageContent.swift
@@ -8,14 +8,14 @@
 import Foundation
 
 /// Object for image content.
-public struct ImageContent {
+public struct ImageContent: Sendable {
     /// currently support the base64 source type for images
-    public enum ImageContentType: String, Codable {
+    public enum ImageContentType: String, Codable, Sendable {
         case base64
     }
 
     /// currently support the image/jpeg, image/png, image/gif, and image/webp media types.
-    public enum ImageContentMediaType: String, Codable {
+    public enum ImageContentMediaType: String, Codable, Sendable {
         case jpeg = "image/jpeg"
         case png = "image/png"
         case gif = "image/gif"
diff --git a/Sources/AnthropicSwiftSDK/Entity/Content/ToolResultContent.swift b/Sources/AnthropicSwiftSDK/Entity/Content/ToolResultContent.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ToolResultContent {
+public struct ToolResultContent: Sendable {
     /// The `id of the tool use request this is a result for
     public let toolUseId: String
     /// The result of the tool, as a string (e.g. `"content": "15 degrees"` ) or
diff --git a/Sources/AnthropicSwiftSDK/Entity/Content/ToolUseContent.swift b/Sources/AnthropicSwiftSDK/Entity/Content/ToolUseContent.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ToolUseContent {
+public struct ToolUseContent: @unchecked Sendable {
     /// A unique identifier for this particular tool use block.
     /// This will be used to match up the tool results later.
     public let id: String
diff --git a/Sources/AnthropicSwiftSDK/Entity/Message.swift b/Sources/AnthropicSwiftSDK/Entity/Message.swift
@@ -14,7 +14,7 @@ import Foundation
 /// Each input message must be an object with a `role` and `content`. You can specify a single `user`-role message, or you can include multiple `user` and `assistant` messages. The first message must always use the `user` role.
 ///
 /// If the final message uses the `assistant` role, the response content will continue immediately from the content in that message. This can be used to constrain part of the model's response.
-public struct Message: Codable {
+public struct Message: Codable, Sendable {
     /// role of the message
     public let role: Role
     /// content of the message
diff --git a/Sources/AnthropicSwiftSDK/Entity/Model.swift b/Sources/AnthropicSwiftSDK/Entity/Model.swift
@@ -10,7 +10,7 @@ import Foundation
 /// The model that will complete your prompt.
 ///
 /// See [models](https://docs.anthropic.com/claude/docs/models-overview) for additional details and options.
-public enum Model {
+public enum Model: Sendable {
     /// Most powerful model for highly complex tasks
     // swiftlint:disable:next identifier_name
     case claude_3_Opus
diff --git a/Sources/AnthropicSwiftSDK/Entity/Role.swift b/Sources/AnthropicSwiftSDK/Entity/Role.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum Role: String, Codable {
+public enum Role: String, Codable, Sendable {
     case user
     case assistant
 }
diff --git a/Sources/AnthropicSwiftSDK/Entity/StopReason.swift b/Sources/AnthropicSwiftSDK/Entity/StopReason.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 /// The reason that we stopped.
-public enum StopReason: String, Decodable {
+public enum StopReason: String, Decodable, Sendable {
     /// the model reached a natural stopping point
     case endTurn = "end_turn"
     /// we exceeded the requested max_tokens or the model's maximum
diff --git a/Sources/AnthropicSwiftSDK/Entity/Streaming/ContentBlockDelta.swift b/Sources/AnthropicSwiftSDK/Entity/Streaming/ContentBlockDelta.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct ContentBlockDelta: Decodable {
+public struct ContentBlockDelta: Decodable, Sendable {
     public let type: ContentBlockDeltaType
     public let text: String?
     public let partialJson: String?
diff --git a/Sources/AnthropicSwiftSDK/Entity/Streaming/ContentBlockDeltaType.swift b/Sources/AnthropicSwiftSDK/Entity/Streaming/ContentBlockDeltaType.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum ContentBlockDeltaType: String, Decodable {
+public enum ContentBlockDeltaType: String, Decodable, Sendable {
     case text = "text_delta"
     case inputJSON = "input_json_delta"
 }
diff --git a/Sources/AnthropicSwiftSDK/Entity/Streaming/MessageDelta.swift b/Sources/AnthropicSwiftSDK/Entity/Streaming/MessageDelta.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct MessageDelta: Decodable {
+public struct MessageDelta: Decodable, Sendable {
     public let stopReason: StopReason
     public let stopSequence: String?
 }
diff --git a/Sources/AnthropicSwiftSDK/Entity/Streaming/StreamingError.swift b/Sources/AnthropicSwiftSDK/Entity/Streaming/StreamingError.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public struct StreamingError: Decodable {
+public struct StreamingError: Decodable, Sendable {
     public let type: AnthropicAPIError
     public let message: String
 }
diff --git a/Sources/AnthropicSwiftSDK/Entity/Streaming/StreamingEvent.swift b/Sources/AnthropicSwiftSDK/Entity/Streaming/StreamingEvent.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum StreamingEvent: String, Decodable {
+public enum StreamingEvent: String, Decodable, Sendable {
     /// contains a `Message` object with empty content
     case messageStart = "message_start"
     /// A series of content blocks, each of which have a `content_block_start`, one or more `content_block_delta` events, and a `content_block_stop` event. Each content block will have an `index` that corresponds to its index in the final `Message` content array.
diff --git a/Sources/AnthropicSwiftSDK/Entity/SystemPrompt.swift b/Sources/AnthropicSwiftSDK/Entity/SystemPrompt.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public enum CacheControl: String {
+public enum CacheControl: String, Sendable {
     /// corresponds to this 5-minute lifetime.
     case ephemeral
 }
@@ -23,7 +23,7 @@ extension CacheControl: Encodable {
     }
 }
 
-public enum SystemPrompt {
+public enum SystemPrompt: Sendable {
     case text(String, CacheControl?)
 
     private var type: String {
diff --git a/Sources/AnthropicSwiftSDK/Entity/TokenUsage.swift b/Sources/AnthropicSwiftSDK/Entity/TokenUsage.swift
@@ -8,7 +8,7 @@
 import Foundation
 
 /// Billing and rate-limit usage.
-public struct TokenUsage: Decodable {
+public struct TokenUsage: Decodable, Sendable {
     /// The number of input tokens which were used.
     public let inputTokens: Int?
     /// The number of output tokens which were used.
diff --git a/Sources/AnthropicSwiftSDK/Network/Extension/StreamingResponse+Extension.swift b/Sources/AnthropicSwiftSDK/Network/Extension/StreamingResponse+Extension.swift
@@ -50,17 +50,14 @@ extension AsyncThrowingStream where Element == StreamingResponse {
         let accumulator = InputJSONDeltaAccumulator()
         let accumulativeStream = accumulator.createAccumulativeStream()
 
-        Task {
+        Task { @Sendable in
             do {
-                defer {
-                    accumulator.finish()
-                }
-
                 for try await value in self {
                     try accumulator.accumulateIfNeeded(value)
                 }
+                accumulator.finish()
             } catch {
-                throw error
+                accumulator.finish(throwing: error)
             }
         }
 
diff --git a/Sources/AnthropicSwiftSDK/Network/Response/MessagesResponse.swift b/Sources/AnthropicSwiftSDK/Network/Response/MessagesResponse.swift
@@ -10,12 +10,12 @@ import Foundation
 /// Object type.
 ///
 /// For Messages, this is always "message".
-public enum MessagesResponseType: String, Decodable {
+public enum MessagesResponseType: String, Decodable, Sendable {
     case message
 }
 
 /// Messages API response
-public struct MessagesResponse: Decodable {
+public struct MessagesResponse: Decodable, Sendable {
     /// Unique object identifier.
     public let id: String
     /// Object type.
diff --git a/Sources/AnthropicSwiftSDK/Network/Response/StreamingResponse.swift b/Sources/AnthropicSwiftSDK/Network/Response/StreamingResponse.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 
-public protocol StreamingResponse: Decodable {
+public protocol StreamingResponse: Decodable, Sendable {
     var type: StreamingEvent { get }
 }
 
diff --git a/Sources/AnthropicSwiftSDK/Network/StreamingParser/AnthropicStreamingParser.swift b/Sources/AnthropicSwiftSDK/Network/StreamingParser/AnthropicStreamingParser.swift
@@ -9,7 +9,7 @@ import Foundation
 
 public enum AnthropicStreamingParser {
     // swiftlint:disable:next cyclomatic_complexity
-    public static func parse<T: AsyncSequence>(stream: T) async throws -> AsyncThrowingStream<StreamingResponse, Error> where T.Element == String {
+    public static func parse<T: AsyncSequence>(stream: T) async throws -> AsyncThrowingStream<StreamingResponse, Error> where T.Element == String, T: Sendable {
         return AsyncThrowingStream.init { continuation in
             let task = Task {
                 var currentEvent: StreamingEvent?
diff --git a/Sources/AnthropicSwiftSDK/Util/InputJSONDeltaAccumulator.swift b/Sources/AnthropicSwiftSDK/Util/InputJSONDeltaAccumulator.swift
@@ -7,35 +7,36 @@
 
 import Foundation
 
-class InputJSONDeltaAccumulator {
+class InputJSONDeltaAccumulator: @unchecked Sendable {
     private var partialJson: [StreamingContentBlockDeltaResponse] = []
     private var toolUseInfo: StreamingContentBlockStartResponse?
     private var accumulativeStream: AsyncThrowingStream<StreamingResponse, Error>.Continuation?
 
     /// Receive StreamingResponse and collect `tool_use` related information if it exists. When `message_stop` is detected, the collected `tool_use`-related information is compiled and sent together with the `StreamingMessageDeltaResponse`.
     /// - Parameter response: `StreamingResponse` to collect data
     func accumulateIfNeeded(_ response: StreamingResponse) throws {
-        var modifiedResponse = response
-
         switch response {
         case let contentBlockStart as StreamingContentBlockStartResponse:
             if case .toolUse = contentBlockStart.contentBlock {
                 toolUseInfo = contentBlockStart
             }
+            accumulativeStream?.yield(response)
         case let contentBlockDelta as StreamingContentBlockDeltaResponse:
             if contentBlockDelta.delta.type == .inputJSON {
                 partialJson.append(contentBlockDelta)
             }
+            accumulativeStream?.yield(response)
         case let messageDelta as StreamingMessageDeltaResponse:
             if messageDelta.delta.stopReason == .toolUse {
                 let toolUseContent = try aggregateToolUseContent(from: partialJson, with: toolUseInfo)
-                modifiedResponse = messageDelta.added(toolUseContent: toolUseContent)
+                let modifiedResponse = messageDelta.added(toolUseContent: toolUseContent)
+                accumulativeStream?.yield(modifiedResponse)
+            } else {
+                accumulativeStream?.yield(response)
             }
         default:
-            break
+            accumulativeStream?.yield(response)
         }
-
-        accumulativeStream?.yield(modifiedResponse)
     }
 
     /// Aggregate the `input_json_delta` of the collected `tool_use` to generate a JSON String and return it as a `ToolUseContent` with other information from the `tool_use`.
@@ -70,4 +71,8 @@ class InputJSONDeltaAccumulator {
     func finish() {
         accumulativeStream?.finish()
     }
+
+    func finish(throwing error: Error) {
+        accumulativeStream?.finish(throwing: error)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public enum MockInspectType {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`public class HTTPMock: URLProtocol {`
`19`		`- public static var inspectType: MockInspectType = .none`
	`19`	`+ nonisolated(unsafe) public static var inspectType: MockInspectType = .none`
`20`	`20`
`21`	`21`	`public override class func canInit(with request: URLRequest) -> Bool {`
`22`	`22`	`return true`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`	`//`
`7`	`7`	`import Foundation`
`8`	`8`
`9`		`-public struct DocumentContent {`
`10`		`- public enum DocumentContentType: String, Codable {`
	`9`	`+public struct DocumentContent: Sendable {`
	`10`	`+ public enum DocumentContentType: String, Codable, Sendable {`
`11`	`11`	`case base64`
`12`	`12`	`}`
`13`	`13`
`14`		`- public enum DocumentContentMediaType: String, Codable {`
	`14`	`+ public enum DocumentContentMediaType: String, Codable, Sendable {`
`15`	`15`	`case pdf = "application/pdf"`
`16`	`16`	`}`
`17`	`17`