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

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/MANIFEST.in

@@ -1,6 +1,7 @@
 include LICENSE
 include README.md
 include MANIFEST.in
+prune smoke
 recursive-include unicom/static *
 recursive-include unicom/templates *
 recursive-include unicom/locale *
@@ -8,4 +9,4 @@ recursive-include unicom/migrations *.py
 global-exclude *.pyc
 global-exclude __pycache__
 global-exclude *.pyo
-global-exclude .git*
+global-exclude .git*

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.4.2.dev0
+Version: 25.4.2.dev2
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/django-unicom
 Author: Meena (Menas) Erian
@@ -23,6 +23,7 @@ Requires-Dist: Pillow>=10.4.0
 Requires-Dist: django-ace>=1.39.2
 Requires-Dist: fa2svg==0.1.10
 Requires-Dist: pytz>=2024.1
+Requires-Dist: Jinja2>=3.1.0
 Requires-Dist: openai
 Requires-Dist: pydub>=0.25.1
 Requires-Dist: audioop-lts; python_version >= "3.13"
@@ -104,6 +105,12 @@ Dynamic: summary
    python -m playwright install --with-deps
    ```
 
+   If you use the email icon-rendering or PDF-export features, you also need
+   native Cairo libraries available on the host image. On Debian/Ubuntu-based
+   systems this typically means installing `libcairo2`. Those libraries are not
+   required for basic messaging setup and are loaded lazily when the relevant
+   feature paths are used.
+
 2. **Add required apps to your Django settings:**
 
    ```python

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/README.md

@@ -59,6 +59,12 @@
    python -m playwright install --with-deps
    ```
 
+   If you use the email icon-rendering or PDF-export features, you also need
+   native Cairo libraries available on the host image. On Debian/Ubuntu-based
+   systems this typically means installing `libcairo2`. Those libraries are not
+   required for basic messaging setup and are loaded lazily when the relevant
+   feature paths are used.
+
 2. **Add required apps to your Django settings:**
 
    ```python

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/django_unicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.4.2.dev0
+Version: 25.4.2.dev2
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/django-unicom
 Author: Meena (Menas) Erian
@@ -23,6 +23,7 @@ Requires-Dist: Pillow>=10.4.0
 Requires-Dist: django-ace>=1.39.2
 Requires-Dist: fa2svg==0.1.10
 Requires-Dist: pytz>=2024.1
+Requires-Dist: Jinja2>=3.1.0
 Requires-Dist: openai
 Requires-Dist: pydub>=0.25.1
 Requires-Dist: audioop-lts; python_version >= "3.13"
@@ -104,6 +105,12 @@ Dynamic: summary
    python -m playwright install --with-deps
    ```
 
+   If you use the email icon-rendering or PDF-export features, you also need
+   native Cairo libraries available on the host image. On Debian/Ubuntu-based
+   systems this typically means installing `libcairo2`. Those libraries are not
+   required for basic messaging setup and are loaded lazily when the relevant
+   feature paths are used.
+
 2. **Add required apps to your Django settings:**
 
    ```python

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/django_unicom.egg-info/SOURCES.txt

@@ -23,17 +23,6 @@ django_unicom.egg-info/dependency_links.txt
 django_unicom.egg-info/requires.txt
 django_unicom.egg-info/top_level.txt
 scripts/reacher_validate.sh
-smoke/consumer-install/.env.example
-smoke/consumer-install/Dockerfile
-smoke/consumer-install/README.md
-smoke/consumer-install/docker-compose.yaml
-smoke/consumer-install/app/manage.py
-smoke/consumer-install/app/seed_webchat_channel.py
-smoke/consumer-install/app/smoke_test.py
-smoke/consumer-install/app/smokeproject/__init__.py
-smoke/consumer-install/app/smokeproject/settings.py
-smoke/consumer-install/app/smokeproject/urls.py
-smoke/consumer-install/app/smokeproject/wsgi.py
 tests/__init__.py
 tests/test_cross_platform_buttons.py
 tests/test_email_authentication.py
@@ -91,6 +80,8 @@ unicom/migrations/0021_message_open_count.py
 unicom/migrations/0022_toolcall_result_status.py
 unicom/migrations/0023_toolcall_progress_updates_for_user.py
 unicom/migrations/0024_email_from_name.py
+unicom/migrations/0025_message_unicom_message_channel_imap_uid_unique.py
+unicom/migrations/0026_message_email_sender_authenticated.py
 unicom/migrations/__init__.py
 unicom/models/__init__.py
 unicom/models/account.py
@@ -121,12 +112,14 @@ unicom/services/crossplatform/scheduler.py
 unicom/services/crossplatform/send_message.py
 unicom/services/email/IMAP_thread_manager.py
 unicom/services/email/__init__.py
+unicom/services/email/auth_helpers.py
 unicom/services/email/email_tracking.py
 unicom/services/email/listen_to_IMAP.py
 unicom/services/email/quote_filter.py
 unicom/services/email/replace_cid_images_with_base64.py
 unicom/services/email/save_email_message.py
 unicom/services/email/send_email_message.py
+unicom/services/email/system_channel.py
 unicom/services/email/validate_email_config.py
 unicom/services/internal/__init__.py
 unicom/services/internal/generate_text_message_data.py
@@ -175,6 +168,7 @@ unicom/static/unicom/webchat/components/voice-recorder.js
 unicom/static/unicom/webchat/utils/api-client.js
 unicom/static/unicom/webchat/utils/datetime-formatter.js
 unicom/static/unicom/webchat/utils/font-awesome-loader.js
+unicom/static/unicom/webchat/utils/morphdom.js
 unicom/static/unicom/webchat/utils/realtime-client.js
 unicom/templates/admin/unicom/chat_history.html
 unicom/templates/admin/unicom/chat/change_list.html

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/django_unicom.egg-info/requires.txt

@@ -12,6 +12,7 @@ Pillow>=10.4.0
 django-ace>=1.39.2
 fa2svg==0.1.10
 pytz>=2024.1
+Jinja2>=3.1.0
 openai
 pydub>=0.25.1
 WeasyPrint==52.5

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/setup.py

@@ -27,6 +27,7 @@ setup(
         'django-ace>=1.39.2',
         'fa2svg==0.1.10',
         'pytz>=2024.1',
+        'Jinja2>=3.1.0',
         'openai',
         'pydub>=0.25.1',
         'audioop-lts; python_version >= "3.13"',

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/unicom/_version.py

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

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/unicom/consumers/webchat_consumer.py

@@ -30,6 +30,7 @@ from typing import Iterable, Optional, Tuple
 try:
     from channels.generic.websocket import AsyncJsonWebsocketConsumer
     from channels.db import database_sync_to_async
+    from channels.layers import get_channel_layer
 
     CHANNELS_AVAILABLE = True
 except ImportError:  # pragma: no cover - channels is optional
@@ -85,6 +86,11 @@ class WebChatConsumer(AsyncJsonWebsocketConsumer):
         self._recent_ids = deque(maxlen=self.warm_cache_limit)
         self._recent_id_set: set[str] = set()
 
+    def _group_name(self) -> Optional[str]:
+        if not self.chat_id:
+            return None
+        return f"webchat_chat_{self.chat_id}"
+
     # ------------------------------------------------------------------ WS API
     async def connect(self):
         """Validate access and start background polling."""
@@ -106,6 +112,9 @@ class WebChatConsumer(AsyncJsonWebsocketConsumer):
             return
 
         await self.accept()
+        group_name = self._group_name()
+        if group_name and self.channel_layer:
+            await self.channel_layer.group_add(group_name, self.channel_name)
         await self._warm_seen_cache()
         await self.send_json({"type": "ready", "chat_id": self.chat_id})
 
@@ -114,6 +123,12 @@ class WebChatConsumer(AsyncJsonWebsocketConsumer):
 
     async def disconnect(self, code):
         """Stop background polling gracefully."""
+        group_name = self._group_name()
+        if group_name and self.channel_layer:
+            try:
+                await self.channel_layer.group_discard(group_name, self.channel_name)
+            except Exception:
+                pass
         if self._polling_task and not self._polling_task.done():
             self._polling_task.cancel()
             try:
@@ -121,6 +136,20 @@ class WebChatConsumer(AsyncJsonWebsocketConsumer):
             except asyncio.CancelledError:
                 pass
 
+    async def webchat_message_updated(self, event):
+        """Receive a message update via channel layer and forward to client."""
+        message_payload = event.get("message")
+        chat_id = event.get("chat_id") or self.chat_id
+        if not message_payload:
+            return
+        await self.send_json(
+            {
+                "type": "message_updated",
+                "chat_id": chat_id,
+                "message": message_payload,
+            }
+        )
+
     async def receive_json(self, content, **kwargs):
         """
         No client commands are required for this consumer. Respond to optional
@@ -305,11 +334,33 @@ def is_channels_available() -> bool:
 
 
 async def broadcast_message_to_chat(chat_id: str, message) -> None:
-    """
-    Legacy helper retained for backwards compatibility.
-
-    The simplified consumer no longer relies on channel layers, so this helper
-    simply exists to avoid import errors in projects that may still reference
-    it. Messages are delivered by the consumer's periodic polling loop instead.
-    """
-    return None
+    """Broadcast a message update to WebSocket clients subscribed to this chat."""
+    if not CHANNELS_AVAILABLE:
+        return
+    channel_layer = get_channel_layer()
+    if channel_layer is None:
+        return
+
+    payload = {
+        "id": message.id,
+        "text": message.text,
+        "html": message.html,
+        "is_outgoing": message.is_outgoing,
+        "sender_name": message.sender_name,
+        "timestamp": message.timestamp.isoformat(),
+        "media_type": message.media_type,
+        "media_url": message.media.url if message.media else None,
+        # Never dereference related objects in async context; use *_id fields only.
+        "reply_to_message_id": message.reply_to_message_id,
+        "interactive_buttons": message.raw.get("interactive_buttons") if message.raw else None,
+        "progress_updates_for_user": (message.raw or {}).get("tool_call", {}).get("arguments", {}).get("progress_updates_for_user") if message.media_type == "tool_call" else None,
+        "result_status": (message.raw or {}).get("tool_response", {}).get("result", {}).get("status") if message.media_type == "tool_response" else None,
+    }
+    await channel_layer.group_send(
+        f"webchat_chat_{chat_id}",
+        {
+            "type": "webchat.message_updated",
+            "chat_id": chat_id,
+            "message": payload,
+        },
+    )

django_unicom-25.4.2.dev2/unicom/migrations/0025_message_unicom_message_channel_imap_uid_unique.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.9 on 2025-12-27 07:06
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('unicom', '0024_email_from_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddConstraint(
+            model_name='message',
+            constraint=models.UniqueConstraint(fields=('channel', 'imap_uid'), name='unicom_message_channel_imap_uid_unique'),
+        ),
+    ]

django_unicom-25.4.2.dev2/unicom/migrations/0026_message_email_sender_authenticated.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.9 on 2025-12-27 08:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('unicom', '0025_message_unicom_message_channel_imap_uid_unique'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='message',
+            name='email_sender_authenticated',
+            field=models.BooleanField(default=True, help_text='Email-only: True when sender identity passed SPF/DKIM/DMARC (always True for other platforms).'),
+        ),
+    ]

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

@@ -5,7 +5,6 @@ from django.contrib.auth.models import User
 from unicom.models.constants import channels
 from django.contrib.postgres.fields import ArrayField
 from django.core.validators import validate_email
-from fa2svg.converter import revert_to_original_fa
 import uuid
 import re
 import os
@@ -14,6 +13,7 @@ import base64
 from .fields import DedupFileField, only_delete_file_if_unused
 from unicom.services.get_public_origin import get_public_origin
 from openai import OpenAI
+from openai import OpenAIError
 from django.conf import settings
 from pydub import AudioSegment
 import io
@@ -21,7 +21,13 @@ import io
 if TYPE_CHECKING:
     from unicom.models import Channel
 
-openai_client = OpenAI(api_key=getattr(settings, 'OPENAI_API_KEY', None))
+def get_openai_client():
+    api_key = getattr(settings, 'OPENAI_API_KEY', None)
+    if not api_key:
+        raise OpenAIError(
+            "OPENAI_API_KEY is required only for LLM features such as Message.reply_using_llm()."
+        )
+    return OpenAI(api_key=api_key)
 
 
 class Message(models.Model):
@@ -52,6 +58,10 @@ class Message(models.Model):
     chat = models.ForeignKey('unicom.Chat', on_delete=models.CASCADE, related_name='messages')
     is_outgoing = models.BooleanField(null=True, default=None, help_text="True for outgoing messages, False for incoming, None for internal")
     sender_name = models.CharField(max_length=100)
+    email_sender_authenticated = models.BooleanField(
+        default=True,
+        help_text="Email-only: True when sender identity passed SPF/DKIM/DMARC (always True for other platforms).",
+    )
     subject = models.CharField(max_length=512, blank=True, null=True, help_text="Subject of the message (only for email messages)")
     text = models.TextField()
     html = models.TextField(
@@ -457,11 +467,13 @@ class Message(models.Model):
                     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,
+                    # Look for user messages after (tool call time - grace period), before this tool response,
                     # that reply to any message in our chain
+                    from django.utils import timezone
+                    grace_start = latest_tool_call_time - timezone.timedelta(minutes=5)
                     user_interrupt = self.chat.messages.filter(
                         is_outgoing=False,
-                        timestamp__gt=latest_tool_call_time,
+                        timestamp__gt=grace_start,
                         timestamp__lt=self.timestamp,
                         reply_to_message_id__in=chain_message_ids
                     ).exclude(
@@ -472,7 +484,7 @@ class Message(models.Model):
                     if not user_interrupt:
                         user_interrupt = self.chat.messages.filter(
                             is_outgoing=False,
-                            timestamp__gt=latest_tool_call_time,
+                            timestamp__gt=grace_start,
                             timestamp__lt=self.timestamp
                         ).exclude(
                             media_type__in=['tool_call', 'tool_response']
@@ -593,7 +605,7 @@ class Message(models.Model):
             openai_kwargs["modalities"] = ["text", "audio"]
             openai_kwargs["audio"] = {"voice": voice, "format": "opus"}
         # Call OpenAI ChatCompletion API
-        response = openai_client.chat.completions.create(
+        response = get_openai_client().chat.completions.create(
             model=model,
             messages=messages,
             **openai_kwargs
@@ -658,6 +670,12 @@ class Message(models.Model):
 
     class Meta:
         ordering = ['-timestamp']
+        constraints = [
+            models.UniqueConstraint(
+                fields=['channel', 'imap_uid'],
+                name='unicom_message_channel_imap_uid_unique',
+            ),
+        ]
 
     def __str__(self) -> str:
         return f"{self.platform}:{self.chat.name}->{self.sender_name}: {self.text}"

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/unicom/services/crossplatform/reply_to_message.py

@@ -28,6 +28,8 @@ def reply_to_message(channel:Channel , message: Message, response: dict) -> Mess
       - If 'base64_audio' is present and type is 'audio', decodes and saves the audio to media folder, sets 'file_path'.
     """
 
+    tool_call_id = response.pop('_tool_call_id', None)
+
     # If it's an image in base64, decode it:
     if response.get("type") == "image" and "base64_image" in response:
         from unicom.services.decode_base64_image import decode_base64_media
@@ -91,6 +93,8 @@ def reply_to_message(channel:Channel , message: Message, response: dict) -> Mess
         }, source_function_call=source_function_call)
     elif platform == 'WebChat':
         payload = {**response, 'chat_id': message.chat_id}
+        if tool_call_id:
+            payload['_tool_call_id'] = tool_call_id
         media_type = payload.pop('type', None)
         if media_type and 'media_type' not in payload:
             payload['media_type'] = media_type

django_unicom-25.4.2.dev2/unicom/services/email/auth_helpers.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+from typing import Tuple
+
+
+def get_email_service_credentials(config: dict, service: str) -> Tuple[str | None, str | None]:
+    """
+    Return the credentials that should be used for the given service (IMAP or SMTP),
+    falling back to the shared EMAIL_ADDRESS/EMAIL_PASSWORD values when overrides
+    like IMAP_USERNAME or SMTP_PASSWORD are not provided.
+    """
+    service_key = service.upper()
+    if service_key not in {'IMAP', 'SMTP'}:
+        raise ValueError(f"Unknown service for email credentials: {service}")
+
+    shared_username = config.get('EMAIL_ADDRESS')
+    shared_password = config.get('EMAIL_PASSWORD')
+    username = config.get(f'{service_key}_USERNAME')
+    password = config.get(f'{service_key}_PASSWORD')
+
+    if username is None:
+        username = shared_username
+    if password is None:
+        password = shared_password
+
+    return username, password

{django_unicom-25.4.2.dev0 → django_unicom-25.4.2.dev2}/unicom/services/email/listen_to_IMAP.py

@@ -1,4 +1,6 @@
+from unicom.services.email.auth_helpers import get_email_service_credentials
 from unicom.services.email.save_email_message import save_email_message
+from unicom.models import Message
 from imapclient import IMAPClient, SEEN
 from imapclient.exceptions import IMAPClientError
 from django.db import connections
@@ -16,7 +18,7 @@ def listen_to_IMAP(channel):
     This runs indefinitely, with automatic reconnects on failure.
     """
     email_address = channel.config['EMAIL_ADDRESS']
-    password      = channel.config['EMAIL_PASSWORD']
+    imap_username, imap_password = get_email_service_credentials(channel.config, 'IMAP')
     imap_conf     = channel.config['IMAP']
     host          = imap_conf['host']
     port          = imap_conf['port']
@@ -27,13 +29,20 @@ def listen_to_IMAP(channel):
     while True:
         try:
             with IMAPClient(host, port=port, ssl=use_ssl) as server:
-                server.login(email_address, password)
+                server.login(imap_username, imap_password)
                 server.select_folder('INBOX')
                 # caps = server.capabilities()
                 mark_seen_on = channel.config.get('mark_seen_on', 'never')
                 # Immediately fetch any older unseen messages on startup
                 uids = server.search(['UNSEEN'])
+                existing_uids = set()
+                if uids:
+                    existing_uids = set(
+                        Message.objects.filter(channel=channel, imap_uid__in=uids).values_list('imap_uid', flat=True)
+                    )
                 for uid in uids:
+                    if uid in existing_uids:
+                        continue
                     try:
                         resp = server.fetch(uid, ['BODY.PEEK[]'])
                         raw = resp[uid][b'BODY[]']
@@ -75,7 +84,14 @@ def listen_to_IMAP(channel):
                         continue
 
                     uids = server.search(['UNSEEN'])
+                    existing_uids = set()
+                    if uids:
+                        existing_uids = set(
+                            Message.objects.filter(channel=channel, imap_uid__in=uids).values_list('imap_uid', flat=True)
+                        )
                     for uid in uids:
+                        if uid in existing_uids:
+                            continue
                         try:
                             resp = server.fetch(uid, ['BODY.PEEK[]'])
                             raw = resp[uid][b'BODY[]']
@@ -95,4 +111,4 @@ def listen_to_IMAP(channel):
             time.sleep(3)
         finally:
             # Ensure we close all connections to avoid leaks
-            connections.close_all()
+            connections.close_all()