Last adjustments

Package.swift

@@ -20,18 +20,17 @@ let package = Package(
     products: [
         .library(name: "SpeziFHIR", targets: ["SpeziFHIR"]),
         .library(name: "SpeziFHIRHealthKit", targets: ["SpeziFHIRHealthKit"]),
-        .library(name: "SpeziFHIRInterpretation", targets: ["SpeziFHIRInterpretation"]),
+        .library(name: "SpeziFHIRLLM", targets: ["SpeziFHIRLLM"]),
         .library(name: "SpeziFHIRMockPatients", targets: ["SpeziFHIRMockPatients"])
     ],
     dependencies: [
         .package(url: "https://github.com/apple/FHIRModels", .upToNextMinor(from: "0.5.0")),
         .package(url: "https://github.com/StanfordBDHG/HealthKitOnFHIR", .upToNextMinor(from: "0.2.4")),
-        .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.1.0"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziHealthKit.git", .upToNextMinor(from: "0.5.0")),
-        //.package(url: "https://github.com/StanfordSpezi/SpeziLLM.git", branch: "feat/structural-improvments"),
-        .package(path: "../SpeziLLM"),
+        .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.2.1"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziHealthKit.git", .upToNextMinor(from: "0.5.1")),
+        .package(url: "https://github.com/StanfordSpezi/SpeziLLM.git", .upToNextMinor(from: "0.7.0")),
         .package(url: "https://github.com/StanfordSpezi/SpeziStorage.git", from: "1.0.0"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziChat.git", .upToNextMinor(from: "0.1.4")),
+        .package(url: "https://github.com/StanfordSpezi/SpeziChat.git", .upToNextMinor(from: "0.1.8")),
         .package(url: "https://github.com/StanfordSpezi/SpeziSpeech.git", from: "1.0.0")
     ],
     targets: [
@@ -53,7 +52,7 @@ let package = Package(
             ]
         ),
         .target(
-            name: "SpeziFHIRInterpretation",
+            name: "SpeziFHIRLLM",
             dependencies: [
                 .target(name: "SpeziFHIR"),
                 .product(name: "Spezi", package: "Spezi"),

Sources/SpeziFHIRInterpretation/FHIRInterpretation/MultipleResources/FHIRGetResourceLLMFunction.swift → Sources/SpeziFHIRLLM/FHIRInterpretation/MultipleResources/FHIRGetResourceLLMFunction.swift

@@ -1,5 +1,5 @@
 //
-// This source file is part of the Stanford LLM on FHIR project
+// This source file is part of the Stanford Spezi project
 //
 // SPDX-FileCopyrightText: 2023 Stanford University
 //
@@ -19,18 +19,32 @@ struct FHIRGetResourceLLMFunction: LLMFunction {
 
     private let fhirStore: FHIRStore
     private let resourceSummary: FHIRResourceSummary
-    private let allResourcesFunctionCallIdentifier: [String]
 
 
     @Parameter var resources: [String]
 
 
-    init(fhirStore: FHIRStore, resourceSummary: FHIRResourceSummary, allResourcesFunctionCallIdentifier: [String]) {
+    init(
+        fhirStore: FHIRStore,
+        resourceSummary: FHIRResourceSummary,
+        resourceCountLimit: Int,
+        allowedResourcesFunctionCallIdentifiers: Set<String>? = nil // swiftlint:disable:this discouraged_optional_collection
+    ) {
         self.fhirStore = fhirStore
         self.resourceSummary = resourceSummary
-        self.allResourcesFunctionCallIdentifier = allResourcesFunctionCallIdentifier
 
-        _resources = Parameter(description: String(localized: "PARAMETER_DESCRIPTION"), enumValues: allResourcesFunctionCallIdentifier)
+        // Only take newest values of the health records
+        var allResourcesFunctionCallIdentifiers = Set(fhirStore.allResourcesFunctionCallIdentifier.suffix(resourceCountLimit))
+
+        // If identifiers are restricted, filter for only allowed function call identifiers of health records.
+        if let allowedResourcesFunctionCallIdentifiers {
+            allResourcesFunctionCallIdentifiers.formIntersection(allowedResourcesFunctionCallIdentifiers)
+        }
+
+        _resources = Parameter(
+            description: String(localized: "PARAMETER_DESCRIPTION"),
+            enumValues: Array(allResourcesFunctionCallIdentifiers)
+        )
     }
 
 

Sources/SpeziFHIRInterpretation/FHIRInterpretation/MultipleResources/FHIRMultipleResourceInterpreter.swift → Sources/SpeziFHIRLLM/FHIRInterpretation/MultipleResources/FHIRMultipleResourceInterpreter.swift

@@ -1,5 +1,5 @@
 //
-// This source file is part of the Stanford LLM on FHIR project
+// This source file is part of the Stanford Spezi project
 //
 // SPDX-FileCopyrightText: 2023 Stanford University
 //
@@ -22,13 +22,14 @@ private enum FHIRMultipleResourceInterpreterConstants {
 }
 
 
+/// Used to interpret multiple FHIR resources via a chat-based interface with an LLM.
 @Observable
-class FHIRMultipleResourceInterpreter {
+public class FHIRMultipleResourceInterpreter {
     static let logger = Logger(subsystem: "edu.stanford.spezi.fhir", category: "SpeziFHIRInterpretation")
 
     private let localStorage: LocalStorage
     private let llmRunner: LLMRunner
-    private let llmSchema: any LLMSchema
+    private var llmSchema: any LLMSchema
     private let fhirStore: FHIRStore
 
     var llm: (any LLMSession)?
@@ -64,7 +65,7 @@ class FHIRMultipleResourceInterpreter {
             return
         }
 
-        var llm = await llmRunner(with: llmSchema)
+        let llm = llmRunner(with: llmSchema)
         // Read initial conversation from storage
         if let storedContext: Chat = try? localStorage.read(storageKey: FHIRMultipleResourceInterpreterConstants.chat) {
             llm.context = storedContext
@@ -81,7 +82,7 @@ class FHIRMultipleResourceInterpreter {
     @MainActor
     func queryLLM() {
         guard let llm,
-              llm.context.last?.role == .user || !(llm.context.contains(where: { $0.role == .assistant }) ?? false) else {
+              llm.context.last?.role == .user || !(llm.context.contains(where: { $0.role == .assistant }) ) else {
             return
         }
 
@@ -100,6 +101,34 @@ class FHIRMultipleResourceInterpreter {
             try localStorage.store(llm.context, storageKey: FHIRMultipleResourceInterpreterConstants.chat)
         }
     }
+
+    /// Change the `LLMSchema` used by the ``FHIRMultipleResourceInterpreter``.
+    public func changeLLMSchema(
+        openAIModel model: LLMOpenAIModelType,
+        resourceCountLimit: Int,
+        resourceSummary: FHIRResourceSummary,
+        allowedResourcesFunctionCallIdentifiers: Set<String>? = nil // swiftlint:disable:this discouraged_optional_collection
+    ) {
+        self.llmSchema = LLMOpenAISchema(
+            parameters: .init(
+                modelType: model,
+                systemPrompts: []   // No system prompt as this will be determined later by the resource interpreter
+            )
+        ) {
+            // FHIR interpretation function
+            FHIRGetResourceLLMFunction(
+                fhirStore: self.fhirStore,
+                resourceSummary: resourceSummary,
+                resourceCountLimit: resourceCountLimit,
+                allowedResourcesFunctionCallIdentifiers: allowedResourcesFunctionCallIdentifiers
+            )
+        }
+        self.llm = nil
+
+        Task { @MainActor in
+            await prepareLLM()
+        }
+    }
 }
 
 
@@ -112,10 +141,12 @@ extension FHIRPrompt {
             storageKey: "prompt.interpretMultipleResources",
             localizedDescription: String(
                 localized: "Interpretation Prompt",
+                bundle: .module,
                 comment: "Title of the multiple resources interpretation prompt."
             ),
             defaultPrompt: String(
-                localized: "Interpretation Prompt Content",
+                localized: "Multiple Resource Interpretation Prompt Content",
+                bundle: .module,
                 comment: "Content of the multiple resources interpretation prompt."
             )
         )