apply two patches from github issues

4 files changed, 105 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60b68a1398e6..eb586e254d7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chatbot-ui-git
 	pkgdesc = An open source ChatGPT UI.
 	pkgver = r293.2e6c0ee
-	pkgrel = 2
+	pkgrel = 4
 	url = https://github.com/mckaywrigley/chatbot-ui
 	arch = any
 	license = MIT
@@ -13,8 +13,12 @@ pkgbase = chatbot-ui-git
 	source = git+https://github.com/mckaywrigley/chatbot-ui.git
 	source = sysusers.conf
 	source = chatbot-ui.service
+	source = 0001-support-GPT-4-Turbo.patch
+	source = 0002-Fix-json-parsing.patch
 	sha256sums = SKIP
 	sha256sums = 4de4e4d3bac91214398da078b3f2b5d72182b7e6a69c9124eb19713827942958
 	sha256sums = 45dcb629ff221cd36d0f4c22cd5d886924233ada9b342bb0e59546fb35d1bea6
+	sha256sums = 5824fc36a6a100151e6a27e8d1b0389a16517a4f2151e14e3f55ce5cd450ffec
+	sha256sums = bf4cccd454d1d77038d71627fb00ec49428e014bd90ed565512910b463aff952
 
 pkgname = chatbot-ui-git
diff --git a/0001-support-GPT-4-Turbo.patch b/0001-support-GPT-4-Turbo.patch
new file mode 100644
index 000000000000..770071aeda4b
--- /dev/null
+++ b/0001-support-GPT-4-Turbo.patch
@@ -0,0 +1,44 @@
+From 8921efb9d2ec6f4ff1706c0e468c1455b7e8a109 Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Tue, 12 Dec 2023 20:50:42 +0800
+Subject: [PATCH] support GPT-4-Turbo
+
+source: https://github.com/mckaywrigley/chatbot-ui/issues/1022#issuecomment-1814319276
+---
+ types/openai.ts | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/types/openai.ts b/types/openai.ts
+index d404350..4ba8810 100644
+--- a/types/openai.ts
++++ b/types/openai.ts
+@@ -12,6 +12,9 @@ export enum OpenAIModelID {
+   GPT_3_5_AZ = 'gpt-35-turbo',
+   GPT_4 = 'gpt-4',
+   GPT_4_32K = 'gpt-4-32k',
++  GPT_4_32K_0613 = 'gpt-4-32k-0613',
++  GPT_4_128K = 'gpt-4-1106-preview'
++  
+ }
+ 
+ // in case the `DEFAULT_MODEL` environment variable is not set or set to an unsupported model
+@@ -42,4 +45,16 @@ export const OpenAIModels: Record<OpenAIModelID, OpenAIModel> = {
+     maxLength: 96000,
+     tokenLimit: 32000,
+   },
++  [OpenAIModelID.GPT_4_32K_0613]: {
++    id: OpenAIModelID.GPT_4_32K_0613,
++    name: 'GPT-4-32K-0613',
++    maxLength: 96000,
++    tokenLimit: 32000,
++  },
++  [OpenAIModelID.GPT_4_128K] :{
++    id: OpenAIModelID.GPT_4_128K,
++    name: 'GPT-4-128K',
++    maxLength: 96000,
++    tokenLimit: 128000
++  }
+ };
+-- 
+2.43.0
+
diff --git a/0002-Fix-json-parsing.patch b/0002-Fix-json-parsing.patch
new file mode 100644
index 000000000000..10b42afee646
--- /dev/null
+++ b/0002-Fix-json-parsing.patch
@@ -0,0 +1,47 @@
+From ffa902c68936cf362737d9edd1e9dcac6ac70fbc Mon Sep 17 00:00:00 2001
+From: Liao Junxuan <mikeljx@126.com>
+Date: Tue, 12 Dec 2023 21:24:10 +0800
+Subject: [PATCH] Fix json parsing
+
+See https://github.com/mckaywrigley/chatbot-ui/issues/580#issuecomment-1523023238
+---
+ utils/server/index.ts | 22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/utils/server/index.ts b/utils/server/index.ts
+index d75b8f1..6a6abc3 100644
+--- a/utils/server/index.ts
++++ b/utils/server/index.ts
+@@ -90,17 +90,19 @@ export const OpenAIStream = async (
+         if (event.type === 'event') {
+           const data = event.data;
+ 
+-          try {
+-            const json = JSON.parse(data);
+-            if (json.choices[0].finish_reason != null) {
+-              controller.close();
+-              return;
++          if (data !== '[DONE]') {
++            try {
++              const json = JSON.parse(data);
++              if (json.choices[0].finish_reason != null) {
++                controller.close();
++                return;
++              }
++              const text = json.choices[0].delta.content;
++              const queue = encoder.encode(text);
++              controller.enqueue(queue);
++            } catch (e) {
++              controller.error(e);
+             }
+-            const text = json.choices[0].delta.content;
+-            const queue = encoder.encode(text);
+-            controller.enqueue(queue);
+-          } catch (e) {
+-            controller.error(e);
+           }
+         }
+       };
+-- 
+2.43.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 774e25d4c908..457b5876886f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=chatbot-ui
 pkgname=$_pkgname-git
 pkgver=r293.2e6c0ee
-pkgrel=2
+pkgrel=4
 pkgdesc="An open source ChatGPT UI."
 arch=('any')
 url='https://github.com/mckaywrigley/chatbot-ui'
@@ -13,11 +13,15 @@ makedepends=('git' 'npm')
 backup=("etc/webapps/${pkgname}/.env.local")
 source=("git+$url.git"
         "sysusers.conf"
-        "chatbot-ui.service")
+        "chatbot-ui.service"
+        "0001-support-GPT-4-Turbo.patch"
+        "0002-Fix-json-parsing.patch")
 options=(!emptydirs)
 sha256sums=('SKIP'
             '4de4e4d3bac91214398da078b3f2b5d72182b7e6a69c9124eb19713827942958'
-            '45dcb629ff221cd36d0f4c22cd5d886924233ada9b342bb0e59546fb35d1bea6')
+            '45dcb629ff221cd36d0f4c22cd5d886924233ada9b342bb0e59546fb35d1bea6'
+            '5824fc36a6a100151e6a27e8d1b0389a16517a4f2151e14e3f55ce5cd450ffec'
+            'bf4cccd454d1d77038d71627fb00ec49428e014bd90ed565512910b463aff952')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -26,6 +30,8 @@ pkgver() {
 
 prepare() {
   cd "${_pkgname}"
+  git apply "${srcdir}"/"0001-support-GPT-4-Turbo.patch" 
+  git apply "${srcdir}"/"0002-Fix-json-parsing.patch" 
 }
 
 build() {