perf: improve code, store openAIVaildModels in Defaults

tisfeng · Apr 6, 2024 · 9d514ae · 9d514ae
1 parent 4458d2e
commit 9d514ae
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/Easydict/Swift/Feature/Configuration/Configuration+Defaults.swift b/Easydict/Swift/Feature/Configuration/Configuration+Defaults.swift
@@ -206,6 +206,10 @@ extension Defaults.Keys {
         EZOpenAIAvailableModelsKey,
         default: OpenAIModel.allCases.map { $0.rawValue }.joined(separator: ",")
     )
+    static let openAIVaildModels = Key<Array>(
+        "EZOpenAIValidModelsKey",
+        default: OpenAIModel.allCases.map { $0.rawValue }
+    )
 
     // Custom OpenAI
     static let customOpenAINameKey = Key<String?>(
@@ -223,6 +227,10 @@ extension Defaults.Keys {
     static let customOpenAIEndPoint = Key<String?>(EZCustomOpenAIEndPointKey, default: "")
     static let customOpenAIModel = Key<String>(EZCustomOpenAIModelKey, default: "")
     static let customOpenAIModelsAvailable = Key<String?>(EZCustomOpenAIModelssAvailableKey, default: "")
+    static let customOpenAIVaildModels = Key<Array>(
+        "EZCustomOpenAIValidModelsKey",
+        default: [""]
+    )
 
     // DeepL
     static let deepLAuth = Key<String?>(EZDeepLAuthKey)

diff --git a/Easydict/Swift/Service/CustomOpenAI/CustomOpenAIService.swift b/Easydict/Swift/Service/CustomOpenAI/CustomOpenAIService.swift
@@ -50,9 +50,7 @@ class CustomOpenAIService: BaseOpenAIService {
     }
 
     override var availableModels: [String] {
-        let models = Defaults[.customOpenAIModelsAvailable]
-        guard let models, !models.isEmpty else { return [] }
-        return models.components(separatedBy: ",").filter { !$0.isEmpty }
+        Defaults[.customOpenAIVaildModels]
     }
 
     override func serviceType() -> ServiceType {

diff --git a/Easydict/Swift/Service/OpenAI/BaseOpenAIService.swift b/Easydict/Swift/Service/OpenAI/BaseOpenAIService.swift
@@ -124,10 +124,7 @@ public class BaseOpenAIService: QueryService {
     // MARK: Internal
 
     var availableModels: [String] {
-        let models = Defaults[.openAIAvailableModels]
-        guard let models, !models.isEmpty else { return [] }
-        return models.components(separatedBy: ",").map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
-            .filter { !$0.isEmpty }
+        Defaults[.openAIVaildModels]
     }
 
     var model: String {

diff --git a/...rationView/QueryService+ConfigurableService/CustomOpenAIService+ConfigurableService.swift b/...rationView/QueryService+ConfigurableService/CustomOpenAIService+ConfigurableService.swift
@@ -158,10 +158,13 @@ private class CustomOpenAIViewModel: ObservableObject {
             validModels = []
             return
         }
-        validModels = availableModels.components(separatedBy: ",").filter { !$0.isEmpty }
+        validModels = availableModels.components(separatedBy: ",")
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.filter { !$0.isEmpty }
         if validModels.count == 1 || !validModels.contains(model) {
             model = validModels[0]
         }
+
+        Defaults[.customOpenAIVaildModels] = validModels
     }
 
     private func serviceConfigChanged() {

diff --git a/...onfigurationView/QueryService+ConfigurableService/OpenAIService+ConfigurableService.swift b/...onfigurationView/QueryService+ConfigurableService/OpenAIService+ConfigurableService.swift
@@ -149,6 +149,8 @@ private class OpenAIServiceViewModel: ObservableObject {
         if validModels.count == 1 || !validModels.contains(model) {
             model = validModels[0]
         }
+
+        Defaults[.openAIVaildModels] = validModels
     }
 
     private func serviceConfigChanged() {