Merge pull request #68 from neatwork-ai/hotfix-include-webview-build

New OpenAI models

Author: kaizu-xyz

bin/cross_build.py

@@ -1,86 +1,90 @@
-import subprocess
-import os
-import shutil
-
-
-def move(src, dest):
-    if os.path.isdir(src):
-        shutil.move(src, dest)
-    else:
-        shutil.copy2(src, dest)
-        os.remove(src)
-
-
-def run_command(cmd, working_dir=None):
-    print(f"Executing in directory: {working_dir}")
-    print(f"Executing command: {cmd}")
-
-    process = subprocess.Popen(
-        cmd, shell=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.STDOUT,
-        cwd=working_dir,
-        text=True,
-        encoding='utf-8'
-    )
-
-    # Stream output in real-time
-    while True:
-        output = process.stdout.readline()
-        if output == '' and process.poll() is not None:
-            break
-        if output:
-            print(output.strip())
-
-    rc = process.poll()
-    return rc
-
-
-def build():
-    script_dir = os.path.dirname(os.path.realpath(__file__))
-    project_root = os.path.dirname(script_dir)
-
-    vsce_dir = os.path.join(project_root, 'vsce')
-    crates_dir = os.path.join(project_root, 'crates', 'neatcoder')
-    webview_dir = os.path.join(project_root, 'webview')
-
-    # Building WASM
-    run_command("wasm-pack build --target nodejs --dev",
-                working_dir=crates_dir)
-
-    # Workaround: Copy neatcoder.d.ts to expected location by create_interface.py
-    dest_dir = os.path.join(project_root, "pkg")
-    # exist_ok=True ensures no error if directory already exists
-    os.makedirs(dest_dir, exist_ok=True)
-
-    shutil.copy2(os.path.join(crates_dir, "pkg", "neatcoder.d.ts"),
-                 os.path.join(dest_dir, "neatcoder.d.ts"))
-
-    run_command("python3 bin/create_interface.py", working_dir=project_root)
-
-    # Move the output file to desired location
-    move(os.path.join(project_root, "neatcoderInterface.d.ts"),
-         os.path.join(webview_dir, "wasm", "neatcoderInterface.d.ts"))
-
-    # Clean up by removing the copied file
-    # os.remove(os.path.join(project_root, "pkg", "neatcoder.d.ts"))
-
-    # Remove the existing pkg directory in vsce_dir if it exists
-    dest_pkg_dir = os.path.join(vsce_dir, "pkg")
-    if os.path.exists(dest_pkg_dir):
-        shutil.rmtree(dest_pkg_dir)
-
-    # Now move the pkg directory from crates_dir to vsce_dir
-    move(os.path.join(crates_dir, "pkg"), dest_pkg_dir)
-
-    # Building WebView
-    run_command("npm install", working_dir=webview_dir)
-    run_command("npm run build", working_dir=webview_dir)
-
-    # Building Client
-    run_command("yarn install", working_dir=vsce_dir)
-    run_command("vsce package --out ../vsix", working_dir=vsce_dir)
-
-
-if __name__ == '__main__':
-    build()
+import subprocess
+import os
+import shutil
+
+
+def move(src, dest):
+    if os.path.isdir(src):
+        shutil.move(src, dest)
+    else:
+        shutil.copy2(src, dest)
+        os.remove(src)
+
+
+def run_command(cmd, working_dir=None):
+    print(f"Executing in directory: {working_dir}")
+    print(f"Executing command: {cmd}")
+
+    process = subprocess.Popen(
+        cmd, shell=True,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT,
+        cwd=working_dir,
+        text=True,
+        encoding='utf-8'
+    )
+
+    # Stream output in real-time
+    while True:
+        output = process.stdout.readline()
+        if output == '' and process.poll() is not None:
+            break
+        if output:
+            print(output.strip())
+
+    rc = process.poll()
+    return rc
+
+
+def build():
+    script_dir = os.path.dirname(os.path.realpath(__file__))
+    project_root = os.path.dirname(script_dir)
+
+    vsce_dir = os.path.join(project_root, 'vsce')
+    crates_dir = os.path.join(project_root, 'crates', 'neatcoder')
+    webview_dir = os.path.join(project_root, 'webview')
+
+    # Building WASM
+    run_command("wasm-pack build --target nodejs --dev",
+                working_dir=crates_dir)
+
+    # Workaround: Copy neatcoder.d.ts to expected location by create_interface.py
+    dest_dir = os.path.join(project_root, "pkg")
+    # exist_ok=True ensures no error if directory already exists
+    os.makedirs(dest_dir, exist_ok=True)
+
+    shutil.copy2(os.path.join(crates_dir, "pkg", "neatcoder.d.ts"),
+                 os.path.join(dest_dir, "neatcoder.d.ts"))
+
+    run_command("python3 bin/create_interface.py", working_dir=project_root)
+
+    # Move the output file to desired location
+    move(os.path.join(project_root, "neatcoderInterface.d.ts"),
+         os.path.join(webview_dir, "wasm", "neatcoderInterface.d.ts"))
+
+    # Clean up by removing the copied file
+    # os.remove(os.path.join(project_root, "pkg", "neatcoder.d.ts"))
+
+    # Remove the existing pkg directory in vsce_dir if it exists
+    dest_pkg_dir = os.path.join(vsce_dir, "pkg")
+    if os.path.exists(dest_pkg_dir):
+        shutil.rmtree(dest_pkg_dir)
+
+    # Now move the pkg directory from crates_dir to vsce_dir
+    move(os.path.join(crates_dir, "pkg"), dest_pkg_dir)
+
+    # Building WebView
+    run_command("npm install", working_dir=webview_dir)
+    run_command("npm run build", working_dir=webview_dir)
+    dest_webview_build_dir = os.path.join(vsce_dir, "webview", "build")
+    if os.path.exists(dest_webview_build_dir):
+        shutil.rmtree(dest_webview_build_dir)
+    move(os.path.join(webview_dir, "build"), dest_webview_build_dir)
+
+    # Building Client
+    run_command("yarn install", working_dir=vsce_dir)
+    run_command("vsce package --out ../vsix", working_dir=vsce_dir)
+
+
+if __name__ == '__main__':
+    build()

crates/neatcoder/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "neatcoder"
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 
 [lib]

crates/neatcoder/src/openai/params.rs

@@ -18,6 +18,8 @@ pub enum OpenAIModels {
     Gpt4,
     Gpt35Turbo,
     Gpt35Turbo16k,
+    Gpt35Turbo1106,
+    Gpt41106Preview,
 }
 
 impl Default for OpenAIModels {
@@ -223,6 +225,8 @@ impl OpenAIModels {
             "gpt-4" => OpenAIModels::Gpt4,
             "gpt-3.5-turbo" => OpenAIModels::Gpt35Turbo,
             "gpt-3.5-turbo-16k" => OpenAIModels::Gpt35Turbo16k,
+            "gpt-3.5-turbo-1106" => OpenAIModels::Gpt35Turbo1106,
+            "gpt-4-1106-preview" => OpenAIModels::Gpt41106Preview,
             _ => panic!("Invalid model {}", model),
         };
 
@@ -235,6 +239,8 @@ impl OpenAIModels {
             OpenAIModels::Gpt4 => String::from("gpt-4"),
             OpenAIModels::Gpt35Turbo => String::from("gpt-3.5-turbo"),
             OpenAIModels::Gpt35Turbo16k => String::from("gpt-3.5-turbo-16k"),
+            OpenAIModels::Gpt35Turbo1106 => String::from("gpt-3.5-turbo-1106"),
+            OpenAIModels::Gpt41106Preview => String::from("gpt-4-1106-preview"),
         }
     }
 }

crates/neatcoder/src/openai/request.rs

@@ -11,6 +11,7 @@ use wasm_bindgen_futures::JsFuture;
 #[wasm_bindgen(js_name = requestBody)]
 pub fn request_body_(
     msgs: IOpenAIMsg,
+    job: OpenAIParams,
     stream: bool,
 ) -> Result<JsValue, JsError> {
     let msgs: Vec<OpenAIMsg> = Vec::from_extern(msgs).map_err(|e| {
@@ -20,7 +21,7 @@ pub fn request_body_(
         ))
     })?;
 
-    let job = OpenAIParams::default();
+    // let job = OpenAIParams::default();
 
     let mut data = json!({
         "model": job.model.as_string(),

vsce/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to the "neatcoder" extension will be documented in this file
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 
+## [0.2.3] - 07/11/2023
+
+### Added
+- New Open AI models `gpt-3.5-turbo-1106` and `gpt-4-1106-preview` now available
+
+### Fixed
+- Fix openChat command webview build URI
+- Fix: Chat view works with both gpt3 and gpt4
+
 ## [0.2.2] - 05/11/2023
 
 ### Fixed

vsce/package.json

@@ -2,7 +2,7 @@
   "name": "neatcoder",
   "displayName": "Neatwork AI - GPT4 on Steroids",
   "description": "Turn your IDE into an AI Sofware engineer.",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "publisher": "NeatworkAi",
   "repository": {
     "url": "https://github.com/neatwork-ai/neatcoder-issues.git",

vsce/src/chat/commands.ts

@@ -61,9 +61,7 @@ export async function initChat(
   );
 
   setWebviewContent(panel, context);
-  console.log("hahaha");
   activePanels.set(panelCounter, panel);
-  console.log("ebebebeb");
   panelCounter++;
 
   panel.onDidDispose(() => {
@@ -90,9 +88,7 @@ export async function openChat(
       enableScripts: true,
       retainContextWhenHidden: true,
       localResourceRoots: [
-        vscode.Uri.file(
-          path.join(context.extensionPath, "..", "webview", "build")
-        ),
+        vscode.Uri.file(path.join(context.extensionPath, "webview", "build")),
       ],
     }
   );

vsce/src/chat/handlers.ts

@@ -4,19 +4,21 @@ import * as wasm from "../../pkg/neatcoder";
 import * as https from "https";
 import * as url from "url";
 import { MessageBuffer } from "../utils/httpClient";
+import { getLLMParams } from "../utils/utils";
 
 export async function buildRequest(
   msgs: Array<wasm.Message>,
   stream: boolean
 ): Promise<[any, any]> {
-  console.log("GOING FOR IT");
   const apiKey = await getOrSetApiKey();
-  console.log("Skipping API KEY");
 
   try {
     console.log("Messages: " + JSON.stringify(msgs.map((msg) => msg.payload)));
+    let llmParams = await getLLMParams();
+
     const body = wasm.requestBody(
       msgs.map((msg) => msg.payload),
+      llmParams,
       stream
     );
     return [apiKey, body];

vsce/src/chat/webview.ts

@@ -14,15 +14,13 @@ export function setWebviewContent(
   let content = fs.readFileSync(entryHtml, "utf8");
 
   // Use asWebviewUri to get the correct URI for the assets
-  console.log("a");
   content = content.replace(/src="\/static\/js\/(.*?)"/g, (match, filename) => {
     const scriptSrc = panel.webview.asWebviewUri(
       vscode.Uri.file(path.join(reactBuildPath, "static", "js", filename))
     );
     return `src="${scriptSrc}"`;
   });
 
-  console.log("b");
   content = content.replace(
     /href="\/static\/css\/(.*?)"/g,
     (match, filename) => {
@@ -33,19 +31,15 @@ export function setWebviewContent(
     }
   );
 
-  console.log("c");
   const publicPath = vscode.Uri.file(reactBuildPath);
-  console.log("d");
   const webviewPath = panel.webview.asWebviewUri(publicPath);
-  console.log("e");
 
   // Injecting the public path
   const inlineScript = `<script>window.publicPath = "${webviewPath.toString()}";</script>`;
   content = content.replace(
     '<script id="pathInjection"></script>',
     inlineScript
   );
-  console.log("f");
 
   if (chatHistory) {
     const historyScript = `<script>window.initialChatHistory = ${JSON.stringify(
@@ -59,5 +53,4 @@ export function setWebviewContent(
   }
 
   panel.webview.html = content;
-  console.log("g");
 }

vsce/src/extension.ts

@@ -24,7 +24,11 @@ import {
 import { initCodeBase, appDataManager, setupDotNeatWatcher } from "./core";
 import { initStatusBar, initLogger, logger } from "./utils";
 import { ChatProvider, initChat, setupChatWatcher } from "./chat";
-import { getOrSetModelVersion, setModelVersion } from "./utils/utils";
+import {
+  getLLMParams,
+  getOrSetModelVersion,
+  setModelVersion,
+} from "./utils/utils";
 import { ChatItem } from "./chat/providers";
 import { openChat, removeChat } from "./chat/commands";
 import MixpanelHelper from "./utils/mixpanelHelper";
@@ -226,17 +230,6 @@ export async function activate(context: vscode.ExtensionContext) {
   );
 }
 
-async function getLLMParams(): Promise<wasm.OpenAIParams> {
-  let modelVersion = await getOrSetModelVersion();
-  if (modelVersion === null) {
-    modelVersion = wasm.OpenAIModels.Gpt4;
-    vscode.window.showErrorMessage(
-      "Invalid model version, defaulting to Gpt4."
-    );
-  }
-  return wasm.OpenAIParams.empty(modelVersion);
-}
-
 // This method is called when the extension is deactivated
 export function deactivate() {
   let mixpanel = MixpanelHelper.getInstance();