Merge branch 'master' into feature/remove-depricated-and-not-used-code

home-assistant · Jun 4, 2024 · 141c31c · 141c31c
2 parents 7b810bc + fe639d2
commit 141c31c
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 8 deletions.
diff --git a/Sources/Shared/Intents/AssistInApp/AssistModel.swift b/Sources/Shared/Intents/AssistInApp/AssistModel.swift
@@ -128,9 +128,11 @@ public struct AssistResponse: HADataDecodable {
         public struct IntentOutput: HADataDecodable {
             public init(data: HAData) throws {
                 self.response = try? data.decode("response")
+                self.conversationId = try? data.decode("conversation_id")
             }
 
             public let response: Response?
+            public let conversationId: String?
         }
 
         public struct Response: HADataDecodable {

diff --git a/Sources/Shared/Intents/AssistInApp/AssistRequests.swift b/Sources/Shared/Intents/AssistInApp/AssistRequests.swift
@@ -4,30 +4,40 @@ import HAKit
 public enum AssistRequests {
     public static func assistByVoiceTypedSubscription(
         preferredPipelineId: String,
-        audioSampleRate: Double
+        audioSampleRate: Double,
+        conversationId: String?
     ) -> HATypedSubscription<AssistResponse> {
-        .init(request: .init(type: .webSocket("assist_pipeline/run"), data: [
+        var data: [String: Any] = [
             "pipeline": preferredPipelineId,
             "start_stage": "stt",
             "end_stage": "tts",
             "input": [
                 "sample_rate": audioSampleRate,
             ],
-        ]))
+        ]
+        if let conversationId {
+            data["conversation_id"] = conversationId
+        }
+        return .init(request: .init(type: .webSocket("assist_pipeline/run"), data: data))
     }
 
     public static func assistByTextTypedSubscription(
         preferredPipelineId: String,
-        inputText: String
+        inputText: String,
+        conversationId: String?
     ) -> HATypedSubscription<AssistResponse> {
-        .init(request: .init(type: .webSocket("assist_pipeline/run"), data: [
+        var data: [String: Any] = [
             "pipeline": preferredPipelineId,
             "start_stage": "intent",
             "end_stage": "intent",
             "input": [
                 "text": inputText,
             ],
-        ]))
+        ]
+        if let conversationId {
+            data["conversation_id"] = conversationId
+        }
+        return .init(request: .init(type: .webSocket("assist_pipeline/run"), data: data))
     }
 
     public static var fetchPipelinesTypedRequest: HATypedRequest<PipelineResponse> {

diff --git a/Sources/Shared/Intents/AssistInApp/AssistService.swift b/Sources/Shared/Intents/AssistInApp/AssistService.swift
@@ -42,6 +42,17 @@ public final class AssistService: AssistServiceProtocol {
     private var cancellable: HACancellable?
     private var sttBinaryHandlerId: UInt8?
 
+    /// Conversation Id that is provided after first interation if available, this keeps context
+    private var conversationId: String?
+    /// This exists to reset conversationId when pipelineId changes
+    private var lastPipelineIdUsed: String? {
+        didSet {
+            if oldValue != lastPipelineIdUsed {
+                conversationId = nil
+            }
+        }
+    }
+
     public init(
         server: Server
     ) {
@@ -88,9 +99,11 @@ public final class AssistService: AssistServiceProtocol {
     }
 
     private func assistWithAudio(pipelineId: String, audioSampleRate: Double) {
+        lastPipelineIdUsed = pipelineId
         connection.subscribe(to: AssistRequests.assistByVoiceTypedSubscription(
             preferredPipelineId: pipelineId,
-            audioSampleRate: audioSampleRate
+            audioSampleRate: audioSampleRate,
+            conversationId: conversationId
         )) { [weak self] cancellable, data in
             guard let self else { return }
             self.cancellable = cancellable
@@ -99,9 +112,11 @@ public final class AssistService: AssistServiceProtocol {
     }
 
     private func assistWithText(input: String, pipelineId: String) {
+        lastPipelineIdUsed = pipelineId
         connection.subscribe(to: AssistRequests.assistByTextTypedSubscription(
             preferredPipelineId: pipelineId,
-            inputText: input
+            inputText: input,
+            conversationId: conversationId
         )) { [weak self] cancellable, data in
             guard let self else { return }
             self.cancellable = cancellable
@@ -140,6 +155,7 @@ public final class AssistService: AssistServiceProtocol {
         case .intentStart:
             break
         case .intentEnd:
+            conversationId = data.data?.intentOutput?.conversationId
             delegate?.didReceiveIntentEndContent(data.data?.intentOutput?.response?.speech.plain.speech ?? "Unknown")
         case .ttsStart:
             break