diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index a7eb728c5..000000000 Binary files a/.DS_Store and /dev/null differ diff --git a/mentat-vscode/LICENSE b/mentat-vscode/LICENSE new file mode 100644 index 000000000..578ff5000 --- /dev/null +++ b/mentat-vscode/LICENSE @@ -0,0 +1,202 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2024 Abante AI + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/mentat-vscode/README.md b/mentat-vscode/README.md index 063698119..6c6918d72 100644 --- a/mentat-vscode/README.md +++ b/mentat-vscode/README.md @@ -1,90 +1,55 @@ -# Mentat VSCode Extension +[![Twitter Follow](https://img.shields.io/twitter/follow/AbanteAi?style=social)](https://twitter.com/AbanteAi) +[![Discord Follow](https://dcbadge.vercel.app/api/server/XbPdxAMJte?style=flat)](https://discord.gg/zbvd9qx9Pb) +[![Documentation Status](https://readthedocs.org/projects/mentat-ai/badge/?version=latest)](https://docs.mentat.ai/en/latest/?badge=latest) +[![Stable Version](https://img.shields.io/pypi/v/mentat?color=blue)](https://pypi.org/project/mentat/) +[![License](https://img.shields.io/pypi/l/mentat.svg)](https://github.com/AbanteAI/mentat/blob/main/LICENSE) -## Local development setup +# 🧙‍♂️ Mentat ⚡ -These instructions will run through the workflow of running the project locally and -(optionally) using the VSCode debugger for the extension and the webviews. +> _It is by will alone I set my mind in motion_ +> +> The Mentat Mantra -### Prerequisites +The Mentats of Dune combine human creativity with computer-like processing - and now you can too. -- VSCode -- Node v18.16.0 +--- -### Steps +Mentat is the AI tool that assists you with any coding task, right from your command line. -1. Install the project +Unlike Copilot, Mentat coordinates edits across multiple locations and files. And unlike ChatGPT, Mentat already has the context of your project - no copy and pasting required! -```shell -npm install -``` +Want help understanding a new codebase? Need to add a new feature? Refactor existing code? Mentat can do it! -2. Build the project (if you are getting the error `Cannot find module extension.js...` you probably need to run this!) +# 🍿 Example Videos (🔊 on!) -```shell -npm run build -``` +https://github.com/AbanteAI/mentat/assets/128252497/35b027a9-d639-452c-a53c-ef019a645719 -3. If you want to test changes to Mentat on a branch, you need to egg install (`pip install -e path/to/repo`) - your branch of mentat into a venv at `~/.mentat/.venv`; otherwise, the extension will automatically pip install mentat for you. +See more videos on [Twitter](https://twitter.com/bio_bootloader/status/1683906735248125955) or YouTube: -**Without the VSCode Debugger** +- [Intro (2 min - same video as above)](https://www.youtube.com/watch?v=lODjaWclwpY) +- [Explaining and editing Llama2.c (3 min)](https://www.youtube.com/watch?v=qSyTWMFOjPs) +- [More Mentat features (4 min)](https://www.youtube.com/watch?v=YJLDIqq8k2A) -If you want to just open VSCode with the extension running (without the VSCode -Debugger), use: +### Add your OpenAI API Key -```shell -npm run vscode -``` +Create a `.env` file with the line `OPENAI_API_KEY=` in your workspace or in `~/.mentat/.env`. +If you want to use a models through Azure, Ollama or other service see [this doc](https://docs.mentat.ai/en/latest/user/alternative_models.html) for details. -At this point the extension is running and you should see the Mentat logo attached to -the sidebar. You don't have to follow the rest of the setup instructions. Congrats! +# 🚀 Usage -**With the VSCode Debugger** +Right click the files you would like Mentat to read and edit and click 'Mentat: Include File'. Mentat will add them to context, so be careful not to exceed the GPT-4 token context limit. To add multiple files at once, you can also add directories. When a directory is provided, Mentat will add all the contained files, except for ones ignored in your `.gitignore`. -If you want to open VSCode with the javascript debugger active and debug the running -extension, use: +For more information on commands, configuration or using other models see [the documentation](https://docs.mentat.ai/en/latest/user/guides.html). -```shell -code . -``` +# 👩‍💻 Roadmap and Contributing -3. Start the "Run Extension" launch configuration. +We welcome contributions! To coordinate, make sure to join the Discord server: [![Discord Follow](https://dcbadge.vercel.app/api/server/XbPdxAMJte?style=flat)](https://discord.gg/zbvd9qx9Pb) -Press "f5" or navigate to the "Run and Debug" menu on the sidebar click the green arrow -at the top of the menu. The "Run Extension" launch configuration should be selected. +The goal for Mentat is to become the best way to write code. Some big improvements coming up are: -If everything runs correctly you should see: +- seamlessly work with codebases much larger than LLM context limits, without requiring users to filter files manually +- improved edit quality -- a second VSCode window opened with the Mentat extension logo in the sidebar -- the VSCode debugger active and attached in the original VSCode window -- two "[watch] build finished" log messages in the terminal (one for the extension and - one for the webview) +If this is something you'd like to work on, jump right in! And if you want to join the team to work on this full time, message [@bio_bootloader](https://twitter.com/bio_bootloader) on twitter. -4. Click on the Mentat extension menu on the sidebar - -The extension will be built correctly if the sidebar is populated with the extension UI. - -At this point in the **second** VSCode window (the one with the extension running) you -can load the webview debug tools. Open the command shortcut menu ("\ + \ + -P" for macos) and type "Developer: Open Webview Developer Tools". - -With the Webview Developer Tools panel active, Typescript files used in the webview can -be opened with the file browser menu ("\ + P" for macos) and breakpoints can be -set as if you were setting breakpoints in a browser. - -The extension and webviews will be rebuilt automatically on save, however to see your -changes you need to refresh the VSCode window running the extension manually ("\ + -R" for macos). - -## Code structure - -We use prettier as our linter. The extension code is broken up into 2 main sections: - -- The extension. This is all the code need to mount/unstop the extension, interact with - VSCode resources, and run any background processes managed by VSCode. -- The webview. This is all all the React code thats rendered and injected into VSCode - "webviews". - -## Publishing - -TODO +To find something specific to work on, take a look at [open issues](https://github.com/AbanteAI/mentat/issues). diff --git a/mentat-vscode/SETUP.md b/mentat-vscode/SETUP.md new file mode 100644 index 000000000..063698119 --- /dev/null +++ b/mentat-vscode/SETUP.md @@ -0,0 +1,90 @@ +# Mentat VSCode Extension + +## Local development setup + +These instructions will run through the workflow of running the project locally and +(optionally) using the VSCode debugger for the extension and the webviews. + +### Prerequisites + +- VSCode +- Node v18.16.0 + +### Steps + +1. Install the project + +```shell +npm install +``` + +2. Build the project (if you are getting the error `Cannot find module extension.js...` you probably need to run this!) + +```shell +npm run build +``` + +3. If you want to test changes to Mentat on a branch, you need to egg install (`pip install -e path/to/repo`) + your branch of mentat into a venv at `~/.mentat/.venv`; otherwise, the extension will automatically pip install mentat for you. + +**Without the VSCode Debugger** + +If you want to just open VSCode with the extension running (without the VSCode +Debugger), use: + +```shell +npm run vscode +``` + +At this point the extension is running and you should see the Mentat logo attached to +the sidebar. You don't have to follow the rest of the setup instructions. Congrats! + +**With the VSCode Debugger** + +If you want to open VSCode with the javascript debugger active and debug the running +extension, use: + +```shell +code . +``` + +3. Start the "Run Extension" launch configuration. + +Press "f5" or navigate to the "Run and Debug" menu on the sidebar click the green arrow +at the top of the menu. The "Run Extension" launch configuration should be selected. + +If everything runs correctly you should see: + +- a second VSCode window opened with the Mentat extension logo in the sidebar +- the VSCode debugger active and attached in the original VSCode window +- two "[watch] build finished" log messages in the terminal (one for the extension and + one for the webview) + +4. Click on the Mentat extension menu on the sidebar + +The extension will be built correctly if the sidebar is populated with the extension UI. + +At this point in the **second** VSCode window (the one with the extension running) you +can load the webview debug tools. Open the command shortcut menu ("\ + \ + +P" for macos) and type "Developer: Open Webview Developer Tools". + +With the Webview Developer Tools panel active, Typescript files used in the webview can +be opened with the file browser menu ("\ + P" for macos) and breakpoints can be +set as if you were setting breakpoints in a browser. + +The extension and webviews will be rebuilt automatically on save, however to see your +changes you need to refresh the VSCode window running the extension manually ("\ + +R" for macos). + +## Code structure + +We use prettier as our linter. The extension code is broken up into 2 main sections: + +- The extension. This is all the code need to mount/unstop the extension, interact with + VSCode resources, and run any background processes managed by VSCode. +- The webview. This is all all the React code thats rendered and injected into VSCode + "webviews". + +## Publishing + +TODO diff --git a/mentat-vscode/package-lock.json b/mentat-vscode/package-lock.json index 666486310..108abda92 100644 --- a/mentat-vscode/package-lock.json +++ b/mentat-vscode/package-lock.json @@ -1,12 +1,12 @@ { "name": "mentat", - "version": "0.0.1", + "version": "0.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mentat", - "version": "0.0.1", + "version": "0.0.3", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21", @@ -22,7 +22,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "1.74.0", "@types/vscode-webview": "1.57.2", - "@vscode/vsce": "2.22.0", + "@vscode/vsce": "^2.22.0", "esbuild": "0.19.4", "eslint": "8.51.0", "react": "18.2.0", diff --git a/mentat-vscode/package.json b/mentat-vscode/package.json index 1532051d8..84f98d0b8 100644 --- a/mentat-vscode/package.json +++ b/mentat-vscode/package.json @@ -191,7 +191,7 @@ "@types/uuid": "^9.0.8", "@types/vscode": "1.74.0", "@types/vscode-webview": "1.57.2", - "@vscode/vsce": "2.22.0", + "@vscode/vsce": "^2.22.0", "esbuild": "0.19.4", "eslint": "8.51.0", "react": "18.2.0", diff --git a/mentat-vscode/src/lib/WebviewProvider.ts b/mentat-vscode/src/lib/WebviewProvider.ts index 7b4316576..dcdfe3564 100644 --- a/mentat-vscode/src/lib/WebviewProvider.ts +++ b/mentat-vscode/src/lib/WebviewProvider.ts @@ -22,12 +22,10 @@ function getUri(webview: Webview, extensionUri: Uri, pathList: string[]) { class WebviewProvider implements vscode.WebviewViewProvider { private extensionUri: vscode.Uri; private view?: vscode.WebviewView; + private loaded: boolean = false; constructor(extensionUri: vscode.Uri, private workspaceRoot: string) { this.extensionUri = extensionUri; - this.sendMessage(null, "vscode:newSession", { - workspaceRoot: workspaceRoot, - }); } private backlog: StreamMessage[] = []; @@ -113,6 +111,15 @@ class WebviewProvider implements vscode.WebviewViewProvider { switch (message.channel) { case "vscode:webviewLoaded": { // All messages we get before user first opens view have to be sent once the webview is loaded. + if (!this.loaded) { + this.loaded = true; + this.sendMessage(null, "vscode:newSession", { + workspaceRoot: this.workspaceRoot, + }); + } else { + this.sendMessage(null, "vscode:continuingSession"); + } + for (const streamMessage of this.backlog) { this.postMessage(streamMessage); } diff --git a/mentat-vscode/src/utils/server.ts b/mentat-vscode/src/utils/server.ts index 3d9af392d..4bdf9cd23 100644 --- a/mentat-vscode/src/utils/server.ts +++ b/mentat-vscode/src/utils/server.ts @@ -74,7 +74,11 @@ class Server { message: "Mentat: Creating Python environment...", }); const createVenvCommand = `${pythonCommand} -m venv ${venvPath}`; - await aexec(createVenvCommand); + try { + await aexec(createVenvCommand); + } catch (error) { + throw new Error(`Error creating Python venv: ${error}`); + } } const binFolder = path.join( venvPath, @@ -98,9 +102,14 @@ class Server { } if (mentatVersion !== MENTAT_VERSION) { progress.report({ message: "Mentat: Installing..." }); - await aexec( - `${pythonLocation} -m pip install mentat==${MENTAT_VERSION}` - ); + try { + await aexec( + `${pythonLocation} -m pip install mentat==${MENTAT_VERSION}`, + { env: { ...process.env, HNSWLIB_NO_NATIVE: "1" } } + ); + } catch (error) { + throw new Error(`Error installing Mentat: ${error}`); + } console.log("Installed Mentat"); } @@ -152,6 +161,8 @@ class Server { return serverProcess; } + private curMessage: string = ""; + public async startServer(workspaceRoot: string) { if (this.binFolder === undefined) { this.binFolder = await vscode.window.withProgress( @@ -171,7 +182,13 @@ class Server { ); this.serverProcess.stdio[4]?.on("data", (rawOutput: Buffer) => { const output = rawOutput.toString("utf-8"); - for (const serializedMessage of output.trim().split("\n")) { + this.curMessage += output; + if (!this.curMessage.endsWith("\n")) { + return; + } + for (const serializedMessage of this.curMessage + .trim() + .split("\n")) { try { const message: StreamMessage = JSON.parse( serializedMessage.trim() @@ -181,6 +198,7 @@ class Server { console.error("Error reading StreamMessage:", error); } } + this.curMessage = ""; }); this.clearBacklog(); } diff --git a/mentat-vscode/src/webviews/views/Chat.tsx b/mentat-vscode/src/webviews/views/Chat.tsx index 38b34cbf8..79a69fbe6 100644 --- a/mentat-vscode/src/webviews/views/Chat.tsx +++ b/mentat-vscode/src/webviews/views/Chat.tsx @@ -20,7 +20,8 @@ const MESSAGE_LIMIT = 100; export default function Chat() { // We have to use null instead of undefined everywhere here because vscode.setState serializes into json, so getState turns undefined into null - const [messages, setMessages] = useState<(Message | null)[]>([]); + const [previousMessages, setPreviousMessages] = useState([]); + const [messages, setMessages] = useState([]); const [inputRequestId, setInputRequestId] = useState(null); const [sessionActive, setSessionActive] = useState(true); const [textAreaValue, setTextAreaValue] = useState(""); @@ -30,25 +31,14 @@ export default function Chat() { const [contextUpdataData, setContextUpdateData] = useState(); + const [loaded, setLoaded] = useState(false); + const chatLogRef = useRef(null); // TODO: Rarely, if you move fast during model output, some bugs can occur when reloading webview view; // figure out why and fix it (easiest to see if you turn off retainContextWhenHidden). Once fixed, turn off retainContextWhenHidden permanently. - // Whenever you add more state, make certain to update both of these effects!!! useEffect(() => { - const state: any = vscode.getState(); - if (state) { - setMessages(state.messages); - setInputRequestId(state.inputRequestId); - setSessionActive(state.sessionActive); - setTextAreaValue(state.textAreaValue); - setInterruptable(state.interruptable); - setActiveEdits(state.activeEdits); - setWorkspaceRoot(state.workspaceRoot); - setContextUpdateData(state.contextUpdataData); - } - window.addEventListener("message", handleServerMessage); // If we send messages before the webview loads and we add the listener, they get thrown out, // so we have to signal when we're loaded and can recieve the stored messages. @@ -57,19 +47,24 @@ export default function Chat() { window.removeEventListener("message", handleServerMessage); }; }, []); + // Whenever you add more state, make certain to update this effect and the continuingSession message receiver! useEffect(() => { - const state = { - messages, - inputRequestId, - sessionActive, - textAreaValue, - interruptable, - activeEdits, - workspaceRoot, - contextUpdataData, - }; - vscode.setState(state); + if (loaded) { + const state = { + previousMessages, + messages, + inputRequestId, + sessionActive, + textAreaValue, + interruptable, + activeEdits, + workspaceRoot, + contextUpdataData, + }; + vscode.setState(state); + } }, [ + previousMessages, messages, inputRequestId, sessionActive, @@ -94,9 +89,9 @@ export default function Chat() { source: "user" | "mentat" ) { setMessages((prevMessages) => { - // If the last message was from the same source, merge the messages + // If the last 2 messages were both from mentat, merge the messages const lastMessage = prevMessages.at(-1); - if (source === lastMessage?.source) { + if (source === "mentat" && lastMessage?.source === "mentat") { const { text: lastText, ...lastAttributes } = lastMessage.content.at(-1) ?? { text: "", @@ -204,24 +199,67 @@ export default function Chat() { const subchannel = message.channel.split(":").at(1); switch (subchannel) { case "newSession": { - setMessages((prevMessages) => { - if ( - prevMessages.length > 0 && - prevMessages.at(-1) !== null - ) { - return [...prevMessages, null]; - } else { - return [...prevMessages]; - } - }); - setActiveEdits([]); - setSessionActive(true); - setInterruptable(false); + const state: any = vscode.getState(); + const statePreviousMessages: Message[] = + state.previousMessages ?? []; + const stateMessages: Message[] = state.messages ?? []; + if ( + stateMessages.some( + (message) => message.source == "user" + ) + ) { + setPreviousMessages([ + ...statePreviousMessages, + ...stateMessages, + ]); + } else { + setPreviousMessages(statePreviousMessages); + } + + setMessages([ + { + content: [ + { + text: "What can I do for you?\n", + style: "info", + }, + ], + source: "mentat", + }, + ]); setWorkspaceRoot(message.extra.workspaceRoot); + setLoaded(true); + break; + } + case "continuingSession": { + const state: any = vscode.getState(); + if (state) { + setPreviousMessages(state.previousMessages); + setMessages(state.messages); + setInputRequestId(state.inputRequestId); + setSessionActive(state.sessionActive); + setTextAreaValue(state.textAreaValue); + setInterruptable(state.interruptable); + setActiveEdits(state.activeEdits); + setWorkspaceRoot(state.workspaceRoot); + setContextUpdateData(state.contextUpdataData); + } + setLoaded(true); break; } case "clearChatbox": { - setMessages([]); + setPreviousMessages([]); + setMessages([ + { + content: [ + { + text: "What can I do for you?\n", + style: "info", + }, + ], + source: "mentat", + }, + ]); setActiveEdits([]); break; } @@ -266,29 +304,30 @@ export default function Chat() { } // Using index as key should be fine since we never insert, delete, or re-order chat messages - const startingMessage: Message = { - content: [{ text: "What can I do for you?", style: "info" }], - source: "mentat", - }; - const chatMessageElements = [startingMessage, ...messages].map( + const previousMessageElements = previousMessages.map( (message, index, arr) => ( - {message === null ? ( -
- ) : ( - - )} + ) ); + const chatMessageElements = messages.map((message, index, arr) => ( + + + + )); return (
+ {previousMessageElements} + {previousMessages.length > 0 && ( +
+ + Conversation above this point not included + in chat context + +
+ )} {chatMessageElements}
{!sessionActive && ( diff --git a/mentat/llm_api_handler.py b/mentat/llm_api_handler.py index 20e316572..f582b4356 100644 --- a/mentat/llm_api_handler.py +++ b/mentat/llm_api_handler.py @@ -327,16 +327,20 @@ def raise_if_context_exceeds_max(tokens: int): class LlmApiHandler: """Used for any functions that require calling the external LLM API""" - def initialize_client(self): + async def initialize_client(self): + from mentat.session_input import collect_user_input + ctx = SESSION_CONTEXT.get() - if not load_dotenv(mentat_dir_path / ".env"): + if not load_dotenv(mentat_dir_path / ".env") and not load_dotenv(ctx.cwd / ".env"): load_dotenv() key = os.getenv("OPENAI_API_KEY") base_url = os.getenv("OPENAI_API_BASE") azure_key = os.getenv("AZURE_OPENAI_KEY") azure_endpoint = os.getenv("AZURE_OPENAI_ENDPOINT") + user_input_key = False + # ChromaDB requires a sync function for embeddings if azure_endpoint and azure_key: ctx.stream.send("Using Azure OpenAI client.", style="warning") @@ -353,20 +357,28 @@ def initialize_client(self): else: if not key: if not base_url: - raise UserError( - "No OpenAI api key detected.\nEither place your key into a .env" - " file or export it as an environment variable." + ctx.stream.send( + "No OpenAI api key detected. To avoid entering your api key on startup, create a .env file in" + " ~/.mentat/.env or in your workspace root.", + style="warning", ) + ctx.stream.send("Enter your api key:", style="info") + key = (await collect_user_input(log_input=False)).data + user_input_key = True # If they set the base_url but not the key, they probably don't need a key, but the client requires one - key = "fake_key" + else: + key = "fake_key" self.async_client = AsyncOpenAI(api_key=key, base_url=base_url) self.sync_client = OpenAI(api_key=key, base_url=base_url) try: - self.async_client.models.list() # Test the key + self.sync_client.models.list() # Test the key except AuthenticationError as e: raise UserError(f"API gave an Authentication Error:\n{e}") + if user_input_key: + ctx.stream.send("API key authenticated.", style="info") + @overload async def call_llm_api( self, diff --git a/mentat/session.py b/mentat/session.py index fc96513e1..02c8ad76b 100644 --- a/mentat/session.py +++ b/mentat/session.py @@ -169,7 +169,7 @@ async def _main(self): if session_context.config.auto_context_tokens > 0: ensure_ctags_installed() - session_context.llm_api_handler.initialize_client() + await session_context.llm_api_handler.initialize_client() check_model() need_user_request = True diff --git a/mentat/session_input.py b/mentat/session_input.py index 11ae529c2..8b33940e3 100644 --- a/mentat/session_input.py +++ b/mentat/session_input.py @@ -8,26 +8,21 @@ from mentat.session_stream import StreamMessage -async def _get_input_request(**kwargs: Any) -> StreamMessage: +async def _get_input_request(log_input: bool, **kwargs: Any) -> StreamMessage: session_context = SESSION_CONTEXT.get() stream = session_context.stream message = stream.send("", channel="input_request", **kwargs) response = await stream.recv(f"input_request:{message.id}") - logging.debug(f"User Input: {response.data}") + if log_input: + logging.debug(f"User Input: {response.data}") + else: + logging.debug("User Input: ****") return response -async def collect_user_input(command_autocomplete: bool = False) -> StreamMessage: - """ - Listens for user input on a new channel - - send a message requesting user to send a response - create a new broadcast channel that listens for the input - close the channel after receiving the input - """ - - response = await _get_input_request(command_autocomplete=command_autocomplete) +async def collect_user_input(command_autocomplete: bool = False, log_input: bool = True) -> StreamMessage: + response = await _get_input_request(log_input=log_input, command_autocomplete=command_autocomplete) # Quit on q if isinstance(response.data, str) and response.data.strip() == "q": raise SessionExit