refactor: rewrite OpenAI service with Swift (tisfeng#473)

* docs: update sponsor list * refactor: rewrite OpenAI service with Swift * perf: move swift services to swift file group * perf: remove all #import "Easydict-Swift.h", since it has been added to pch file * refactor: replace hardcode apikey with plist apikey * perf: improve file structure and naming * perf: remove unused var defaultModel * fix: try to fix ci error * fix: custom OpenAI service cannot directly inherit from OpenAI tisfeng#473 * perf: replace UserDefaults with Defaults * perf: remove deprecated key EZOpenAIDomainKey * perf: remove reverted EZTableTipsCell files * docs: remove EZOpenAIDomainKey * chore: update issue templates * Update Easydict/Swift/Service/OpenAI/BaseOpenAIService.swift Co-authored-by: Phillip Song <[email protected]> * perf: replace EZOpenAIService with EZBaseOpenAIService * Update Easydict/objc/ViewController/View/ResultView/EZResultView.m Co-authored-by: Phillip Song <[email protected]> * Update Easydict/objc/ViewController/View/ResultView/EZResultView.m Co-authored-by: Phillip Song <[email protected]> --------- Co-authored-by: Phillip Song <[email protected]>
MxIris-Application-Forks · Apr 2, 2024 · 4175b9f · 4175b9f
1 parent 3d5ea5b
commit 4175b9f
Show file tree

Hide file tree

Showing 460 changed files with 1,180 additions and 1,560 deletions.
diff --git a/.github/ISSUE_TEMPLATE/cn_feature_request.yml b/.github/ISSUE_TEMPLATE/cn_feature_request.yml
@@ -1,6 +1,6 @@
 name: 功能建议
 description: 功能建议
-title: "🚀 功能建议：{{请填写标题，不要留空}}"
+title: "🚀 功能建议：请填写标题，不要留空"
 labels: ["enhancement"]
 
 body:

diff --git a/.github/ISSUE_TEMPLATE/en_feature_request.yml b/.github/ISSUE_TEMPLATE/en_feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature request
 description: Request a new feature
-title: "🚀 Feature Request: {{Please fill in the title, don't leave it blank}}"
+title: "🚀 Feature Request: Please fill in the title, don't leave it blank"
 labels: ["enhancement"]
 
 body:

diff --git a/.github/ISSUE_TEMPLATE/others.md b/.github/ISSUE_TEMPLATE/others.md
diff --git a/Easydict.xcodeproj/project.pbxproj b/Easydict.xcodeproj/project.pbxproj
diff --git a/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Easydict.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,4 +1,5 @@
 {
+  "originHash" : "ca4d31aa1a70fb6a354fe9e139a2e74a189e4fcff55ed959a3adc71522905fc4",
   "pins" : [
     {
       "identity" : "abseil-cpp-binary",
@@ -189,6 +190,15 @@
         "version" : "2.30909.0"
       }
     },
+    {
+      "identity" : "openai",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/tisfeng/OpenAI",
+      "state" : {
+        "branch" : "dev",
+        "revision" : "9490fa07602cef2979715dc0ee80877e78dc3872"
+      }
+    },
     {
       "identity" : "plcrashreporter",
       "kind" : "remoteSourceControl",

diff --git a/Easydict/App/AppDelegate+EZURLScheme.m b/Easydict/App/AppDelegate+EZURLScheme.m
@@ -10,7 +10,6 @@
 #import <JLRoutes.h>
 #import "EZWindowManager.h"
 #import "EZSchemeParser.h"
-#import "Easydict-Swift.h"
 
 @implementation AppDelegate (EZURLScheme)
 

diff --git a/Easydict/App/AppDelegate.m b/Easydict/App/AppDelegate.m
@@ -10,7 +10,6 @@
 #import "EZShortcut.h"
 #import "MMCrash.h"
 #import "AppDelegate+EZURLScheme.h"
-#import "Easydict-Swift.h"
 
 @interface AppDelegate ()
 

diff --git a/Easydict/App/Easydict-Bridging-Header.h b/Easydict/App/Easydict-Bridging-Header.h
@@ -31,9 +31,8 @@
 #import "EZLanguageManager.h"
 #import "DarkModeManager.h"
 #import "EZScriptExecutor.h"
-#import "EZOpenAILikeService.h"
 #import "EZNiuTransTranslate.h"
 #import "EZDeepLTranslate.h"
 #import "EZBingService.h"
-
+#import "NSString+EZUtils.h"
 
diff --git a/Easydict/NewApp/EasydictApp.swift → Easydict/App/EasydictApp.swift b/Easydict/NewApp/EasydictApp.swift → Easydict/App/EasydictApp.swift
diff --git a/Easydict/App/entry.m b/Easydict/App/entry.m
@@ -8,7 +8,6 @@
 
 #import <Cocoa/Cocoa.h>
 #import "EZWindowManager.h"
-#import "Easydict-Swift.h"
 #import "XPMArguments.h"
 #include <stdio.h>
 #include <sys/ioctl.h>

diff --git a/Easydict/Feature/Service/OpenAI/EZOpenAIChatResponse.h b/Easydict/Feature/Service/OpenAI/EZOpenAIChatResponse.h
diff --git a/Easydict/Feature/Service/OpenAI/EZOpenAIChatResponse.m b/Easydict/Feature/Service/OpenAI/EZOpenAIChatResponse.m
diff --git a/Easydict/Feature/Service/OpenAI/EZOpenAILikeService+EZPromptMessages.h b/Easydict/Feature/Service/OpenAI/EZOpenAILikeService+EZPromptMessages.h