summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--continuedev/src/continuedev/core/autopilot.py15
-rw-r--r--continuedev/src/continuedev/libs/util/dedent.py16
-rw-r--r--continuedev/src/continuedev/server/ide.py12
-rw-r--r--continuedev/src/continuedev/steps/core/core.py14
-rw-r--r--extension/package-lock.json4
-rw-r--r--extension/package.json2
-rw-r--r--extension/react-app/src/tabs/gui.tsx97
-rw-r--r--extension/src/activation/activate.ts31
-rw-r--r--extension/src/activation/environmentSetup.ts34
-rw-r--r--extension/src/debugPanel.ts14
-rw-r--r--extension/src/suggestions.ts2
11 files changed, 199 insertions, 42 deletions
diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py
index 3b2b65db..7d149e7e 100644
--- a/continuedev/src/continuedev/core/autopilot.py
+++ b/continuedev/src/continuedev/core/autopilot.py
@@ -139,13 +139,14 @@ class Autopilot(ContinueBaseModel):
return None
# If a parent step is deleted/cancelled, don't run this step
- last_depth = self._step_depth
- i = self.history.current_index
- while i >= 0 and self.history.timeline[i].depth == last_depth - 1:
- if self.history.timeline[i].deleted:
- return None
- last_depth = self.history.timeline[i].depth
- i -= 1
+ # TODO: This was problematic because when running a step after deleting one, it seemed to think that was the parent
+ # last_depth = self._step_depth
+ # i = self.history.current_index
+ # while i >= 0 and self.history.timeline[i].depth == last_depth - 1:
+ # if self.history.timeline[i].deleted:
+ # return None
+ # last_depth = self.history.timeline[i].depth
+ # i -= 1
capture_event(self.continue_sdk.ide.unique_id, 'step run', {
'step_name': step.name, 'params': step.dict()})
diff --git a/continuedev/src/continuedev/libs/util/dedent.py b/continuedev/src/continuedev/libs/util/dedent.py
new file mode 100644
index 00000000..74edd173
--- /dev/null
+++ b/continuedev/src/continuedev/libs/util/dedent.py
@@ -0,0 +1,16 @@
+from typing import Tuple
+
+
+def dedent_and_get_common_whitespace(s: str) -> Tuple[str, str]:
+ lines = s.splitlines()
+
+ # Longest common whitespace prefix
+ lcp = lines[0].split(lines[0].strip())[0]
+ for i in range(1, len(lines)):
+ for j in range(0, len(lcp)):
+ if j >= len(lines[i]) or lcp[j] != lines[i][j]:
+ lcp = lcp[:j]
+ if lcp == "":
+ return s, ""
+ break
+ return "\n".join(map(lambda x: x.removeprefix(lcp), lines)), lcp
diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py
index 6a94326a..ff0b2a24 100644
--- a/continuedev/src/continuedev/server/ide.py
+++ b/continuedev/src/continuedev/server/ide.py
@@ -253,10 +253,14 @@ class IdeProtocolServer(AbstractIdeProtocolServer):
async def getUserSecret(self, key: str) -> str:
"""Get a user secret"""
- resp = await self._send_and_receive_json({
- "key": key
- }, GetUserSecretResponse, "getUserSecret")
- return resp.value
+ try:
+ resp = await self._send_and_receive_json({
+ "key": key
+ }, GetUserSecretResponse, "getUserSecret")
+ return resp.value
+ except Exception as e:
+ print("Error getting user secret", e)
+ return ""
async def saveFile(self, filepath: str):
"""Save a file"""
diff --git a/continuedev/src/continuedev/steps/core/core.py b/continuedev/src/continuedev/steps/core/core.py
index a712c12f..c8acd7c5 100644
--- a/continuedev/src/continuedev/steps/core/core.py
+++ b/continuedev/src/continuedev/steps/core/core.py
@@ -11,6 +11,7 @@ from ...models.filesystem import FileSystem, RangeInFile, RangeInFileWithContent
from ...core.observation import Observation, TextObservation, TracebackObservation, UserInputObservation
from ...core.main import ChatMessage, Step, SequentialStep
from ...libs.util.count_tokens import MAX_TOKENS_FOR_MODEL, DEFAULT_MAX_TOKENS
+from ...libs.util.dedent import dedent_and_get_common_whitespace
import difflib
@@ -266,6 +267,8 @@ class DefaultModelEditCodeStep(Step):
file_prefix, contents, file_suffix, model_to_use = await self.get_prompt_parts(
rif, sdk, full_file_contents)
+ contents, common_whitespace = dedent_and_get_common_whitespace(
+ contents)
prompt = self.compile_prompt(file_prefix, contents, file_suffix, sdk)
full_file_contents_lines = full_file_contents.split("\n")
@@ -292,10 +295,11 @@ class DefaultModelEditCodeStep(Step):
index_of_last_matched_line = -1
async def handle_generated_line(line: str):
- nonlocal lines, current_block_start, current_line_in_file, original_lines, original_lines_below_previous_blocks, current_block_lines, offset_from_blocks, matched_lines_at_end_of_block, index_of_last_matched_line, LINES_TO_MATCH_BEFORE_ENDING_BLOCK
+ nonlocal lines, current_block_start, current_line_in_file, original_lines, original_lines_below_previous_blocks, current_block_lines, offset_from_blocks, matched_lines_at_end_of_block, index_of_last_matched_line, LINES_TO_MATCH_BEFORE_ENDING_BLOCK, common_whitespace
# Highlight the line to show progress
- line_to_highlight = current_line_in_file - len(current_block_lines)
+ # - len(current_block_lines)
+ line_to_highlight = current_line_in_file
await sdk.ide.highlightCode(RangeInFile(filepath=rif.filepath, range=Range.from_shorthand(
line_to_highlight, 0, line_to_highlight, 0)), "#FFFFFF22" if len(current_block_lines) == 0 else "#00FF0022")
@@ -393,6 +397,9 @@ class DefaultModelEditCodeStep(Step):
# Trailing whitespace doesn't matter
line = line.rstrip()
+ # Add the common whitespace that was removed before prompting
+ line = common_whitespace + line
+
# Lines that should signify the end of generation
if self.is_end_line(line):
break
@@ -406,7 +413,7 @@ class DefaultModelEditCodeStep(Step):
continue
# Because really short lines might be expected to be repeated, this is only a !heuristic!
# Stop when it starts copying the file_suffix
- elif line.strip() == line_below_highlighted_range.strip() and len(line.strip()) > 4 and not line.strip() == original_lines_below_previous_blocks[0].strip():
+ elif line.strip() == line_below_highlighted_range.strip() and len(line.strip()) > 4 and not (len(original_lines_below_previous_blocks) > 0 and line.strip() == original_lines_below_previous_blocks[0].strip()):
repeating_file_suffix = True
break
@@ -417,6 +424,7 @@ class DefaultModelEditCodeStep(Step):
# Add the unfinished line
if unfinished_line != "" and not self.line_to_be_ignored(unfinished_line, completion_lines_covered == 0) and not self.is_end_line(unfinished_line):
+ unfinished_line = common_whitespace + unfinished_line
lines.append(unfinished_line)
await handle_generated_line(unfinished_line)
completion_lines_covered += 1
diff --git a/extension/package-lock.json b/extension/package-lock.json
index a4aff512..241ea5ca 100644
--- a/extension/package-lock.json
+++ b/extension/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "continue",
- "version": "0.0.79",
+ "version": "0.0.86",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "continue",
- "version": "0.0.79",
+ "version": "0.0.86",
"license": "Apache-2.0",
"dependencies": {
"@electron/rebuild": "^3.2.10",
diff --git a/extension/package.json b/extension/package.json
index 44b55e89..7eca6042 100644
--- a/extension/package.json
+++ b/extension/package.json
@@ -14,7 +14,7 @@
"displayName": "Continue",
"pricing": "Free",
"description": "Accelerating software development with language models",
- "version": "0.0.79",
+ "version": "0.0.86",
"publisher": "Continue",
"engines": {
"vscode": "^1.74.0"
diff --git a/extension/react-app/src/tabs/gui.tsx b/extension/react-app/src/tabs/gui.tsx
index 13b74423..249d9785 100644
--- a/extension/react-app/src/tabs/gui.tsx
+++ b/extension/react-app/src/tabs/gui.tsx
@@ -64,7 +64,101 @@ function GUI(props: GUIProps) {
const [dataSwitchChecked, setDataSwitchChecked] = useState(false);
const [showDataSharingInfo, setShowDataSharingInfo] = useState(false);
const [stepsOpen, setStepsOpen] = useState<boolean[]>([]);
- const [history, setHistory] = useState<History | undefined>();
+ const [history, setHistory] = useState<History | undefined>({
+ timeline: [
+ {
+ step: {
+ name: "SequentialStep",
+ hide: true,
+ description: "Running step: SequentialStep",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ steps: [
+ {
+ name: "Welcome to Continue",
+ hide: false,
+ description:
+ "Type '/' to see the list of available slash commands. If you highlight code, edits and explanations will be localized to the highlighted range. Otherwise, the currently open file is used. In both cases, the code is combined with the previous steps to construct the context.",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ message:
+ "Type '/' to see the list of available slash commands. If you highlight code, edits and explanations will be localized to the highlighted range. Otherwise, the currently open file is used. In both cases, the code is combined with the previous steps to construct the context.",
+ },
+ {
+ name: "Welcome to Continue!",
+ hide: true,
+ description: "Welcome to Continue!",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ },
+ {
+ name: "StepsOnStartupStep",
+ hide: true,
+ description: "Running steps on startup",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ },
+ ],
+ },
+ observation: null,
+ depth: 0,
+ deleted: false,
+ active: false,
+ },
+ {
+ step: {
+ name: "Welcome to Continue",
+ hide: false,
+ description:
+ "Type '/' to see the list of available slash commands. If you highlight code, edits and explanations will be localized to the highlighted range. Otherwise, the currently open file is used. In both cases, the code is combined with the previous steps to construct the context.",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ message:
+ "Type '/' to see the list of available slash commands. If you highlight code, edits and explanations will be localized to the highlighted range. Otherwise, the currently open file is used. In both cases, the code is combined with the previous steps to construct the context.",
+ },
+ observation: {
+ text: "Type '/' to see the list of available slash commands. If you highlight code, edits and explanations will be localized to the highlighted range. Otherwise, the currently open file is used. In both cases, the code is combined with the previous steps to construct the context.",
+ },
+ depth: 1,
+ deleted: false,
+ active: false,
+ },
+ {
+ step: {
+ name: "Welcome to Continue!",
+ hide: true,
+ description: "Welcome to Continue!",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ },
+ observation: null,
+ depth: 1,
+ deleted: false,
+ active: false,
+ },
+ {
+ step: {
+ name: "StepsOnStartupStep",
+ hide: true,
+ description: "Running steps on startup",
+ system_message: null,
+ chat_context: [],
+ manage_own_chat_context: false,
+ },
+ observation: null,
+ depth: 1,
+ deleted: false,
+ active: false,
+ },
+ ],
+ current_index: 3,
+ } as any);
// {
// timeline: [
// {
@@ -228,7 +322,6 @@ function GUI(props: GUIProps) {
}, []);
useEffect(() => {
- console.log("CLIENT ON STATE UPDATE: ", client, client?.onStateUpdate);
client?.onStateUpdate((state) => {
// Scroll only if user is at very bottom of the window.
setUsingFastModel(state.default_model === "gpt-3.5-turbo");
diff --git a/extension/src/activation/activate.ts b/extension/src/activation/activate.ts
index df8b6871..cd8f0cf3 100644
--- a/extension/src/activation/activate.ts
+++ b/extension/src/activation/activate.ts
@@ -24,19 +24,6 @@ export async function activateExtension(
registerAllCodeLensProviders(context);
registerAllCommands(context);
- await new Promise((resolve, reject) => {
- vscode.window.withProgress(
- {
- location: vscode.ProgressLocation.Notification,
- title: "Starting Continue Server...",
- cancellable: false,
- },
- async (progress, token) => {
- await startContinuePythonServer();
- resolve(null);
- }
- );
- });
const serverUrl = getContinueServerUrl();
ideProtocolClient = new IdeProtocolClient(
@@ -46,8 +33,8 @@ export async function activateExtension(
// Setup the left panel
(async () => {
- const sessionId = await ideProtocolClient.getSessionId();
- const provider = new ContinueGUIWebviewViewProvider(sessionId);
+ const sessionIdPromise = ideProtocolClient.getSessionId();
+ const provider = new ContinueGUIWebviewViewProvider(sessionIdPromise);
context.subscriptions.push(
vscode.window.registerWebviewViewProvider(
@@ -60,6 +47,20 @@ export async function activateExtension(
);
})();
+ await new Promise((resolve, reject) => {
+ vscode.window.withProgress(
+ {
+ location: vscode.ProgressLocation.Notification,
+ title:
+ "Starting Continue Server... (it may take a minute to download Python packages)",
+ cancellable: false,
+ },
+ async (progress, token) => {
+ await startContinuePythonServer();
+ resolve(null);
+ }
+ );
+ });
// All opened terminals should be replaced by our own terminal
// vscode.window.onDidOpenTerminal((terminal) => {});
diff --git a/extension/src/activation/environmentSetup.ts b/extension/src/activation/environmentSetup.ts
index 168c79ad..823670fd 100644
--- a/extension/src/activation/environmentSetup.ts
+++ b/extension/src/activation/environmentSetup.ts
@@ -101,9 +101,34 @@ function checkEnvExists() {
}
function checkRequirementsInstalled() {
- return fs.existsSync(
- path.join(getExtensionUri().fsPath, "scripts", ".continue_env_installed")
+ let envLibsPath = path.join(
+ getExtensionUri().fsPath,
+ "scripts",
+ "env",
+ process.platform == "win32" ? "Lib" : "lib"
);
+ // If site-packages is directly under env, use that
+ if (fs.existsSync(path.join(envLibsPath, "site-packages"))) {
+ envLibsPath = path.join(envLibsPath, "site-packages");
+ } else {
+ // Get the python version folder name
+ const pythonVersions = fs.readdirSync(envLibsPath).filter((f: string) => {
+ return f.startsWith("python");
+ });
+ if (pythonVersions.length == 0) {
+ return false;
+ }
+ const pythonVersion = pythonVersions[0];
+ envLibsPath = path.join(envLibsPath, pythonVersion, "site-packages");
+ }
+
+ const continuePath = path.join(envLibsPath, "continuedev");
+
+ return fs.existsSync(continuePath);
+
+ // return fs.existsSync(
+ // path.join(getExtensionUri().fsPath, "scripts", ".continue_env_installed")
+ // );
}
async function setupPythonEnv() {
@@ -249,7 +274,10 @@ export async function startContinuePythonServer() {
});
child.stderr.on("data", (data: any) => {
console.log(`stderr: ${data}`);
- if (data.includes("Uvicorn running on")) {
+ if (
+ data.includes("Uvicorn running on") || // Successfully started the server
+ data.includes("address already in use") // The server is already running (probably a simultaneously opened VS Code window)
+ ) {
console.log("Successfully started Continue python server");
resolve(null);
}
diff --git a/extension/src/debugPanel.ts b/extension/src/debugPanel.ts
index b0db590a..79719a3b 100644
--- a/extension/src/debugPanel.ts
+++ b/extension/src/debugPanel.ts
@@ -126,7 +126,7 @@ let streamManager = new StreamManager();
export let debugPanelWebview: vscode.Webview | undefined;
export function setupDebugPanel(
panel: vscode.WebviewPanel | vscode.WebviewView,
- sessionId: string
+ sessionIdPromise: Promise<string>
): string {
debugPanelWebview = panel.webview;
panel.onDidDispose(() => {
@@ -224,6 +224,7 @@ export function setupDebugPanel(
panel.webview.onDidReceiveMessage(async (data) => {
switch (data.type) {
case "onLoad": {
+ const sessionId = await sessionIdPromise;
panel.webview.postMessage({
type: "onLoad",
vscMachineId: vscode.env.machineId,
@@ -334,10 +335,10 @@ export class ContinueGUIWebviewViewProvider
implements vscode.WebviewViewProvider
{
public static readonly viewType = "continue.continueGUIView";
- private readonly sessionId: string;
+ private readonly sessionIdPromise: Promise<string>;
- constructor(sessionId: string) {
- this.sessionId = sessionId;
+ constructor(sessionIdPromise: Promise<string>) {
+ this.sessionIdPromise = sessionIdPromise;
}
resolveWebviewView(
@@ -345,6 +346,9 @@ export class ContinueGUIWebviewViewProvider
_context: vscode.WebviewViewResolveContext,
_token: vscode.CancellationToken
): void | Thenable<void> {
- webviewView.webview.html = setupDebugPanel(webviewView, this.sessionId);
+ webviewView.webview.html = setupDebugPanel(
+ webviewView,
+ this.sessionIdPromise
+ );
}
}
diff --git a/extension/src/suggestions.ts b/extension/src/suggestions.ts
index c9e29ed5..c36b9b34 100644
--- a/extension/src/suggestions.ts
+++ b/extension/src/suggestions.ts
@@ -231,6 +231,8 @@ function selectSuggestion(
currentSuggestion.set(editorUri, Math.min(idx, suggestions.length - 1));
}
rerenderDecorations(editorUri);
+
+ editorToSuggestions.set(editorUri, suggestions);
}
export function acceptSuggestionCommand(key: SuggestionRanges | null = null) {
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-06 16:04:03 +0000