0.4.1

Author: jbexta

src/gui/bubbles.py

@@ -12,6 +12,7 @@
     QEasingCurve
 from PySide6.QtGui import QPixmap, QIcon, QTextCursor, QTextOption, Qt, QDesktopServices
 
+from src.members.user import User
 # from interpreter import interpreter
 from src.plugins.openinterpreter.src import interpreter
 
@@ -229,14 +230,24 @@ def send_message(
         self,
         message: str,
         role: str = 'user',
-        as_member_id: str = '1',
+        as_member_id: str = None,  # '1',
+        feed_back=False,
         clear_input=False,
         run_workflow=True
     ):  # todo default as_mem_id
         # check if threadpool is active
         if self.main.threadpool.activeThreadCount() > 0:
             return
 
+        if as_member_id is None:  # todo
+            members = self.workflow.members
+            workflow_first_member = next(iter(sorted(members.values(), key=lambda x: x['loc_x'])), None)
+
+            if workflow_first_member:
+                first_member_is_user = isinstance(workflow_first_member, User)
+                if first_member_is_user:  # todo de-dupe
+                    as_member_id = workflow_first_member.member_id
+
         last_msg = self.workflow.message_history.messages[-1] if self.workflow.message_history.messages else None
         new_msg = self.workflow.save_message(role, message, member_id=as_member_id)
         if not new_msg:
@@ -267,34 +278,35 @@ def send_message(
         self.parent.workflow_settings.refresh_member_highlights()
 
         if run_workflow:
-            self.run_workflow(as_member_id)
+            self.run_workflow(from_member_id=as_member_id, feed_back=feed_back)  # as_member_id)
 
     # def after_send_message(self, as_member_id: str):
     #     self.run_workflow(as_member_id)
     #
 
-    def run_workflow(self, from_member_id=None):
+    def run_workflow(self, from_member_id=None, feed_back=False):
         self.main.send_button.update_icon(is_generating=True)
 
         # self.refresh_waiting_bar(set_visibility=False)
         # self.parent.workflow_settings.refresh_member_highlights()
 
-        runnable = self.RespondingRunnable(self, from_member_id)
+        runnable = self.RespondingRunnable(self, from_member_id, feed_back)
         self.main.threadpool.start(runnable)
 
         if self.parent.__class__.__name__ == 'Page_Chat':
             self.parent.try_generate_title()
 
     class RespondingRunnable(QRunnable):
-        def __init__(self, parent, from_member_id=None):
+        def __init__(self, parent, from_member_id=None, feed_back=False):
             super().__init__()
             self.parent = parent
             self.main = parent.main
             self.from_member_id = from_member_id
+            self.feed_back = feed_back  # todo clean
 
         def run(self):
             try:
-                asyncio.run(self.parent.workflow.behaviour.start(self.from_member_id))
+                asyncio.run(self.parent.workflow.behaviour.start(self.from_member_id, feed_back=self.feed_back))
                 self.main.finished_signal.emit()
             except Exception as e:
                 if os.environ.get('AP_DEV_MODE', False):
@@ -671,7 +683,7 @@ def rerun_msg(self):
 
                 oi_res = interpreter.computer.run(lang, code)
                 output = next(r for r in oi_res if r['format'] == 'output').get('content', '')
-                self.msg_container.parent.send_message(output, role='output', as_member_id=member_id, clear_input=False)
+                self.msg_container.parent.send_message(output, role='output', as_member_id=member_id, feed_back=True, clear_input=False)
             elif bubble.role == 'tool':
                 from src.system.base import manager
                 parsed, tool_dict = try_parse_json(bubble.text)

src/members/workflow.py

@@ -369,7 +369,7 @@ def get_member_by_full_member_id(self, full_member_id: str) -> Optional[Member]:
     def save_message(
         self, role: str,
         content: str,
-        member_id: str = '1',
+        member_id: str = None,  # '1',
         log_obj=None
     ):
         """Saves a message to the database and returns the message_id"""
@@ -457,11 +457,11 @@ def __init__(self, workflow):
         self.workflow: Workflow = workflow
         # self.tasks = []
 
-    async def start(self, from_member_id: int = None):
-        async for key, chunk in self.receive(from_member_id):
+    async def start(self, from_member_id: int = None, feed_back: bool = False):
+        async for key, chunk in self.receive(from_member_id, feed_back):
             pass
 
-    async def receive(self, from_member_id: int = None):
+    async def receive(self, from_member_id: int = None, feed_back: bool = False):
         processed_members = set()
 
         def create_async_group_task(member_ids):
@@ -495,8 +495,14 @@ async def run_member_task(member):  # todo dirty
         filter_role = self.workflow.config.get('config', {}).get('filter_role', 'All').lower()
         self.workflow.responding = True
         try:
+            found_source = True if from_member_id is None else False
             for member in self.workflow.members.values():
-                if member.turn_output is not None or member.member_id in processed_members:
+                if not found_source and member.member_id == from_member_id:
+                    found_source = True
+                if not found_source:
+                    continue  # todo clean mechanism
+                ignore_turn_output = feed_back and member.member_id == from_member_id
+                if (member.turn_output is not None and not ignore_turn_output) or member.member_id in processed_members:
                     continue
                 if self.workflow.chat_page:
                     self.workflow.chat_page.workflow_settings.refresh_member_highlights()