Merge pull request #1 from FunctionCalling/feature/bump-dependencies

bump dependencies

Author: fumito-ito

Package.swift

@@ -16,8 +16,8 @@ let package = Package(
             targets: ["FunctionCalling-FirebaseVertexAI"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/fumito-ito/FunctionCalling", from: "0.3.0"),
-        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "10.4.0")
+        .package(url: "https://github.com/fumito-ito/FunctionCalling", from: "0.4.0"),
+        .package(url: "https://github.com/firebase/firebase-ios-sdk.git", from: "11.2.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package, defining a module or a test suite.

README.md

@@ -48,7 +48,7 @@ let package = Package(
         )
     ],
     dependencies: [
-        .package(url: "https://github.com/FunctionCalling/FunctionCalling-FirebaseVertexAI", from: "0.0.1")
+        .package(url: "https://github.com/FunctionCalling/FunctionCalling-FirebaseVertexAI", from: "0.1.0")
     ]
 )
 ```

Sources/FunctionCalling-FirebaseVertexAI/FunctionCalling_FirebaseVertexAI.swift

@@ -9,16 +9,14 @@ import FunctionCalling
 import FirebaseVertexAI
 import Foundation
 
-typealias FunctionCallingTool = FunctionCalling.Tool
-
 extension ToolContainer {
     public var firebaseVertexAITools: [FirebaseVertexAI.Tool] {
-        get throws {
-            let data = allTools.data(using: .utf8)!
-            let functionCallingTools = try JSONDecoder().decode([FunctionCallingTool].self, from: data)
-            let firebaseVertexAITools = functionCallingTools.map { $0.toFunctionDeclaration }
-
-            return [FirebaseVertexAI.Tool(functionDeclarations: firebaseVertexAITools)]
+        get {
+            [
+                FirebaseVertexAI.Tool(
+                    functionDeclarations: allTools?.compactMap { $0.toFunctionDeclaration }
+                )
+            ]
         }
     }
 }

Tests/FunctionCalling-FirebaseVertexAITests/Extensions.swift

@@ -0,0 +1,24 @@
+//
+//  Extensions.swift
+//  FunctionCalling-FirebaseVertexAI
+//
+//  Created by 伊藤史 on 2024/09/20.
+//
+
+@testable import FirebaseVertexAI
+
+extension FirebaseVertexAI.Tool {
+    var functions: [FirebaseVertexAI.FunctionDeclaration]? {
+        functionDeclarations
+    }
+}
+
+extension FirebaseVertexAI.FunctionDeclaration {
+    func getName() -> String {
+        name
+    }
+
+    func getDescription() -> String {
+        description
+    }
+}

Tests/FunctionCalling-FirebaseVertexAITests/FunctionCalling_FirebaseVertexAITests.swift

@@ -1,12 +1,38 @@
 import XCTest
 @testable import FunctionCalling_FirebaseVertexAI
+import FunctionCalling
 
 final class FunctionCalling_FirebaseVertexAITests: XCTestCase {
-    func testExample() throws {
-        // XCTest Documentation
-        // https://developer.apple.com/documentation/xctest
+    @FunctionCalling(service: .claude)
+        struct FunctionContainer {
+            /// Return current weather of location that passed by the argument
+            /// - Parameter location: location that I want to know how the weather
+            /// - Returns: string of weather
+            @CallableFunction
+            func getWeather(location: String) -> String {
+                return "Sunny"
+            }
 
-        // Defining Test Cases and Test Methods
-        // https://developer.apple.com/documentation/xctest/defining_test_cases_and_test_methods
-    }
+            @CallableFunction
+            func getStock(args: String) -> Int {
+                return 0
+            }
+        }
+
+        func testConvertedResults() throws {
+            guard let functions = FunctionContainer().firebaseVertexAITools.first?.functions else {
+                XCTFail("Conainer should contain some functions")
+                return
+            }
+
+            XCTAssertEqual(functions.count, 2)
+
+            let getWeather = try XCTUnwrap(functions.first)
+            XCTAssertEqual(getWeather.getName(), "getWeather")
+            XCTAssertEqual(getWeather.getDescription(), "Return current weather of location that passed by the argument- Parameter location: location that I want to know how the weather- Returns: string of weather")
+
+            let getStock = try XCTUnwrap(functions.last)
+            XCTAssertEqual(getStock.getName(), "getStock")
+            XCTAssertEqual(getStock.getDescription(), "")
+        }
 }