dhisana 0.0.1.dev304__tar.gz → 0.0.1.dev306__tar.gz

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev304
+Version: 0.0.1.dev306
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dhisana',  
-    version='0.0.1-dev304',
+    version='0.0.1-dev306',
     description='A Python SDK for Dhisana AI Platform',
     author='Admin',
     author_email='contact@dhisana.ai',

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/schemas/common.py

@@ -380,19 +380,24 @@ class SendEmailContext(BaseModel):
     body_format: BodyFormat = BodyFormat.AUTO
     headers: Optional[Dict[str, str]] = None
     email_open_token: Optional[str] = None
-    
+    to_recipients: Optional[List["EmailRecipient"]] = None
+    cc_recipients: Optional[List["EmailRecipient"]] = None
+    bcc_recipients: Optional[List["EmailRecipient"]] = None
+
 class QueryEmailContext(BaseModel):
     start_time: str
     end_time: str
     sender_email: str
     unread_only: bool = True
     labels: Optional[List[str]] = None
-    
+
 
 class EmailRecipient(BaseModel):
     email: str
     name: Optional[str] = None
 
+SendEmailContext.model_rebuild()
+
 
 class ReplyEmailContext(BaseModel):
     """Context for replying to or forwarding an email."""

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/schemas/sales.py

@@ -271,6 +271,8 @@ class ChannelType(str, Enum):
     REPLY_EMAIL = "reply_email"
     LINKEDIN_USER_MESSAGE = "linkedin_user_message"
     CUSTOM_MESSAGE = "custom_message"
+    SMS = "sms"
+    WHATSAPP = "whatsapp"
 
 class SenderInfo(BaseModel):
     """

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/utils/generate_content.py

@@ -6,6 +6,7 @@ from dhisana.utils.assistant_tool_tag import assistant_tool
 from dhisana.utils.generate_email import generate_personalized_email
 from dhisana.utils.generate_linkedin_response_message import get_linkedin_response_message_variations
 from dhisana.utils.generate_custom_message import generate_custom_message
+from dhisana.utils.generate_sms_whatsapp import generate_sms_whatsapp_message
 
 
 @assistant_tool
@@ -36,6 +37,8 @@ async def generate_content(
         return await generate_inbound_email_response_variations(generation_context, number_of_variations, tool_config)
     elif generation_context.target_channel_type == ChannelType.LINKEDIN_USER_MESSAGE.value:
         return await get_linkedin_response_message_variations(generation_context, number_of_variations, tool_config)
+    elif generation_context.target_channel_type in (ChannelType.SMS.value, ChannelType.WHATSAPP.value):
+        return await generate_sms_whatsapp_message(generation_context, number_of_variations, tool_config)
     else:
         # Default to CUSTOM_MESSAGE for any unrecognized channel type
         return await generate_custom_message(generation_context, number_of_variations, tool_config)

dhisana-0.0.1.dev306/src/dhisana/utils/generate_sms_whatsapp.py

@@ -0,0 +1,253 @@
+import re
+from datetime import datetime, timezone
+from typing import Dict, List, Optional
+
+from pydantic import BaseModel, ConfigDict
+
+from dhisana.schemas.sales import (
+    CampaignContext,
+    ChannelType,
+    ContentGenerationContext,
+    ConversationContext,
+    Lead,
+    MessageGenerationInstructions,
+    MessageItem,
+    SenderInfo,
+)
+from dhisana.utils.generate_email import _sanitize_lead_for_prompt
+from dhisana.utils.generate_structured_output_internal import (
+    get_structured_output_internal,
+    get_structured_output_with_assistant_and_vector_store,
+)
+
+DEFAULT_SMS_GEN_MODEL = "gpt-5.4"
+
+SMS_CHAR_LIMIT = 160
+WHATSAPP_CHAR_LIMIT = 1000
+
+# Standard opt-out suffix appended to every generated message.
+OPT_OUT_SUFFIX_SMS = "\nReply STOP to opt out."
+OPT_OUT_SUFFIX_WHATSAPP = "\nReply STOP to opt out."
+
+
+class SMSWhatsAppCopy(BaseModel):
+    body: str
+
+    model_config = ConfigDict(extra="forbid")
+
+
+def _effective_char_limit(channel_type: ChannelType) -> int:
+    if channel_type == ChannelType.WHATSAPP:
+        return WHATSAPP_CHAR_LIMIT
+    return SMS_CHAR_LIMIT
+
+
+def _opt_out_suffix(channel_type: ChannelType) -> str:
+    if channel_type == ChannelType.WHATSAPP:
+        return OPT_OUT_SUFFIX_WHATSAPP
+    return OPT_OUT_SUFFIX_SMS
+
+
+# Matches explicit opt-out instructions like "Reply STOP", "Text STOP to …",
+# "opt out", or "unsubscribe" — requires an action verb before "stop" so
+# normal prose like "stop wasting time" does not suppress the footer.
+_OPT_OUT_RE = re.compile(
+    r"(?:reply|text|send|message|say)\s+stop\b"
+    r"|\bopt[\s\-]?out\b"
+    r"|\bunsubscribe\b",
+    re.IGNORECASE,
+)
+
+
+def _ensure_opt_out(body: str, channel_type: ChannelType) -> str:
+    suffix = _opt_out_suffix(channel_type)
+    if _OPT_OUT_RE.search(body):
+        return body
+    return body.rstrip() + suffix
+
+
+def _cleanup_context(
+    ctx: ContentGenerationContext,
+) -> ContentGenerationContext:
+    clone = ctx.model_copy(deep=True)
+    if clone.external_known_data:
+        clone.external_known_data.external_openai_vector_store_id = None
+    return clone
+
+
+async def generate_sms_whatsapp_copy(
+    message_context: ContentGenerationContext,
+    message_instructions: MessageGenerationInstructions,
+    variation_text: str,
+    channel_type: ChannelType,
+    tool_config: Optional[List[Dict]] = None,
+) -> dict:
+    cleaned = _cleanup_context(message_context)
+
+    user_instructions = (
+        message_instructions.instructions_to_generate_message or ""
+    ).strip()
+    selected_instructions = user_instructions if user_instructions else variation_text
+
+    lead_data = cleaned.lead_info or Lead()
+    sender_data = cleaned.sender_info or SenderInfo()
+    campaign_data = cleaned.campaign_context or CampaignContext()
+    conversation_data = (
+        cleaned.current_conversation_context or ConversationContext()
+    )
+
+    char_limit = _effective_char_limit(channel_type)
+    opt_out_suffix = _opt_out_suffix(channel_type)
+    usable_chars = char_limit - len(opt_out_suffix)
+    channel_label = "WhatsApp" if channel_type == ChannelType.WHATSAPP else "SMS"
+
+    prompt = f"""You are an AI sales copywriter. Write exactly one personalized {channel_label} message on behalf of the sender to the lead described below.
+
+## Channel Rules — {channel_label}
+
+1. The message body (excluding the compliance footer) MUST be {usable_chars} characters or fewer.
+2. Plain text only — no HTML, no markdown, no emojis unless the instructions ask for them.
+3. No subject line — output only a "body" field.
+4. Be concise and conversational. Lead with value, not a greeting. Avoid filler.
+5. Do NOT include any opt-out / STOP language — the system appends it automatically.
+6. Do NOT include phone numbers, email addresses, or links unless the writing instructions explicitly request a specific provided URL.
+7. Ground every claim in the provided context. Never fabricate information.
+8. Do not use em dashes.
+
+## Lead
+
+Name: {lead_data.first_name or ''} {lead_data.last_name or ''}
+Organization: {lead_data.organization_name or ''}
+Title: {lead_data.job_title or ''}
+
+## Sender (closed set — use ONLY these facts)
+
+- Full Name: {sender_data.sender_full_name or ''}
+- First Name: {sender_data.sender_first_name or ''}
+- Last Name: {sender_data.sender_last_name or ''}
+- Bio: {sender_data.sender_bio or ''}
+
+## Campaign
+
+- Product: {campaign_data.product_name or ''}
+- Value Proposition: {campaign_data.value_prop or ''}
+- Call to Action: {campaign_data.call_to_action or ''}
+- Pain Points: {campaign_data.pain_points or []}
+- Proof Points: {campaign_data.proof_points or []}
+
+## Writing Instructions
+
+{selected_instructions}
+
+## Conversation History
+
+{conversation_data.current_email_thread or ''}
+{conversation_data.current_linkedin_thread or ''}
+
+## Output Format
+
+Return JSON with a single field: "body" (string, plain text, max {usable_chars} chars).
+
+## Additional Lead Context (reference only)
+
+{_sanitize_lead_for_prompt(lead_data)}
+"""
+
+    vector_store_id = (
+        message_context.external_known_data.external_openai_vector_store_id
+        if message_context.external_known_data
+        else None
+    )
+    use_cache = (
+        message_context.message_instructions.use_cache
+        if message_context.message_instructions
+        else True
+    )
+
+    if vector_store_id:
+        response, status = (
+            await get_structured_output_with_assistant_and_vector_store(
+                prompt=prompt,
+                response_format=SMSWhatsAppCopy,
+                vector_store_id=vector_store_id,
+                model=DEFAULT_SMS_GEN_MODEL,
+                effort="medium",
+                tool_config=tool_config,
+                use_cache=use_cache,
+            )
+        )
+    else:
+        response, status = await get_structured_output_internal(
+            prompt=prompt,
+            response_format=SMSWhatsAppCopy,
+            model=DEFAULT_SMS_GEN_MODEL,
+            effort="medium",
+            tool_config=tool_config,
+            use_cache=use_cache,
+        )
+
+    if status != "SUCCESS":
+        raise Exception(
+            f"Error: Could not generate {channel_label} message."
+        )
+
+    body = (response.body or "").strip()
+    # Truncate if model exceeded the limit
+    if len(body) > usable_chars:
+        body = body[:usable_chars].rsplit(" ", 1)[0]
+    body = _ensure_opt_out(body, channel_type)
+
+    response_item = MessageItem(
+        message_id="",
+        thread_id="",
+        sender_name=sender_data.sender_full_name or "",
+        sender_email=sender_data.sender_email or "",
+        receiver_name=(message_context.lead_info.full_name or "") if message_context.lead_info else "",
+        receiver_email=(message_context.lead_info.email or "") if message_context.lead_info else "",
+        iso_datetime=datetime.now(timezone.utc).isoformat(),
+        subject="",
+        body=body,
+        html_body=None,
+    )
+    return response_item.model_dump()
+
+
+FRAMEWORK_VARIATIONS_SMS = [
+    "Write a brief, personalized outreach message. Lead with a relevant insight about the prospect's company.",
+    "Write a short value-first message — mention one pain point and how the product helps.",
+    "Write a concise, curiosity-driven message with a clear call to action.",
+]
+
+
+async def generate_sms_whatsapp_message(
+    generation_context: ContentGenerationContext,
+    number_of_variations: int = 3,
+    tool_config: Optional[List[Dict]] = None,
+) -> List[dict]:
+    channel_type = generation_context.target_channel_type or ChannelType.SMS
+    message_instructions = generation_context.message_instructions
+    user_instructions_exist = bool(
+        (message_instructions.instructions_to_generate_message or "").strip()
+    )
+
+    variations: List[dict] = []
+    for i in range(number_of_variations):
+        if user_instructions_exist:
+            variation_text = (
+                message_instructions.instructions_to_generate_message or ""
+            )
+        else:
+            variation_text = FRAMEWORK_VARIATIONS_SMS[
+                i % len(FRAMEWORK_VARIATIONS_SMS)
+            ]
+
+        copy = await generate_sms_whatsapp_copy(
+            message_context=generation_context,
+            message_instructions=message_instructions,
+            variation_text=variation_text,
+            channel_type=channel_type,
+            tool_config=tool_config,
+        )
+        variations.append(copy)
+
+    return variations

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/utils/google_oauth_tools.py

@@ -210,6 +210,27 @@ async def send_email_using_google_oauth_async(
     message["from"] = f"{send_email_context.sender_name} <{send_email_context.sender_email}>"
     message["subject"] = send_email_context.subject
 
+    # Add extra To recipients
+    extra_to = getattr(send_email_context, "to_recipients", None) or []
+    if extra_to:
+        additional = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in extra_to]
+        additional = [a for a in additional if a and a.lower() != send_email_context.recipient.strip().lower()]
+        if additional:
+            del message["to"]
+            message["to"] = ", ".join([send_email_context.recipient] + additional)
+
+    # Add CC recipients
+    cc_list = getattr(send_email_context, "cc_recipients", None) or []
+    if cc_list:
+        cc_addrs = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in cc_list]
+        message["cc"] = ", ".join(a for a in cc_addrs if a)
+
+    # Add BCC recipients (header set for envelope; Gmail strips it before delivery)
+    bcc_list = getattr(send_email_context, "bcc_recipients", None) or []
+    if bcc_list:
+        bcc_addrs = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in bcc_list]
+        message["bcc"] = ", ".join(a for a in bcc_addrs if a)
+
     extra_headers = getattr(send_email_context, "headers", None) or {}
     for header, value in extra_headers.items():
         if not header or value is None:

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/utils/microsoft365_tools.py

@@ -227,6 +227,35 @@ async def send_email_using_microsoft_graph_async(
         ],
     }
 
+    # Merge additional To recipients from the new field
+    extra_to = getattr(send_email_context, "to_recipients", None) or []
+    for r in extra_to:
+        addr = r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r))
+        if addr and addr.lower() != send_email_context.recipient.strip().lower():
+            message_payload["toRecipients"].append({"emailAddress": {"address": addr}})
+
+    # CC recipients
+    cc_list = getattr(send_email_context, "cc_recipients", None) or []
+    if cc_list:
+        cc_entries = []
+        for r in cc_list:
+            addr = r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r))
+            if addr:
+                cc_entries.append({"emailAddress": {"address": addr}})
+        if cc_entries:
+            message_payload["ccRecipients"] = cc_entries
+
+    # BCC recipients
+    bcc_list = getattr(send_email_context, "bcc_recipients", None) or []
+    if bcc_list:
+        bcc_entries = []
+        for r in bcc_list:
+            addr = r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r))
+            if addr:
+                bcc_entries.append({"emailAddress": {"address": addr}})
+        if bcc_entries:
+            message_payload["bccRecipients"] = bcc_entries
+
     extra_headers = getattr(send_email_context, "headers", None) or {}
     if extra_headers:
         message_payload["internetMessageHeaders"] = [

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana/utils/smtp_email_tools.py

@@ -226,6 +226,35 @@ async def send_email_via_smtp_async(
     msg["To"] = ctx.recipient
     msg["Subject"] = ctx.subject
 
+    # Build envelope recipient list starting with primary
+    envelope_recipients = [ctx.recipient]
+
+    # Add extra To recipients
+    extra_to = getattr(ctx, "to_recipients", None) or []
+    if extra_to:
+        additional = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in extra_to]
+        additional = [a for a in additional if a and a.lower() != ctx.recipient.strip().lower()]
+        if additional:
+            del msg["To"]
+            msg["To"] = ", ".join([ctx.recipient] + additional)
+            envelope_recipients.extend(additional)
+
+    # Add CC recipients
+    cc_list = getattr(ctx, "cc_recipients", None) or []
+    if cc_list:
+        cc_addrs = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in cc_list]
+        cc_addrs = [a for a in cc_addrs if a]
+        if cc_addrs:
+            msg["Cc"] = ", ".join(cc_addrs)
+            envelope_recipients.extend(cc_addrs)
+
+    # Add BCC recipients (envelope only, no header)
+    bcc_list = getattr(ctx, "bcc_recipients", None) or []
+    if bcc_list:
+        bcc_addrs = [r.email if hasattr(r, "email") else (r.get("email") if isinstance(r, dict) else str(r)) for r in bcc_list]
+        bcc_addrs = [a for a in bcc_addrs if a]
+        envelope_recipients.extend(bcc_addrs)
+
     # Generate a real RFC 5322 Message-ID
     domain_part = ctx.sender_email.split("@", 1)[-1] or "local"
     generated_id = f"<{uuid.uuid4()}@{domain_part}>"
@@ -236,6 +265,12 @@ async def send_email_via_smtp_async(
         if not header or value is None:
             continue
         msg[header] = str(value)
+        # Preserve envelope delivery for Cc/Bcc/To addresses set via extra headers,
+        # since explicit recipients= overrides aiosmtplib's header extraction.
+        if header.lower() in ("to", "cc", "bcc"):
+            for _, addr in email.utils.getaddresses([str(value)]):
+                if addr and addr.lower() not in {a.lower() for a in envelope_recipients}:
+                    envelope_recipients.append(addr)
 
     smtp_kwargs = dict(
         hostname=smtp_server,
@@ -253,7 +288,7 @@ async def send_email_via_smtp_async(
     try:
         # aiosmtplib.send returns a (code, response) tuple, but no server message ID.
         # We rely on the real Message-ID we have just set.
-        await aiosmtplib.send(msg, **smtp_kwargs)
+        await aiosmtplib.send(msg, recipients=envelope_recipients, **smtp_kwargs)
         logging.info("SMTP send OK – msg id %s", generated_id)
         return generated_id
     except Exception:

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dhisana
-Version: 0.0.1.dev304
+Version: 0.0.1.dev306
 Summary: A Python SDK for Dhisana AI Platform
 Home-page: https://github.com/dhisana-ai/dhisana-python-sdk
 Author: Admin

{dhisana-0.0.1.dev304 → dhisana-0.0.1.dev306}/src/dhisana.egg-info/SOURCES.txt

@@ -54,6 +54,7 @@ src/dhisana/utils/generate_flow.py
 src/dhisana/utils/generate_leads_salesnav.py
 src/dhisana/utils/generate_linkedin_connect_message.py
 src/dhisana/utils/generate_linkedin_response_message.py
+src/dhisana/utils/generate_sms_whatsapp.py
 src/dhisana/utils/generate_structured_output_internal.py
 src/dhisana/utils/google_custom_search.py
 src/dhisana/utils/google_oauth_tools.py
@@ -110,6 +111,7 @@ tests/test_apollo_lead_search.py
 tests/test_connectivity.py
 tests/test_email_body_utils.py
 tests/test_generate_email.py
+tests/test_generate_sms_whatsapp.py
 tests/test_google_document.py
 tests/test_hubspot_call_logs.py
 tests/test_linkedin_serper.py
@@ -119,4 +121,5 @@ tests/test_normalize_graph_datetime.py
 tests/test_proxycurl_get_company_search_id.py
 tests/test_proxycurl_job_count.py
 tests/test_reply_thread_fallback.py
+tests/test_send_email_recipients.py
 tests/test_structured_output_with_mcp.py