accept updates

Author: fumito-ito

Package.swift

@@ -26,7 +26,7 @@ let package = Package(
             name: "FunctionCalling-FirebaseVertexAI",
             dependencies: [
                 .product(name: "FunctionCalling", package: "FunctionCalling"),
-                .product(name: "FirebaseVertexAI-Preview", package: "firebase-ios-sdk")
+                .product(name: "FirebaseVertexAI", package: "firebase-ios-sdk")
             ]
         ),
         .testTarget(

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

@@ -10,34 +10,68 @@ import FirebaseVertexAI
 
 extension FunctionCalling.InputSchema {
     var toSchema: FirebaseVertexAI.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: FirebaseVertexAI.DataType {
-        switch self {
+        switch type {
         case .string:
-            return .string
+            return .string(
+                description: description,
+                nullable: nullable ?? false,
+                format: format.toStringFormat
+            )
         case .number:
-            return .number
+            return .double(
+                description: description,
+                nullable: nullable ?? false
+            )
         case .integer:
-            return .integer
+            return .integer(
+                description: description,
+                nullable: nullable ?? false,
+                format: format.toIntegerFormat
+            )
         case .boolean:
-            return .boolean
+            return .boolean(
+                description: description,
+                nullable: nullable ?? false
+            )
         case .array:
-            return .array
+            guard let items else {
+                fatalError("array is set but items are not found")
+            }
+
+            return .array(
+                items: items.toSchema,
+                description: description,
+                nullable: nullable ?? false
+            )
         case .object:
-            return .object
+            guard let properties else {
+                fatalError("object is set but properties are note found")
+            }
+
+            return .object(
+                properties: properties.mapValues { $0.toSchema },
+                optionalProperties: [],
+                description: description,
+                nullable: nullable ?? false
+            )
+        }
+    }
+}
+
+extension Optional<String> {
+    var toStringFormat: FirebaseVertexAI.Schema.StringFormat? {
+        guard let format = self else {
+            return nil
         }
+
+        return .custom(format)
+    }
+
+    var toIntegerFormat: FirebaseVertexAI.Schema.IntegerFormat? {
+        guard let format = self else {
+            return nil
+        }
+
+        return .custom(format)
     }
 }

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

@@ -10,11 +10,18 @@ import FirebaseVertexAI
 
 extension FunctionCalling.Tool {
     var toFunctionDeclaration: FirebaseVertexAI.FunctionDeclaration {
-        FunctionDeclaration(
+        let parameters: [String: FirebaseVertexAI.Schema] = {
+            guard let properties = inputSchema.properties else {
+                return [:]
+            }
+
+            return properties.mapValues { $0.toSchema }
+        }()
+
+        return FunctionDeclaration(
             name: name,
             description: description,
-            parameters: inputSchema.properties?.mapValues { $0.toSchema },
-            requiredParameters: inputSchema.requiredProperties
+            parameters: parameters
         )
     }
 }

Sources/FunctionCalling-FirebaseVertexAI/FunctionCalling_FirebaseVertexAI.swift

@@ -11,10 +11,10 @@ import Foundation
 
 extension ToolContainer {
     public var firebaseVertexAITools: [FirebaseVertexAI.Tool] {
-        [
-            FirebaseVertexAI.Tool(
-                functionDeclarations: allTools?.compactMap { $0.toFunctionDeclaration }
-            )
-        ]
+        guard let declarations = allTools?.compactMap({ $0.toFunctionDeclaration }) else {
+            return [.functionDeclarations([])]
+        }
+
+        return [FirebaseVertexAI.Tool.functionDeclarations(declarations)]
     }
 }