add modules

Author: fumito-ito

.gitignore

@@ -6,3 +6,4 @@ DerivedData/
 .swiftpm/configuration/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
+Package.resolved

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2024 Fumito Ito
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Package.swift

@@ -4,20 +4,33 @@
 import PackageDescription
 
 let package = Package(
-    name: "FunctionCalling-generative-ai-swift",
+    name: "FunctionCalling-GoogleGenerativeAI",
+    platforms: [
+        .macOS(.v13),
+        .iOS(.v17)
+    ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
-            name: "FunctionCalling-generative-ai-swift",
-            targets: ["FunctionCalling-generative-ai-swift"]),
+            name: "FunctionCalling-GoogleGenerativeAI",
+            targets: ["FunctionCalling-GoogleGenerativeAI"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/google-gemini/generative-ai-swift", from: "0.5.6"),
+        .package(url: "https://github.com/fumito-ito/FunctionCalling", from: "0.3.0"),
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.
         // Targets can depend on other targets in this package and products from dependencies.
         .target(
-            name: "FunctionCalling-generative-ai-swift"),
+            name: "FunctionCalling-GoogleGenerativeAI",
+            dependencies: [
+                .product(name: "GoogleGenerativeAI", package: "generative-ai-swift"),
+                .product(name: "FunctionCalling", package: "FunctionCalling"),
+            ]
+        ),
         .testTarget(
-            name: "FunctionCalling-generative-ai-swiftTests",
-            dependencies: ["FunctionCalling-generative-ai-swift"]),
+            name: "FunctionCalling-GoogleGenerativeAITests",
+            dependencies: ["FunctionCalling-GoogleGenerativeAI"]),
     ]
 )

README.md

@@ -0,0 +1,62 @@
+# FunctionCalling-GoogleGenerativeAI
+
+This library simplifies the integration of the [FunctionCalling](https://github.com/fumito-ito/FunctionCalling) macro into [GoogleGenerativeAI](https://github.com/google-gemini/generative-ai-swift). By using this library, you can directly generate `Tool` objects from Swift native functions, which can then be specified as FunctionCalling when invoking VertexAI.
+
+## Usage
+
+```swift
+
+import FunctionCalling
+import FunctionCalling_GoogleGenerativeAI
+import GoogleGenerativeAI
+
+// MARK: Declare the container and functions for the tools to be called from FunctionCalling.
+
+@FunctionCalling(service: .llamaOrGemini)
+struct MyFunctionTools {
+    @CallableFunction
+    /// Get the current stock price for a given ticker symbol
+    ///
+    /// - Parameter: The stock ticker symbol, e.g. GOOG 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 VertexAI.
+
+let model = GenerativeModel(
+    modelName: "gemini-1.5-flash",
+    tools: MyFunctionTools().googleGenerativeAITools
+)
+```
+
+## Installation
+
+### Swift Package Manager
+
+```
+let package = Package(
+    name: "MyPackage",
+    products: [...],
+    targets: [
+        .target(
+            "YouAppModule",
+            dependencies: [
+                .product(name: "FunctionCalling-GoogleGenerativeAI", package: "FunctionCalling-GoogleGenerativeAI")
+            ]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/fumito-ito/FunctionCalling-GoogleGenerativeAI", from: "0.0.1")
+    ]
+)
+```
+
+## 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

Sources/FunctionCalling-GoogleGenerativeAI/Extension/InputSchema+Extension.swift

@@ -0,0 +1,43 @@
+//
+//  InputSchema+Extension.swift
+//
+//
+//  Created by 伊藤史 on 2024/09/13.
+//
+
+import FunctionCalling
+import GoogleGenerativeAI
+
+extension FunctionCalling.InputSchema {
+    var toSchema: GoogleGenerativeAI.Schema {
+        Schema(
+            type: type.toDataType,
+            format: format,
+            description: description,
+            nullable: nullable,
+            enumValues: enumValues,
+            items: items?.toSchema,
+            properties: properties?.mapValues { $0.toSchema },
+            requiredProperties: requiredProperties
+        )
+    }
+}
+
+extension FunctionCalling.InputSchema.DataType {
+    var toDataType: GoogleGenerativeAI.DataType {
+        switch self {
+        case .string:
+            return .string
+        case .number:
+            return .number
+        case .integer:
+            return .integer
+        case .boolean:
+            return .boolean
+        case .array:
+            return .array
+        case .object:
+            return .object
+        }
+    }
+}

Sources/FunctionCalling-GoogleGenerativeAI/Extension/Tool+Extension.swift

@@ -0,0 +1,20 @@
+//
+//  Tool+Extension.swift
+//
+//
+//  Created by 伊藤史 on 2024/09/13.
+//
+
+import FunctionCalling
+import GoogleGenerativeAI
+
+extension FunctionCalling.Tool {
+    var toFunctionDeclaration: GoogleGenerativeAI.FunctionDeclaration {
+        FunctionDeclaration(
+            name: name,
+            description: description,
+            parameters: inputSchema.properties?.mapValues { $0.toSchema },
+            requiredParameters: inputSchema.requiredProperties
+        )
+    }
+}

Sources/FunctionCalling-GoogleGenerativeAI/FunctionCalling_GoogleGenerativeAI.swift

@@ -0,0 +1,20 @@
+// The Swift Programming Language
+// https://docs.swift.org/swift-book
+
+import FunctionCalling
+import GoogleGenerativeAI
+import Foundation
+
+typealias FunctionCallingTool = FunctionCalling.Tool
+
+extension ToolContainer {
+    public var googleGenerativeAITools: [GoogleGenerativeAI.Tool] {
+        get throws {
+            let data = allTools.data(using: .utf8)!
+            let functionCallingTools = try JSONDecoder().decode([FunctionCallingTool].self, from: data)
+            let googleGenerativeAITools = functionCallingTools.map { $0.toFunctionDeclaration }
+
+            return [GoogleGenerativeAI.Tool(functionDeclarations: googleGenerativeAITools)]
+        }
+    }
+}

Sources/FunctionCalling-generative-ai-swift/FunctionCalling_generative_ai_swift.swift

@@ -1,7 +1,7 @@
 import XCTest
-@testable import FunctionCalling_generative_ai_swift
+@testable import FunctionCalling_GoogleGenerativeAI
 
-final class FunctionCalling_generative_ai_swiftTests: XCTestCase {
+final class FunctionCalling_GoogleGenerativeAITests: XCTestCase {
     func testExample() throws {
         // XCTest Documentation
         // https://developer.apple.com/documentation/xctest