Merge pull request #46 from AppcentMobile/feature/function-calls

🎷 [FEATURE] Function calls added.

Author: burakcolakappcent

ACMOpenAI.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name         = "ACMOpenAI"
-    spec.version      = "1.0.2"
+    spec.version      = "1.0.8"
     spec.summary      = "ACMOpenAI iOS Library"
     spec.description  = <<-DESC
             ACMOpenAI is a library that help developers to use Open AI API easily.
@@ -14,5 +14,5 @@ Pod::Spec.new do |spec|
     spec.swift_version = '5.0'  
     spec.source       = { :git => "https://github.com/AppcentMobile/ACMOpenAI-iOS.git", :tag => "#{spec.version}" }
     spec.source_files  = "Sources/**/*.{h,m,swift}"
-    spec.dependency 'ACMNetworking', '~> 1.1.3'
+    spec.dependency 'ACMNetworking', '~> 1.2.3'
   end

Package.resolved

@@ -15,7 +15,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/AppcentMobile/ACMNetworking.git", exact: "1.2.0"),
+        .package(url: "https://github.com/AppcentMobile/ACMNetworking.git", exact: "1.2.3"),
     ],
     targets: [
         .target(

Package.swift

@@ -15,11 +15,11 @@ public extension ACMOAIChatManager {
     ///    - request: `ACMOAIChatRequest` Model of possible requests
     ///
     func create(request: ACMOAIChatRequest.Create, onSuccess: ChatCallback.Create = nil, onPartial: ChatCallback.Create = nil, onError: ACMGenericCallbacks.ErrorCallback) {
-
         guard var to = endpoint?.set(path: ChatRoute.create)
             .set(method: .post)
             .add(param: ACMBodyModel(key: "model", value: request.model))
-            .add(param: ACMBodyModel(key: "messages", value: request.messages)) else {
+            .add(param: ACMBodyModel(key: "messages", value: request.messages))
+        else {
             return
         }
 
@@ -63,6 +63,18 @@ public extension ACMOAIChatManager {
             to = to.add(param: ACMBodyModel(key: "user", value: user))
         }
 
+        if let tools = request.tools {
+            to = to.add(param: ACMBodyModel(key: "tools", value: tools))
+        }
+
+        if let tool_choice = request.tool_choice {
+            if let strChoice = tool_choice.strChoice {
+                to = to.add(param: ACMBodyModel(key: "tool_choice", value: strChoice))
+            } else if let objChoice = tool_choice.objChoice {
+                to = to.add(param: ACMBodyModel(key: "tool_choice", value: ACMToolChoiceObjectModel(type: objChoice.type, function: objChoice.function)))
+            }
+        }
+
         let buildEndpoint = to.build()
 
         if request.stream == true {

Sources/ACMOpenAI/Manager/Chat/ACMOAIChatManager.swift

@@ -16,7 +16,8 @@ public extension ACMOAIModerationsManager {
     func create(request: ACMOAIModerationsRequest.Create, onSuccess: ModerationsCallback.Create, onError: ACMGenericCallbacks.ErrorCallback) {
         guard var to = endpoint?.set(path: ModerationsRoute.create)
             .set(method: .post)
-            .add(param: ACMBodyModel(key: "input", value: request.input)) else {
+            .add(param: ACMBodyModel(key: "input", value: request.input))
+        else {
             return
         }
 

Sources/ACMOpenAI/Manager/Moderations/ACMOAIModerationsManager.swift

@@ -12,6 +12,10 @@ public extension ACMOAIChatRequest {
         public var model: String
         /// messages: required*
         public var messages: [ACMChatMessageModel]
+        /// tools
+        public var tools: [ACMToolsModel]?
+        /// tool choice
+        public var tool_choice: ACMToolChoiceModel?
         /// temperature: optional
         public var temperature: Double?
         /// top_p: optional
@@ -34,7 +38,7 @@ public extension ACMOAIChatRequest {
         public var user: String?
 
         /// Init function for creating request
-        public init(model: String, messages: [ACMChatMessageModel], temperature: Double? = nil, top_p: Double? = nil, n: Int? = nil, stream: Bool? = nil, stop: [String]? = nil, max_tokens: Int? = nil, presence_penalty: Double? = nil, frequency_penalty: Double? = nil, logit_bias: [String: Int]? = nil, user: String? = nil) {
+        public init(model: String, messages: [ACMChatMessageModel], tools: [ACMToolsModel]? = nil, tool_choice: ACMToolChoiceModel? = nil, temperature: Double? = nil, top_p: Double? = nil, n: Int? = nil, stream: Bool? = nil, stop: [String]? = nil, max_tokens: Int? = nil, presence_penalty: Double? = nil, frequency_penalty: Double? = nil, logit_bias: [String: Int]? = nil, user: String? = nil) {
             self.model = model
             self.messages = messages
             self.temperature = temperature
@@ -47,6 +51,8 @@ public extension ACMOAIChatRequest {
             self.frequency_penalty = frequency_penalty
             self.logit_bias = logit_bias
             self.user = user
+            self.tools = tools
+            self.tool_choice = tool_choice
         }
     }
 }

Sources/ACMOpenAI/Requests/Chat/ACMOAIChatRequest.swift

@@ -0,0 +1,65 @@
+//
+//  ACMToolsModel.swift
+//
+//
+//  Created by burak on 20.02.2024.
+//
+
+import Foundation
+
+public struct ACMToolsModel: Codable {
+    public let type: String
+    public let function: ACMToolsFunctionModel
+
+    public init(type: String, function: ACMToolsFunctionModel) {
+        self.type = type
+        self.function = function
+    }
+}
+
+public struct ACMToolsFunctionModel: Codable {
+    public let description: String?
+    public let name: String
+    public let parameters: String?
+
+    public init(description: String? = nil, name: String, params: [String: Any]? = nil) {
+        self.description = description
+        self.name = name
+        if let params, let data = try? JSONSerialization.data(withJSONObject: params, options: []) {
+            parameters = String(data: data, encoding: .utf8)
+        } else {
+            parameters = nil
+        }
+    }
+}
+
+public struct ACMToolChoiceModel: Codable {
+    public var strChoice: String?
+    public var objChoice: ACMToolChoiceObjectModel?
+
+    public init(strChoice: String? = nil) {
+        self.strChoice = strChoice
+    }
+
+    public init(objChoice: ACMToolChoiceObjectModel? = nil) {
+        self.objChoice = objChoice
+    }
+}
+
+public struct ACMToolChoiceObjectModel: Codable {
+    public var type: String
+    public var function: ACMToolChoiceObjectFunctionModel
+
+    public init(type: String, function: ACMToolChoiceObjectFunctionModel) {
+        self.type = type
+        self.function = function
+    }
+}
+
+public struct ACMToolChoiceObjectFunctionModel: Codable {
+    public var name: String
+
+    public init(name: String) {
+        self.name = name
+    }
+}