Merge pull request #31 from lowcoding/feat/v1.8.7

🐞 fix: openai stream format

Author: wjkang

package.json

@@ -3,7 +3,7 @@
 	"displayName": "lowcode",
 	"description": "lowcode tool, support ChatGPT and other LLM",
 	"author": "wjkang <[email protected]>",
-	"version": "1.8.6",
+	"version": "1.8.7",
 	"icon": "asset/icon.png",
 	"publisher": "wjkang",
 	"repository": "https://github.com/lowcoding/lowcode-vscode",

src/utils/openai.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-continue */
 import * as https from 'https';
 import { TextDecoder } from 'util';
 import { getChatGPTConfig } from './config';
@@ -8,7 +9,7 @@ export const createChatCompletion = (options: {
 }) =>
   new Promise<string>((resolve) => {
     let combinedResult = '';
-    let error = '发生错误：';
+    const error = '发生错误：';
     const config = getChatGPTConfig();
     const request = https.request(
       {
@@ -22,35 +23,40 @@ export const createChatCompletion = (options: {
         },
       },
       (res) => {
+        let preDataLast = '';
         res.on('data', async (chunk) => {
           const text = new TextDecoder('utf-8').decode(chunk);
           const data = text.split('\n\n').filter((s) => s);
           for (let i = 0; i < data.length; i++) {
             try {
               let element = data[i];
-              if (element.includes('data: ')) {
+              if (i === data.length - 1 && !data[i].endsWith('}')) {
+                preDataLast = data[i];
+                continue;
+              }
+              if (element.startsWith('data: ')) {
                 if (element.trim() === 'data:') {
                   // 处理只返回了 data: 的情况
-                  return;
+                  continue;
                 }
-              } else if (element.includes('delta')) {
+              } else {
                 // 处理没有 data 开头
-                element = `data: ${element}`;
+                element = preDataLast + element;
               }
               if (element.includes('data: ')) {
                 if (element.includes('[DONE]')) {
                   if (options.handleChunk) {
                     options.handleChunk({ text: '' });
                   }
-                  return;
+                  continue;
                 }
                 // remove 'data: '
                 const data = JSON.parse(element.replace('data: ', ''));
                 if (data.finish_reason === 'stop') {
                   if (options.handleChunk) {
                     options.handleChunk({ text: '' });
                   }
-                  return;
+                  continue;
                 }
                 const openaiRes = data.choices[0].delta.content;
                 if (openaiRes) {
@@ -62,19 +68,14 @@ export const createChatCompletion = (options: {
                   combinedResult += openaiRes;
                 }
               } else {
-                if (options.handleChunk) {
-                  options.handleChunk({
-                    text: element,
-                  });
-                }
-                return;
+                console.log('no includes data: ', element);
               }
             } catch (e) {
               console.error({
-                e,
+                e: (e as Error).toString(),
                 element: data[i],
               });
-              error = (e as Error).toString();
+              // error = (e as Error).toString();
             }
           }
         });
@@ -84,7 +85,6 @@ export const createChatCompletion = (options: {
               text: e.toString(),
             });
           }
-          // reject(e);
           resolve(e.toString());
         });
         res.on('end', () => {

webview-react/src/pages/blocks/Detail/index.tsx

@@ -136,26 +136,6 @@ export default () => {
           </Button>
         </Space>
       </Footer>
-      <Modal
-        title="修改表单数据"
-        maskClosable={false}
-        visible={model.tempFormDataModal.visible}
-        onCancel={presenter.handleUpdateModelCancel}
-        onOk={presenter.handleUpdateModelOk}
-        okText="确定"
-        cancelText="取消"
-      >
-        <CodeMirror
-          domId="modelCodeMirror"
-          lint
-          value={JSON.stringify(model.tempFormDataModal.formData, null, 2)}
-          onChange={(value) => {
-            model.setTempFormDataModal((s) => {
-              s.formData = JSON.parse(value);
-            });
-          }}
-        />
-      </Modal>
       <SelectDirectory
         visible={model.directoryModalVsible}
         loading={model.loading}
@@ -191,6 +171,27 @@ export default () => {
         }}
         onOk={presenter.handleRunScriptResult}
       />
+      <Modal
+        title="修改表单数据"
+        maskClosable={false}
+        visible={model.tempFormDataModal.visible}
+        onCancel={presenter.handleUpdateModelCancel}
+        onOk={presenter.handleUpdateModelOk}
+        okText="确定"
+        cancelText="取消"
+        zIndex={9999}
+      >
+        <CodeMirror
+          domId="modelCodeMirror"
+          lint
+          value={JSON.stringify(model.tempFormDataModal.formData, null, 2)}
+          onChange={(value) => {
+            model.setTempFormDataModal((s) => {
+              s.formData = JSON.parse(value);
+            });
+          }}
+        />
+      </Modal>
     </div>
   );
 };