Update workflows for Xcode 16.1 and add pull model feature

Author: 1amageek

.github/workflows/code-quality.yml

@@ -8,18 +8,21 @@ on:
     branches:
       - main
 
+env:
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
+
 jobs:
   test-ios:
-    runs-on: macos-13
+    runs-on: macos-15
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Build and test
-        run: xcodebuild test -scheme OllamaKit -destination 'platform=iOS Simulator,name=iPhone 14 Pro'
+        run: xcodebuild test -scheme OllamaKit -destination 'platform=iOS Simulator,name=iPhone 16 Pro'
 
   test-macos:
-    runs-on: macos-13
+    runs-on: macos-15
 
     steps:
       - uses: actions/checkout@v3

.github/workflows/deploy-docs.yml

@@ -13,9 +13,12 @@ concurrency:
   group: "pages"
   cancel-in-progress: false
 
+env:
+  DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
+
 jobs:
   deploy:
-    runs-on: macos-13
+    runs-on: macos-15
 
     environment:
       name: github-pages

CHANGELOG.md

@@ -1,38 +1,36 @@
-# 5.0.5
+# 5.0.7
+
+- feat: adds structured output support by @macistador in https://github.com/kevinhermawan/OllamaKit/pull/43
+
+# 5.0.6
+
+- Add support to pull model from library by @lukepistrol in https://github.com/kevinhermawan/OllamaKit/pull/39
+- Swift 6 support by @lukepistrol in https://github.com/kevinhermawan/OllamaKit/pull/40
+- fix: crash when retrieving model information using Combine by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/41
 
-## What's Changed
+# 5.0.5
 
 - fix: parameters aren't encoded by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/36
 
 # 5.0.4
 
-## What's Changed
-
 - refactor: updates chat and generation options by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/34
 
 # 5.0.3
 
-## What's Changed
-
 - refactor: marks `images` as optional by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/32
 - feat: adds `doneReason` to chat and generation responses by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/33
 
 # 5.0.2
 
-## What's Changed
-
 - feat: adds tool calling support by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/31
 
 # 5.0.1
 
-## What's Changed
-
 - chore: changes minimum macOS version to 12 by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/30
 
 # 5.0.0
 
-## What's Changed
-
 - refactor: removes Alamofire from `copyModel` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/20
 - refactor: removes Alamofire from `deleteModel` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/21
 - refactor: removes Alamofire from `embeddings` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/22
@@ -46,14 +44,10 @@
 
 # 4.1.0
 
-## What's Changed
-
 - refactor: changes type from `Double` to `Int` in `context` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/19
 
 # 4.0.0
 
-## What's Changed
-
 - chore: removes Playground by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/14
 - feat: adds initializer with default base URL by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/15
 - refactor: renames `generateEmbeddings` to `embeddings` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/16
@@ -62,23 +56,17 @@
 
 # 3.0.2
 
-## What's Changed
-
 - Added generateEmbeddings by @thrashr888 in https://github.com/kevinhermawan/OllamaKit/pull/11
 - Forward Alamofire failures by @malicious in https://github.com/kevinhermawan/OllamaKit/pull/12
 
 # 3.0.1
 
-## What's Changed
-
 - refactor: migrates `chat` and `generate` from `Future` to `PassthroughSubject` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/8
 - chore: moves `Documentation.md` by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/9
 - fix: `context` must be an array of integers by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/10
 
 # 3.0.0
 
-## What's Changed
-
 - docs: improves the documentation by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/6
 - feat: adds reactive implementation for all APIs by @kevinhermawan in https://github.com/kevinhermawan/OllamaKit/pull/5
 

[email protected]

@@ -0,0 +1,29 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "OllamaKit",
+    platforms: [
+        .iOS(.v15),
+        .macOS(.v12),
+        .macCatalyst(.v15)
+    ],
+    products: [
+        .library(
+            name: "OllamaKit",
+            targets: ["OllamaKit"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/apple/swift-docc-plugin.git", .upToNextMajor(from: "1.3.0"))
+    ],
+    targets: [
+        .target(
+            name: "OllamaKit",
+            dependencies: []),
+        .testTarget(
+            name: "OllamaKitTests",
+            dependencies: ["OllamaKit"]),
+    ]
+)

Playground/OKPlayground.xcodeproj/project.pbxproj

@@ -3,10 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 56;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
+		04A2EC422D22A513009C9AED /* ChatWithFormatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A2EC412D22A513009C9AED /* ChatWithFormatView.swift */; };
+		04C1CC092D21E8B8005362B0 /* OllamaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 04C1CC082D21E8B8005362B0 /* OllamaKit */; };
 		0A5648C42C1468E0008FB5F6 /* OKPlaygroundApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5648C32C1468E0008FB5F6 /* OKPlaygroundApp.swift */; };
 		0A5648C82C1468E1008FB5F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0A5648C72C1468E1008FB5F6 /* Assets.xcassets */; };
 		0A5648CB2C1468E1008FB5F6 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 0A5648CA2C1468E1008FB5F6 /* Preview Assets.xcassets */; };
@@ -21,9 +23,11 @@
 		0A5648EA2C1504CD008FB5F6 /* GenerateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5648E92C1504CD008FB5F6 /* GenerateView.swift */; };
 		0A5648EE2C150C66008FB5F6 /* OllamaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0A5648ED2C150C66008FB5F6 /* OllamaKit */; };
 		0A7B752D2C55E79400624336 /* ChatWithToolsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A7B752C2C55E79400624336 /* ChatWithToolsView.swift */; };
+		0AEA9B902CFCFD0100227D01 /* OllamaKit in Frameworks */ = {isa = PBXBuildFile; productRef = 0AEA9B8F2CFCFD0100227D01 /* OllamaKit */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		04A2EC412D22A513009C9AED /* ChatWithFormatView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWithFormatView.swift; sourceTree = "<group>"; };
 		0A5648C02C1468E0008FB5F6 /* OKPlayground.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OKPlayground.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0A5648C32C1468E0008FB5F6 /* OKPlaygroundApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OKPlaygroundApp.swift; sourceTree = "<group>"; };
 		0A5648C72C1468E1008FB5F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -47,6 +51,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				0A5648EE2C150C66008FB5F6 /* OllamaKit in Frameworks */,
+				0AEA9B902CFCFD0100227D01 /* OllamaKit in Frameworks */,
+				04C1CC092D21E8B8005362B0 /* OllamaKit in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -102,6 +108,7 @@
 				0A5648E72C14E00E008FB5F6 /* ChatView.swift */,
 				0A5648E92C1504CD008FB5F6 /* GenerateView.swift */,
 				0A7B752C2C55E79400624336 /* ChatWithToolsView.swift */,
+				04A2EC412D22A513009C9AED /* ChatWithFormatView.swift */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -148,6 +155,8 @@
 			name = OKPlayground;
 			packageProductDependencies = (
 				0A5648ED2C150C66008FB5F6 /* OllamaKit */,
+				0AEA9B8F2CFCFD0100227D01 /* OllamaKit */,
+				04C1CC082D21E8B8005362B0 /* OllamaKit */,
 			);
 			productName = OKPlayground;
 			productReference = 0A5648C02C1468E0008FB5F6 /* OKPlayground.app */;
@@ -178,6 +187,7 @@
 			);
 			mainGroup = 0A5648B72C1468E0008FB5F6;
 			packageReferences = (
+				04C1CC072D21E8B8005362B0 /* XCLocalSwiftPackageReference "../../OllamaKit" */,
 			);
 			productRefGroup = 0A5648C12C1468E0008FB5F6 /* Products */;
 			projectDirPath = "";
@@ -216,6 +226,7 @@
 				0A5648E42C14D342008FB5F6 /* ModelInfoView.swift in Sources */,
 				0A5648E22C14C7E1008FB5F6 /* ViewModel.swift in Sources */,
 				0A5648DF2C14C583008FB5F6 /* EmbeddingsView.swift in Sources */,
+				04A2EC422D22A513009C9AED /* ChatWithFormatView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -366,7 +377,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.kevinhermawan.OKPlayground;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -396,7 +407,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.kevinhermawan.OKPlayground;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -424,11 +435,26 @@
 		};
 /* End XCConfigurationList section */
 
+/* Begin XCLocalSwiftPackageReference section */
+		04C1CC072D21E8B8005362B0 /* XCLocalSwiftPackageReference "../../OllamaKit" */ = {
+			isa = XCLocalSwiftPackageReference;
+			relativePath = ../../OllamaKit;
+		};
+/* End XCLocalSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
+		04C1CC082D21E8B8005362B0 /* OllamaKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = OllamaKit;
+		};
 		0A5648ED2C150C66008FB5F6 /* OllamaKit */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = OllamaKit;
 		};
+		0AEA9B8F2CFCFD0100227D01 /* OllamaKit */ = {
+			isa = XCSwiftPackageProductDependency;
+			productName = OllamaKit;
+		};
 /* End XCSwiftPackageProductDependency section */
 	};
 	rootObject = 0A5648B82C1468E0008FB5F6 /* Project object */;

Playground/OKPlayground.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -9,6 +9,7 @@ import Foundation
 import OllamaKit
 
 @Observable
+@MainActor
 final class ViewModel {
     var ollamaKit = OllamaKit()
 

Playground/OKPlayground/ViewModels/ViewModel.swift

@@ -44,7 +44,11 @@ struct AppView: View {
                     NavigationLink("Chat with Tools") {
                         ChatWithToolsView()
                     }
-                    
+
+                    NavigationLink("Chat with Format") {
+                        ChatWithFormatView()
+                    }
+
                     NavigationLink("Generate") {
                         GenerateView()
                     }