Re-ordered parameters to align with the Android SDK

Author: andrewheard

FirebaseAI/Sources/Types/Internal/InternalPart.swift

@@ -44,26 +44,26 @@ struct FileData: Codable, Equatable, Sendable {
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 struct FunctionCall: Equatable, Sendable {
   let name: String
-  let id: String?
   let args: JSONObject
+  let id: String?
 
-  init(name: String, id: String?, args: JSONObject) {
+  init(name: String, args: JSONObject, id: String?) {
     self.name = name
-    self.id = id
     self.args = args
+    self.id = id
   }
 }
 
 @available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
 struct FunctionResponse: Codable, Equatable, Sendable {
   let name: String
-  let id: String?
   let response: JSONObject
+  let id: String?
 
-  init(name: String, id: String?, response: JSONObject) {
+  init(name: String, response: JSONObject, id: String?) {
     self.name = name
-    self.id = id
     self.response = response
+    self.id = id
   }
 }
 

FirebaseAI/Sources/Types/Public/Part.swift

@@ -109,13 +109,13 @@ public struct FunctionCallPart: Part {
   /// The name of the function to call.
   public var name: String { functionCall.name }
 
+  /// The function parameters and values.
+  public var args: JSONObject { functionCall.args }
+
   /// The unique ID of the function call. If specified, this identifier should be included in the
   /// ``FunctionResponsePart``.
   public var id: String? { functionCall.id }
 
-  /// The function parameters and values.
-  public var args: JSONObject { functionCall.args }
-
   /// Constructs a new function call part.
   ///
   /// > Note: A `FunctionCallPart` is typically received from the model, rather than created
@@ -125,7 +125,7 @@ public struct FunctionCallPart: Part {
   ///   - name: The name of the function to call.
   ///   - args: The function parameters and values.
   public init(name: String, args: JSONObject) {
-    self.init(FunctionCall(name: name, id: nil, args: args))
+    self.init(FunctionCall(name: name, args: args, id: nil))
   }
 
   init(_ functionCall: FunctionCall) {
@@ -152,11 +152,11 @@ public struct FunctionResponsePart: Part {
   ///
   /// - Parameters:
   ///   - name: The name of the function that was called.
+  ///   - response: The function's response.
   ///   - id: The unique ID of the function call, if specified, that this response corresponds with;
   ///     see ``FunctionCallPart/id`` for more details.
-  ///   - response: The function's response.
-  public init(name: String, id: String? = nil, response: JSONObject) {
-    self.init(FunctionResponse(name: name, id: id, response: response))
+  public init(name: String, response: JSONObject, id: String? = nil) {
+    self.init(FunctionResponse(name: name, response: response, id: id))
   }
 
   init(_ functionResponse: FunctionResponse) {

FirebaseAI/Tests/Unit/Snippets/FunctionCallingSnippets.swift

@@ -92,8 +92,8 @@ final class FunctionCallingSnippets: XCTestCase {
 
         functionResponses.append(FunctionResponsePart(
           name: functionCall.name,
-          id: functionCall.id,
-          response: fetchWeather(city: city, state: state, date: date)
+          response: fetchWeather(city: city, state: state, date: date),
+          id: functionCall.id
         ))
       }
       // TODO(developer): Handle other potential function calls, if any.