fix remaining tests

Author: sebsto

Sources/Converse/ContentBlocks/JSON.swift

@@ -56,6 +56,9 @@ public enum JSONValue: Codable, Sendable {
         case let v as [JSONValue]:
             self = .array(v)
             break
+        case let v as JSONValue:
+            self = v
+            break
         default:
             fatalError("JSONValue: Unsupported type: \(type(of: value))")
         }
@@ -146,24 +149,6 @@ public struct JSON: Codable, Sendable {
         }
     }
 
-    public func getValue<T>(_ key: String) -> T? {
-        if case let .object(dictionary) = value {
-            guard let v = dictionary[key] else {
-                return nil
-            }
-            switch v {
-            case .int(let val): return val as? T
-            case .double(let val): return val as? T
-            case .string(let val): return val as? T
-            case .bool(let val): return val as? T
-            case .array(let val): return val as? T
-            case .object(let val): return val as? T
-            case .null: return nil
-            }
-        }
-        return nil
-    }
-
     public func getValue<T>() -> T? {
         switch value {
         case .int(let v): return v as? T

Tests/Converse/ConverseToolTests.swift

@@ -32,21 +32,14 @@ extension BedrockServiceTests {
             .withTool(tool)
         let reply = try await bedrock.converse(with: builder)
         #expect(reply.textReply == nil)
-        let id: String
-        let name: String
-        let input: JSON
+
         if let toolUse = reply.toolUse {
-            id = toolUse.id
-            name = toolUse.name
-            input = toolUse.input
+            #expect(toolUse.id == "toolId")
+            #expect(toolUse.name == "toolName")
+            #expect(toolUse.input["value"]?["code"] == "string")
         } else {
-            id = ""
-            name = ""
-            input = JSON(with: .object(["code": .string("wrong")]))
+            Issue.record("Tool use is nil")
         }
-        #expect(id == "toolId")
-        #expect(name == "toolName")
-        #expect(input.getValue("code") == "abc")
     }
 
     @Test("Request tool usage with reused builder")
@@ -67,23 +60,15 @@ extension BedrockServiceTests {
 
         #expect(reply.textReply == nil)
 
-        let id: String
-        let name: String
-        let input: JSON
         if let toolUse = reply.toolUse {
-            id = toolUse.id
-            name = toolUse.name
-            input = toolUse.input
+            print(toolUse)
+            #expect(toolUse.id == "toolId")
+            #expect(toolUse.name == "toolName")
+            #expect(toolUse.input["value"]?["code"] == "string")
         } else {
-            id = ""
-            name = ""
-            input = JSON(with: .object(["code": .string("wrong")]))
+            Issue.record("ToolUse is nil")
         }
 
-        #expect(id == "toolId")
-        #expect(name == "toolName")
-        #expect(input.getValue("code") == "abc")
-
         builder = try ConverseRequestBuilder(from: builder, with: reply)
             .withToolResult("Information from Tool")
 

Tests/Converse/JSONTests.swift

@@ -25,32 +25,32 @@ struct JSONTests {
     func jsonGetValueFromValidJSONString() async throws {
 
         let json = try jsonFromString()
-        #expect(json.getValue("name") == "Jane Doe")
-        #expect(json.getValue("age") == 30)
-        #expect(json.getValue("isMember") == true)
-        let t: String? = json.getValue("nonExistentKey")
+        #expect(json["name"] == "Jane Doe")
+        #expect(json["age"] == 30)
+        #expect(json["isMember"] == true)
+        let t: String? = json["nonExistentKey"]
         #expect(t == nil)
     }
 
     @Test("JSON getValue from [String:JSONValue]")
     func jsonGetValueFromDictionary() async throws {
         let json = try jsonFromDictionary()
 
-        #expect(json.getValue("name") == "Jane Doe")
-        #expect(json.getValue("age") == 30)
-        #expect(json.getValue("isMember") == true)
-        let t: String? = json.getValue("nonExistentKey")
+        #expect(json["name"] == "Jane Doe")
+        #expect(json["age"] == 30)
+        #expect(json["isMember"] == true)
+        let t: String? = json["nonExistentKey"]
         #expect(t == nil)
     }
 
     @Test("JSON getValue nested")
     func jsonGetValueNested() async throws {
 
         let json = try jsonFromDictionaryWithNested()
-        #expect(json.getValue("name") == "Jane Doe")
-        #expect(json.getValue("age") == 30)
-        #expect(json.getValue("isMember") == true)
-        let t: String? = json.getValue("nonExistentKey")
+        #expect(json["name"] == "Jane Doe")
+        #expect(json["age"] == 30)
+        #expect(json["isMember"] == true)
+        let t: String? = json["nonExistentKey"]
         #expect(t == nil)
         #expect(json["address"]?["street"] == "123 Main St")
         #expect(json["address"]?["city"] == "Anytown")
@@ -114,7 +114,7 @@ struct JSONTests {
     func emptyJSON() async throws {
         #expect(throws: Never.self) {
             let json = try JSON(from: "")
-            let t: String? = json.getValue("nonExistentKey")
+            let t: String? = json["nonExistentKey"]
             #expect(t == nil)
         }
     }

Tests/Converse/ToolResultBlockTests.swift

@@ -39,15 +39,13 @@ extension BedrockServiceTests {
 
     @Test("ToolResultBlock Initializer with ID and JSON Content")
     func toolResultBlockInitializerWithJSON() async throws {
-        let json = JSON(with: .object(["code": .string("string")]))
+        let json = JSON(with: .object(["key": .string("string")]))
         let block = ToolResultBlock(json, id: "block2")
         #expect(block.id == "block2")
         #expect(block.content.count == 1)
-        var value = ""
         if case .json(let json) = block.content.first {
-            value = json.getValue("key") ?? ""
+            #expect(json["key"] == "string")
         }
-        #expect(value == "value")
         #expect(block.status == .success)
     }
 
@@ -90,11 +88,9 @@ extension BedrockServiceTests {
 
         #expect(block.id == "block5")
         #expect(block.content.count == 1)
-        var value = ""
         if case .json(let json) = block.content.first {
-            value = json.getValue("key") ?? ""
+            #expect(json["key"] == "value")
         }
-        #expect(value == "value")
         #expect(block.status == block.status)
     }
 
@@ -108,14 +104,10 @@ extension BedrockServiceTests {
         let block = try ToolResultBlock(object, id: "block6")
         #expect(block.id == "block6")
         #expect(block.content.count == 1)
-        var name = ""
-        var age = 0
         if case .json(let jsonContent) = block.content.first {
-            name = jsonContent.getValue("name") ?? ""
-            age = jsonContent.getValue("age") ?? 0
+            #expect(jsonContent["name"] == "Jane")
+            #expect(jsonContent["age"] == 30)
         }
-        #expect(name == "Jane")
-        #expect(age == 30)
     }
 
     @Test("ToolResultBlock Initializer with Invalid Data Throws Error")