Swift 6 Complete Concurrency Checking

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 //
 // This source file is part of the Stanford Spezi open source project
@@ -10,7 +10,6 @@
 
 import PackageDescription
 
-
 let package = Package(
     name: "SpeziLLM",
     defaultLocalization: "en",
@@ -35,7 +34,7 @@ let package = Package(
         .package(url: "https://github.com/StanfordSpezi/SpeziFoundation", from: "2.0.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziStorage", from: "1.0.2"),
         .package(url: "https://github.com/StanfordSpezi/SpeziOnboarding", from: "1.1.1"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziChat", .upToNextMinor(from: "0.2.1")),
+        .package(url: "https://github.com/StanfordSpezi/SpeziChat", .upToNextMinor(from: "0.2.2")),
         .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.3.1")
     ],
     targets: [

Sources/SpeziLLM/LLMPlatformState.swift

@@ -10,7 +10,7 @@
 /// Describes the current state of the ``LLMPlatform`` which is responsible for sending ``LLMSchema``s to execution via ``LLMSession``s.
 /// 
 /// The ``LLMPlatformState`` is quite minimal with only ``LLMPlatformState/idle`` and ``LLMPlatformState/processing`` states.
-public enum LLMPlatformState {
+public enum LLMPlatformState: Sendable {
     /// Indicates that the ``LLMPlatform`` is currently idle and doesn't execute any ``LLMSession``s.
     case idle
     /// Indicates that the ``LLMPlatform`` is currently processing and executing ``LLMSession``s.

Sources/SpeziLLM/LLMSessionProvider.swift

@@ -45,7 +45,7 @@ public struct _LLMSessionProvider<Schema: LLMSchema>: DynamicProperty {     // s
     }
 
     /// Creates a `Binding` to the ``LLMSession``that one can pass around. Useful for passing the ``LLMSession`` as a `Binding` to the ``LLMChatView``.
-    public var projectedValue: Binding<Schema.Platform.Session> {
+    @MainActor public var projectedValue: Binding<Schema.Platform.Session> {
         Binding {
             wrappedValue
         } set: {

Sources/SpeziLLM/Models/LLMContextEntity.swift

@@ -14,9 +14,9 @@ import Foundation
 /// A ``LLMContextEntity`` can be thought of as a single message entity within a ``LLMContext``
 /// It consists of a ``LLMContextEntity/Role``, a unique identifier, a timestamp in the form of a `Date` as well as an `String`-based ``LLMContextEntity/content`` property which can contain Markdown-formatted text.
 /// Furthermore, the ``LLMContextEntity/complete`` flag indicates if the current state of the ``LLMContextEntity`` is final and the content will not be updated anymore.
-public struct LLMContextEntity: Codable, Equatable, Hashable, Identifiable {
+public struct LLMContextEntity: Codable, Equatable, Hashable, Identifiable, Sendable {
     /// Represents a tool call by the LLM, including its parameters
-    public struct ToolCall: Codable, Equatable, Hashable {
+    public struct ToolCall: Codable, Equatable, Hashable, Sendable {
         /// The ID of the function call, uniquely identifying the specific function call and matching the response to it.
         public let id: String
         /// The name of the function call.
@@ -39,7 +39,7 @@ public struct LLMContextEntity: Codable, Equatable, Hashable, Identifiable {
     }
 
     /// Indicates which ``LLMContextEntity/Role`` is associated with a ``LLMContextEntity``.
-    public enum Role: Codable, Equatable, Hashable {
+    public enum Role: Codable, Equatable, Hashable, Sendable {
         case user
         case assistant(toolCalls: [ToolCall] = [])
         case system

Sources/SpeziLLM/Models/LLMState.swift

@@ -11,7 +11,7 @@ import Foundation
 /// Describes possible states that the ``LLMSession`` can be in.
 ///
 /// Based on the ``LLMState``, `SpeziLLM` performs proper actions on the model as well as state management.
-public enum LLMState: CustomStringConvertible, Equatable {
+public enum LLMState: CustomStringConvertible, Equatable, Sendable {
     /// The Spezi ``LLMSession`` is allocated, but the underlying model has not yet been initialized.
     case uninitialized
     /// The Spezi ``LLMSession`` is in the process of being initialized.

Sources/SpeziLLMFog/LLMFogSession+Generation.swift

@@ -12,14 +12,7 @@ import SpeziChat
 
 
 extension LLMFogSession {
-    private static let modelNotFoundRegex: Regex = {
-        guard let regex = try? Regex("model '([\\w:]+)' not found, try pulling it first") else {
-            preconditionFailure("SpeziLLMFog: Error Regex could not be parsed")
-        }
-
-        return regex
-    }()
-
+    private static let modelNotFoundRegex = "model '([\\w:]+)' not found, try pulling it first"
 
     /// Based on the input prompt, generate the output via some OpenAI API, e.g., Ollama.
     ///
@@ -61,7 +54,7 @@ extension LLMFogSession {
             }
         } catch let error as APIErrorResponse {
             // Sadly, there's no better way to check the error messages as there aren't any Ollama error codes as with the OpenAI API
-            if error.error.message.contains(Self.modelNotFoundRegex) {
+            if error.error.message.range(of: Self.modelNotFoundRegex, options: .regularExpression) != nil {
                 Self.logger.error("SpeziLLMFog: LLM model type could not be accessed on fog node - \(error.error.message)")
                 await finishGenerationWithError(LLMFogError.modelAccessError(error), on: continuation)
             } else if error.error.code == "401" || error.error.code == "403" {

Sources/SpeziLLMLocalDownload/LLMLocalDownloadManager.swift

@@ -23,7 +23,7 @@ import SpeziViews
 /// is of type ``LLMLocalDownloadManager/DownloadState``, containing states such as ``LLMLocalDownloadManager/DownloadState/downloading(progress:)``
 /// which includes the progress of the download or ``LLMLocalDownloadManager/DownloadState/downloaded(storageUrl:)`` which indicates that the download has finished.
 @Observable
-public final class LLMLocalDownloadManager: NSObject {
+public final class LLMLocalDownloadManager: NSObject, @unchecked Sendable {
     /// An enum containing all possible states of the ``LLMLocalDownloadManager``.
     public enum DownloadState: Equatable {
         case idle
@@ -79,49 +79,47 @@ public final class LLMLocalDownloadManager: NSObject {
     }
 
     /// Starts a `URLSessionDownloadTask` to download the specified model.
+    @MainActor
     public func startDownload() async {
         if modelExist {
-            Task { @MainActor in
-                self.state = .downloaded
-            }
+            state = .downloaded
             return
         }
 
         await cancelDownload()
         downloadTask = Task(priority: .userInitiated) {
             do {
                 try await downloadWithHub()
-                await MainActor.run {
-                    self.state = .downloaded
-                }
+                state = .downloaded
             } catch {
-                await MainActor.run {
-                    self.state = .error(
-                        AnyLocalizedError(
-                            error: error,
-                            defaultErrorDescription: LocalizedStringResource("LLM_DOWNLOAD_FAILED_ERROR", bundle: .atURL(from: .module))
+                state = .error(
+                    AnyLocalizedError(
+                        error: error,
+                        defaultErrorDescription: LocalizedStringResource(
+                            "LLM_DOWNLOAD_FAILED_ERROR",
+                            bundle: .atURL(from: .module)
                         )
                     )
-                }
+                )
             }
         }
     }
 
     /// Cancels the download of a specified model via a `URLSessionDownloadTask`.
+    @MainActor
     public func cancelDownload() async {
         downloadTask?.cancel()
-        await MainActor.run {
-            self.state = .idle
-        }
+        state = .idle
     }
-
-    @MainActor
+
     private func downloadWithHub() async throws {
         let repo = Hub.Repo(id: model.hubID)
         let modelFiles = ["*.safetensors", "config.json"]
 
         try await HubApi.shared.snapshot(from: repo, matching: modelFiles) { progress in
-            self.state = .downloading(progress: progress)
+            Task { @MainActor in
+                self.state = .downloading(progress: progress)
+            }
         }
     }
 }