temperature support (#18)

* refactoring: Rootview * add system prompt and topk, topp * temperature support * fix build error
enoch1118 · Mar 5, 2024 · 4e22a93 · 4e22a93
1 parent 39a9cd3
commit 4e22a93
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 39 deletions.
diff --git a/ollamaGUI/Data/RoomEntity.swift b/ollamaGUI/Data/RoomEntity.swift
@@ -53,16 +53,14 @@ extension ChatModel {
     }
 }
 
-#if DEBUG
-    extension RoomEntity {
-        static var randomRoom: RoomEntity {
-            let room = RoomEntity()
-            room.title = RandomGenerator.randomNames.randomElement()
-            room.chats = [
-            ]
+extension RoomEntity {
+    static var randomRoom: RoomEntity {
+        let room = RoomEntity()
+        room.title = RandomGenerator.randomNames.randomElement()
+        room.chats = [
+        ]
 
-            room.updatedAt = RandomGenerator.randomDate()
-            return room
-        }
+        room.updatedAt = RandomGenerator.randomDate()
+        return room
     }
-#endif
+}
diff --git a/ollamaGUI/Data/RoomOptionEntity.swift b/ollamaGUI/Data/RoomOptionEntity.swift
@@ -14,13 +14,18 @@ class RoomOptionEntity {
     var system: String?
     var top_p: Float
     var top_k: Int
+    var temperature: Float?
     init(model: String?,
          system: String?,
          top_p: Float = 0.9,
-         top_k: Int = 40) {
+         top_k: Int = 40,
+         temperature: Float = 0.8
+    ) {
+
         self.model = model
         self.system = system
         self.top_p = top_p
         self.top_k = top_k
+        self.temperature = temperature
     }
 }
diff --git a/ollamaGUI/Helper/RandomGenerator.swift b/ollamaGUI/Helper/RandomGenerator.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-#if DEBUG
     enum RandomGenerator {
         static var randomNames: [String] {
             [
@@ -33,4 +32,3 @@ import Foundation
             }
 
     }
-#endif
diff --git a/ollamaGUI/Model/ChatRequestModel.swift b/ollamaGUI/Model/ChatRequestModel.swift
@@ -69,7 +69,10 @@ struct ChatRequestModel: Encodable, DictionaryEncodable {
         guard let option = option else {
             return self
         }
-        options = OptionModel(top_p: option.top_p, top_k: option.top_k)
+        options = OptionModel(top_p: option.top_p, 
+                              top_k: option.top_k,
+                              temperature: option.temperature)
+
         if let model = option.model {
             self.model = model
         }

diff --git a/ollamaGUI/Model/OptionModel.swift b/ollamaGUI/Model/OptionModel.swift
@@ -10,27 +10,31 @@ import Foundation
 struct OptionModel:Encodable,DictionaryEncodable {
     var top_p: Float
     var top_k: Int
+    var temperature: Float?
 
-    init(top_p: Float, top_k: Int) {
+    init(top_p: Float, top_k: Int,temperature:Float?) {
         self.top_p = top_p
         self.top_k = top_k
+        self.temperature = temperature
     }
 
     enum CodingKeys: CodingKey {
         case top_p
         case top_k
+        case temperature
     }
 
     func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(self.top_p, forKey: .top_p)
         try container.encode(self.top_k, forKey: .top_k)
+        try container.encodeIfPresent(self.temperature, forKey: .temperature)
     }
 
 
     func getDictionary() -> [String : Any]? {
         let dict = getLeafDictionary()
-        guard var d = dict else {
+        guard let d = dict else {
             return nil
         }
         return d

diff --git a/ollamaGUI/UI/BubbleShape.swift b/ollamaGUI/UI/BubbleShape.swift
@@ -74,9 +74,4 @@ struct BubbleShape: Shape {
 
 }
 
-#Preview {
-    VStack {
-        ChatBubble(chat: .init(type: RoleEnum.user))
-        ChatBubble(chat: .init(type: RoleEnum.assistant))
-    }
-}
+
diff --git a/ollamaGUI/UI/ChatBubble.swift b/ollamaGUI/UI/ChatBubble.swift
@@ -46,9 +46,3 @@ struct ChatBubble: View {
 
 }
 
-#Preview {
-    VStack {
-        ChatBubble(chat: .init(type: RoleEnum.user))
-        ChatBubble(chat: .init(type: RoleEnum.assistant))
-    }
-}
diff --git a/ollamaGUI/UI/SettingSheet.swift b/ollamaGUI/UI/SettingSheet.swift
@@ -12,11 +12,10 @@ import SwiftUI
 struct SettingSheet: View {
     @ObservedObject var model: SettingSheetViewModel
     @Binding var showSetting: Bool
-
-    var room:RoomEntity
+    @State var roomState: RoomEntity
 
     init(room: RoomEntity,showSetting: Binding<Bool>) {
-        self.room = room
+        self.roomState = room
         self.model = SettingSheetViewModel()
         self._showSetting = showSetting
         model.system = room.option?.system ?? ""
@@ -51,18 +50,25 @@ struct SettingSheet: View {
                 }
                 Text("Works together with top-k. A higher value (e.g., 0.95) will lead to more diverse text, while a lower value (e.g., 0.5) will generate more focused and conservative text. (Default: 0.9)").font(.caption)
                 Slider(value: $model.topp,in: 0...1)
+                HStack{
+                    Text("Temperature").font(.headline)
+                    Spacer()
+                    Text("\(String(format: "%.2f",model.temperature))")
+                }
+                Text("The temperature of the model. Increasing the temperature will make the model answer more creatively. (Default: 0.8)").font(.caption)
+                Slider(value: $model.temperature,in: 0...1)
                 Spacer().frame(height: 16)
+
                 HStack{
-                    Text(model.helpText).font(.caption)
                     Spacer()
                     Button(action: {
-
+                        model.reset()
+                        model.apply()
                     }){
                         Text("reset")
                     }.buttonStyle(CommonButton(enabled: false))
                     Button(action: {
-                        model.apply()
-                        room.option = model.options
+                        roomState.option = model.options
                         showSetting.toggle()
                     }){
                         Text("apply change")

diff --git a/ollamaGUI/UI/SettingSheetViewModel.swift b/ollamaGUI/UI/SettingSheetViewModel.swift
@@ -12,16 +12,25 @@ class SettingSheetViewModel: ObservableObject {
     @Published var system: String
     @Published var topk: Float
     @Published var topp: Float
+    @Published var temperature: Float
 
 
-    @Published var helpText:String
 
     init() {
         options = nil
         system = ""
-        helpText = ""
         topk = 40
         topp = 0.9
+        temperature = 0.8
+    }
+
+
+    func reset() {
+        options = nil
+        system = ""
+        topk = 40
+        topp = 0.9
+        temperature = 0.8
     }
 
 
@@ -34,10 +43,10 @@ class SettingSheetViewModel: ObservableObject {
         }
         options.top_k = Int(topk)
         options.top_p = topp
+        options.temperature = temperature
         if !system.isEmpty {
             options.system = system
         }
-        helpText = "success"
         print("success")
     }
 }