Merge pull request #22 from lowcoding/feat/v1.7.9

✨ feat: getEnv return extensionContext

Author: wjkang

package.json

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

src/utils/emitter.ts

@@ -125,7 +125,7 @@ function mitt<Events extends Record<EventType, unknown>>(
 
 type Events = {
   clipboardImage: string;
-  chatGPTChunck: { text?: string; hasMore: boolean };
+  chatGPTChunck: { text?: string };
   chatGPTComplete: string;
 };
 

src/utils/llm.ts

@@ -4,11 +4,13 @@ import { createChatCompletion as openaiCreateChatCompletion } from './openai';
 import { emitter } from './emitter';
 import { getSyncFolder } from './config';
 import { showChatGPTView } from '../webview';
+import { getEnv } from './vscodeEnv';
 
 const LLMScript: {
   createChatCompletion?: (options: {
     messages: { role: 'system' | 'user' | 'assistant'; content: string }[];
-    handleChunk?: (data: { text?: string; hasMore: boolean }) => void;
+    handleChunk?: (data: { text?: string }) => void;
+    lowcodeContext: object;
   }) => Promise<string>;
 } = {};
 
@@ -27,7 +29,7 @@ if (syncFolder) {
 
 export const createChatCompletion = async (options: {
   messages: { role: 'system' | 'user' | 'assistant'; content: string }[];
-  handleChunk?: (data: { text?: string; hasMore: boolean }) => void;
+  handleChunk?: (data: { text?: string }) => void;
 }) => {
   if (LLMScript.createChatCompletion) {
     const res = await LLMScript.createChatCompletion({
@@ -38,6 +40,9 @@ export const createChatCompletion = async (options: {
           emitter.emit('chatGPTChunck', data);
         }
       },
+      lowcodeContext: {
+        env: getEnv(),
+      },
     });
     emitter.emit('chatGPTComplete', res);
     return res;
@@ -57,7 +62,7 @@ export const createChatCompletion = async (options: {
 
 export const createChatCompletionForScript = (options: {
   messages: { role: 'system' | 'user' | 'assistant'; content: string }[];
-  handleChunk?: (data: { text?: string; hasMore: boolean }) => void;
+  handleChunk?: (data: { text?: string }) => void;
   showWebview?: boolean;
 }) => {
   if (!options.showWebview) {

src/utils/openai.ts

@@ -1,11 +1,10 @@
 import * as https from 'https';
 import { TextDecoder } from 'util';
 import { getChatGPTConfig } from './config';
-import { showChatGPTView } from '../webview';
 
 export const createChatCompletion = (options: {
   messages: { role: 'system' | 'user' | 'assistant'; content: string }[];
-  handleChunk?: (data: { text?: string; hasMore: boolean }) => void;
+  handleChunk?: (data: { text?: string }) => void;
 }) =>
   new Promise<string>((resolve) => {
     let combinedResult = '';
@@ -41,15 +40,15 @@ export const createChatCompletion = (options: {
               if (element.includes('data: ')) {
                 if (element.includes('[DONE]')) {
                   if (options.handleChunk) {
-                    options.handleChunk({ hasMore: true, text: '' });
+                    options.handleChunk({ text: '' });
                   }
                   return;
                 }
                 // remove 'data: '
                 const data = JSON.parse(element.replace('data: ', ''));
                 if (data.finish_reason === 'stop') {
                   if (options.handleChunk) {
-                    options.handleChunk({ hasMore: true, text: '' });
+                    options.handleChunk({ text: '' });
                   }
                   return;
                 }
@@ -58,15 +57,13 @@ export const createChatCompletion = (options: {
                   if (options.handleChunk) {
                     options.handleChunk({
                       text: openaiRes.replaceAll('\\n', '\n'),
-                      hasMore: true,
                     });
                   }
                   combinedResult += openaiRes;
                 }
               } else {
                 if (options.handleChunk) {
                   options.handleChunk({
-                    hasMore: true,
                     text: element,
                   });
                 }
@@ -84,7 +81,6 @@ export const createChatCompletion = (options: {
         res.on('error', (e) => {
           if (options.handleChunk) {
             options.handleChunk({
-              hasMore: true,
               text: e.toString(),
             });
           }
@@ -95,7 +91,6 @@ export const createChatCompletion = (options: {
           if (error !== '发生错误：') {
             if (options.handleChunk) {
               options.handleChunk({
-                hasMore: true,
                 text: error,
               });
             }
@@ -111,8 +106,7 @@ export const createChatCompletion = (options: {
       max_tokens: config.maxTokens,
     };
     request.on('error', (error) => {
-      options.handleChunk &&
-        options.handleChunk({ hasMore: true, text: error.toString() });
+      options.handleChunk && options.handleChunk({ text: error.toString() });
       resolve(error.toString());
     });
     request.write(JSON.stringify(body));

src/utils/vscodeEnv.ts

@@ -1,6 +1,7 @@
 import * as path from 'path';
 import { workspace } from 'vscode';
 import { getSyncFolder } from './config';
+import { getExtensionContext } from '../context';
 
 export const rootPath = path.join(workspace.rootPath || '');
 
@@ -39,6 +40,7 @@ export const getEnv = () => ({
   blockMaterialsPath,
   snippetMaterialsPath,
   privateMaterialsPath: getSyncFolder(),
+  extensionContext: getExtensionContext(),
 });
 
 export const checkRootPath = () => {