Add settings for bing search

Author: intitni

Core/Sources/ChatPlugins/SearchChatPlugin/SearchQuery.swift

@@ -1,8 +1,6 @@
 import BingSearchService
 import Foundation
 import LangChain
-import PythonHelper
-import PythonKit
 
 enum SearchEvent {
     case startAction(String)
@@ -13,8 +11,8 @@ enum SearchEvent {
 
 func search(_ query: String) async throws -> AsyncThrowingStream<SearchEvent, Error> {
     let bingSearch = BingSearchService(
-        subscriptionKey: "",
-        searchURL: ""
+        subscriptionKey: UserDefaults.shared.value(for: \.bingSearchSubscriptionKey),
+        searchURL: UserDefaults.shared.value(for: \.bingSearchEndpoint)
     )
 
     final class LinkStorage {
@@ -30,7 +28,7 @@ func search(_ query: String) async throws -> AsyncThrowingStream<SearchEvent, Er
             run: {
                 linkStorage.links = []
                 let result = try await bingSearch.search(query: $0, numberOfResult: 5)
-                guard let websites = result.webPages?.value else { return "No search results." }
+                let websites = result.webPages.value
 
                 var string = ""
                 for (index, website) in websites.enumerated() {

Core/Sources/HostApp/AccountSettings/BingSearchView.swift

@@ -0,0 +1,51 @@
+import AppKit
+import Client
+import OpenAIService
+import Preferences
+import SuggestionModel
+import SwiftUI
+
+final class BingSearchViewSettings: ObservableObject {
+    @AppStorage(\.bingSearchSubscriptionKey) var bingSearchSubscriptionKey: String
+    @AppStorage(\.bingSearchEndpoint) var bingSearchEndpoint: String
+    init() {}
+}
+
+struct BingSearchView: View {
+    @Environment(\.openURL) var openURL
+    @StateObject var settings = BingSearchViewSettings()
+
+    var body: some View {
+        Form {
+            Button(action: {
+                let url = URL(string: "https://www.microsoft.com/bing/apis/bing-web-search-api")!
+                openURL(url)
+            }) {
+                Text("Apply for Subscription Key for Free")
+            }
+            
+            SecureField(text: $settings.bingSearchSubscriptionKey, prompt: Text("")) {
+                Text("Bing Search Subscription Key")
+            }
+            .textFieldStyle(.roundedBorder)
+
+            TextField(
+                text: $settings.bingSearchEndpoint,
+                prompt: Text("https://api.bing.microsoft.com/***")
+            ) {
+                Text("Bing Search Endpoint")
+            }.textFieldStyle(.roundedBorder)
+        }
+    }
+}
+
+struct BingSearchView_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            BingSearchView()
+        }
+        .frame(height: 800)
+        .padding(.all, 8)
+    }
+}
+

Core/Sources/HostApp/ServiceView.swift

@@ -39,6 +39,15 @@ struct ServiceView: View {
                 subtitle: "Chat, Prompt to Code",
                 image: "globe"
             )
+            
+            ScrollView {
+                BingSearchView().padding()
+            }.sidebarItem(
+                tag: 4,
+                title: "Bing Search",
+                subtitle: "Search Chat Plugin",
+                image: "globe"
+            )
         }
     }
 }

Tool/Sources/BingSearchService/BingSearchService.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 public struct BingSearchResult: Codable {
-    public var webPages: WebPages?
+    public var webPages: WebPages
 
     public struct WebPages: Codable {
         public var webSearchUrl: String
@@ -18,6 +18,16 @@ public struct BingSearchResult: Codable {
     }
 }
 
+struct BingSearchResponseError: Codable, Error, LocalizedError {
+    struct E: Codable {
+        var code: String?
+        var message: String?
+    }
+
+    var error: E
+    var errorDescription: String? { error.message }
+}
+
 enum BingSearchError: Error, LocalizedError {
     case searchURLFormatIncorrect(String)
 
@@ -52,9 +62,13 @@ public struct BingSearchService {
         request.addValue(subscriptionKey, forHTTPHeaderField: "Ocp-Apim-Subscription-Key")
 
         let (data, _) = try await URLSession.shared.data(for: request)
-        let decoder = JSONDecoder()
-        let result = try decoder.decode(BingSearchResult.self, from: data)
-        return result
+        do {
+            let result = try JSONDecoder().decode(BingSearchResult.self, from: data)
+            return result
+        } catch {
+            let e = try JSONDecoder().decode(BingSearchResponseError.self, from: data)
+            throw e
+        }
     }
 }
 

Tool/Sources/Preferences/Keys.swift

@@ -247,6 +247,18 @@ public extension UserDefaultPreferenceKeys {
     }
 }
 
+// MARK: - Bing Search
+
+public extension UserDefaultPreferenceKeys {
+    var bingSearchSubscriptionKey: PreferenceKey<String> {
+        .init(defaultValue: "", key: "BingSearchSubscriptionKey")
+    }
+    
+    var bingSearchEndpoint: PreferenceKey<String> {
+        .init(defaultValue: "https://api.bing.microsoft.com/v7.0/search/", key: "BingSearchEndpoint")
+    }
+}
+
 // MARK: - Custom Commands
 
 public extension UserDefaultPreferenceKeys {