add Cloudflare

MLeo · MLeo · commit 198820f094c0 · 2025-11-27T23:24:57.000+08:00
diff --git a/Sources/Enums/AIProviderEnum.swift b/Sources/Enums/AIProviderEnum.swift
@@ -12,6 +12,7 @@ enum AIProviderEnum: String, Codable, CaseIterable, Identifiable {
     case openAI = "OpenAI"
     case gemini = "Gemini"
     case deepSeek = "DeepSeek"
+    case cloudflare = "Cloudflare"
     case custom = "Custom(OpenAI)"
 
     var id: String { self.rawValue }
@@ -22,6 +23,7 @@ enum AIProviderEnum: String, Codable, CaseIterable, Identifiable {
         .openAI:AIProviderEnumModel.getOpenAI(),
         .gemini:AIProviderEnumModel.getGemini(),
         .deepSeek:AIProviderEnumModel.getDeepSeek(),
+        .cloudflare:AIProviderEnumModel.getCloudflare(),
         .custom:AIProviderEnumModel.getCustom()
     ]
     
diff --git a/Sources/Enums/Models/AIProviderEnumModel.swift b/Sources/Enums/Models/AIProviderEnumModel.swift
@@ -87,6 +87,20 @@ class AIProviderEnumModel {
             service: service
         )
     }
+    static func getCloudflare() -> AIProviderEnumModel {
+        let title = "Cloudflare(AI Gateway)"
+        let icon = ""
+        let supportUrl = "https://developers.cloudflare.com/ai-gateway/usage/chat-completion/"
+        let APIURL = "https://gateway.ai.cloudflare.com/v1/{account_id}/{gateway_id}"
+        let service = CloudflareService()
+        return AIProviderEnumModel(
+            title: title,
+            icon: icon,
+            supportUrl: supportUrl,
+            APIURL: APIURL,
+            service: service
+        )
+    }
     static func getCustom() -> AIProviderEnumModel {
         let title = "Custom(OpenAI)"
         let icon = ""
diff --git a/Sources/Protocols/Services/CloudflareService.swift b/Sources/Protocols/Services/CloudflareService.swift
@@ -0,0 +1,166 @@
+//
+//  GrokService.swift
+//  iChat
+//
+//  Created by Lion on 2025/4/28.
+//
+
+import Foundation
+
+/// Cloudflare客户端实现
+class CloudflareService: AIProtocol {
+    
+    private let chatPath = "/compat/chat/completions"
+    private let modelPath = "/compat/openai/models"
+    private let session: URLSession = .shared
+
+    func getModels(provider: AIProvider) async throws -> [Model] {
+        guard let APIURL = URL(string: provider.APIURL + modelPath) else {
+            throw AIError.WrongAPIURL
+        }
+        // 构建请求
+        var request = URLRequest(url: APIURL)
+        request.httpMethod = "GET"
+        request.setValue(
+            "Bearer \(provider.APIKey)",
+            forHTTPHeaderField: "Authorization"
+        )
+        request.setValue(
+            "application/json",
+            forHTTPHeaderField: "Content-Type"
+        )
+        let (data, response) = try await session.data(for: request)
+//        print(String(data: data, encoding: .utf8))
+        try validateResponse(response)
+        let modelResponse = try JSONDecoder().decode(
+            ModelResponse.self,
+            from: data
+        )
+        return modelResponse.data
+    }
+
+    
+    
+    
+    func streamChatResponse(
+        provider:AIProvider,
+        model: AIModel,
+        messages: [ChatMessage],
+        temperature:Double
+    ) async throws -> AsyncThrowingStream<Delta, Error>  {
+        guard let provider = model.provider else{
+            throw AIError.MissingProvider
+        }
+        guard
+            let APIURL = URL(string: provider.APIURL + chatPath)
+        else {
+            throw AIError.WrongAPIURL
+        }
+        // 构建请求
+        var request = URLRequest(url: APIURL)
+        request.httpMethod = "POST"
+        request.setValue(
+            "Bearer \(provider.APIKey)",
+            forHTTPHeaderField: "Authorization"
+        )
+        request.setValue(
+            "application/json",
+            forHTTPHeaderField: "Content-Type"
+        )
+
+        // 构建请求体
+        var requestBody = StreamRequestBody(
+            model: model.name,
+            messages: messages.map({ message in
+                message.apiRepresentation
+            }),
+            temperature: temperature,
+            stream: true
+        )
+        requestBody.extraBody = ExtraBody(google: Google(thinkingConfig: ThinkingConfig()))
+        request.httpBody = try JSONEncoder().encode(requestBody)
+        
+        // 获取流式响应
+        let (bytes, response) = try await session.bytes(
+            for: request
+        )
+        
+        try validateResponse(response)
+        
+       return  AsyncThrowingStream { continuation in
+            Task {
+                do {
+                    // 处理 SSE 流
+                    try await processStream(
+                        bytes: bytes,
+                        continuation: continuation
+                    )
+                    continuation.finish()
+                } catch {
+                    continuation.finish(throwing: error)
+                }
+            }
+        }
+    }
+
+
+
+    // 处理 SSE 流
+    private func processStream(
+        bytes: URLSession.AsyncBytes,
+        continuation: AsyncThrowingStream<Delta, Error>.Continuation
+    ) async throws {
+        var isThinking = false
+        for try await line in bytes.lines {
+            print(line)
+            guard line.hasPrefix("data:") else { continue }
+
+            let jsonDataString = line.dropFirst(5).trimmingCharacters(
+                in: .whitespacesAndNewlines
+            )
+
+            if jsonDataString == "[DONE]" {
+                return
+            }
+
+            guard let jsonData = jsonDataString.data(using: .utf8) else {
+                continue
+            }
+
+            do {
+                let response = try JSONDecoder().decode(
+                    APIResponseMessage.self,
+                    from: jsonData
+                )
+                if let content = response.choices?.first?.delta {
+                    let content = transformThinking(delta: content,isThinking:&isThinking)
+                    continuation.yield(content)
+                }
+            } catch {
+                print("JSON 解码错误: \(error) for data: \(jsonDataString)")
+                continue
+            }
+        }
+    }
+    
+    private func transformThinking(delta:  Delta,isThinking: inout Bool) -> Delta{
+        guard var  content = delta.content else {
+            return delta
+        }
+        if content.contains("<thought>") {
+            isThinking = true
+            content.removeAll{ "<thought>".contains($0) }
+        }else if content.contains("</thought>") {
+            isThinking = false
+            content.removeAll { content in
+                "</thought>".contains(content)
+            }
+        }
+        let delta = Delta(
+                content: isThinking ? nil : content,
+                reasoning: isThinking ? content : nil
+            )
+        return delta
+    }
+}
+
diff --git a/Sources/Protocols/Services/GeminiService.swift b/Sources/Protocols/Services/GeminiService.swift
@@ -14,10 +14,6 @@ class GeminiService: AIProtocol {
     private let modelPath = "/v1beta/openai/models"
     private let session: URLSession = .shared
 
-    //    init(session: URLSession = .shared) {
-    //        self.session = session
-    //    }
-
     func getModels(provider: AIProvider) async throws -> [Model] {
         guard let APIURL = URL(string: provider.APIURL + modelPath) else {
             throw AIError.WrongAPIURL
diff --git a/Sources/Views/Chat/Message/ChatContentView.swift b/Sources/Views/Chat/Message/ChatContentView.swift
@@ -30,11 +30,6 @@ struct ChatContentView: View {
                     .cornerRadius(20)
             case .assistant:
                 Markdown(toMarkdown(), lazy: true)
-//                    .padding()
-//                    .fixedSize(horizontal: false, vertical: true)
-//                    .background(messageBackgroundColor)
-//                    .foregroundStyle(messageForegroundColor)
-//                    .cornerRadius(30)
             }
         }
     }
diff --git a/Sources/iChat.entitlements b/Sources/iChat.entitlements
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-<dict>
-	<key>com.apple.security.app-sandbox</key>
-	<true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
-	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
-</dict>
+<dict/>
 </plist>
diff --git a/iChat.xcodeproj/project.pbxproj b/iChat.xcodeproj/project.pbxproj
@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		1045A4552DFF16140062042A /* SessionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1045A4542DFF16140062042A /* SessionView.swift */; };
+		107710F22ED89A6E00EB62D4 /* CloudflareService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 107710F12ED89A6E00EB62D4 /* CloudflareService.swift */; };
 		10C9F6AD2E05295A00A8719E /* ResponseContentHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10C9F6AC2E05295A00A8719E /* ResponseContentHelper.swift */; };
 		B42DB27F2DFA8C1A005EF8BE /* AssistantView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42DB27E2DFA8C1A005EF8BE /* AssistantView.swift */; };
 		B42DB2812DFA8F7B005EF8BE /* AssistantEditView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42DB2802DFA8F7B005EF8BE /* AssistantEditView.swift */; };
@@ -77,6 +78,7 @@
 
 /* Begin PBXFileReference section */
 		1045A4542DFF16140062042A /* SessionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionView.swift; sourceTree = "<group>"; };
+		107710F12ED89A6E00EB62D4 /* CloudflareService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudflareService.swift; sourceTree = "<group>"; };
 		10C9F6AC2E05295A00A8719E /* ResponseContentHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseContentHelper.swift; sourceTree = "<group>"; };
 		B400B5062DEF3DAB002CF2B4 /* README_zh.md */ = {isa = PBXFileReference; explicitFileType = net.daringfireball.markdown; path = README_zh.md; sourceTree = "<group>"; };
 		B400B5082DEF4199002CF2B4 /* _config.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = _config.yml; sourceTree = "<group>"; };
@@ -289,6 +291,7 @@
 			children = (
 				B457E88E2DBFA74100598C36 /* GrokService.swift */,
 				B440D2742DDF72AC0064B3BE /* GeminiService.swift */,
+				107710F12ED89A6E00EB62D4 /* CloudflareService.swift */,
 				B49731592DF1C55C004D9DCD /* DeepSeekService.swift */,
 				B457E8802DBB775F00598C36 /* APIResponseMessage.swift */,
 			);
@@ -435,7 +438,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1620;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 2610;
 				TargetAttributes = {
 					B4806FAB2D9B8047004C952C = {
 						CreatedOnToolsVersion = 16.2;
@@ -531,6 +534,7 @@
 				B49731712DF74FAF004D9DCD /* PromptEnumModel.swift in Sources */,
 				B457E8892DBFA6DA00598C36 /* ChatRoleEnum.swift in Sources */,
 				B457E88B2DBFA6EA00598C36 /* ChatSession.swift in Sources */,
+				107710F22ED89A6E00EB62D4 /* CloudflareService.swift in Sources */,
 				B49731612DF46B9C004D9DCD /* CustomButtonView.swift in Sources */,
 				B4A22C792DEC5E460091CB68 /* AppearanceEnum.swift in Sources */,
 				B44725D12DC1FA8A00B9B31B /* InputAreaView.swift in Sources */,
@@ -609,6 +613,7 @@
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 			};
@@ -666,6 +671,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 			};
 			name = Release;
@@ -680,11 +686,15 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Sources/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
+				ENABLE_APP_SANDBOX = YES;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SELECTED_FILES = readwrite;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "© 2025 iChochy";
@@ -715,11 +725,15 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"Sources/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
+				ENABLE_APP_SANDBOX = YES;
+				ENABLE_INCOMING_NETWORK_CONNECTIONS = YES;
+				ENABLE_OUTGOING_NETWORK_CONNECTIONS = YES;
 				ENABLE_PREVIEWS = YES;
+				ENABLE_USER_SELECTED_FILES = readwrite;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				INFOPLIST_KEY_NSHumanReadableCopyright = "© 2025 iChochy";
diff --git a/iChat.xcodeproj/xcshareddata/xcschemes/iChat.xcscheme b/iChat.xcodeproj/xcshareddata/xcschemes/iChat.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1640"
+   LastUpgradeVersion = "2610"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,6 @@ struct ChatContentView: View {`
`30`	`30`	`.cornerRadius(20)`
`31`	`31`	`case .assistant:`
`32`	`32`	`Markdown(toMarkdown(), lazy: true)`
`33`		`-// .padding()`
`34`		`-// .fixedSize(horizontal: false, vertical: true)`
`35`		`-// .background(messageBackgroundColor)`
`36`		`-// .foregroundStyle(messageForegroundColor)`
`37`		`-// .cornerRadius(30)`
`38`	`33`	`}`
`39`	`34`	`}`
`40`	`35`	`}`