diff --git a/package.json b/package.json index da07d0d..cf57df7 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,12 @@ "description": "Specify llm stream", "when": "DevChat.llmModel == 'OpenAI'" }, + "DevChat.OpenAI.tokensPerPrompt": { + "type": "number", + "default": 6000, + "description": "token for each prompt", + "when": "DevChat.llmModel == 'OpenAI'" + }, "DevChat.OpenAI.apiKey": { "type": "string", "default": "", diff --git a/src/toolwrapper/devchat.ts b/src/toolwrapper/devchat.ts index 2a9b381..55f4ac0 100644 --- a/src/toolwrapper/devchat.ts +++ b/src/toolwrapper/devchat.ts @@ -7,220 +7,234 @@ import * as dotenv from 'dotenv'; import * as path from 'path'; import * as fs from 'fs'; -const spawnAsync = async (command: string, args: string[], options: any, onData: (data: string) => void): Promise<{code: number, stdout: string; stderr: string }> => { - return new Promise((resolve, reject) => { - const child = spawn(command, args, options); - let stdout = ''; - let stderr = ''; +const spawnAsync = async (command: string, args: string[], options: any, onData: (data: string) => void): Promise<{ code: number, stdout: string; stderr: string }> => { + return new Promise((resolve, reject) => { + const child = spawn(command, args, options); + let stdout = ''; + let stderr = ''; - child.stdout.on('data', (data) => { - const dataStr = data.toString(); - onData(dataStr); - stdout += dataStr; - }); + child.stdout.on('data', (data) => { + const dataStr = data.toString(); + onData(dataStr); + stdout += dataStr; + }); - child.stderr.on('data', (data) => { - stderr += data; - }); + child.stderr.on('data', (data) => { + stderr += data; + }); - child.on('close', (code) => { - if (code === 0) { - resolve({code, stdout, stderr }); - } else { - reject({code, stdout, stderr }); - } - }); - }); + child.on('close', (code) => { + if (code === 0) { + resolve({ code, stdout, stderr }); + } else { + reject({ code, stdout, stderr }); + } + }); + }); }; const envPath = path.join(__dirname, '..', '.env'); dotenv.config({ path: envPath }); export interface ChatOptions { - parent?: string; - reference?: string[]; - header?: string[]; - context?: string[]; + parent?: string; + reference?: string[]; + header?: string[]; + context?: string[]; } export interface LogOptions { - skip?: number; - maxCount?: number; + skip?: number; + maxCount?: number; } export interface LogEntry { - "prompt-hash": string; - user: string; - date: string; - message: string; - response: string; + hash: string; + user: string; + date: string; + request: string; + response: string; + context: string[]; } export interface ChatResponse { - "prompt-hash": string; - user: string; - date: string; - response: string; - isError: boolean; + "prompt-hash": string; + user: string; + date: string; + response: string; + isError: boolean; } + class DevChat { - async chat(content: string, options: ChatOptions = {}, onData: (data: string) => void): Promise { - let args = ["prompt"]; - - if (options.parent) { - args.push("-p", options.parent); - } - if (options.reference) { - args.push("-r", options.reference.join(",")); - } - if (options.header) { - args.push("-i", options.header.join(",")); - } - if (options.context) { - args.push("-c", options.context.join(",")); - } - args.push(content) - - const workspaceDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath; - // const openaiApiKey = process.env.OPENAI_API_KEY; + async chat(content: string, options: ChatOptions = {}, onData: (data: string) => void): Promise { + let args = ["prompt"]; - const openaiApiKey = vscode.workspace.getConfiguration('DevChat').get('OpenAI.apiKey'); + if (options.parent) { + for (const parent of options.parent) { + args.push("-p", parent); + } + } + if (options.reference) { + for (const reference of options.reference) { + args.push("-r", reference); + } + } + if (options.header) { + for (const header of options.header) { + args.push("-i", header); + } + } - const openaiModel = vscode.workspace.getConfiguration('DevChat').get('OpenAI.model'); - const openaiTemperature = vscode.workspace.getConfiguration('DevChat').get('OpenAI.temperature'); - const openaiStream = vscode.workspace.getConfiguration('DevChat').get('OpenAI.stream'); - const llmModel = vscode.workspace.getConfiguration('DevChat').get('llmModel'); + if (options.context) { + args.push("-c", options.context.join(",")); + } + args.push(content) - const devchatConfig = { - llm: llmModel, - OpenAI: { - model: openaiModel, - temperature: openaiTemperature, - stream: openaiStream - } - } - // write to config file - const configPath = path.join(workspaceDir!, '.chatconfig.json'); - // write devchatConfig to configPath - const configJson = JSON.stringify(devchatConfig, null, 2); - fs.writeFileSync(configPath, configJson); + const workspaceDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath; + // const openaiApiKey = process.env.OPENAI_API_KEY; - try { - const {code, stdout, stderr } = await spawnAsync('devchat', args, { - maxBuffer: 10 * 1024 * 1024, // Set maxBuffer to 10 MB - cwd: workspaceDir, - env: { - ...process.env, - OPENAI_API_KEY: openaiApiKey, - }, - }, onData); + let openaiApiKey = vscode.workspace.getConfiguration('DevChat').get('OpenAI.apiKey'); + if (!openaiApiKey) { + openaiApiKey = process.env.OPENAI_API_KEY; + } - if (stderr) { - const errorMessage = stderr.trim().match(/Error：(.+)/)?.[1]; - return { - "prompt-hash": "", - user: "", - date: "", - response: errorMessage ? `Error: ${errorMessage}` : "Unknown error", - isError: true, - }; - } + const openaiModel = vscode.workspace.getConfiguration('DevChat').get('OpenAI.model'); + const openaiTemperature = vscode.workspace.getConfiguration('DevChat').get('OpenAI.temperature'); + const openaiStream = vscode.workspace.getConfiguration('DevChat').get('OpenAI.stream'); + const llmModel = vscode.workspace.getConfiguration('DevChat').get('llmModel'); + const tokensPerPrompt = vscode.workspace.getConfiguration('DevChat').get('OpenAI.tokensPerPrompt'); + + const devchatConfig = { + model: openaiModel, + provider: llmModel, + OpenAI: { + temperature: openaiTemperature, + stream: openaiStream, + "tokens-per-prompt": tokensPerPrompt + } + } + // write to config file + const configPath = path.join(workspaceDir!, '.chat', 'config.json'); + // write devchatConfig to configPath + const configJson = JSON.stringify(devchatConfig, null, 2); + fs.writeFileSync(configPath, configJson); - const responseLines = stdout.trim().split("\n"); - console.log(responseLines) - - if (responseLines.length === 0) { - return { - "prompt-hash": "", - user: "", - date: "", - response: "", - isError: true, - }; - } - - let promptHashLine = ""; - for (let i = responseLines.length - 1; i >= 0; i--) { - if (responseLines[i].startsWith("prompt")) { - promptHashLine = responseLines[i]; - responseLines.splice(i, 1); - break; - } - } - - if (!promptHashLine) { - return { - "prompt-hash": "", - user: "", - date: "", - response: responseLines.join("\n"), - isError: true, - }; - } - - const promptHash = promptHashLine.split(" ")[1]; - - const userLine = responseLines.shift()!; - const user = (userLine.match(/User: (.+)/)?.[1]) ?? ""; - - const dateLine = responseLines.shift()!; - const date = (dateLine.match(/Date: (.+)/)?.[1]) ?? ""; - - const response = responseLines.join("\n"); - - return { - "prompt-hash": promptHash, - user, - date, - response, - isError: false, - }; - } catch (error: any) { - return { - "prompt-hash": "", - user: "", - date: "", - response: `Error: ${error.stderr}\nExit code: ${error.code}`, - isError: true, - }; - } - } + try { + const { code, stdout, stderr } = await spawnAsync('devchat', args, { + maxBuffer: 10 * 1024 * 1024, // Set maxBuffer to 10 MB + cwd: workspaceDir, + env: { + ...process.env, + OPENAI_API_KEY: openaiApiKey, + }, + }, onData); - async log(options: LogOptions = {}): Promise { - let args = ["log"]; + if (stderr) { + const errorMessage = stderr.trim().match(/Error：(.+)/)?.[1]; + return { + "prompt-hash": "", + user: "", + date: "", + response: errorMessage ? `Error: ${errorMessage}` : "Unknown error", + isError: true, + }; + } - if (options.skip) { - args.push('--skip', `${options.skip}`); - } - if (options.maxCount) { - args.push('--max-count', `${options.maxCount}`); - } + const responseLines = stdout.trim().split("\n"); + console.log(responseLines) - const workspaceDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath; - const openaiApiKey = process.env.OPENAI_API_KEY; + if (responseLines.length === 0) { + return { + "prompt-hash": "", + user: "", + date: "", + response: "", + isError: true, + }; + } - try { - const {code, stdout, stderr } = await spawnAsync('devchat', args, { - maxBuffer: 10 * 1024 * 1024, // Set maxBuffer to 10 MB - cwd: workspaceDir, - env: { - ...process.env, - OPENAI_API_KEY: openaiApiKey, - }, - }, (partialResponse: string) => {}); - - if (stderr) { - console.error(stderr); - return []; - } + let promptHashLine = ""; + for (let i = responseLines.length - 1; i >= 0; i--) { + if (responseLines[i].startsWith("prompt")) { + promptHashLine = responseLines[i]; + responseLines.splice(i, 1); + break; + } + } - return JSON.parse(stdout.trim()); - } catch (error) { - console.error(error) - return []; - } - } + if (!promptHashLine) { + return { + "prompt-hash": "", + user: "", + date: "", + response: responseLines.join("\n"), + isError: true, + }; + } + + const promptHash = promptHashLine.split(" ")[1]; + + const userLine = responseLines.shift()!; + const user = (userLine.match(/User: (.+)/)?.[1]) ?? ""; + + const dateLine = responseLines.shift()!; + const date = (dateLine.match(/Date: (.+)/)?.[1]) ?? ""; + + const response = responseLines.join("\n"); + + return { + "prompt-hash": promptHash, + user, + date, + response, + isError: false, + }; + } catch (error: any) { + return { + "prompt-hash": "", + user: "", + date: "", + response: `Error: ${error.stderr}\nExit code: ${error.code}`, + isError: true, + }; + } + } + + async log(options: LogOptions = {}): Promise { + let args = ["log"]; + + if (options.skip) { + args.push('--skip', `${options.skip}`); + } + if (options.maxCount) { + args.push('--max-count', `${options.maxCount}`); + } + + const workspaceDir = vscode.workspace.workspaceFolders?.[0].uri.fsPath; + const openaiApiKey = process.env.OPENAI_API_KEY; + + try { + const { code, stdout, stderr } = await spawnAsync('devchat', args, { + maxBuffer: 10 * 1024 * 1024, // Set maxBuffer to 10 MB + cwd: workspaceDir, + env: { + ...process.env, + OPENAI_API_KEY: openaiApiKey, + }, + }, (partialResponse: string) => { }); + + if (stderr) { + console.error(stderr); + return []; + } + + return JSON.parse(stdout.trim()); + } catch (error) { + console.error(error) + return []; + } + } } export default DevChat;