Merge branch 'main' into feature/lint

Author: fumito-ito

Package.resolved

@@ -17,8 +17,8 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/FunctionCalling/FunctionCalling", from: "0.3.0"),
-        .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "0.77.1")
+        .package(url: "https://github.com/FunctionCalling/FunctionCalling", from: "0.5.0"),
+        .package(url: "https://github.com/awslabs/aws-sdk-swift", from: "1.0.36")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

Package.swift

@@ -1,2 +1,61 @@
 # FunctionCalling-AWSBedrock
-Easy to use your Swift native functions for function calling with [AWSBedrock](https://github.com/awslabs/aws-sdk-swift/tree/main).
+
+This library simplifies the integration of the [FunctionCalling](https://github.com/fumito-ito/FunctionCalling) macro into [AWSBedrock](https://github.com/awslabs/aws-sdk-swift). By using this library, you can directly generate `Tool` objects from Swift native functions, which can then be specified as FunctionCalling when invoking Bedrock.
+
+## Usage
+
+```swift
+
+import FunctionCalling
+import FunctionCalling_AWSBedrock
+import AWSBedrockRuntime
+
+// MARK: Declare the container and functions for the tools to be called from FunctionCalling.
+
+@FunctionCalling(service: .claude)
+struct MyFunctionTools {
+    @CallableFunction
+    /// Get the current stock price for a given ticker symbol
+    ///
+    /// - Parameter: The stock ticker symbol, e.g. AMZN for Google Inc.
+    func getStockPrice(ticker: String) async throws -> String {
+        // code to return stock price of passed ticker
+    }
+}
+
+// MARK: You can directly pass the tools generated from objects to the model in Bedrock.
+
+let client = try BedrockRuntimeClient(region: "us-east-1")
+let input = ConverseInput(toolConfig: .init(tools: MyFunctionTools().bedrockAllTools))
+try await client.converse(input: input)
+```
+
+## Installation
+
+### Swift Package Manager
+
+```
+let package = Package(
+    name: "MyPackage",
+    products: [...],
+    targets: [
+        .target(
+            "YouAppModule",
+            dependencies: [
+                .product(name: "FunctionCalling-AWSBedrock", package: "FunctionCalling-AWSBedrock")
+            ]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/FunctionCalling/FunctionCalling-AWSBedrock", from: "0.1.0")
+    ]
+)
+```
+
+## Contributing
+
+Pull requests are welcome. For major changes, please open an issue first to discuss what you would like to change.Please make sure to update tests as appropriate.
+
+## License
+
+The MIT License

README.md

@@ -5,20 +5,15 @@ import FunctionCalling
 import AWSBedrockRuntime
 import Foundation
 
-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.replacingOccurrences(of: "\n", with: "").data(using: .utf8)!
-            let functionCallingTools = try decoder.decode([FunctionCallingTool].self, from: data)
+            guard let functionCallingTools = allTools else {
+                return []
+            }
+
             return try functionCallingTools.map { try $0.toBedrockTool }
         }
     }

Sources/FunctionCalling-AWSBedrock/FunctionCalling-AWSBedrock.swift

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}