summaryrefslogtreecommitdiff
path: root/continuedev
diff options
context:
space:
mode:
authorNate Sesti <sestinj@gmail.com>2023-08-06 15:24:13 -0700
committerNate Sesti <sestinj@gmail.com>2023-08-06 15:24:13 -0700
commitc25527926ad1d1f861dbed01df577e962e08d746 (patch)
treea8542dd40879257ba544842d7ece2ebf01afb383 /continuedev
parent31e7c9828f985eceb16b4c9c749cc5d4d9fd5beb (diff)
downloadsncontinue-c25527926ad1d1f861dbed01df577e962e08d746.tar.gz
sncontinue-c25527926ad1d1f861dbed01df577e962e08d746.tar.bz2
sncontinue-c25527926ad1d1f861dbed01df577e962e08d746.zip
feat: :construction: successfully loading past sessions
Diffstat (limited to 'continuedev')
-rw-r--r--continuedev/src/continuedev/core/autopilot.py21
-rw-r--r--continuedev/src/continuedev/core/main.py15
-rw-r--r--continuedev/src/continuedev/libs/util/paths.py3
-rw-r--r--continuedev/src/continuedev/libs/util/telemetry.py1
-rw-r--r--continuedev/src/continuedev/server/gui.py11
-rw-r--r--continuedev/src/continuedev/server/session_manager.py27
6 files changed, 48 insertions, 30 deletions
diff --git a/continuedev/src/continuedev/core/autopilot.py b/continuedev/src/continuedev/core/autopilot.py
index 7e7ce5d8..6dd30db1 100644
--- a/continuedev/src/continuedev/core/autopilot.py
+++ b/continuedev/src/continuedev/core/autopilot.py
@@ -15,7 +15,7 @@ from ..plugins.context_providers.highlighted_code import HighlightedCodeContextP
from ..server.ide_protocol import AbstractIdeProtocolServer
from ..libs.util.queue import AsyncSubscriptionQueue
from ..models.main import ContinueBaseModel
-from .main import Context, ContinueCustomException, Policy, History, FullState, Step, HistoryNode
+from .main import Context, ContinueCustomException, Policy, History, FullState, SessionInfo, Step, HistoryNode
from ..plugins.steps.core.core import DisplayErrorStep, ReversibleStep, ManualEditStep, UserInputStep
from .sdk import ContinueSDK
from ..libs.util.traceback_parsers import get_python_traceback, get_javascript_traceback
@@ -53,7 +53,8 @@ class Autopilot(ContinueBaseModel):
policy: Policy = DefaultPolicy()
history: History = History.from_empty()
context: Context = Context()
- full_state: Union[FullState, None] = None
+ full_state: Optional[FullState] = None
+ session_info: Optional[SessionInfo] = None
context_manager: ContextManager = ContextManager()
continue_sdk: ContinueSDK = None
@@ -88,7 +89,6 @@ class Autopilot(ContinueBaseModel):
if full_state is not None:
self.history = full_state.history
self.context_manager.context_providers["code"].adding_highlighted_code = full_state.adding_highlighted_code
- await self.context_manager.set_selected_items(full_state.selected_context_items)
self.started = True
@@ -112,6 +112,7 @@ class Autopilot(ContinueBaseModel):
adding_highlighted_code=self.context_manager.context_providers[
"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 [],
+ session_info=self.session_info
)
self.full_state = full_state
return full_state
@@ -375,6 +376,20 @@ class Autopilot(ContinueBaseModel):
self._main_user_input_queue.append(user_input)
await self.update_subscribers()
+ # Use the first input to create title for session info, and make the session saveable
+ if self.session_info is None:
+ async def create_title():
+ title = await self.continue_sdk.models.medium.complete(f"Give a short title to describe the current chat session. Do not put quotes around the title. The first message was: \"{user_input}\". The title is: ")
+ self.session_info = SessionInfo(
+ title=title,
+ session_id=self.ide.session_id,
+ date_created=time.strftime(
+ "%Y-%m-%d %H:%M:%S", time.gmtime())
+ )
+
+ create_async_task(create_title(), on_error=lambda e: self.continue_sdk.run_step(
+ DisplayErrorStep(e=e)))
+
if len(self._main_user_input_queue) > 1:
return
diff --git a/continuedev/src/continuedev/core/main.py b/continuedev/src/continuedev/core/main.py
index 9a06f2e1..a33d777e 100644
--- a/continuedev/src/continuedev/core/main.py
+++ b/continuedev/src/continuedev/core/main.py
@@ -1,5 +1,5 @@
import json
-from typing import Coroutine, Dict, List, Literal, Union
+from typing import Coroutine, Dict, List, Literal, Optional, Union
from pydantic.schema import schema
@@ -253,6 +253,12 @@ class ContextItem(BaseModel):
editable: bool = False
+class SessionInfo(ContinueBaseModel):
+ session_id: str
+ title: str
+ date_created: str
+
+
class FullState(ContinueBaseModel):
"""A full state of the program, including the history"""
history: History
@@ -261,12 +267,7 @@ class FullState(ContinueBaseModel):
slash_commands: List[SlashCommandDescription]
adding_highlighted_code: bool
selected_context_items: List[ContextItem]
-
-
-class SessionInfo(ContinueBaseModel):
- session_id: str
- title: str
- date_created: str
+ session_info: Optional[SessionInfo] = None
class ContinueSDK:
diff --git a/continuedev/src/continuedev/libs/util/paths.py b/continuedev/src/continuedev/libs/util/paths.py
index 66c921f7..01b594cf 100644
--- a/continuedev/src/continuedev/libs/util/paths.py
+++ b/continuedev/src/continuedev/libs/util/paths.py
@@ -35,6 +35,9 @@ def getSessionFilePath(session_id: str):
def getSessionsListFilePath():
path = os.path.join(getSessionsFolderPath(), "sessions.json")
os.makedirs(os.path.dirname(path), exist_ok=True)
+ if not os.path.exists(path):
+ with open(path, 'w') as f:
+ f.write("[]")
return path
diff --git a/continuedev/src/continuedev/libs/util/telemetry.py b/continuedev/src/continuedev/libs/util/telemetry.py
index 60c910bb..0f66ad8d 100644
--- a/continuedev/src/continuedev/libs/util/telemetry.py
+++ b/continuedev/src/continuedev/libs/util/telemetry.py
@@ -23,7 +23,6 @@ class PostHogLogger:
self.posthog = Posthog(self.api_key, host='https://app.posthog.com')
def setup(self, unique_id: str, allow_anonymous_telemetry: bool):
- logger.debug(f"Setting unique_id as {unique_id}")
self.unique_id = unique_id or "NO_UNIQUE_ID"
self.allow_anonymous_telemetry = allow_anonymous_telemetry or True
diff --git a/continuedev/src/continuedev/server/gui.py b/continuedev/src/continuedev/server/gui.py
index b6f7b141..661e1787 100644
--- a/continuedev/src/continuedev/server/gui.py
+++ b/continuedev/src/continuedev/server/gui.py
@@ -99,6 +99,8 @@ class GUIProtocolServer(AbstractGUIProtocolServer):
self.on_show_logs_at_index(data["index"])
elif message_type == "select_context_item":
self.select_context_item(data["id"], data["query"])
+ elif message_type == "load_session":
+ self.load_session(data["session_id"])
def on_main_input(self, input: str):
# Do something with user input
@@ -154,8 +156,13 @@ class GUIProtocolServer(AbstractGUIProtocolServer):
create_async_task(
self.session.autopilot.select_context_item(id, query), self.on_error)
- async def reconnect_at_session(self, session_id: str):
- await self._send_json("reconnect_at_session", {"session_id": session_id})
+ def load_session(self, session_id: str):
+ async def load_and_tell_to_reconnect():
+ await session_manager.load_session(self.session.session_id, session_id)
+ await self._send_json("reconnect_at_session", {"session_id": session_id})
+
+ create_async_task(
+ load_and_tell_to_reconnect(), self.on_error)
@router.websocket("/ws")
diff --git a/continuedev/src/continuedev/server/session_manager.py b/continuedev/src/continuedev/server/session_manager.py
index f876c9a9..062f9527 100644
--- a/continuedev/src/continuedev/server/session_manager.py
+++ b/continuedev/src/continuedev/server/session_manager.py
@@ -78,18 +78,7 @@ class SessionManager:
try:
await autopilot.start(full_state=full_state)
except Exception as e:
- # Have to manually add to history because autopilot isn't started
- formatted_err = '\n'.join(traceback.format_exception(e))
- msg_step = MessageStep(
- name="Error starting Autopilot", message=formatted_err)
- msg_step.description = f"```\n{formatted_err}\n```"
- autopilot.history.add_node(HistoryNode(
- step=msg_step,
- observation=None,
- depth=0,
- active=False
- ))
- logger.warning(f"Error starting Autopilot: {e}")
+ await self.on_error(e)
def on_error(e: Exception) -> Coroutine:
err_msg = '\n'.join(traceback.format_exception(e))
@@ -101,7 +90,7 @@ class SessionManager:
async def remove_session(self, session_id: str):
logger.debug(f"Removing session: {session_id}")
if session_id in self.sessions:
- if session_id in self.registered_ides:
+ if session_id in self.registered_ides and self.registered_ides[session_id] is not None:
ws_to_close = self.registered_ides[session_id].websocket
if ws_to_close is not None and ws_to_close.client_state != WebSocketState.DISCONNECTED:
await self.sessions[session_id].autopilot.ide.websocket.close()
@@ -111,6 +100,9 @@ class SessionManager:
async def persist_session(self, session_id: str):
"""Save the session's FullState as a json file"""
full_state = await self.sessions[session_id].autopilot.get_full_state()
+ if full_state.session_info is None:
+ return
+
with open(getSessionFilePath(session_id), "w") as f:
json.dump(full_state.dict(), f)
@@ -118,9 +110,10 @@ class SessionManager:
with open(getSessionsListFilePath(), "r") as f:
sessions_list = json.load(f)
- sessions_list.append(SessionInfo(
- session_info=full_state.session_info
- ))
+ sessions_list.append(full_state.session_info.dict())
+
+ with open(getSessionsListFilePath(), "w") as f:
+ json.dump(sessions_list, f)
async def load_session(self, old_session_id: str, new_session_id: str):
"""Load the session's FullState from a json file"""
@@ -130,7 +123,7 @@ class SessionManager:
# Delete the old session, but keep the IDE
ide = self.registered_ides[old_session_id]
- self.registered_ides[old_session_id] = None
+ del self.registered_ides[old_session_id]
# Start the new session
await self.new_session(ide, session_id=new_session_id)