Add JSONValue dependency and remove OKJSONValue usage

Author: 1amageek

Package.resolved

@@ -1,5 +1,15 @@
 {
+  "originHash" : "6242cad8dd673917dc88c55f945db46d49b52a4cb3fc946fd6473dbfe09979f0",
   "pins" : [
+    {
+      "identity" : "jsonvalue",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/1amageek/JSONValue.git",
+      "state" : {
+        "branch" : "main",
+        "revision" : "067dcf205a3688bdd9a11928aeb83f3e61774271"
+      }
+    },
     {
       "identity" : "swift-docc-plugin",
       "kind" : "remoteSourceControl",
@@ -19,5 +29,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }

Package.swift

@@ -16,12 +16,15 @@ let package = Package(
             targets: ["OllamaKit"]),
     ],
     dependencies: [
+        .package(url: "https://github.com/1amageek/JSONValue.git", branch: "main"),
         .package(url: "https://github.com/apple/swift-docc-plugin.git", .upToNextMajor(from: "1.3.0"))
     ],
     targets: [
         .target(
             name: "OllamaKit",
-            dependencies: []),
+            dependencies: [
+                "JSONValue"
+            ]),
         .testTarget(
             name: "OllamaKitTests",
             dependencies: ["OllamaKit"]),

Playground/OKPlayground/Views/ChatWithFormatView.swift

@@ -8,6 +8,7 @@
 import Combine
 import OllamaKit
 import SwiftUI
+import JSONValue
 
 struct ChatWithFormatView: View {
 
@@ -133,7 +134,7 @@ struct ChatWithFormatView: View {
             .store(in: &cancellables)
     }
 
-    private func getFormat() -> OKJSONValue {
+    private func getFormat() -> JSONValue {
         return
             .object(["type": .string("array"),
                      "items": .object([

Playground/OKPlayground/Views/ChatWithToolsView.swift

@@ -8,6 +8,7 @@
 import Combine
 import OllamaKit
 import SwiftUI
+import JSONValue
 
 struct ChatWithToolsView: View {
     @Environment(ViewModel.self) private var viewModel
@@ -105,7 +106,7 @@ struct ChatWithToolsView: View {
             .store(in: &cancellables)
     }
 
-    private func getTools() -> [OKJSONValue] {
+    private func getTools() -> [JSONValue] {
         return [
             .object([
                 "type": .string("function"),

Sources/OllamaKit/RequestData/OKChatRequestData.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import JSONValue
 
 /// A structure that encapsulates data for chat requests to the Ollama API.
 public struct OKChatRequestData: Sendable {
@@ -17,12 +18,12 @@ public struct OKChatRequestData: Sendable {
     /// An array of ``Message`` instances representing the content to be sent to the Ollama API.
     public let messages: [Message]
 
-    /// An optional array of ``OKJSONValue`` representing the tools available for tool calling in the chat.
-    public let tools: [OKJSONValue]?
+    /// An optional array of ``JSONValue`` representing the tools available for tool calling in the chat.
+    public let tools: [JSONValue]?
 
-    /// Optional ``OKJSONValue`` representing the JSON schema for the response.
+    /// Optional ``JSONValue`` representing the JSON schema for the response.
     /// Be sure to also include "return as JSON" in your prompt
-    public let format: OKJSONValue?
+    public let format: JSONValue?
 
     /// Optional ``OKCompletionOptions`` providing additional configuration for the chat request.
     public var options: OKCompletionOptions?
@@ -31,8 +32,8 @@ public struct OKChatRequestData: Sendable {
     public init(
         model: String,
         messages: [Message],
-        tools: [OKJSONValue]? = nil,
-        format: OKJSONValue? = nil,
+        tools: [JSONValue]? = nil,
+        format: JSONValue? = nil,
         options: OKCompletionOptions? = nil
     ) {
         self.stream = tools == nil
@@ -46,8 +47,8 @@ public struct OKChatRequestData: Sendable {
     public init(
         model: String,
         messages: [Message],
-        tools: [OKJSONValue]? = nil,
-        format: OKJSONValue? = nil,
+        tools: [JSONValue]? = nil,
+        format: JSONValue? = nil,
         with configureOptions: @Sendable (inout OKCompletionOptions) -> Void
     ) {
         self.stream = tools == nil

Sources/OllamaKit/RequestData/OKGenerateRequestData.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import JSONValue
 
 /// A structure that encapsulates the data required for generating responses using the Ollama API.
 public struct OKGenerateRequestData: Sendable {
@@ -20,9 +21,9 @@ public struct OKGenerateRequestData: Sendable {
     /// An optional array of base64-encoded images.
     public let images: [String]?
 
-    /// Optional ``OKJSONValue`` representing the JSON schema for the response.
+    /// Optional ``JSONValue`` representing the JSON schema for the response.
     /// Be sure to also include "return as JSON" in your prompt
-    public let format: OKJSONValue?
+    public let format: JSONValue?
 
     /// An optional string specifying the system message.
     public var system: String?
@@ -39,7 +40,7 @@ public struct OKGenerateRequestData: Sendable {
         images: [String]? = nil,
         system: String? = nil,
         context: [Int]? = nil,
-        format: OKJSONValue? = nil,
+        format: JSONValue? = nil,
         options: OKCompletionOptions? = nil
     ) {
         self.stream = true
@@ -56,7 +57,7 @@ public struct OKGenerateRequestData: Sendable {
         model: String,
         prompt: String,
         images: [String]? = nil,
-        format: OKJSONValue? = nil,
+        format: JSONValue? = nil,
         with configureOptions: @Sendable (inout OKCompletionOptions) -> Void
     ) {
         self.stream = true

Sources/OllamaKit/Responses/OKChatResponse.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+@_exported import JSONValue
 
 /// A structure that represents the response to a chat request from the Ollama API.
 public struct OKChatResponse: OKCompletionResponse, Decodable, Sendable {
@@ -107,8 +108,8 @@ public struct OKChatResponse: OKCompletionResponse, Decodable, Sendable {
                 /// The name of the tool being called.
                 public let name: String?
 
-                /// An optional ``OKJSONValue`` representing the arguments passed to the tool.
-                public let arguments: OKJSONValue?
+                /// An optional ``JSONValue`` representing the arguments passed to the tool.
+                public let arguments: JSONValue?
             }
         }
     }