feature(code-streaming): added code streaming to editor while AI is writing code

This commit is contained in:
Anirban Kar
2024-11-08 11:14:15 +05:30
parent 1ba0606e58
commit 54351cd845
5 changed files with 6957 additions and 8282 deletions

View File

@@ -36,6 +36,10 @@ const messageParser = new StreamingMessageParser({
workbenchStore.runAction(data); workbenchStore.runAction(data);
}, },
onActionStream: (data) => {
logger.trace('onActionStream', data.action);
workbenchStore.runAction(data, true);
},
}, },
}); });

View File

@@ -72,7 +72,7 @@ export class ActionRunner {
}); });
} }
async runAction(data: ActionCallbackData) { async runAction(data: ActionCallbackData, isStreaming: boolean = false) {
const { actionId } = data; const { actionId } = data;
const action = this.actions.get()[actionId]; const action = this.actions.get()[actionId];
@@ -83,19 +83,22 @@ export class ActionRunner {
if (action.executed) { if (action.executed) {
return; return;
} }
if (isStreaming && action.type !== 'file') {
return;
}
this.#updateAction(actionId, { ...action, ...data.action, executed: true }); this.#updateAction(actionId, { ...action, ...data.action, executed: !isStreaming });
this.#currentExecutionPromise = this.#currentExecutionPromise this.#currentExecutionPromise = this.#currentExecutionPromise
.then(() => { .then(() => {
return this.#executeAction(actionId); return this.#executeAction(actionId, isStreaming);
}) })
.catch((error) => { .catch((error) => {
console.error('Action failed:', error); console.error('Action failed:', error);
}); });
} }
async #executeAction(actionId: string) { async #executeAction(actionId: string, isStreaming: boolean = false) {
const action = this.actions.get()[actionId]; const action = this.actions.get()[actionId];
this.#updateAction(actionId, { status: 'running' }); this.#updateAction(actionId, { status: 'running' });
@@ -112,7 +115,7 @@ export class ActionRunner {
} }
} }
this.#updateAction(actionId, { status: action.abortSignal.aborted ? 'aborted' : 'complete' }); this.#updateAction(actionId, { status: isStreaming ? 'running' : action.abortSignal.aborted ? 'aborted' : 'complete' });
} catch (error) { } catch (error) {
this.#updateAction(actionId, { status: 'failed', error: 'Action failed' }); this.#updateAction(actionId, { status: 'failed', error: 'Action failed' });

View File

@@ -28,6 +28,7 @@ export interface ParserCallbacks {
onArtifactOpen?: ArtifactCallback; onArtifactOpen?: ArtifactCallback;
onArtifactClose?: ArtifactCallback; onArtifactClose?: ArtifactCallback;
onActionOpen?: ActionCallback; onActionOpen?: ActionCallback;
onActionStream?: ActionCallback;
onActionClose?: ActionCallback; onActionClose?: ActionCallback;
} }
@@ -54,7 +55,7 @@ interface MessageState {
export class StreamingMessageParser { export class StreamingMessageParser {
#messages = new Map<string, MessageState>(); #messages = new Map<string, MessageState>();
constructor(private _options: StreamingMessageParserOptions = {}) {} constructor(private _options: StreamingMessageParserOptions = {}) { }
parse(messageId: string, input: string) { parse(messageId: string, input: string) {
let state = this.#messages.get(messageId); let state = this.#messages.get(messageId);
@@ -118,6 +119,21 @@ export class StreamingMessageParser {
i = closeIndex + ARTIFACT_ACTION_TAG_CLOSE.length; i = closeIndex + ARTIFACT_ACTION_TAG_CLOSE.length;
} else { } else {
if ('type' in currentAction && currentAction.type === 'file') {
let content = input.slice(i);
this._options.callbacks?.onActionStream?.({
artifactId: currentArtifact.id,
messageId,
actionId: String(state.actionId - 1),
action: {
...currentAction as FileAction,
content,
filePath: currentAction.filePath,
},
});
}
break; break;
} }
} else { } else {

View File

@@ -12,6 +12,7 @@ import { TerminalStore } from './terminal';
import JSZip from 'jszip'; import JSZip from 'jszip';
import { saveAs } from 'file-saver'; import { saveAs } from 'file-saver';
import { Octokit } from "@octokit/rest"; import { Octokit } from "@octokit/rest";
import * as nodePath from 'node:path';
export interface ArtifactState { export interface ArtifactState {
id: string; id: string;
@@ -258,7 +259,7 @@ export class WorkbenchStore {
artifact.runner.addAction(data); artifact.runner.addAction(data);
} }
async runAction(data: ActionCallbackData) { async runAction(data: ActionCallbackData, isStreaming: boolean = false) {
const { messageId } = data; const { messageId } = data;
const artifact = this.#getArtifact(messageId); const artifact = this.#getArtifact(messageId);
@@ -266,8 +267,29 @@ export class WorkbenchStore {
if (!artifact) { if (!artifact) {
unreachable('Artifact not found'); unreachable('Artifact not found');
} }
if (data.action.type === 'file') {
let wc = await webcontainer
const fullPath = nodePath.join(wc.workdir, data.action.filePath);
if (this.selectedFile.value !== fullPath) {
this.setSelectedFile(fullPath);
}
if (this.currentView.value !== 'code') {
this.currentView.set('code');
}
const doc = this.#editorStore.documents.get()[fullPath];
if (!doc) {
await artifact.runner.runAction(data, isStreaming);
}
artifact.runner.runAction(data); this.#editorStore.updateFile(fullPath, data.action.content);
if (!isStreaming) {
this.resetCurrentDocument();
await artifact.runner.runAction(data);
}
} else {
artifact.runner.runAction(data);
}
} }
#getArtifact(id: string) { #getArtifact(id: string) {
@@ -336,20 +358,20 @@ export class WorkbenchStore {
} }
async pushToGitHub(repoName: string, githubUsername: string, ghToken: string) { async pushToGitHub(repoName: string, githubUsername: string, ghToken: string) {
try { try {
// Get the GitHub auth token from environment variables // Get the GitHub auth token from environment variables
const githubToken = ghToken; const githubToken = ghToken;
const owner = githubUsername; const owner = githubUsername;
if (!githubToken) { if (!githubToken) {
throw new Error('GitHub token is not set in environment variables'); throw new Error('GitHub token is not set in environment variables');
} }
// Initialize Octokit with the auth token // Initialize Octokit with the auth token
const octokit = new Octokit({ auth: githubToken }); const octokit = new Octokit({ auth: githubToken });
// Check if the repository already exists before creating it // Check if the repository already exists before creating it
let repo let repo
try { try {
@@ -368,13 +390,13 @@ export class WorkbenchStore {
throw error; // Some other error occurred throw error; // Some other error occurred
} }
} }
// Get all files // Get all files
const files = this.files.get(); const files = this.files.get();
if (!files || Object.keys(files).length === 0) { if (!files || Object.keys(files).length === 0) {
throw new Error('No files found to push'); throw new Error('No files found to push');
} }
// Create blobs for each file // Create blobs for each file
const blobs = await Promise.all( const blobs = await Promise.all(
Object.entries(files).map(async ([filePath, dirent]) => { Object.entries(files).map(async ([filePath, dirent]) => {
@@ -389,13 +411,13 @@ export class WorkbenchStore {
} }
}) })
); );
const validBlobs = blobs.filter(Boolean); // Filter out any undefined blobs const validBlobs = blobs.filter(Boolean); // Filter out any undefined blobs
if (validBlobs.length === 0) { if (validBlobs.length === 0) {
throw new Error('No valid files to push'); throw new Error('No valid files to push');
} }
// Get the latest commit SHA (assuming main branch, update dynamically if needed) // Get the latest commit SHA (assuming main branch, update dynamically if needed)
const { data: ref } = await octokit.git.getRef({ const { data: ref } = await octokit.git.getRef({
owner: repo.owner.login, owner: repo.owner.login,
@@ -403,7 +425,7 @@ export class WorkbenchStore {
ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch
}); });
const latestCommitSha = ref.object.sha; const latestCommitSha = ref.object.sha;
// Create a new tree // Create a new tree
const { data: newTree } = await octokit.git.createTree({ const { data: newTree } = await octokit.git.createTree({
owner: repo.owner.login, owner: repo.owner.login,
@@ -416,7 +438,7 @@ export class WorkbenchStore {
sha: blob!.sha, sha: blob!.sha,
})), })),
}); });
// Create a new commit // Create a new commit
const { data: newCommit } = await octokit.git.createCommit({ const { data: newCommit } = await octokit.git.createCommit({
owner: repo.owner.login, owner: repo.owner.login,
@@ -425,7 +447,7 @@ export class WorkbenchStore {
tree: newTree.sha, tree: newTree.sha,
parents: [latestCommitSha], parents: [latestCommitSha],
}); });
// Update the reference // Update the reference
await octokit.git.updateRef({ await octokit.git.updateRef({
owner: repo.owner.login, owner: repo.owner.login,
@@ -433,7 +455,7 @@ export class WorkbenchStore {
ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch
sha: newCommit.sha, sha: newCommit.sha,
}); });
alert(`Repository created and code pushed: ${repo.html_url}`); alert(`Repository created and code pushed: ${repo.html_url}`);
} catch (error) { } catch (error) {
console.error('Error pushing to GitHub:', error instanceof Error ? error.message : String(error)); console.error('Error pushing to GitHub:', error instanceof Error ? error.message : String(error));

15150
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff