From fe1b9265a631f3ce5ace109d1eac6716b1fe2eb6 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Tue, 1 Aug 2023 14:09:23 -0700 Subject: refactor: :loud_sound: show errors to IDE before GUI connected --- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- extension/src/continueIdeClient.ts | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'extension') diff --git a/extension/package-lock.json b/extension/package-lock.json index d6c53eb2..4c5b6263 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.233", + "version": "0.0.234", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.233", + "version": "0.0.234", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index d7334b2b..42c0d382 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.233", + "version": "0.0.234", "publisher": "Continue", "engines": { "vscode": "^1.67.0" diff --git a/extension/src/continueIdeClient.ts b/extension/src/continueIdeClient.ts index 498cf9de..a0ce009c 100644 --- a/extension/src/continueIdeClient.ts +++ b/extension/src/continueIdeClient.ts @@ -192,6 +192,8 @@ class IdeProtocolClient { }); } + visibleMessages: Set = new Set(); + async handleMessage( messageType: string, data: any, @@ -254,6 +256,20 @@ class IdeProtocolClient { this.openFile(data.filepath); // TODO: Close file if False break; + case "showMessage": + if (!this.visibleMessages.has(data.message)) { + this.visibleMessages.add(data.message); + vscode.window + .showInformationMessage(data.message, "Copy Traceback", "View Logs") + .then((selection) => { + if (selection === "View Logs") { + vscode.commands.executeCommand("continue.viewLogs"); + } else if (selection === "Copy Traceback") { + vscode.env.clipboard.writeText(data.message); + } + }); + } + break; case "showVirtualFile": this.showVirtualFile(data.name, data.contents); break; -- cgit v1.2.3-70-g09d2 From 74a52c8399b3ccf2d2100b088b79e65c6ca6ad7e Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Tue, 1 Aug 2023 14:25:33 -0700 Subject: fix: :bug: bug when highlighting code prior to context_manager creation --- continuedev/src/continuedev/core/autopilot.py | 6 +++--- continuedev/src/continuedev/core/context.py | 17 ++++++++++------- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) (limited to 'extension') diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index d92c51cd..99b9185f 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -54,7 +54,7 @@ class Autopilot(ContinueBaseModel): history: History = History.from_empty() context: Context = Context() full_state: Union[FullState, None] = None - context_manager: Union[ContextManager, None] = None + context_manager: ContextManager = ContextManager() continue_sdk: ContinueSDK = None _on_update_callbacks: List[Callable[[FullState], None]] = [] @@ -72,7 +72,7 @@ class Autopilot(ContinueBaseModel): self.policy = override_policy # Load documents into the search index - self.context_manager = await ContextManager.create( + await self.context_manager.start( self.continue_sdk.config.context_providers + [ HighlightedCodeContextProvider(ide=self.ide), FileContextProvider(workspace_dir=self.ide.workspace_directory) @@ -98,7 +98,7 @@ class Autopilot(ContinueBaseModel): user_input_queue=self._main_user_input_queue, slash_commands=self.get_available_slash_commands(), adding_highlighted_code=self.context_manager.context_providers[ - "code"].adding_highlighted_code if self.context_manager is not None else False, + "code"].adding_highlighted_code if "code" in self.context_manager.context_providers else False, selected_context_items=await self.context_manager.get_selected_items() if self.context_manager is not None else [], ) self.full_state = full_state diff --git a/continuedev/src/continuedev/core/context.py b/continuedev/src/continuedev/core/context.py index e968c35c..3f5f6fd3 100644 --- a/continuedev/src/continuedev/core/context.py +++ b/continuedev/src/continuedev/core/context.py @@ -133,14 +133,19 @@ class ContextManager: """ return sum([await provider.get_chat_messages() for provider in self.context_providers.values()], []) - def __init__(self, context_providers: List[ContextProvider]): + def __init__(self): + self.context_providers = {} + self.provider_titles = set() + + async def start(self, context_providers: List[ContextProvider]): + """ + Starts the context manager. + """ self.context_providers = { prov.title: prov for prov in context_providers} self.provider_titles = { provider.title for provider in context_providers} - @classmethod - async def create(cls, context_providers: List[ContextProvider]): async with Client('http://localhost:7700') as search_client: meilisearch_running = True try: @@ -154,10 +159,8 @@ class ContextManager: if not meilisearch_running: logger.warning( "MeiliSearch not running, avoiding any dependent context providers") - context_providers = list( - filter(lambda cp: cp.title == "code", context_providers)) - - return cls(context_providers) + self.context_providers = list( + filter(lambda cp: cp.title == "code", self.context_providers)) async def load_index(self, workspace_dir: str): for _, provider in self.context_providers.items(): diff --git a/extension/package-lock.json b/extension/package-lock.json index 4c5b6263..abca8d98 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.234", + "version": "0.0.235", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.234", + "version": "0.0.235", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index 42c0d382..15e7676d 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.234", + "version": "0.0.235", "publisher": "Continue", "engines": { "vscode": "^1.67.0" -- cgit v1.2.3-70-g09d2 From fa34214012d14385d231a1ac4f16006aaf4331fb Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Tue, 1 Aug 2023 14:42:48 -0700 Subject: fix: :bug: fix bugs when selecting code to edit --- continuedev/src/continuedev/core/autopilot.py | 7 +++- continuedev/src/continuedev/server/gui.py | 8 ++-- continuedev/src/continuedev/server/ide.py | 4 +- continuedev/src/continuedev/server/main.py | 45 ---------------------- extension/react-app/src/components/PillButton.tsx | 4 +- .../src/hooks/AbstractContinueGUIClientProtocol.ts | 2 +- .../src/hooks/ContinueGUIClientProtocol.ts | 4 +- 7 files changed, 18 insertions(+), 56 deletions(-) (limited to 'extension') diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index 99b9185f..0b296432 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -1,7 +1,7 @@ from functools import cached_property import traceback import time -from typing import Any, Callable, Coroutine, Dict, List, Union +from typing import Callable, Coroutine, Dict, List, Union from aiohttp import ClientPayloadError from pydantic import root_validator @@ -66,6 +66,8 @@ class Autopilot(ContinueBaseModel): _user_input_queue = AsyncSubscriptionQueue() _retry_queue = AsyncSubscriptionQueue() + started: bool = False + async def start(self): self.continue_sdk = await ContinueSDK.create(self) if override_policy := self.continue_sdk.config.policy_override: @@ -79,6 +81,7 @@ class Autopilot(ContinueBaseModel): ]) await self.context_manager.load_index(self.ide.workspace_directory) + self.started = True class Config: arbitrary_types_allowed = True @@ -201,7 +204,7 @@ class Autopilot(ContinueBaseModel): await self.update_subscribers() async def set_editing_at_ids(self, ids: List[str]): - self.context_manager.context_providers["code"].set_editing_at_ids(ids) + await self.context_manager.context_providers["code"].set_editing_at_ids(ids) await self.update_subscribers() async def _run_singular_step(self, step: "Step", is_future_step: bool = False) -> Coroutine[Observation, None, None]: diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py index 57ecceb2..7c89c5c2 100644 --- a/continuedev/src/continuedev/server/gui.py +++ b/continuedev/src/continuedev/server/gui.py @@ -93,8 +93,8 @@ class GUIProtocolServer(AbstractGUIProtocolServer): self.on_delete_context_with_ids(data["ids"]) elif message_type == "toggle_adding_highlighted_code": self.on_toggle_adding_highlighted_code() - elif message_type == "set_editing_at_indices": - self.on_set_editing_at_indices(data["indices"]) + elif message_type == "set_editing_at_ids": + self.on_set_editing_at_ids(data["ids"]) elif message_type == "show_logs_at_index": self.on_show_logs_at_index(data["index"]) elif message_type == "select_context_item": @@ -138,9 +138,9 @@ class GUIProtocolServer(AbstractGUIProtocolServer): create_async_task( self.session.autopilot.toggle_adding_highlighted_code(), self.on_error) - def on_set_editing_at_indices(self, indices: List[int]): + def on_set_editing_at_ids(self, ids: List[str]): create_async_task( - self.session.autopilot.set_editing_at_indices(indices), self.on_error) + self.session.autopilot.set_editing_at_ids(ids), self.on_error) def on_show_logs_at_index(self, index: int): name = f"continue_logs.txt" diff --git a/continuedev/src/continuedev/server/ide.py b/continuedev/src/continuedev/server/ide.py index b026f4f2..9797a8b7 100644 --- a/continuedev/src/continuedev/server/ide.py +++ b/continuedev/src/continuedev/server/ide.py @@ -309,7 +309,9 @@ class IdeProtocolServer(AbstractIdeProtocolServer): def __get_autopilot(self): if self.session_id not in self.session_manager.sessions: return None - return self.session_manager.sessions[self.session_id].autopilot + + autopilot = self.session_manager.sessions[self.session_id].autopilot + return autopilot if autopilot.started else None def onFileEdits(self, edits: List[FileEditWithFullContents]): if autopilot := self.__get_autopilot(): diff --git a/continuedev/src/continuedev/server/main.py b/continuedev/src/continuedev/server/main.py index 468bc855..f8dfb009 100644 --- a/continuedev/src/continuedev/server/main.py +++ b/continuedev/src/continuedev/server/main.py @@ -1,5 +1,4 @@ import asyncio -import sys import time import psutil import os @@ -8,13 +7,11 @@ from fastapi.middleware.cors import CORSMiddleware import atexit import uvicorn import argparse -import logging.config from .ide import router as ide_router from .gui import router as gui_router from .session_manager import session_manager -from ..libs.util.paths import getLogFilePath from ..libs.util.logging import logger app = FastAPI() @@ -38,25 +35,6 @@ def health(): return {"status": "ok"} -class Logger(object): - def __init__(self, log_file: str): - self.terminal = sys.stdout - self.log = open(log_file, "a") - - def write(self, message): - self.terminal.write(message) - self.log.write(message) - - def flush(self): - # this flush method is needed for python 3 compatibility. - # this handles the flush command by doing nothing. - # you might want to specify some extra behavior here. - pass - - def isatty(self): - return False - - try: # add cli arg for server port parser = argparse.ArgumentParser() @@ -71,7 +49,6 @@ except Exception as e: def run_server(): config = uvicorn.Config(app, host="127.0.0.1", port=args.port) server = uvicorn.Server(config) - server.run() @@ -87,32 +64,10 @@ def cleanup(): loop.close() -def cpu_usage_report(): - process = psutil.Process(os.getpid()) - # Call cpu_percent once to start measurement, but ignore the result - process.cpu_percent(interval=None) - # Wait for a short period of time - time.sleep(1) - # Call cpu_percent again to get the CPU usage over the interval - cpu_usage = process.cpu_percent(interval=None) - logger.debug(f"CPU usage: {cpu_usage}%") - - atexit.register(cleanup) if __name__ == "__main__": try: - # Uncomment to get CPU usage reports - # import threading - - # def cpu_usage_loop(): - # while True: - # cpu_usage_report() - # time.sleep(2) - - # cpu_thread = threading.Thread(target=cpu_usage_loop) - # cpu_thread.start() - run_server() except Exception as e: logger.debug(f"Error starting Continue server: {e}") diff --git a/extension/react-app/src/components/PillButton.tsx b/extension/react-app/src/components/PillButton.tsx index e3d05711..0b1aa23d 100644 --- a/extension/react-app/src/components/PillButton.tsx +++ b/extension/react-app/src/components/PillButton.tsx @@ -168,7 +168,9 @@ const PillButton = (props: PillButtonProps) => { data-tooltip-id={`edit-${props.index}`} backgroundColor={"#8800aa55"} onClick={() => { - client?.setEditingAtIndices([props.index]); + client?.setEditingAtIds([ + props.item.description.id.item_id, + ]); }} > Date: Tue, 1 Aug 2023 15:20:06 -0700 Subject: fix: :bug: fix history.timeline indexing bug --- continuedev/src/continuedev/core/autopilot.py | 4 ++-- extension/package-lock.json | 4 ++-- extension/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'extension') diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py index 0b296432..a3dd854e 100644 --- a/continuedev/src/continuedev/core/autopilot.py +++ b/continuedev/src/continuedev/core/autopilot.py @@ -247,7 +247,7 @@ class Autopilot(ContinueBaseModel): try: observation = await step(self.continue_sdk) except Exception as e: - if self.history.timeline[index_of_history_node].deleted: + if index_of_history_node >= len(self.history.timeline) or self.history.timeline[index_of_history_node].deleted: # If step was deleted/cancelled, don't show error or allow retry return None @@ -304,7 +304,7 @@ class Autopilot(ContinueBaseModel): self._step_depth -= 1 # Add observation to history, unless already attached error observation - if not caught_error: + if not caught_error and index_of_history_node < len(self.history.timeline): self.history.timeline[index_of_history_node].observation = observation self.history.timeline[index_of_history_node].active = False await self.update_subscribers() diff --git a/extension/package-lock.json b/extension/package-lock.json index abca8d98..981b5168 100644 --- a/extension/package-lock.json +++ b/extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "continue", - "version": "0.0.235", + "version": "0.0.236", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "continue", - "version": "0.0.235", + "version": "0.0.236", "license": "Apache-2.0", "dependencies": { "@electron/rebuild": "^3.2.10", diff --git a/extension/package.json b/extension/package.json index 15e7676d..b740cbd3 100644 --- a/extension/package.json +++ b/extension/package.json @@ -14,7 +14,7 @@ "displayName": "Continue", "pricing": "Free", "description": "The open-source coding autopilot", - "version": "0.0.235", + "version": "0.0.236", "publisher": "Continue", "engines": { "vscode": "^1.67.0" -- cgit v1.2.3-70-g09d2