Merge branch 'feature/add-openai-headers' into develop

Author: intitni

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

@@ -29,6 +29,8 @@ struct ChatModelEdit {
         var apiKeySelection: APIKeySelection.State = .init()
         var baseURLSelection: BaseURLSelection.State = .init()
         var enforceMessageOrder: Bool = false
+        var openAIOrganizationID: String = ""
+        var openAIProjectID: String = ""
     }
 
     enum Action: Equatable, BindableAction {
@@ -197,6 +199,10 @@ extension ChatModel {
                     }
                 }(),
                 modelName: state.modelName.trimmingCharacters(in: .whitespacesAndNewlines),
+                openAIInfo: .init(
+                    organizationID: state.openAIOrganizationID,
+                    projectID: state.openAIProjectID
+                ),
                 ollamaInfo: .init(keepAlive: state.ollamaKeepAlive),
                 googleGenerativeAIInfo: .init(apiVersion: state.apiVersion),
                 openAICompatibleInfo: .init(enforceMessageOrder: state.enforceMessageOrder)
@@ -219,7 +225,9 @@ extension ChatModel {
                 apiKeyManagement: .init(availableAPIKeyNames: [info.apiKeyName])
             ),
             baseURLSelection: .init(baseURL: info.baseURL, isFullURL: info.isFullURL),
-            enforceMessageOrder: info.openAICompatibleInfo.enforceMessageOrder
+            enforceMessageOrder: info.openAICompatibleInfo.enforceMessageOrder,
+            openAIOrganizationID: info.openAIInfo.organizationID,
+            openAIProjectID: info.openAIInfo.projectID
         )
     }
 }

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

@@ -243,6 +243,14 @@ struct ChatModelEditView: View {
 
                 MaxTokensTextField(store: store)
                 SupportsFunctionCallingToggle(store: store)
+                
+                TextField(text: $store.openAIOrganizationID, prompt: Text("Optional")) {
+                    Text("Organization ID")
+                }
+
+                TextField(text: $store.openAIProjectID, prompt: Text("Optional")) {
+                    Text("Project ID")
+                }
 
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
@@ -308,7 +316,7 @@ struct ChatModelEditView: View {
 
                 MaxTokensTextField(store: store)
                 SupportsFunctionCallingToggle(store: store)
-                
+
                 Toggle(isOn: $store.enforceMessageOrder) {
                     Text("Enforce message order to be user/assistant alternated")
                 }
@@ -387,9 +395,9 @@ struct ChatModelEditView: View {
                 BaseURLTextField(store: store, prompt: Text("https://api.anthropic.com")) {
                     Text("/v1/messages")
                 }
-                
+
                 ApiKeyNamePicker(store: store)
-                
+
                 TextField("Model Name", text: $store.modelName)
                     .overlay(alignment: .trailing) {
                         Picker(
@@ -411,9 +419,9 @@ struct ChatModelEditView: View {
                         )
                         .frame(width: 20)
                     }
-                
+
                 MaxTokensTextField(store: store)
-                
+
                 VStack(alignment: .leading, spacing: 8) {
                     Text(Image(systemName: "exclamationmark.triangle.fill")) + Text(
                         " For more details, please visit [https://anthropic.com](https://anthropic.com)."

Tool/Sources/AIModel/ChatModel.swift

@@ -38,9 +38,12 @@ public struct ChatModel: Codable, Equatable, Identifiable {
         public struct OpenAIInfo: Codable, Equatable {
             @FallbackDecoding<EmptyString>
             public var organizationID: String
+            @FallbackDecoding<EmptyString>
+            public var projectID: String
 
-            public init(organizationID: String = "") {
+            public init(organizationID: String = "", projectID: String = "") {
                 self.organizationID = organizationID
+                self.projectID = projectID
             }
         }
 

Tool/Sources/OpenAIService/APIs/OpenAIChatCompletionsService.swift

@@ -350,6 +350,14 @@ actor OpenAIChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI
                         forHTTPHeaderField: "OpenAI-Organization"
                     )
                 }
+
+                if !model.info.openAIInfo.projectID.isEmpty {
+                    request.setValue(
+                        model.info.openAIInfo.projectID,
+                        forHTTPHeaderField: "OpenAI-Project"
+                    )
+                }
+                
                 request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
             case .openAICompatible:
                 request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")