Merge pull request #24 from fumito-ito/fix/remove-unused-property-for-bedrock

bedrock client should use model passed in `message` methods

Author: fumito-ito

Sources/AnthropicSwiftSDK-Bedrock/AnthropicBedrockClient.swift

@@ -18,7 +18,7 @@ public final class AnthropicBedrockClient {
         AnthropicVersion.custom("bedrock-2023-05-31").stringfy
     }
 
-    init(client: BedrockRuntimeClient, model: Model) {
-        self.messages = .init(client: client, model: model)
+    init(client: BedrockRuntimeClient) {
+        self.messages = .init(client: client)
     }
 }

Sources/AnthropicSwiftSDK-Bedrock/Extensions/BedrockClient+Extension.swift

@@ -16,16 +16,16 @@ public extension BedrockRuntimeClient {
     ///   - client: Bedrock runtime client
     ///   - model: Claude model, Bedrock supports Haiku or Sonnet instance type.
     /// - Returns: Client using Claude through Bedrock
-    static func useAnthropic(_ client: BedrockRuntimeClient, model: Model) -> AnthropicBedrockClient {
-        AnthropicBedrockClient(client: client, model: model)
+    static func useAnthropic(_ client: BedrockRuntimeClient) -> AnthropicBedrockClient {
+        AnthropicBedrockClient(client: client)
     }
 
     /// Create a client using Claude through Bedrock
     ///
     /// - Parameters:
     ///   - model: Claude model, Bedrock supports Haiku or Sonnet instance type.
     /// - Returns: Client using Claude through Bedrock
-    func useAnthropic(model: Model) -> AnthropicBedrockClient {
-        AnthropicBedrockClient(client: self, model: model)
+    func useAnthropic() -> AnthropicBedrockClient {
+        AnthropicBedrockClient(client: self)
     }
 }

Sources/AnthropicSwiftSDK-Bedrock/Messages.swift

@@ -16,12 +16,9 @@ public struct Messages {
     public let requestContentType = "application/json"
     /// Bedrock API Client
     public let client: BedrockRuntimeClient
-    /// Claude model for this client
-    public let model: Model
 
-    init(client: BedrockRuntimeClient, model: Model) {
+    init(client: BedrockRuntimeClient) {
         self.client = client
-        self.model = model
     }
 
     /// Creates a message using the specified parameters and sends a request to the Anthropic API asynchronously.

Tests/AnthropicSwiftSDK-BedrockTests/AnthropicBedrockClientTests.swift

@@ -11,25 +11,6 @@ import AnthropicSwiftSDK
 import AWSBedrockRuntime
 
 final class AnthropicBedrockClientTests: XCTestCase {
-    func testClientUsePassedAnthropicModel() throws {
-        let client = try BedrockRuntimeClient(region: "US")
-
-        var anthropic = BedrockRuntimeClient.useAnthropic(client, model: .claude_3_Haiku)
-        XCTAssertEqual(anthropic.messages.model.description, Model.claude_3_Haiku.description)
-
-        anthropic = BedrockRuntimeClient.useAnthropic(client, model: .claude_3_Sonnet)
-        XCTAssertEqual(anthropic.messages.model.description, Model.claude_3_Sonnet.description)
-
-        anthropic = BedrockRuntimeClient.useAnthropic(client, model: .claude_3_Opus)
-        XCTAssertEqual(anthropic.messages.model.description, Model.claude_3_Opus.description)
-
-        anthropic = BedrockRuntimeClient.useAnthropic(client, model: .claude_3_5_Sonnet)
-        XCTAssertEqual(anthropic.messages.model.description, Model.claude_3_5_Sonnet.description)
-
-        anthropic = BedrockRuntimeClient.useAnthropic(client, model: .custom("custom-model"))
-        XCTAssertEqual(anthropic.messages.model.description, "custom-model")
-    }
-
     func testInvokeModelContainEncodedMessageRequest() throws {
         let request = MessagesRequest(model: .claude_3_Haiku, messages: [Message(role: .user, content: [.text("Hello! Claude!")])], system: nil, maxTokens: 1024, metaData: MetaData(userId: "112234"), stopSequences: ["stop sequence"], stream: false, temperature: 0.4, topP: 1, topK: 2)
         let invokeModel = try InvokeModelInput(accept: "application/json", request: request, contentType: "application/json")