django-unicom 25.2.27.dev0__tar.gz → 25.2.27.dev2__tar.gz

{django_unicom-25.2.27.dev0 → django_unicom-25.2.27.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.2.27.dev0
+Version: 25.2.27.dev2
 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.dev0 → django_unicom-25.2.27.dev2}/django_unicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.2.27.dev0
+Version: 25.2.27.dev2
 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.dev0 → django_unicom-25.2.27.dev2}/unicom/_version.py

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

{django_unicom-25.2.27.dev0 → django_unicom-25.2.27.dev2}/unicom/models/message.py

@@ -284,8 +284,8 @@ class Message(models.Model):
                     import json
                     arguments = json.dumps(arguments)
                 d = {
-                    "role": role,
-                    "content": msg.text or "",
+                    "role": "assistant",  # Tool calls are always from assistant
+                    "content": None,      # Tool calls should have null content
                     "tool_calls": [{
                         "id": tool_call_data.get('id', f"call_{msg.id}"),
                         "type": "function",
@@ -316,6 +316,28 @@ class Message(models.Model):
             idx = list(qs.values_list("id", flat=True)).index(self.id)
             start = max(0, idx - depth + 1)
             selected = list(qs[start:idx+1])
+            
+            # Handle user interruption for tool response messages in chat mode
+            if self.media_type == "tool_response":
+                # Find any user message that came chronologically after any tool call in our range
+                tool_call_timestamps = [m.timestamp for m in selected if m.media_type == "tool_call"]
+                if tool_call_timestamps:
+                    latest_tool_call_time = max(tool_call_timestamps)
+                    # Look for user messages after the latest tool call but before this tool response
+                    user_interrupt = self.chat.messages.filter(
+                        is_outgoing=False,
+                        timestamp__gt=latest_tool_call_time,
+                        timestamp__lt=self.timestamp
+                    ).exclude(
+                        media_type__in=['tool_call', 'tool_response']
+                    ).order_by('-timestamp').first()
+                    
+                    if user_interrupt:
+                        # Found user interrupt - get conversation from that user message
+                        return user_interrupt.as_llm_chat(depth=depth, mode=mode,
+                                                        system_instruction=system_instruction,
+                                                        multimodal=multimodal)
+            
             for m in selected:
                 messages.append(msg_to_dict(m))
         elif mode == "thread":
@@ -326,6 +348,33 @@ class Message(models.Model):
                     break
                 chain.append(cur)
                 cur = cur.reply_to_message
+            
+            # Handle user interruption for tool response messages in thread mode
+            if self.media_type == "tool_response":
+                # Find any user message that came chronologically after any tool call in our chain
+                # AND that replies to one of the messages in our chain
+                tool_call_timestamps = [m.timestamp for m in chain if m.media_type == "tool_call"]
+                if tool_call_timestamps:
+                    latest_tool_call_time = max(tool_call_timestamps)
+                    chain_message_ids = [m.id for m in chain]
+                    
+                    # Look for user messages after the latest tool call, before this tool response,
+                    # that reply to any message in our chain
+                    user_interrupt = self.chat.messages.filter(
+                        is_outgoing=False,
+                        timestamp__gt=latest_tool_call_time,
+                        timestamp__lt=self.timestamp,
+                        reply_to_message_id__in=chain_message_ids
+                    ).exclude(
+                        media_type__in=['tool_call', 'tool_response']
+                    ).order_by('-timestamp').first()
+                    
+                    if user_interrupt:
+                        # Found user interrupt - get conversation from that user message
+                        return user_interrupt.as_llm_chat(depth=depth, mode=mode,
+                                                        system_instruction=system_instruction,
+                                                        multimodal=multimodal)
+            
             for m in reversed(chain):
                 messages.append(msg_to_dict(m))
         else:
@@ -449,6 +498,8 @@ 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.dev0 → django_unicom-25.2.27.dev2}/unicom/models/message_template.py

@@ -108,7 +108,11 @@ 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.dev0 → django_unicom-25.2.27.dev2}/unicom/services/email/IMAP_thread_manager.py

@@ -66,6 +66,8 @@ 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.dev0 → django_unicom-25.2.27.dev2}/unicom/services/email/listen_to_IMAP.py

@@ -41,6 +41,8 @@ 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:
@@ -85,13 +87,17 @@ 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:
-                            logger.error(f"Channel {channel.pk}: Failed to process 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()}")
                         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.dev0 → django_unicom-25.2.27.dev2}/unicom/services/email/send_email_message.py

@@ -223,7 +223,10 @@ 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.extend(parent.raw['References'].split())
+                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())
             # Then add the parent's Message-ID
             references.append(params['reply_to_message_id'])
         else:

{django_unicom-25.2.27.dev0 → django_unicom-25.2.27.dev2}/unicom/services/html_inline_images.py

@@ -41,7 +41,11 @@ 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.dev0 → django_unicom-25.2.27.dev2}/unicom/services/telegram/send_telegram_message.py

@@ -125,7 +125,10 @@ 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
-                byte_offset = int(ret['description'].split("byte offset")[1].split()[0])
+                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])
                 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}\"")