Skip to content

Commit

Permalink
feature(code-streaming): added code streaming to editor while AI is w…
Browse files Browse the repository at this point in the history
…riting code
  • Loading branch information
thecodacus committed Nov 8, 2024
1 parent 1ba0606 commit 54351cd
Show file tree
Hide file tree
Showing 5 changed files with 6,556 additions and 7,881 deletions.
4 changes: 4 additions & 0 deletions app/lib/hooks/useMessageParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ const messageParser = new StreamingMessageParser({

workbenchStore.runAction(data);
},
onActionStream: (data) => {
logger.trace('onActionStream', data.action);
workbenchStore.runAction(data, true);
},
},
});

Expand Down
13 changes: 8 additions & 5 deletions app/lib/runtime/action-runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class ActionRunner {
});
}

async runAction(data: ActionCallbackData) {
async runAction(data: ActionCallbackData, isStreaming: boolean = false) {
const { actionId } = data;
const action = this.actions.get()[actionId];

Expand All @@ -83,19 +83,22 @@ export class ActionRunner {
if (action.executed) {
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
.then(() => {
return this.#executeAction(actionId);
return this.#executeAction(actionId, isStreaming);
})
.catch((error) => {
console.error('Action failed:', error);
});
}

async #executeAction(actionId: string) {
async #executeAction(actionId: string, isStreaming: boolean = false) {
const action = this.actions.get()[actionId];

this.#updateAction(actionId, { status: 'running' });
Expand All @@ -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) {
this.#updateAction(actionId, { status: 'failed', error: 'Action failed' });

Expand Down
18 changes: 17 additions & 1 deletion app/lib/runtime/message-parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface ParserCallbacks {
onArtifactOpen?: ArtifactCallback;
onArtifactClose?: ArtifactCallback;
onActionOpen?: ActionCallback;
onActionStream?: ActionCallback;
onActionClose?: ActionCallback;
}

Expand All @@ -54,7 +55,7 @@ interface MessageState {
export class StreamingMessageParser {
#messages = new Map<string, MessageState>();

constructor(private _options: StreamingMessageParserOptions = {}) {}
constructor(private _options: StreamingMessageParserOptions = {}) { }

parse(messageId: string, input: string) {
let state = this.#messages.get(messageId);
Expand Down Expand Up @@ -118,6 +119,21 @@ export class StreamingMessageParser {

i = closeIndex + ARTIFACT_ACTION_TAG_CLOSE.length;
} 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;
}
} else {
Expand Down
54 changes: 38 additions & 16 deletions app/lib/stores/workbench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { TerminalStore } from './terminal';
import JSZip from 'jszip';
import { saveAs } from 'file-saver';
import { Octokit } from "@octokit/rest";
import * as nodePath from 'node:path';

export interface ArtifactState {
id: string;
Expand Down Expand Up @@ -258,16 +259,37 @@ export class WorkbenchStore {
artifact.runner.addAction(data);
}

async runAction(data: ActionCallbackData) {
async runAction(data: ActionCallbackData, isStreaming: boolean = false) {
const { messageId } = data;

const artifact = this.#getArtifact(messageId);

if (!artifact) {
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) {
Expand Down Expand Up @@ -336,20 +358,20 @@ export class WorkbenchStore {
}

async pushToGitHub(repoName: string, githubUsername: string, ghToken: string) {

try {
// Get the GitHub auth token from environment variables
const githubToken = ghToken;

const owner = githubUsername;

if (!githubToken) {
throw new Error('GitHub token is not set in environment variables');
}

// Initialize Octokit with the auth token
const octokit = new Octokit({ auth: githubToken });

// Check if the repository already exists before creating it
let repo
try {
Expand All @@ -368,13 +390,13 @@ export class WorkbenchStore {
throw error; // Some other error occurred
}
}

// Get all files
const files = this.files.get();
if (!files || Object.keys(files).length === 0) {
throw new Error('No files found to push');
}

// Create blobs for each file
const blobs = await Promise.all(
Object.entries(files).map(async ([filePath, dirent]) => {
Expand All @@ -389,21 +411,21 @@ export class WorkbenchStore {
}
})
);

const validBlobs = blobs.filter(Boolean); // Filter out any undefined blobs

if (validBlobs.length === 0) {
throw new Error('No valid files to push');
}

// Get the latest commit SHA (assuming main branch, update dynamically if needed)
const { data: ref } = await octokit.git.getRef({
owner: repo.owner.login,
repo: repo.name,
ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch
});
const latestCommitSha = ref.object.sha;

// Create a new tree
const { data: newTree } = await octokit.git.createTree({
owner: repo.owner.login,
Expand All @@ -416,7 +438,7 @@ export class WorkbenchStore {
sha: blob!.sha,
})),
});

// Create a new commit
const { data: newCommit } = await octokit.git.createCommit({
owner: repo.owner.login,
Expand All @@ -425,15 +447,15 @@ export class WorkbenchStore {
tree: newTree.sha,
parents: [latestCommitSha],
});

// Update the reference
await octokit.git.updateRef({
owner: repo.owner.login,
repo: repo.name,
ref: `heads/${repo.default_branch || 'main'}`, // Handle dynamic branch
sha: newCommit.sha,
});

alert(`Repository created and code pushed: ${repo.html_url}`);
} catch (error) {
console.error('Error pushing to GitHub:', error instanceof Error ? error.message : String(error));
Expand Down
Loading

0 comments on commit 54351cd

Please sign in to comment.