django-unicom 25.3.45.dev1__tar.gz → 25.3.45.dev3__tar.gz

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.3.45.dev1
+Version: 25.3.45.dev3
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/unicom
 Author: Meena (Menas) Erian
@@ -630,12 +630,12 @@ channel.send_message({
     'to': ['a@example.com'],
     'subject': 'Hello',
     'html': '<p>Hello {{ variables.name }}</p>',
-    'render_template': True,                 # enable rendering
+    'render_template': True,                 # enable rendering (admin email compose & scheduled drafts set this for you)
     'render_variables': {'name': 'Alice'},   # merged into variables.*
     # Optionally pass a custom render_context if you want to add more fields
 })
 ```
-If you omit `render_template`/context/variables, the HTML is sent as-is.
+If you omit `render_template`/context/variables, the HTML is sent as-is. The Django admin email composer and scheduled drafts already enable rendering by default; you only need to pass the flag when sending programmatically.
 
 ### Draft Messages & Scheduling
 

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/README.md

@@ -586,12 +586,12 @@ channel.send_message({
     'to': ['a@example.com'],
     'subject': 'Hello',
     'html': '<p>Hello {{ variables.name }}</p>',
-    'render_template': True,                 # enable rendering
+    'render_template': True,                 # enable rendering (admin email compose & scheduled drafts set this for you)
     'render_variables': {'name': 'Alice'},   # merged into variables.*
     # Optionally pass a custom render_context if you want to add more fields
 })
 ```
-If you omit `render_template`/context/variables, the HTML is sent as-is.
+If you omit `render_template`/context/variables, the HTML is sent as-is. The Django admin email composer and scheduled drafts already enable rendering by default; you only need to pass the flag when sending programmatically.
 
 ### Draft Messages & Scheduling
 

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/django_unicom.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-unicom
-Version: 25.3.45.dev1
+Version: 25.3.45.dev3
 Summary: Unified communication layer for Django (Telegram, WhatsApp, Email)
 Home-page: https://github.com/meena-erian/unicom
 Author: Meena (Menas) Erian
@@ -630,12 +630,12 @@ channel.send_message({
     'to': ['a@example.com'],
     'subject': 'Hello',
     'html': '<p>Hello {{ variables.name }}</p>',
-    'render_template': True,                 # enable rendering
+    'render_template': True,                 # enable rendering (admin email compose & scheduled drafts set this for you)
     'render_variables': {'name': 'Alice'},   # merged into variables.*
     # Optionally pass a custom render_context if you want to add more fields
 })
 ```
-If you omit `render_template`/context/variables, the HTML is sent as-is.
+If you omit `render_template`/context/variables, the HTML is sent as-is. The Django admin email composer and scheduled drafts already enable rendering by default; you only need to pass the flag when sending programmatically.
 
 ### Draft Messages & Scheduling
 

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/unicom/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '25.3.45.dev1'
-__version_tuple__ = version_tuple = (25, 3, 45, 'dev1')
+__version__ = version = '25.3.45.dev3'
+__version_tuple__ = version_tuple = (25, 3, 45, 'dev3')
 
 __commit_id__ = commit_id = None

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/unicom/services/email/send_email_message.py

@@ -20,6 +20,8 @@ from unicom.services.html_inline_images import html_shortlinks_to_base64_images,
 from unicom.services.template_renderer import (
     render_template as render_unicom_template,
     build_unicom_message_context,
+    extract_variable_keys,
+    compute_crm_variables,
 )
 
 logger = logging.getLogger(__name__)
@@ -281,9 +283,19 @@ def send_email_message(channel: Channel, params: dict, user: User=None):
 
     # Optionally render templates for non-CRM use-cases when explicitly requested.
     render_context = params.get('render_context')
-    render_variables = params.get('render_variables')
+    render_variables = params.get('render_variables') or {}
     render_requested = params.get('render_template') or render_context or render_variables
     if render_requested and html_content:
+        crm_variables: dict[str, object] = {}
+        requested_keys = extract_variable_keys(html_content)
+        if requested_keys:
+            # Use first To address (if any) to resolve contact for CRM variables.
+            primary_email = None
+            to_addrs_for_crm = params.get('to') or to_addrs
+            if to_addrs_for_crm:
+                primary_email = (to_addrs_for_crm[0] or '').strip()
+            crm_variables = compute_crm_variables(requested_keys, primary_email)
+
         base_context = render_context or build_unicom_message_context(
             params=params,
             channel={
@@ -297,10 +309,13 @@ def send_email_message(channel: Channel, params: dict, user: User=None):
                 'email': getattr(user, 'email', None),
             } if user else {},
         )
+        merged_variables = {}
+        merged_variables.update(crm_variables)
+        merged_variables.update(render_variables)
         render_result = render_unicom_template(
             html_content,
             base_context=base_context,
-            variables=render_variables or {},
+            variables=merged_variables,
         )
         if render_result.errors:
             logger.warning("Template rendering errors: %s", "; ".join(render_result.errors))

{django_unicom-25.3.45.dev1 → django_unicom-25.3.45.dev3}/unicom/services/template_renderer.py

@@ -7,6 +7,7 @@ import re
 from urllib.parse import unquote
 
 from django.utils import timezone
+from django.db import IntegrityError
 from jinja2 import StrictUndefined, TemplateError
 from jinja2.sandbox import SandboxedEnvironment
 
@@ -138,3 +139,61 @@ def build_unicom_message_context(
     if extra:
         ctx.update(extra)
     return ctx
+
+
+_VARIABLE_PLACEHOLDER_RE = re.compile(r"\{\{\s*variables\.([^\s\}]+)\s*\}\}")
+
+
+def extract_variable_keys(template_html: str | None) -> set[str]:
+    """
+    Return the set of variable keys referenced as {{ variables.* }} in the template.
+    """
+    if not template_html:
+        return set()
+    unprotected = unprotect_tinymce_markup(template_html)
+    return {m.group(1) for m in _VARIABLE_PLACEHOLDER_RE.finditer(unprotected)}
+
+
+def _load_crm_models():
+    """
+    Dynamically load CRM models if unicrm is installed; otherwise return (None, None).
+    """
+    try:
+        from django.apps import apps
+        Contact = apps.get_model('unicrm', 'Contact')
+        TemplateVariable = apps.get_model('unicrm', 'TemplateVariable')
+        if Contact is None or TemplateVariable is None:
+            return None, None
+        return Contact, TemplateVariable
+    except Exception:
+        return None, None
+
+
+def compute_crm_variables(keys: set[str], contact_email: str | None) -> Dict[str, Any]:
+    """
+    Best-effort evaluation of CRM TemplateVariables for a contact resolved by email.
+    Safe to call when unicrm is not installed (returns {}).
+    """
+    if not keys or not contact_email:
+        return {}
+    Contact, TemplateVariable = _load_crm_models()
+    if Contact is None or TemplateVariable is None:
+        return {}
+    contact = Contact.objects.filter(email__iexact=contact_email).first()
+    if not contact:
+        try:
+            contact, _ = Contact.objects.get_or_create(
+                email=contact_email,
+                defaults={'email': contact_email},
+            )
+        except IntegrityError:
+            contact = Contact.objects.filter(email__iexact=contact_email).first()
+    if not contact:
+        return {}
+    results: Dict[str, Any] = {}
+    for variable in TemplateVariable.objects.filter(is_active=True, key__in=keys):
+        try:
+            results[variable.key] = variable.get_callable()(contact)
+        except Exception as exc:  # pragma: no cover - defensive
+            results[variable.key] = f"<error: {exc}>"
+    return results