add modules

Author: fumito-ito

Package.resolved

@@ -16,7 +16,7 @@ let package = Package(
             targets: ["FunctionCalling-AWSBedrock"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/fumito-ito/FunctionCalling", from: "0.3.0"),
+        .package(url: "https://github.com/FunctionCalling/FunctionCalling", from: "0.3.0"),
         .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "0.77.1"),
     ],
     targets: [

Package.swift

@@ -0,0 +1,17 @@
+//
+//  Smithy_Document+Extension.swift
+//  
+//
+//  Created by 伊藤史 on 2024/09/18.
+//
+
+import FunctionCalling
+import Foundation
+import struct Smithy.Document
+
+extension Smithy.Document {
+    init(from schema: FunctionCalling.InputSchema) throws {
+        let data = try JSONEncoder().encode(schema)
+        self = try Self.make(from: data)
+    }
+}

Sources/FunctionCalling-AWSBedrock/Extension/Smithy_Document+Extension.swift

@@ -0,0 +1,15 @@
+//
+//  ToolInputSchema+Extension.swift
+//  
+//
+//  Created by 伊藤史 on 2024/09/18.
+//
+
+import FunctionCalling
+import AWSBedrockRuntime
+
+extension BedrockRuntimeClientTypes.ToolInputSchema {
+    init(from schema: FunctionCalling.InputSchema) throws {
+        self = .json(try .init(from: schema))
+    }
+}

Sources/FunctionCalling-AWSBedrock/Extension/ToolInputSchema+Extension.swift

@@ -0,0 +1,19 @@
+//
+//  ToolSpecification+Extension.swift
+//  
+//
+//  Created by 伊藤史 on 2024/09/18.
+//
+
+import FunctionCalling
+import AWSBedrockRuntime
+
+extension BedrockRuntimeClientTypes.ToolSpecification {
+    init(from tool: FunctionCalling.Tool) throws {
+        self.init(
+            description: tool.description,
+            inputSchema: try .init(from: tool.inputSchema),
+            name: tool.name
+        )
+    }
+}

Sources/FunctionCalling-AWSBedrock/Extension/ToolSpecification+Extension.swift

@@ -4,15 +4,21 @@
 import FunctionCalling
 import AWSBedrockRuntime
 import Foundation
-import struct Smithy.Document
+
+let decoder: JSONDecoder = {
+    let decoder = JSONDecoder()
+    decoder.keyDecodingStrategy = .convertFromSnakeCase
+
+    return decoder
+}()
 
 extension ToolContainer {
     typealias FunctionCallingTool = FunctionCalling.Tool
-
+    
     public var bedrockAllTools: [BedrockRuntimeClientTypes.Tool] {
         get throws {
-            let data = allTools.data(using: .utf8)!
-            let functionCallingTools = try JSONDecoder().decode([FunctionCallingTool].self, from: data)
+            let data = allTools.replacingOccurrences(of: "\n", with: "").data(using: .utf8)!
+            let functionCallingTools = try decoder.decode([FunctionCallingTool].self, from: data)
             return try functionCallingTools.map { try $0.toBedrockTool }
         }
     }
@@ -25,26 +31,3 @@ extension FunctionCalling.Tool {
         }
     }
 }
-
-extension BedrockRuntimeClientTypes.ToolSpecification {
-    init(from tool: FunctionCalling.Tool) throws {
-        self.init(
-            description: tool.description,
-            inputSchema: try .init(from: tool.inputSchema),
-            name: tool.name
-        )
-    }
-}
-
-extension BedrockRuntimeClientTypes.ToolInputSchema {
-    init(from schema: FunctionCalling.InputSchema) throws {
-        self = .json(try .init(from: schema))
-    }
-}
-
-extension Smithy.Document {
-    init(from schema: FunctionCalling.InputSchema) throws {
-        let data = try JSONEncoder().encode(schema)
-        self = try Self.make(from: data)
-    }
-}

Sources/FunctionCalling-AWSBedrock/FunctionCalling-AWSBedrock.swift

@@ -1,6 +1,38 @@
 import Testing
-@testable import MyLibrary
+@testable import FunctionCalling_AWSBedrock
+import FunctionCalling
 
-@Test func example() async throws {
-    // Write your test here and use APIs like `#expect(...)` to check expected conditions.
+actor BedrockTests {
+    @FunctionCalling(service: .claude)
+    struct FunctionContainer {
+        /// Return current weather of location that passed by the argument
+        /// - Parameter location: location that
+        /// - Returns: string of weather
+        @CallableFunction
+        func getWeather(location: String) -> String {
+            return "Sunny"
+        }
+        
+        @CallableFunction
+        func getStock(args: String) -> Int {
+            return 0
+        }
+    }
+
+    @Test func checkConvertedResults() async throws {
+        let functions = try FunctionContainer().bedrockAllTools
+        
+        #expect(functions.count == 2)
+        
+        let getWeather = try #require(functions.first?.toolSpecification)
+        #expect(getWeather.name == "getWeather")
+        #expect(getWeather.description == """
+        Return current weather of location that passed by the argument- Parameter location: location that- Returns: string of weather
+        """)
+        
+        let getStock = try #require(functions[1].toolSpecification)
+        #expect(getStock.name == "getStock")
+        #expect(getStock.description == "")
+    }
 }
+

Tests/FunctionCalling-AWSBedrockTests/FunctionCalling-AWSBedrockTests.swift

@@ -0,0 +1,19 @@
+//
+//  BedrockRuntimeClientTypes+Extension.swift
+//  FunctionCalling-AWSBedrock
+//
+//  Created by 伊藤史 on 2024/09/19.
+//
+
+import AWSBedrockRuntime
+
+extension BedrockRuntimeClientTypes.Tool {
+    var toolSpecification: BedrockRuntimeClientTypes.ToolSpecification? {
+        switch self {
+        case .toolspec(let specification):
+            return specification
+        case .sdkUnknown:
+            return nil
+        }
+    }
+}