summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--continuedev/src/continuedev/core/autopilot.py15
-rw-r--r--continuedev/src/continuedev/core/policy.py2
-rw-r--r--continuedev/src/continuedev/libs/util/traceback_parsers.py33
-rw-r--r--continuedev/src/continuedev/server/ide_protocol.py4
-rw-r--r--continuedev/src/continuedev/steps/chat.py2
-rw-r--r--continuedev/src/continuedev/steps/core/core.py16
-rw-r--r--continuedev/src/continuedev/steps/main.py23
-rw-r--r--continuedev/src/continuedev/steps/on_traceback.py2
-rw-r--r--extension/src/terminal/terminalEmulator.ts18
9 files changed, 34 insertions, 81 deletions
diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py
index 3ccce89a..782d6270 100644
--- a/continuedev/src/continuedev/core/autopilot.py
+++ b/continuedev/src/continuedev/core/autopilot.py
@@ -14,6 +14,7 @@ from ..libs.util.telemetry import capture_event
from .sdk import ContinueSDK
import asyncio
from ..libs.util.step_name_to_steps import get_step_from_name
+from ..libs.util.traceback_parsers import get_python_traceback, get_javascript_traceback
class Autopilot(ContinueBaseModel):
@@ -92,12 +93,14 @@ class Autopilot(ContinueBaseModel):
# Note that this is being overriden to do nothing in DemoAgent
async def handle_command_output(self, output: str):
- is_traceback = False
- if is_traceback:
- for tb_step in self.continue_sdk.config.on_traceback:
- step = get_step_from_name(tb_step.step_name)(
- output=output, **tb_step.params)
- await self._run_singular_step(step)
+ get_traceback_funcs = [get_python_traceback, get_javascript_traceback]
+ for get_tb_func in get_traceback_funcs:
+ traceback = get_tb_func(output)
+ if traceback is not None:
+ for tb_step in self.continue_sdk.config.on_traceback:
+ step = get_step_from_name(
+ tb_step.step_name, {"output": output, **tb_step.params})
+ await self._run_singular_step(step)
_step_depth: int = 0
diff --git a/continuedev/src/continuedev/core/policy.py b/continuedev/src/continuedev/core/policy.py
index 255f598d..1b53834b 100644
--- a/continuedev/src/continuedev/core/policy.py
+++ b/continuedev/src/continuedev/core/policy.py
@@ -8,7 +8,7 @@ from ..recipes.DeployPipelineAirflowRecipe.main import DeployPipelineAirflowReci
from ..recipes.AddTransformRecipe.main import AddTransformRecipe
from .main import Step, Validator, History, Policy
from .observation import Observation, TracebackObservation, UserInputObservation
-from ..steps.main import EditHighlightedCodeStep, SolveTracebackStep, RunCodeStep, FasterEditHighlightedCodeStep, StarCoderEditHighlightedCodeStep, EmptyStep, SetupContinueWorkspaceStep
+from ..steps.main import EditHighlightedCodeStep, SolveTracebackStep
from ..recipes.WritePytestsRecipe.main import WritePytestsRecipe
from ..recipes.ContinueRecipeRecipe.main import ContinueStepStep
from ..steps.comment_code import CommentCodeStep
diff --git a/continuedev/src/continuedev/libs/util/traceback_parsers.py b/continuedev/src/continuedev/libs/util/traceback_parsers.py
index c31929c1..4e7a24e0 100644
--- a/continuedev/src/continuedev/libs/util/traceback_parsers.py
+++ b/continuedev/src/continuedev/libs/util/traceback_parsers.py
@@ -1,24 +1,15 @@
-from typing import Union
-from ...models.main import Traceback
-from boltons import tbutils
-
-
-def sort_func(items):
- """Sort a list of items."""
- return sorted(items)
-
-
-def parse_python_traceback(stdout: str) -> Union[Traceback, None]:
- """Parse a python traceback from stdout."""
-
- # Sometimes paths are not quoted, but they need to be
- if "File \"" not in stdout:
- stdout = stdout.replace("File ", "File \"").replace(
- ", line ", "\", line ")
+def get_python_traceback(output: str) -> str:
+ if "Traceback (most recent call last):" in output or "SyntaxError" in output:
+ return output
+ else:
+ return None
- try:
- tbutil_parsed_exc = tbutils.ParsedException.from_string(stdout)
- return Traceback.from_tbutil_parsed_exc(tbutil_parsed_exc)
- except Exception:
+def get_javascript_traceback(output: str) -> str:
+ lines = output.splitlines()
+ if len(lines) > 0:
+ first_line = lines[0].split(": ")
+ if len(lines) > 1 and len(first_line) > 0 and len(first_line[0]) > 0 and "at" in lines[1].lstrip():
+ return output
+ else:
return None
diff --git a/continuedev/src/continuedev/server/ide_protocol.py b/continuedev/src/continuedev/server/ide_protocol.py
index 1d98f4a1..2dcedc30 100644
--- a/continuedev/src/continuedev/server/ide_protocol.py
+++ b/continuedev/src/continuedev/server/ide_protocol.py
@@ -36,10 +36,6 @@ class AbstractIdeProtocolServer(ABC):
"""Called when the user accepts or rejects a suggestion"""
@abstractmethod
- def onTraceback(self, traceback: Traceback):
- """Called when a traceback is received"""
-
- @abstractmethod
def onFileSystemUpdate(self, update: FileSystemEdit):
"""Called when a file system update is received"""
diff --git a/continuedev/src/continuedev/steps/chat.py b/continuedev/src/continuedev/steps/chat.py
index 499d127f..90514ad6 100644
--- a/continuedev/src/continuedev/steps/chat.py
+++ b/continuedev/src/continuedev/steps/chat.py
@@ -10,7 +10,7 @@ class SimpleChatStep(Step):
name: str = "Chat"
async def run(self, sdk: ContinueSDK):
- self.description = f"## {self.user_input}\n\n"
+ self.description = f"```{self.user_input}```\n\n"
async for chunk in sdk.models.default.stream_chat(self.user_input, with_history=await sdk.get_chat_context()):
self.description += chunk
await sdk.update_ui()
diff --git a/continuedev/src/continuedev/steps/core/core.py b/continuedev/src/continuedev/steps/core/core.py
index 7f3a93ba..59af5f38 100644
--- a/continuedev/src/continuedev/steps/core/core.py
+++ b/continuedev/src/continuedev/steps/core/core.py
@@ -332,19 +332,3 @@ class WaitForUserConfirmationStep(Step):
self.description = self.prompt
resp = await sdk.wait_for_user_input()
return TextObservation(text=resp)
-
-
-def get_python_traceback(output: str) -> str:
- if "Traceback" in output:
- return output
- else:
- return None
-
-def get_javascript_traceback(output: str) -> str:
- lines = output.splitlines("\n")
- if len(lines) > 0:
- first_line = lines[0].split(": ")
- if len(lines) > 1 and len(first_line) > 0 and len(first_line[0]) > 0 and "at" in lines[1].lstrip():
- return output
- else:
- return None \ No newline at end of file
diff --git a/continuedev/src/continuedev/steps/main.py b/continuedev/src/continuedev/steps/main.py
index b61aa3fe..5ba86c53 100644
--- a/continuedev/src/continuedev/steps/main.py
+++ b/continuedev/src/continuedev/steps/main.py
@@ -3,7 +3,6 @@ from typing import Coroutine, List, Union
from pydantic import BaseModel
-from ..libs.util.traceback_parsers import parse_python_traceback
from ..libs.llm import LLM
from ..models.main import Traceback, Range
from ..models.filesystem_edit import EditDiff, FileEdit
@@ -33,28 +32,6 @@ class SetupContinueWorkspaceStep(Step):
}"""))
-class RunCodeStep(Step):
- cmd: str
-
- async def describe(self, models: Models) -> Coroutine[str, None, None]:
- return f"Ran command: `{self.cmd}`"
-
- async def run(self, sdk: ContinueSDK) -> Coroutine[Observation, None, None]:
- result = subprocess.run(
- self.cmd.split(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- stdout = result.stdout.decode("utf-8")
- stderr = result.stderr.decode("utf-8")
- print(stdout, stderr)
-
- # If it fails, return the error
- tb = parse_python_traceback(stdout) or parse_python_traceback(stderr)
- if tb:
- return TracebackObservation(traceback=tb)
- else:
- self.hide = True
- return None
-
-
class Policy(BaseModel):
pass
diff --git a/continuedev/src/continuedev/steps/on_traceback.py b/continuedev/src/continuedev/steps/on_traceback.py
index de668775..a0c4d07b 100644
--- a/continuedev/src/continuedev/steps/on_traceback.py
+++ b/continuedev/src/continuedev/steps/on_traceback.py
@@ -9,6 +9,6 @@ class DefaultOnTracebackStep(Step):
hide: bool = True
async def run(self, sdk: ContinueSDK):
- sdk.run_step(SimpleChatStep(
+ await sdk.run_step(SimpleChatStep(
name="Help With Traceback",
user_input=f"""I got the following error, can you please help explain how to fix it?\n\n{self.output}"""))
diff --git a/extension/src/terminal/terminalEmulator.ts b/extension/src/terminal/terminalEmulator.ts
index 35f02ac0..9d90b331 100644
--- a/extension/src/terminal/terminalEmulator.ts
+++ b/extension/src/terminal/terminalEmulator.ts
@@ -70,12 +70,13 @@ export class CapturedTerminal {
private hasRunCommand: boolean = false;
private dataEndsInPrompt(strippedData: string): boolean {
- const lines = this.dataBuffer.split("\n");
+ const lines = strippedData.split("\n");
+ const last_line = lines[lines.length - 1];
return (
- lines.length > 0 &&
- (lines[lines.length - 1].includes("bash-") ||
- lines[lines.length - 1].includes(") $ ")) &&
- lines[lines.length - 1].includes("$")
+ (lines.length > 0 &&
+ (last_line.includes("bash-") || last_line.includes(") $ ")) &&
+ last_line.includes("$")) ||
+ (last_line.includes("]> ") && last_line.includes(") ["))
);
}
@@ -127,12 +128,12 @@ export class CapturedTerminal {
// Split the output by commands so it can be sent to Continue Server
const strippedData = stripAnsi(data);
- this.splitByCommandsBuffer += strippedData;
+ this.splitByCommandsBuffer += data;
if (this.dataEndsInPrompt(strippedData)) {
if (this.onCommandOutput) {
- this.onCommandOutput(this.splitByCommandsBuffer);
+ this.onCommandOutput(stripAnsi(this.splitByCommandsBuffer));
}
- this.dataBuffer = "";
+ this.splitByCommandsBuffer = "";
}
}
@@ -166,6 +167,7 @@ export class CapturedTerminal {
// Pass data through to terminal
this.writeEmitter.fire(data);
+ this.splitByCommandsListener(data);
for (let listener of this.onDataListeners) {
listener(data);
}
generated by cgit v1.2.3-70-g09d2 (git 2.48.1) at 2025-02-02 23:02:22 +0000