lollms-client 1.4.1__py3-none-any.whl → 1.7.10__py3-none-any.whl

lollms_client/lollms_discussion.py

@@ -1,3 +1,6 @@
+#lollms_client/lollms_discussion.py
+#author : ParisNeo
+
 import base64
 import json
 import re
@@ -214,6 +217,11 @@ class LollmsDataManager:
         self.SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=self.engine)
         self.create_and_migrate_tables()
 
+    def discussion_exists(self, discussion_id: str) -> bool:
+        """Checks if a discussion with the given ID exists in the database."""
+        with self.get_session() as session:
+            return session.query(self.DiscussionModel).filter_by(id=discussion_id).first() is not None
+
     @staticmethod
     def new_message(**kwargs) -> 'SimpleNamespace':
         """A static factory method to create a new message data object.
@@ -851,10 +859,6 @@ class LollmsDiscussion:
                     ASCIIColors.success(f"Active branch ID for discussion {self.id} updated to: {new_active_leaf_id} (deepest leaf descendant).")
                 elif new_active_leaf_id is None: # Should not happen if current_active_id exists
                     ASCIIColors.warning(f"Could not find a deeper leaf from '{current_active_id}'. Keeping current ID.")
-                else:
-                    ASCIIColors.info(f"Active branch ID '{current_active_id}' is already the deepest leaf. No change needed.")
-            else:
-                ASCIIColors.info(f"Active branch ID '{current_active_id}' is already a leaf. No change needed.")
 
 
     def touch(self):
@@ -925,6 +929,18 @@ class LollmsDiscussion:
             else:
                 kwargs['sender_type'] = 'assistant'
 
+        # --- NEW PARTICIPANT LOGIC ---
+        if kwargs.get('sender_type') == 'user':
+            sender_name = kwargs.get('sender')
+            sender_icon = kwargs.get('sender_icon')
+            if sender_name:
+                if self.participants is None:
+                    self.participants = {}
+                # Update only if not present or icon is missing
+                if sender_name not in self.participants or self.participants[sender_name].get('icon') is None:
+                    self.participants[sender_name] = {"icon": sender_icon}
+                    self.touch()
+        # --- END NEW PARTICIPANT LOGIC ---
 
         message_data = {
             'id': msg_id,
@@ -1000,6 +1016,13 @@ class LollmsDiscussion:
         self._rebuild_message_index() # Ensure index is fresh
         return [LollmsMessage(self, msg_obj) for msg_obj in self._message_index.values()]
 
+    def setMemory(self, memory:str):
+        """sets memory content
+
+        Args:
+            memory (str): _description_
+        """
+        self.memory = memory
 
     def get_full_data_zone(self):
         """Assembles all data zones into a single, formatted string for the prompt."""
@@ -1094,7 +1117,7 @@ class LollmsDiscussion:
                     if callback:
                         qg_id = callback("Generating query for dynamic personality data...", MSG_TYPE.MSG_TYPE_STEP_START, {"id": "dynamic_data_query_gen"})
 
-                    context_for_query = self.export('markdown')
+                    context_for_query = self.export('markdown', suppress_system_prompt=True)
                     query_prompt = (
                         "You are an expert query generator. Based on the current conversation, formulate a concise and specific query to retrieve relevant information from a knowledge base. "
                         "The query will be used to fetch data that will help you answer the user's latest request.\n\n"
@@ -1155,7 +1178,7 @@ class LollmsDiscussion:
         # Step 1: Add user message, now including any images.
         if add_user_message:
             user_msg = self.add_message(
-                sender="user", 
+                sender=kwargs.get("user_name", "user"), 
                 sender_type="user", 
                 content=user_message,
                 images=images,
@@ -1182,17 +1205,30 @@ class LollmsDiscussion:
         final_content = ""
 
         if is_agentic_turn:
-            prompt_for_agent = self.export("markdown", branch_tip_id if branch_tip_id else self.active_branch_id)
+            prompt_for_agent = self.export("markdown", branch_tip_id if branch_tip_id else self.active_branch_id, suppress_system_prompt=True)
             if debug:
                 ASCIIColors.cyan("\n" + "="*50 + "\n--- DEBUG: AGENTIC TURN TRIGGERED ---\n" + f"--- PROMPT FOR AGENT (from discussion history) ---\n{prompt_for_agent}\n" + "="*50 + "\n")
-
+            
+            
+            # Combine system prompt and data zones
+            system_prompt_part = (self._system_prompt or "").strip()
+            data_zone_part = self.get_full_data_zone() # This now returns a clean, multi-part block or an empty string
+            full_system_prompt = ""
+
+            # Combine them intelligently
+            if system_prompt_part and data_zone_part:
+                full_system_prompt = f"{system_prompt_part}\n\n{data_zone_part}"
+            elif system_prompt_part:
+                full_system_prompt = system_prompt_part
+            else:
+                full_system_prompt = data_zone_part
             agent_result = self.lollmsClient.generate_with_mcp_rag(
                 prompt=prompt_for_agent,
                 use_mcps=effective_use_mcps,
                 use_data_store=use_data_store,
                 max_reasoning_steps=max_reasoning_steps,
                 images=images,
-                system_prompt = self._system_prompt,
+                system_prompt = full_system_prompt,
                 debug=debug,
                 **kwargs
             )
@@ -1403,7 +1439,7 @@ class LollmsDiscussion:
         self.touch() # Mark for update and auto-save if configured
         print(f"Branch starting at {message_id} ({len(messages_to_delete_ids)} messages) removed. New active branch: {self.active_branch_id}")
         
-    def export(self, format_type: str, branch_tip_id: Optional[str] = None, max_allowed_tokens: Optional[int] = None) -> Union[List[Dict], str]:
+    def export(self, format_type: str, branch_tip_id: Optional[str] = None, max_allowed_tokens: Optional[int] = None, suppress_system_prompt=False) -> Union[List[Dict], str]:
         """Exports the discussion history into a specified format.
 
         This method can format the conversation for different backends like OpenAI,
@@ -1441,12 +1477,13 @@ class LollmsDiscussion:
         full_system_prompt = ""
 
         # Combine them intelligently
-        if system_prompt_part and data_zone_part:
-            full_system_prompt = f"{system_prompt_part}\n\n{data_zone_part}"
-        elif system_prompt_part:
-            full_system_prompt = system_prompt_part
-        else:
-            full_system_prompt = data_zone_part
+        if not suppress_system_prompt:
+            if system_prompt_part and data_zone_part:
+                full_system_prompt = f"{system_prompt_part}\n\n{data_zone_part}"
+            elif system_prompt_part:
+                full_system_prompt = system_prompt_part
+            else:
+                full_system_prompt = data_zone_part
 
 
         participants = self.participants or {}
@@ -2368,7 +2405,7 @@ class LollmsDiscussion:
         return self.add_artefact(
             title, content=new_content, images=new_images,
             audios=latest_artefact.get("audios", []),videos=latest_artefact.get("videos", []),
-            zip_content=latest_artefact.get("zip"), version=latest_version + 1, **extra_data
+            zip_content=latest_artefact.get("zip"), **extra_data
         )
 
     def load_artefact_into_data_zone(self, title: str, version: Optional[int] = None):
@@ -2585,4 +2622,4 @@ class LollmsDiscussion:
         if db_manager:
             new_discussion.commit()
 
-        return new_discussion
+        return new_discussion