fix: stream service like OpenAI trigger multi Alert issue (#393)

* fix: stream service like OpenAI trigger multi Alert issue * fix: stream validation issue * perf: improve validation request case --------- Co-authored-by: tisfeng <[email protected]>
tisfeng · Feb 9, 2024 · adee5f7 · adee5f7
1 parent 213f092
commit adee5f7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/Easydict/NewApp/Utility/Protocol/ServiceSecretConfigreValidatable.swift b/Easydict/NewApp/Utility/Protocol/ServiceSecretConfigreValidatable.swift
@@ -19,6 +19,12 @@ extension ServiceSecretConfigreValidatable {
 extension QueryService: ServiceSecretConfigreValidatable {
     func validate(completion: @escaping (EZQueryResult, Error?) -> Void) {
         resetServiceResult()
-        translate("hello world!", from: .english, to: .simplifiedChinese, completion: completion)
+        /**
+         To reduce output text, save cost, a simple translation example is enough.
+
+         1. use zh -> en to avoid analyze English sentence.
+         2. if Chinese text length > 5, it won't query dict.
+         */
+        translate("曾经沧海难为水", from: .simplifiedChinese, to: .english, completion: completion)
     }
 }
diff --git a/...pp/View/SettingView/Tabs/ServiceConfiguration/ServiceConfigurationSecretSectionView.swift b/...pp/View/SettingView/Tabs/ServiceConfiguration/ServiceConfigurationSecretSectionView.swift
@@ -61,7 +61,7 @@ struct ServiceConfigurationSecretSectionView<Content: View>: View {
         }
         .alert(viewModel.alertMessage, isPresented: $viewModel.isAlertPresented, actions: {
             Button("ok") {
-                viewModel.isAlertPresented = false
+                viewModel.reset()
             }
         })
     }
@@ -70,10 +70,11 @@ struct ServiceConfigurationSecretSectionView<Content: View>: View {
         viewModel.isValidating.toggle()
         service.validate { _, error in
             DispatchQueue.main.async {
+                guard viewModel.isValidating else { return }
+                viewModel.isValidating = false
                 viewModel.alertMessage = error == nil ? "service.configuration.validation_success" : "service.configuration.validation_fail"
                 print("\(service.serviceType()) validate \(error == nil ? "success" : "fail")!")
-                viewModel.isValidating.toggle()
-                viewModel.isAlertPresented.toggle()
+                viewModel.isAlertPresented = true
             }
         }
     }
@@ -103,6 +104,12 @@ private class ServiceValidationViewModel: ObservableObject {
                 }
         )
     }
+
+    func reset() {
+        isValidating = false
+        alertMessage = ""
+        isAlertPresented = false
+    }
 }
 
 @available(macOS 13.0, *)