django-unicom 25.2.27.dev3__tar.gz → 25.2.27.dev4__tar.gz

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.2.27.dev3
+Version: 25.2.27.dev4
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/unicom
 Author: Meena (Menas) Erian

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/django_unicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.2.27.dev3
+Version: 25.2.27.dev4
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/unicom
 Author: Meena (Menas) Erian

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/django_unicom.egg-info/SOURCES.txt

@@ -58,6 +58,7 @@ unicom/migrations/0008_add_all_members_group.py
 unicom/migrations/0009_add_tool_call_types.py
 unicom/migrations/0010_request_initial_request_request_llm_calls_count_and_more.py
 unicom/migrations/0011_toolcall_add_message_reference.py
+unicom/migrations/0012_message_response_to_tool_call_and_more.py
 unicom/migrations/__init__.py
 unicom/models/__init__.py
 unicom/models/account.py

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '25.2.27.dev3'
-__version_tuple__ = version_tuple = (25, 2, 27, 'dev3')
+__version__ = version = '25.2.27.dev4'
+__version_tuple__ = version_tuple = (25, 2, 27, 'dev4')
 
 __commit_id__ = commit_id = None

django_unicom-25.2.27.dev4/unicom/migrations/0012_message_response_to_tool_call_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.20 on 2025-09-27 14:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('unicom', '0011_toolcall_add_message_reference'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='message',
+            name='response_to_tool_call',
+            field=models.ForeignKey(blank=True, help_text='The ToolCall that this message is responding to (for assistant messages from tool responses)', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='response_messages', to='unicom.toolcall'),
+        ),
+        migrations.AddField(
+            model_name='toolcall',
+            name='initial_user_message',
+            field=models.ForeignKey(default=1, help_text='The original user message that this tool call is responding to', on_delete=django.db.models.deletion.CASCADE, related_name='triggered_tool_calls', to='unicom.message'),
+            preserve_default=False,
+        ),
+    ]

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/models/message.py

@@ -68,6 +68,11 @@ class Message(models.Model):
     media = models.FileField(upload_to='media/', blank=True, null=True)
     reply_to_message = models.ForeignKey(
         'self', on_delete=models.SET_NULL, null=True, blank=True, related_name='replies')
+    response_to_tool_call = models.ForeignKey(
+        'unicom.ToolCall', on_delete=models.SET_NULL, null=True, blank=True, 
+        related_name='response_messages',
+        help_text="The ToolCall that this message is responding to (for assistant messages from tool responses)"
+    )
     timestamp = models.DateTimeField()
     time_sent = models.DateTimeField(null=True, blank=True)
     time_delivered = models.DateTimeField(null=True, blank=True)
@@ -100,7 +105,33 @@ class Message(models.Model):
         """
         Reply to this message with a dictionary containing the response.
         The dictionary can contain 'text', 'html', 'file_path', etc.
+        
+        For tool response messages, this will send the reply to the original user message
+        while maintaining the chain by setting reply_to_message to this tool response.
         """
+        # Handle tool response messages - send to original user but maintain chain
+        if self.media_type == 'tool_response':
+            # Get the request using reverse lookup
+            request = self.request_set.first()  # tool response message -> request
+            if request:
+                initial_request = request.initial_request or request
+                target_message = initial_request.message
+                
+                # Get the ToolCall that this response came from
+                tool_call = request.tool_calls.first()
+                
+                # Send reply to original user message
+                reply_msg = target_message.reply_with(msg_dict)
+                
+                # Set the reply chain and tool call reference
+                reply_msg.reply_to_message = self
+                if tool_call:
+                    reply_msg.response_to_tool_call = tool_call
+                reply_msg.save(update_fields=['reply_to_message', 'response_to_tool_call'])
+                
+                return reply_msg
+        
+        # Normal case - reply to this message directly
         from unicom.services.crossplatform.reply_to_message import reply_to_message
         return reply_to_message(self.channel, self, msg_dict)
 
@@ -177,6 +208,71 @@ class Message(models.Model):
                     img_tag['src'] = f'data:{mime};base64,{b64}'
         return str(soup)
 
+    def _process_chain_with_tool_grouping(self, chain, msg_to_dict):
+        """
+        Process message chain with intelligent tool call grouping.
+        Groups parallel tool calls (same initial_user_message, unique call_id) into single LLM messages.
+        """
+        messages = []
+        i = 0
+        
+        while i < len(chain):
+            msg = chain[i]
+            
+            # Check if this is an assistant message responding to a tool call
+            if (msg.is_outgoing and msg.response_to_tool_call and 
+                msg.response_to_tool_call.initial_user_message):
+                
+                # This assistant message was created from a tool response
+                # Find all parallel tool calls from the same initial user message
+                initial_user_msg = msg.response_to_tool_call.initial_user_message
+                
+                # Get all tool calls triggered by the same initial user message
+                # Group by unique call_id to handle periodic responses properly
+                tool_calls_dict = {}
+                for tool_call in initial_user_msg.triggered_tool_calls.all():
+                    if tool_call.call_id not in tool_calls_dict:
+                        tool_calls_dict[tool_call.call_id] = tool_call
+                
+                # Create grouped tool call message
+                if tool_calls_dict:
+                    tool_calls_list = []
+                    for tool_call in tool_calls_dict.values():
+                        arguments = tool_call.arguments
+                        if isinstance(arguments, dict):
+                            import json
+                            arguments = json.dumps(arguments)
+                        
+                        tool_calls_list.append({
+                            "id": tool_call.call_id,
+                            "type": "function", 
+                            "function": {
+                                "name": tool_call.tool_name,
+                                "arguments": arguments
+                            }
+                        })
+                    
+                    # Create single assistant message with all parallel tool calls
+                    grouped_msg = {
+                        "role": "assistant",
+                        "content": None,
+                        "tool_calls": tool_calls_list
+                    }
+                    messages.append(grouped_msg)
+                
+                # Add the current assistant message (response to tool calls)
+                messages.append(msg_to_dict(msg))
+                
+            else:
+                # Regular message - just convert normally
+                # Skip tool_call and tool_response messages as they're handled above
+                if msg.media_type not in ['tool_call', 'tool_response']:
+                    messages.append(msg_to_dict(msg))
+            
+            i += 1
+        
+        return messages
+
     def as_llm_chat(self, depth=10, mode="chat", system_instruction=None, multimodal=True):
         """
         Returns a list of dicts for LLM chat APIs (OpenAI, Gemini, etc), each with 'role' and 'content'.
@@ -338,8 +434,8 @@ class Message(models.Model):
                                                         system_instruction=system_instruction,
                                                         multimodal=multimodal)
             
-            for m in selected:
-                messages.append(msg_to_dict(m))
+            # Process selected messages with tool call grouping
+            messages = self._process_chain_with_tool_grouping(selected, msg_to_dict)
         elif mode == "thread":
             chain = []
             cur = self
@@ -375,8 +471,8 @@ class Message(models.Model):
                                                         system_instruction=system_instruction,
                                                         multimodal=multimodal)
             
-            for m in reversed(chain):
-                messages.append(msg_to_dict(m))
+            # Process chain with tool call grouping
+            messages = self._process_chain_with_tool_grouping(chain, msg_to_dict)
         else:
             raise ValueError(f"Unknown mode: {mode}")
         if system_instruction:
@@ -498,8 +594,6 @@ class Message(models.Model):
                     m = re.match(r"data:(.*?);base64,(.*)", url)
                     if m:
                         mime, b64data = m.groups()
-                        if not isinstance(mime, str):
-                            raise ValueError(f"Expected mime to be string, got {type(mime)}: {mime}")
                         ext = mime.split("/")[-1]
                         image_file_name = f"media/{uuid.uuid4()}.{ext}"
                         with open(image_file_name, "wb") as f:

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/models/message_template.py

@@ -108,11 +108,7 @@ class MessageTemplate(models.Model):
             for img in soup.find_all('img'):
                 src = img.get('src', '')
                 if src.startswith('data:image/') and ';base64,' in src:
-                    if not isinstance(src, str):
-                        raise ValueError(f"Expected src to be string, got {type(src)}: {src}")
                     header, b64data = src.split(';base64,', 1)
-                    if not isinstance(header, str):
-                        raise ValueError(f"Expected header to be string, got {type(header)}: {header}")
                     mime = header.split(':')[1]
                     ext = mimetypes.guess_extension(mime) or '.png'
                     data = base64.b64decode(b64data)

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/models/request.py

@@ -532,6 +532,7 @@ class Request(models.Model):
                     arguments=arguments,
                     request=self,
                     tool_call_message=tool_call_msg,  # Link to the tool call message
+                    initial_user_message=self.message,  # Link to the original user message
                     status='PENDING'
                 )
                 

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/models/tool_call.py

@@ -37,6 +37,14 @@ class ToolCall(models.Model):
         help_text="The tool_call message that this ToolCall object represents"
     )
     
+    # Reference to the initial user message that triggered this tool call
+    initial_user_message = models.ForeignKey(
+        'unicom.Message',
+        on_delete=models.CASCADE,
+        related_name='triggered_tool_calls',
+        help_text="The original user message that this tool call is responding to"
+    )
+    
     # Timestamps
     created_at = models.DateTimeField(auto_now_add=True, db_index=True)
     started_at = models.DateTimeField(null=True, blank=True)

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/services/email/IMAP_thread_manager.py

@@ -66,8 +66,6 @@ class IMAPThreadManager:
                 channel.listen_to_IMAP()
             except Exception as e:
                 logger.exception(f"Listener for Channel {channel.pk} crashed: {e}")
-                import traceback
-                logger.error(f"Full traceback: {traceback.format_exc()}")
                 time.sleep(10)
             finally:
                 # ensure no DB connections are leaked by this thread

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/services/email/listen_to_IMAP.py

@@ -41,8 +41,6 @@ def listen_to_IMAP(channel):
                         # logger.info(f"Channel {channel.pk}: Found email {msg.id} (uid={uid})")
                     except Exception as e:
                         logger.error(f"Channel {channel.pk}: Failed to process UID {uid}: {e}")
-                        import traceback
-                        logger.error(f"Full traceback: {traceback.format_exc()}")
 
                 if mark_seen_on == 'on_save':
                     if uids:
@@ -87,17 +85,13 @@ def listen_to_IMAP(channel):
                                 server.add_flags(uid, [SEEN])
                             logger.debug(f"Incoming email - Message-ID: {msg.id}, In-Reply-To: {msg.raw.get('In-Reply-To') if msg.raw else 'None'}")
                             logger.debug(f"Associated with chat: {msg.chat_id}")
-                        except Exception as e:
-                            logger.error(f"Channel {channel.pk}: Failed to process UID {uid}: {e}")
-                            import traceback
-                            logger.error(f"Full traceback: {traceback.format_exc()}")
+                        except Exception:
+                            logger.error(f"Channel {channel.pk}: Failed to process UID {uid}")
                         finally:
                             connections.close_all()
 
         except Exception as e:
             logger.error(f"Channel {channel.pk}: Fatal IMAP error: {e}, reconnecting in 30s…")
-            import traceback
-            logger.error(f"Full traceback: {traceback.format_exc()}")
             time.sleep(3)
         finally:
             # Ensure we close all connections to avoid leaks

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/services/email/send_email_message.py

@@ -223,10 +223,7 @@ def send_email_message(channel: Channel, params: dict, user: User=None):
         if parent:
             # First add any existing References from parent
             if parent.raw and 'References' in parent.raw:
-                references_header = parent.raw['References']
-                if not isinstance(references_header, str):
-                    raise ValueError(f"Expected References header to be string, got {type(references_header)}: {references_header}")
-                references.extend((references_header or '').split())
+                references.extend(parent.raw['References'].split())
             # Then add the parent's Message-ID
             references.append(params['reply_to_message_id'])
         else:

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/services/html_inline_images.py

@@ -41,11 +41,7 @@ def html_base64_images_to_shortlinks(html: str) -> tuple[str, list[int]]:
     for img in soup.find_all('img'):
         src = img.get('src', '')
         if src.startswith('data:image/') and ';base64,' in src:
-            if not isinstance(src, str):
-                raise ValueError(f"Expected src to be string, got {type(src)}: {src}")
             header, b64data = src.split(';base64,', 1)
-            if not isinstance(header, str):
-                raise ValueError(f"Expected header to be string, got {type(header)}: {header}")
             mime = header.split(':')[1]
             ext = mimetypes.guess_extension(mime) or '.png'
             data = base64.b64decode(b64data)

{django_unicom-25.2.27.dev3 → django_unicom-25.2.27.dev4}/unicom/services/telegram/send_telegram_message.py

@@ -125,10 +125,7 @@ def send_telegram_message(channel: Channel, params: dict, user: User=None, retry
                 params[text_field_key] = params[text_field_key][:4095 - len(cropping_footer)] + cropping_footer
             elif "Can't find end of the entity starting at byte offset" in ret.get('description', ''):
                 # Extract mentioned byte offset from error message
-                description = ret['description']
-                if not isinstance(description, str):
-                    raise ValueError(f"Expected description to be string, got {type(description)}: {description}")
-                byte_offset = int(description.split("byte offset")[1].split()[0])
+                byte_offset = int(ret['description'].split("byte offset")[1].split()[0])
                 print(f"Byte offset: {byte_offset}")
                 mentioned_char = params[text_field_key][byte_offset]
                 print(f"Mentioned char that's causing the error: \"{mentioned_char}\"")