Merge pull request #265 from pieces-app/fix-context

fix context command

Author: bishoy-at-pieces

_pieces_lib/aenum/_py2.py

@@ -82,6 +82,7 @@ def create(cls,type: AnchorTypeEnum,path: str) -> "BasicAnchor":
 			type = type,
 			fullpath = path
 		))
+		AnchorSnapshot.identifiers_snapshot[anchor.id] = anchor # Update the local cache
 		return BasicAnchor(anchor.id)
 
 	@staticmethod
@@ -125,10 +126,10 @@ def exists(cls, paths: List[str]) -> Optional["BasicAnchor"]:
 		Returns:
 			The existing anchor if found, otherwise None.
 		"""
-		for anchor in AnchorSnapshot.identifiers_snapshot.values():
+		for anchor in AnchorSnapshot.identifiers_snapshot.keys():
 			a = BasicAnchor(anchor)
 			if a.fullpath == paths:
-				return BasicAsset(a.id)
+				return BasicAnchor(a.id)
 
 	@property
 	def assets(self) -> Optional[List["BasicAsset"]]:
@@ -138,7 +139,7 @@ def assets(self) -> Optional[List["BasicAsset"]]:
 		Returns:
 			The assets of the anchor.
 		"""
-		return [BasicAsset(asset.id) for asset in self.anchor.assets.iterable] if self.anchor.assets else None
+		return [(asset.id) for asset in self.anchor.assets.iterable] if self.anchor.assets else None
 
 	@property
 	def chats(self) -> Optional[List["BasicChat"]]:
@@ -172,7 +173,7 @@ def from_raw_content(cls, path: str) -> "BasicAnchor":
 		Returns:
 			The created BasicAnchor instance.
 		"""
-		anchor = cls.exists(path)
+		anchor = cls.exists([path])
 		if anchor:
 			return anchor
 		else:

_pieces_lib/pieces_os_client/wrapper/basic_identifier/anchor.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, List, Callable, Optional
+from typing import TYPE_CHECKING, List, Callable, Optional, SupportsIndex
 import os
 
 from Pieces._pieces_lib.pieces_os_client.models.anchors import Anchors
@@ -8,14 +8,14 @@
 from Pieces._pieces_lib.pieces_os_client.models.seeds import Seeds
 from Pieces._pieces_lib.pieces_os_client.models.flattened_conversation_messages import FlattenedConversationMessages
 from Pieces._pieces_lib.pieces_os_client.models.temporal_range_grounding import TemporalRangeGrounding
-from Pieces._pieces_lib.pieces_os_client.wrapper.basic_identifier.anchor import BasicAnchor
 
+from .basic_identifier import BasicAsset, BasicMessage, BasicAnchor
 from .long_term_memory import LongTermMemory
 
 if TYPE_CHECKING:
-	from .basic_identifier import BasicAsset,BasicMessage
 	from . import PiecesClient
 	from .copilot import Copilot
+	from .basic_identifier import BasicChat
 
 class ValidatedContextList(List):
 	"""
@@ -61,15 +61,23 @@ def __add__(self, other):
 			new_list.append(value)
 		return new_list
 
-	def pop(self, index: int = -1):
+	def pop(self, index: SupportsIndex = -1):
 		value = super().pop(index)
 		self.on_remove(index)
 		return value
 
+	def clear(self, **kwargs):
+		if kwargs.get("_notifiy", True):
+			for item in range(len(self)):
+				self.on_remove(item)
+
+		super().clear()
+
+
 class Context:
 	def __init__(self,
 				 pieces_client: "PiecesClient",
-				 copilot: "Copilot" = None,
+				 copilot: "Copilot",
 				 paths: List[str] = None,
 				 raw_assets: List[str] = None,
 				 assets: List["BasicAsset"] = None,
@@ -88,12 +96,12 @@ def __init__(self,
 		self._messages: FlattenedConversationMessages = FlattenedConversationMessages(iterable=[])
 		self._paths: Anchors = Anchors(iterable=[])
 
-	def clear(self):
+	def clear(self, **kwargs):
 		"""Clears the Copilot context"""
-		self.raw_assets = []
-		self.paths = []
-		self.assets = []
-		self.messages = []
+		self.raw_assets.clear(_notifiy = kwargs.get("_notifiy", True))
+		self.paths.clear(_notifiy = kwargs.get("_notifiy", True))
+		self.assets.clear(_notifiy = kwargs.get("_notifiy", True))
+		self.messages.clear(_notifiy = kwargs.get("_notifiy", True))
 		self._paths = Anchors(iterable=[])
 		self._assets = Assets(iterable=[])
 		self._raw_assets = Seeds(iterable=[])
@@ -128,6 +136,8 @@ def _add_message(self, message):
 		if not isinstance(message, BasicMessage):
 			raise ValueError("Message should be BasicMessage type")
 		self._messages.iterable.append(message.message)
+		if not self.copilot.chat:
+			self.copilot.create_chat()
 		self.copilot.chat.associate_message(message)
 
 	def _remove_message(self, index: int):
@@ -138,6 +148,8 @@ def _add_asset(self, asset):
 		if not isinstance(asset, BasicAsset):
 			raise ValueError("Snippet content should be BasicAsset type")
 		self._assets.iterable.append(asset.asset)
+		if not self.copilot.chat:
+			self.copilot.create_chat()
 		self.copilot.chat.associate_asset(asset)
 
 	def _remove_asset(self, index: int):
@@ -148,7 +160,9 @@ def _add_path(self,path):
 		if not os.path.exists(path):
 			raise ValueError("Invalid path in the context")
 		anchor = BasicAnchor.from_raw_content(path)
-		self._paths.iterable.append(anchor)
+		self._paths.iterable.append(anchor.anchor)
+		if not self.copilot.chat:
+			self.copilot.create_chat()
 		self.copilot.chat.associate_anchor(anchor)
 
 	def _remove_path(self, index: int):
@@ -163,3 +177,19 @@ def _add_raw_asset(self, asset: str):
 	def _remove_raw_asset(self, index: int):
 		self._raw_assets.iterable.pop(index)
 
+	def _init(self, chat: "BasicChat"):
+		self.clear(_notifiy = False)
+		self.assets.extend(
+			chat._from_indices(
+				getattr(chat.conversation.assets,"indices",{}),
+				lambda id: BasicAsset(id)
+			)
+		)
+		ls = chat._from_indices(
+				getattr(chat.conversation.anchors,"indices",{}),
+				lambda id: BasicAnchor(id).fullpath
+			)
+		ls = [item for sublist in ls for item in sublist]
+
+		self.paths.extend(ls)
+

_pieces_lib/pieces_os_client/wrapper/context.py

@@ -154,11 +154,14 @@ def chat(self, chat: Optional[BasicChat]):
             use chat = None if you want to create a new conversation on asking
         """
         self._chat = chat
-        self.context.clear() # clear the context on changing the conversation
+        if chat:
+            self.context._init(chat)
+        else:
+            self.context.clear()
         self._chat_id = chat._id if chat else None
 
 
-    def create_chat(self, name:Optional[str]=None):
+    def create_chat(self, name:str = "New Conversation"):
         """
             Creates a New Chat and change the current Copilot chat state to the new generated one
         """

_pieces_lib/pieces_os_client/wrapper/copilot.py

@@ -34,7 +34,7 @@
 
 ENABLE_LTM = f"""
 In order to get the most out of Long-Term Memory (LTM) Context, you need to enable the Long-Term Memory Engine, which provides time-based contextua awareness for your Copilot.
-<br>
+<br><br>
 <div style="padding-right:2px;padding-left:2px;padding-buttom:2px">
 	<a style="{PHANTOM_A_TAG_STYLE}" href = "enable">Activiate Long-Term Engine</a>
 	<a style="{PHANTOM_A_TAG_STYLE}" href = "learn">Learn about LTM context</a>

copilot/ask_view.py

@@ -8,12 +8,8 @@
 
 class PiecesContextManagerCommand(sublime_plugin.WindowCommand):
 	@check_pieces_os()
-	def run(self,context:str,pieces_asset_id=None,context_remove=None):
-		if context == "ltm_on":
-			PiecesSettings.api_client.copilot.context.ltm.chat_enable_ltm()
-			copilot.gpt_view.run_command('pieces_show_qr_codes',args={"force":True})
-		elif context == "ltm_off":
-			PiecesSettings.api_client.copilot.context.ltm.chat_disable_ltm()
+	def run(self,context:str, pieces_asset_id=None, context_remove=None):
+		self.handle_ltm(context)
 
 		if context_remove:
 			key,idx = context_remove.split("_")
@@ -27,6 +23,13 @@ def run(self,context:str,pieces_asset_id=None,context_remove=None):
 
 		if pieces_asset_id:
 			PiecesSettings.api_client.copilot.context.assets.append(BasicAsset(pieces_asset_id))
+	
+	def handle_ltm(self, context):
+		if context == "ltm_on":
+			PiecesSettings.api_client.copilot.context.ltm.chat_enable_ltm()
+			copilot.gpt_view.run_command('pieces_show_qr_codes',args={"force":True})
+		elif context == "ltm_off":
+			PiecesSettings.api_client.copilot.context.ltm.chat_disable_ltm()
 
 	def is_enabled(self):
 		v = sublime.active_window().active_view()
@@ -85,9 +88,9 @@ class PiecesAddContextCommand(sublime_plugin.ApplicationCommand):
 	@check_pieces_os()
 	def run(self,paths = None):
 		if paths == None:
-			paths = [sublime.active_window().active_view().file_name()]
-			if paths[0] == None: return # check the file already exists
-
+			paths = sublime.active_window().active_view().file_name()
+			if paths == None: return # check the file already exists
+			paths = [paths]
 		if not copilot._gpt_view: # check if the Copilot is running
 			copilot.render_conversation(None) # Create a new conversation
 		PiecesSettings.api_client.copilot.context.paths.extend(paths)

copilot/context_manager.py

@@ -101,6 +101,7 @@ def _render_conversation(self, views):
 		for view in views:
 			if view.settings().get("PIECES_GPT_VIEW"):
 				conv = view.settings().get("conversation_id")
+				copilot.gpt_view = view
 				if conv in ConversationsSnapshot.identifiers_snapshot:
 					copilot.render_conversation(conv)
 				else:

event_listener.py

@@ -1,7 +1,9 @@
+from .._pieces_lib.pieces_os_client.wrapper.websockets.health_ws import HealthWS
 from ..settings import PiecesSettings
 from .._pieces_lib.pieces_os_client.wrapper.websockets import BaseWebsocket
 import sublime
 import sublime_plugin
+import traceback
 
 
 
@@ -13,11 +15,10 @@ def run(self):
 	def reload_async(self):
 		if PiecesSettings.api_client.is_pieces_running():
 			try:
-				PiecesSettings.api_client._startup() # Running the startup command
-				PiecesSettings.on_settings_change()
-				BaseWebsocket.reconnect_all()
+				HealthWS.instance.start()
 				sublime.status_message(f"Reloading [completed]")
 			except Exception as e:
+				print(traceback.format_exc())
 				sublime.error_message(f"Error during reload: {e}")
 		else:
 			sublime.status_message(f"PiecesOS is offline")