Add custom header settings to OpenAI compatible

Author: intitni

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEdit.swift

@@ -31,6 +31,7 @@ struct ChatModelEdit {
         var enforceMessageOrder: Bool = false
         var openAIOrganizationID: String = ""
         var openAIProjectID: String = ""
+        var customHeaders: [ChatModel.Info.CustomHeaderInfo.HeaderField] = []
     }
 
     enum Action: Equatable, BindableAction {
@@ -205,7 +206,8 @@ extension ChatModel {
                 ),
                 ollamaInfo: .init(keepAlive: state.ollamaKeepAlive),
                 googleGenerativeAIInfo: .init(apiVersion: state.apiVersion),
-                openAICompatibleInfo: .init(enforceMessageOrder: state.enforceMessageOrder)
+                openAICompatibleInfo: .init(enforceMessageOrder: state.enforceMessageOrder),
+                customHeaderInfo: .init(headers: state.customHeaders)
             )
         )
     }
@@ -227,7 +229,8 @@ extension ChatModel {
             baseURLSelection: .init(baseURL: info.baseURL, isFullURL: info.isFullURL),
             enforceMessageOrder: info.openAICompatibleInfo.enforceMessageOrder,
             openAIOrganizationID: info.openAIInfo.organizationID,
-            openAIProjectID: info.openAIInfo.projectID
+            openAIProjectID: info.openAIInfo.projectID,
+            customHeaders: info.customHeaderInfo.headers
         )
     }
 }

Core/Sources/HostApp/AccountSettings/ChatModelManagement/ChatModelEditView.swift

@@ -285,6 +285,7 @@ struct ChatModelEditView: View {
 
     struct OpenAICompatibleForm: View {
         @Perception.Bindable var store: StoreOf<ChatModelEdit>
+        @State var isEditingCustomHeader = false
 
         var body: some View {
             WithPerceptionTracking {
@@ -320,6 +321,12 @@ struct ChatModelEditView: View {
                 Toggle(isOn: $store.enforceMessageOrder) {
                     Text("Enforce message order to be user/assistant alternated")
                 }
+                
+                Button("Custom Headers") {
+                    isEditingCustomHeader.toggle()
+                }
+            }.sheet(isPresented: $isEditingCustomHeader) {
+                CustomHeaderSettingsView(headers: $store.customHeaders)
             }
         }
     }

Core/Sources/HostApp/AccountSettings/CustomHeaderSettingsView.swift

@@ -0,0 +1,78 @@
+import AIModel
+import Foundation
+import SwiftUI
+
+struct CustomHeaderSettingsView: View {
+    @Binding var headers: [ChatModel.Info.CustomHeaderInfo.HeaderField]
+    @Environment(\.dismiss) var dismiss
+    @State private var newKey = ""
+    @State private var newValue = ""
+
+    var body: some View {
+        VStack {
+            List {
+                ForEach(headers.indices, id: \.self) { index in
+                    HStack {
+                        TextField("Key", text: Binding(
+                            get: { headers[index].key },
+                            set: { newKey in
+                                headers[index].key = newKey
+                            }
+                        ))
+                        TextField("Value", text: Binding(
+                            get: { headers[index].value },
+                            set: { headers[index].value = $0 }
+                        ))
+                        Button(action: {
+                            headers.remove(at: index)
+                        }) {
+                            Image(systemName: "trash")
+                                .foregroundColor(.red)
+                        }
+                    }
+                }
+
+                HStack {
+                    TextField("New Key", text: $newKey)
+                    TextField("New Value", text: $newValue)
+                    Button(action: {
+                        if !newKey.isEmpty {
+                            headers.append(ChatModel.Info.CustomHeaderInfo.HeaderField(
+                                key: newKey,
+                                value: newValue
+                            ))
+                            newKey = ""
+                            newValue = ""
+                        }
+                    }) {
+                        Image(systemName: "plus.circle.fill")
+                            .foregroundColor(.green)
+                    }
+                }
+            }
+
+            HStack {
+                Spacer()
+                Button("Done") {
+                    dismiss()
+                }
+            }.padding()
+        }
+        .frame(height: 500)
+    }
+}
+
+#Preview {
+    struct V: View {
+        @State var headers: [ChatModel.Info.CustomHeaderInfo.HeaderField] = [
+            .init(key: "key", value: "value"),
+            .init(key: "key2", value: "value2"),
+        ]
+        var body: some View {
+            CustomHeaderSettingsView(headers: $headers)
+        }
+    }
+
+    return V()
+}
+

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEdit.swift

@@ -26,6 +26,7 @@ struct EmbeddingModelEdit {
         var suggestedMaxTokens: Int?
         var apiKeySelection: APIKeySelection.State = .init()
         var baseURLSelection: BaseURLSelection.State = .init()
+        var customHeaders: [ChatModel.Info.CustomHeaderInfo.HeaderField] = []
     }
 
     enum Action: Equatable, BindableAction {
@@ -168,7 +169,8 @@ extension EmbeddingModel {
                 isFullURL: state.isFullURL,
                 maxTokens: state.maxTokens,
                 modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
-                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive)
+                ollamaInfo: .init(keepAlive: state.ollamaKeepAlive),
+                customHeaderInfo: .init(headers: state.customHeaders)
             )
         )
     }
@@ -188,7 +190,8 @@ extension EmbeddingModel {
             baseURLSelection: .init(
                 baseURL: info.baseURL,
                 isFullURL: info.isFullURL
-            )
+            ),
+            customHeaders: info.customHeaderInfo.headers
         )
     }
 }

Core/Sources/HostApp/AccountSettings/EmbeddingModelManagement/EmbeddingModelEditView.swift

@@ -248,6 +248,7 @@ struct EmbeddingModelEditView: View {
 
     struct OpenAICompatibleForm: View {
         @Perception.Bindable var store: StoreOf<EmbeddingModelEdit>
+        @State var isEditingCustomHeader = false
 
         var body: some View {
             WithPerceptionTracking {
@@ -278,6 +279,12 @@ struct EmbeddingModelEditView: View {
                 TextField("Model Name", text: $store.modelName)
 
                 MaxTokensTextField(store: store)
+                
+                Button("Custom Headers") {
+                    isEditingCustomHeader.toggle()
+                }
+            }.sheet(isPresented: $isEditingCustomHeader) {
+                CustomHeaderSettingsView(headers: $store.customHeaders)
             }
         }
     }

Tool/Sources/AIModel/ChatModel.swift

@@ -66,10 +66,20 @@ public struct ChatModel: Codable, Equatable, Identifiable {
         }
 
         public struct CustomHeaderInfo: Codable, Equatable {
-            @FallbackDecoding<EmptyDictionary>
-            public var headers: [String: String]
+            public struct HeaderField: Codable, Equatable {
+                public var key: String
+                public var value: String
+                
+                public init(key: String, value: String) {
+                    self.key = key
+                    self.value = value
+                }
+            }
+            
+            @FallbackDecoding<EmptyArray>
+            public var headers: [HeaderField]
 
-            public init(headers: [String : String] = [:]) {
+            public init(headers: [HeaderField] = []) {
                 self.headers = headers
             }
         }