Add X-Title field to OpenRouter requests

Author: intitni

Tool/Sources/OpenAIService/APIs/OpenAIChatCompletionsService.swift

@@ -233,28 +233,9 @@ actor OpenAIChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI
         let encoder = JSONEncoder()
         request.httpBody = try encoder.encode(requestBody)
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        if !apiKey.isEmpty {
-            switch model.format {
-            case .openAI:
-                if !model.info.openAIInfo.organizationID.isEmpty {
-                    request.setValue(
-                        model.info.openAIInfo.organizationID,
-                        forHTTPHeaderField: "OpenAI-Organization"
-                    )
-                }
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .openAICompatible:
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .azureOpenAI:
-                request.setValue(apiKey, forHTTPHeaderField: "api-key")
-            case .googleAI:
-                assertionFailure("Unsupported")
-            case .ollama:
-                assertionFailure("Unsupported")
-            case .claude:
-                assertionFailure("Unsupported")
-            }
-        }
+        
+        Self.setupRequestTitle(&request)
+        Self.setupAPIKey(&request, model: model, apiKey: apiKey)
 
         let (result, response) = try await URLSession.shared.bytes(for: request)
         guard let response = response as? HTTPURLResponse else {
@@ -303,13 +284,50 @@ actor OpenAIChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI
         let encoder = JSONEncoder()
         request.httpBody = try encoder.encode(requestBody)
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        Self.setupRequestTitle(&request)
+        Self.setupAPIKey(&request, model: model, apiKey: apiKey)
+
+        let (result, response) = try await URLSession.shared.data(for: request)
+        guard let response = response as? HTTPURLResponse else {
+            throw ChatGPTServiceError.responseInvalid
+        }
+
+        guard response.statusCode == 200 else {
+            let error = try? JSONDecoder().decode(CompletionAPIError.self, from: result)
+            throw error ?? ChatGPTServiceError
+                .otherError(String(data: result, encoding: .utf8) ?? "Unknown Error")
+        }
+
+        do {
+            let body = try JSONDecoder().decode(ResponseBody.self, from: result)
+            return body.formalized()
+        } catch {
+            dump(error)
+            throw error
+        }
+    }
+    
+    static func setupRequestTitle(_ request: inout URLRequest) {
+        if #available(macOS 13.0, *) {
+            if request.url?.host == "openrouter.ai" {
+                request.setValue("Copilot for Xcode", forHTTPHeaderField: "X-Title")
+            }
+        } else {
+            if request.url?.host == "openrouter.ai" {
+                request.setValue("Copilot for Xcode", forHTTPHeaderField: "X-Title")
+            }
+        }
+    }
+    
+    static func setupAPIKey(_ request: inout URLRequest, model: ChatModel, apiKey: String) {
         if !apiKey.isEmpty {
             switch model.format {
             case .openAI:
                 if !model.info.openAIInfo.organizationID.isEmpty {
                     request.setValue(
-                        "OpenAI-Organization",
-                        forHTTPHeaderField: model.info.openAIInfo.organizationID
+                        model.info.openAIInfo.organizationID,
+                        forHTTPHeaderField: "OpenAI-Organization"
                     )
                 }
                 request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
@@ -325,25 +343,6 @@ actor OpenAIChatCompletionsService: ChatCompletionsStreamAPI, ChatCompletionsAPI
                 assertionFailure("Unsupported")
             }
         }
-
-        let (result, response) = try await URLSession.shared.data(for: request)
-        guard let response = response as? HTTPURLResponse else {
-            throw ChatGPTServiceError.responseInvalid
-        }
-
-        guard response.statusCode == 200 else {
-            let error = try? JSONDecoder().decode(CompletionAPIError.self, from: result)
-            throw error ?? ChatGPTServiceError
-                .otherError(String(data: result, encoding: .utf8) ?? "Unknown Error")
-        }
-
-        do {
-            let body = try JSONDecoder().decode(ResponseBody.self, from: result)
-            return body.formalized()
-        } catch {
-            dump(error)
-            throw error
-        }
     }
 }
 

Tool/Sources/OpenAIService/APIs/OpenAIEmbeddingService.swift

@@ -31,24 +31,9 @@ struct OpenAIEmbeddingService: EmbeddingAPI {
             model: model.info.modelName
         ))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        if !apiKey.isEmpty {
-            switch model.format {
-            case .openAI:
-                if model.info.openAIInfo.organizationID.isEmpty {
-                    request.setValue(
-                        "OpenAI-Organization",
-                        forHTTPHeaderField: model.info.openAIInfo.organizationID
-                    )
-                }
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .openAICompatible:
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .azureOpenAI:
-                request.setValue(apiKey, forHTTPHeaderField: "api-key")
-            case .ollama:
-                assertionFailure("Unsupported")
-            }
-        }
+        
+        Self.setupRequestTitle(&request)
+        Self.setupAPIKey(&request, model: model, apiKey: apiKey)
 
         let (result, response) = try await URLSession.shared.data(for: request)
         guard let response = response as? HTTPURLResponse else {
@@ -87,24 +72,9 @@ struct OpenAIEmbeddingService: EmbeddingAPI {
             model: model.info.modelName
         ))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
-        if !apiKey.isEmpty {
-            switch model.format {
-            case .openAI:
-                if model.info.openAIInfo.organizationID.isEmpty {
-                    request.setValue(
-                        "OpenAI-Organization",
-                        forHTTPHeaderField: model.info.openAIInfo.organizationID
-                    )
-                }
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .openAICompatible:
-                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
-            case .azureOpenAI:
-                request.setValue(apiKey, forHTTPHeaderField: "api-key")
-            case .ollama:
-                assertionFailure("Unsupported")
-            }
-        }
+        
+        Self.setupRequestTitle(&request)
+        Self.setupAPIKey(&request, model: model, apiKey: apiKey)
 
         let (result, response) = try await URLSession.shared.data(for: request)
         guard let response = response as? HTTPURLResponse else {
@@ -132,5 +102,38 @@ struct OpenAIEmbeddingService: EmbeddingAPI {
         #endif
         return embeddingResponse
     }
+    
+    static func setupRequestTitle(_ request: inout URLRequest) {
+        if #available(macOS 13.0, *) {
+            if request.url?.host == "openrouter.ai" {
+                request.setValue("Copilot for Xcode", forHTTPHeaderField: "X-Title")
+            }
+        } else {
+            if request.url?.host == "openrouter.ai" {
+                request.setValue("Copilot for Xcode", forHTTPHeaderField: "X-Title")
+            }
+        }
+    }
+    
+    static func setupAPIKey(_ request: inout URLRequest, model: EmbeddingModel, apiKey: String) {
+        if !apiKey.isEmpty {
+            switch model.format {
+            case .openAI:
+                if model.info.openAIInfo.organizationID.isEmpty {
+                    request.setValue(
+                        model.info.openAIInfo.organizationID,
+                        forHTTPHeaderField: "OpenAI-Organization"
+                    )
+                }
+                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
+            case .openAICompatible:
+                request.setValue("Bearer \(apiKey)", forHTTPHeaderField: "Authorization")
+            case .azureOpenAI:
+                request.setValue(apiKey, forHTTPHeaderField: "api-key")
+            case .ollama:
+                assertionFailure("Unsupported")
+            }
+        }
+    }
 }