add modules

Author: fumito-ito

.gitignore

@@ -6,3 +6,65 @@ DerivedData/
 .swiftpm/configuration/registries.json
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 .netrc
+# Xcode
+#
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## User settings
+xcuserdata/
+
+## Obj-C/Swift specific
+*.hmap
+
+## App packaging
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+# Package.resolved
+# *.xcodeproj
+#
+# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata
+# hence it is not needed unless you have added a package configuration file to your project
+# .swiftpm
+
+.build/
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+# *.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build/
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo.
+# Instead, use fastlane to re-generate the screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 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.resolved

@@ -5,17 +5,30 @@ import PackageDescription
 
 let package = Package(
     name: "FunctionCalling-MacPaw-OpenAI",
+    platforms: [
+        .macOS(.v13),
+        .iOS(.v17)
+    ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.
         .library(
             name: "FunctionCalling-MacPaw-OpenAI",
             targets: ["FunctionCalling-MacPaw-OpenAI"]),
     ],
+    dependencies: [
+        .package(url: "https://github.com/FunctionCalling/FunctionCalling", from: "0.4.0"),
+        .package(url: "https://github.com/MacPaw/OpenAI", 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-MacPaw-OpenAI"),
+            name: "FunctionCalling-MacPaw-OpenAI",
+            dependencies: [
+                .product(name: "OpenAI", package: "OpenAI"),
+                .product(name: "FunctionCalling", package: "FunctionCalling"),
+            ]
+        ),
         .testTarget(
             name: "FunctionCalling-MacPaw-OpenAITests",
             dependencies: ["FunctionCalling-MacPaw-OpenAI"]

Package.swift

@@ -0,0 +1,2 @@
+# FunctionCalling-MacPaw-OpenAI
+Easy to use your Swift native functions for function calling with [MacPaw/OpenAI](https://github.com/MacPaw/OpenAI).

README.md

@@ -0,0 +1,84 @@
+//
+//  ChatQuery+Extension.swift
+//  FunctionCalling-MacPaw-OpenAI
+//
+//  Created by 伊藤史 on 2024/09/27.
+//
+
+import FunctionCalling
+import OpenAI
+
+extension ChatQuery.ChatCompletionToolParam {
+    init(tool: Tool) {
+        self.init(function: .init(tool: tool))
+    }
+}
+
+extension ChatQuery.ChatCompletionToolParam.FunctionDefinition {
+    init(tool: Tool) {
+        self.init(
+            name: tool.name,
+            description: tool.description,
+            parameters: FunctionParameters(inputSchema: tool.inputSchema)
+        )
+    }
+}
+
+extension ChatQuery.ChatCompletionToolParam.FunctionDefinition.FunctionParameters {
+    init(inputSchema: InputSchema) {
+        self.init(
+            type: JSONType(dataType: inputSchema.type),
+            properties: inputSchema.properties?.mapValues { Property(inputSchema: $0) },
+            required: inputSchema.requiredProperties,
+            enum: inputSchema.enumValues
+        )
+    }
+}
+
+extension ChatQuery.ChatCompletionToolParam.FunctionDefinition.FunctionParameters.Property.Items {
+    init?(inputSchema: InputSchema?) {
+        guard let inputSchema else {
+            return nil
+        }
+
+        self.init(
+            type: JSONType(dataType: inputSchema.type),
+            properties: inputSchema.properties?.mapValues {
+                ChatQuery.ChatCompletionToolParam.FunctionDefinition.FunctionParameters.Property(inputSchema: $0)
+            },
+            enum: inputSchema.enumValues
+        )
+    }
+}
+
+extension ChatQuery.ChatCompletionToolParam.FunctionDefinition.FunctionParameters.Property {
+    init(inputSchema: InputSchema) {
+        self.init(
+            type: JSONType(dataType: inputSchema.type),
+            description: inputSchema.description,
+            format: inputSchema.format,
+            items: Items(inputSchema: inputSchema.items),
+            required: inputSchema.requiredProperties,
+            enum: inputSchema.enumValues
+        )
+    }
+}
+
+extension ChatQuery.ChatCompletionToolParam.FunctionDefinition.FunctionParameters.JSONType {
+    init(dataType: InputSchema.DataType) {
+        switch dataType {
+        case .string:
+            self = .string
+        case .number:
+            self = .number
+        case .integer:
+            self = .integer
+        case .boolean:
+            self = .boolean
+        case .array:
+            self = .array
+        case .object:
+            self = .object
+        }
+    }
+}

Sources/FunctionCalling-MacPaw-OpenAI/Extension/ChatQuery+Extension.swift

@@ -1,2 +1,15 @@
 // The Swift Programming Language
 // https://docs.swift.org/swift-book
+
+import FunctionCalling
+import OpenAI
+
+extension ToolContainer {
+    public var macPawOpenAITools: [ChatQuery.ChatCompletionToolParam] {
+        guard let allTools else {
+            return []
+        }
+
+        return allTools.compactMap { ChatQuery.ChatCompletionToolParam(tool: $0) }
+    }
+}