dhisana 0.0.1.dev240__tar.gz → 0.0.1.dev242__tar.gz

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/PKG-INFO

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

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/setup.py

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

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/schemas/common.py

@@ -378,6 +378,7 @@ class SendEmailContext(BaseModel):
     sender_email: str
     labels: Optional[List[str]]
     body_format: BodyFormat = BodyFormat.AUTO
+    headers: Optional[Dict[str, str]] = None
     
 class QueryEmailContext(BaseModel):
     start_time: str

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/schemas/sales.py

@@ -270,6 +270,7 @@ class ChannelType(str, Enum):
     LINKEDIN_CONNECT_MESSAGE = "linkedin_connect_message"
     REPLY_EMAIL = "reply_email"
     LINKEDIN_USER_MESSAGE = "linkedin_user_message"
+    CUSTOM_MESSAGE = "custom_message"
 
 class SenderInfo(BaseModel):
     """

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/generate_content.py

@@ -5,6 +5,7 @@ from dhisana.utils.generate_linkedin_connect_message import generate_personalize
 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
 
 
 @assistant_tool
@@ -36,4 +37,5 @@ async def generate_content(
     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)
     else:
-        raise ValueError("Invalid target channel type.")
+        # 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.dev242/src/dhisana/utils/generate_custom_message.py

@@ -0,0 +1,271 @@
+# Import necessary modules
+import html as html_lib
+import re
+from typing import Dict, List, Optional
+from pydantic import BaseModel
+
+from dhisana.schemas.sales import CampaignContext, ContentGenerationContext, ConversationContext, Lead, MessageGenerationInstructions, MessageItem, SenderInfo
+from dhisana.utils.generate_structured_output_internal import (
+    get_structured_output_internal,
+    get_structured_output_with_assistant_and_vector_store
+)
+from datetime import datetime
+from pydantic import BaseModel, ConfigDict
+
+# -----------------------------------------------------------------------------
+# Custom Message schema
+# -----------------------------------------------------------------------------
+class CustomMessageCopy(BaseModel):
+    subject: str
+    body: str
+    body_html: Optional[str] = None
+ 
+    model_config = ConfigDict(extra="forbid")
+
+
+def _html_to_plain_text(html_content: str) -> str:
+    """Simple HTML to text conversion to backfill plain body."""
+    if not html_content:
+        return ""
+    # Remove tags and normalize whitespace
+    text = re.sub(r"<[^>]+>", " ", html_content)
+    text = html_lib.unescape(text)
+    # Collapse repeated whitespace/newlines
+    lines = [line.strip() for line in text.splitlines()]
+    return "\n".join([line for line in lines if line])
+
+# -----------------------------------------------------------------------------
+# Utility to Clean Up Context (if needed)
+# -----------------------------------------------------------------------------
+def cleanup_message_context(message_context: ContentGenerationContext) -> ContentGenerationContext:
+    """
+    Return a copy of ContentGenerationContext without sensitive or irrelevant fields.
+    Modify or remove fields as necessary for your project.
+    """
+    clone_context = message_context.copy(deep=True)
+    # For demonstration, no sensitive fields in new classes by default.
+    # Adjust if you want to remove certain fields (like 'sender_bio', etc.).
+    if clone_context.external_known_data:
+        clone_context.external_known_data.external_openai_vector_store_id = None
+    return clone_context
+
+# -----------------------------------------------------------------------------
+# Known Framework Variations (fallback if user instructions are not provided)
+# -----------------------------------------------------------------------------
+FRAMEWORK_VARIATIONS = [
+    "Write a summary of the input having key highlights.",
+]
+
+# -----------------------------------------------------------------------------
+# Core function to generate a custom message copy
+# -----------------------------------------------------------------------------
+async def generate_custom_message_copy(
+    message_context: ContentGenerationContext,
+    message_instructions: MessageGenerationInstructions,
+    variation_text: str,
+    tool_config: Optional[List[Dict]] = None,
+) -> dict:
+    """
+    Generate a personalized custom message using the provided context and instructions.
+
+    Steps:
+      1. Build a prompt referencing 6 main info:
+          (a) Lead Info
+          (b) Sender Info
+          (c) Campaign Info
+          (d) Messaging Instructions
+          (e) Additional Data (vector store) if any
+          (f) Current Conversation Context
+      2. Generate an initial draft with or without vector store usage.
+      3. Optionally refine if a vector store was used and user instructions were not provided.
+      4. Return the final subject & body.
+    """
+    cleaned_context = cleanup_message_context(message_context)
+
+    # Check if user provided custom instructions
+    user_custom_instructions = (message_instructions.instructions_to_generate_message or "").strip()
+    use_custom_instructions = bool(user_custom_instructions)
+
+    # Decide final instructions: user-provided or fallback variation
+    if use_custom_instructions:
+        selected_instructions = user_custom_instructions
+    else:
+        selected_instructions = variation_text
+
+    # Pull out fields or fallback to empty if None
+    lead_data = cleaned_context.lead_info or Lead()
+    sender_data = cleaned_context.sender_info or SenderInfo()
+    campaign_data = cleaned_context.campaign_context or CampaignContext()
+    conversation_data = cleaned_context.current_conversation_context or ConversationContext()
+
+    html_note = (
+        f"\n        Provide the HTML body using this guidance/template when possible:\n        {message_instructions.html_template}"
+        if getattr(message_instructions, "html_template", None)
+        else ""
+    )
+    
+    important_requirements = """
+        IMPORTANT REQUIREMENTS:
+        - Output must be JSON with "subject", "body", and "body_html" fields.
+        - "body_html" should be clean HTML suitable for the message (no external assets), inline styles welcome.
+        - "body" must be the plain-text equivalent of "body_html".
+        - Keep it concise and relevant. No placeholders or extra instructions.
+        - Do not include PII or internal references, guids or content identifiers in the message.
+        - Use conversational names for company/person placeholders when provided.
+        - Do Not Make up information. Use the information provided in the context and instructions only.
+        - Do Not use em dash in the generated output.
+        - Follow the user instructions carefully regarding format, tone, and structure.
+    """
+    
+    if not getattr(message_instructions, "allow_html", False):
+        important_requirements = """
+        IMPORTANT REQUIREMENTS:
+        - Output must be JSON with "subject" and "body" fields only.
+        - In the subject or body DO NOT include any HTML tags like <a>, <b>, <i>, etc.
+        - The body and subject should be in plain text.
+        - If there is a link provided use it as is. Don't wrap it in any HTML tags.
+        - Keep it concise and relevant. No placeholders or extra instructions.
+        - Do not include PII or internal references, guids or content identifiers in the message.
+        - Use conversational name for company name if used.
+        - Do Not Make up information. Use the information provided in the context and instructions only.
+        - Make sure the body text is well-formatted and that newline and carriage-return characters are correctly present and preserved in the message body.
+        - Do Not use em dash in the generated output.
+        - Follow the user instructions carefully regarding format, tone, and structure.
+    """
+
+    # Construct the consolidated prompt
+    initial_prompt = f"""
+        Hi AI Assistant,
+
+        Below is the context in 6 main sections. Use it to craft a concise, professional message:
+
+        1) Lead Information:
+        {lead_data.dict()}
+
+        2) Sender Information:
+        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 ''}
+
+        3) Campaign Information:
+        Product Name: {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 []}
+        Triage Guidelines (Email): {campaign_data.email_triage_guidelines or ''}
+        Triage Guidelines (LinkedIn): {campaign_data.linkedin_triage_guidelines or ''}
+
+        4) Messaging Instructions (template/framework):
+        {selected_instructions}{html_note}
+
+        5) External Data / Vector Store:
+        (I will be provided with file_search tool if present.)
+
+        6) Current Conversation Context:
+        Email Thread: {conversation_data.current_email_thread or ''}
+        LinkedIn Thread: {conversation_data.current_linkedin_thread or ''}
+
+        {important_requirements}
+    """
+
+    # Check if a vector store is available
+    vector_store_id = (message_context.external_known_data.external_openai_vector_store_id
+                       if message_context.external_known_data else None)
+
+    initial_response = None
+    initial_status = ""
+
+    # Generate initial draft
+    if vector_store_id:
+        initial_response, initial_status = await get_structured_output_with_assistant_and_vector_store(
+            prompt=initial_prompt,
+            response_format=CustomMessageCopy,
+            vector_store_id=vector_store_id,
+            model="gpt-5.1-chat",
+            tool_config=tool_config,
+            use_cache=message_context.message_instructions.use_cache if message_context.message_instructions else True
+        )
+    else:
+        # Otherwise, generate the initial draft internally
+        initial_response, initial_status = await get_structured_output_internal(
+            prompt=initial_prompt,
+            response_format=CustomMessageCopy,
+            model="gpt-5.1-chat",
+            tool_config=tool_config,
+            use_cache=message_context.message_instructions.use_cache if message_context.message_instructions else True
+        )
+
+    if initial_status != "SUCCESS":
+        raise Exception("Error: Could not generate initial draft for the custom message.")
+    
+    plain_body = initial_response.body
+    html_body = getattr(initial_response, "body_html", None)
+    if not plain_body and html_body:
+        plain_body = _html_to_plain_text(html_body)
+
+    response_item = MessageItem(
+        message_id="",  # or some real ID if you have it
+        thread_id="",
+        sender_name=message_context.sender_info.sender_full_name or "",
+        sender_email=message_context.sender_info.sender_email or "",
+        receiver_name=message_context.lead_info.full_name or "",
+        receiver_email=message_context.lead_info.email or "",
+        iso_datetime=datetime.utcnow().isoformat(),
+        subject="",
+        body=plain_body,
+        html_body=html_body if getattr(message_instructions, "allow_html", False) else None,
+    )
+    return response_item.model_dump()
+
+# -----------------------------------------------------------------------------
+# Primary function to generate multiple variations
+# -----------------------------------------------------------------------------
+async def generate_custom_message(
+    generation_context: ContentGenerationContext,
+    number_of_variations: int = 3,
+    tool_config: Optional[List[Dict]] = None
+) -> List[dict]:
+    """
+    Generates multiple custom message variations based on the given context and instructions.
+
+    Parameters:
+        - generation_context: The consolidated context for message generation.
+        - number_of_variations: How many message variations to produce.
+        - tool_config: Optional tool configuration for the LLM calls.
+
+    Returns:
+        A list of dictionaries, each containing:
+          {
+            "subject": "string",
+            "body": "string"
+          }
+    """
+    message_variations = []
+    message_instructions = generation_context.message_instructions 
+    user_instructions_exist = bool(
+        (message_instructions.instructions_to_generate_message or "").strip()
+    )
+
+    for i in range(number_of_variations):
+        try:
+            # If user provided instructions, use them for each variation
+            # (skip the internal frameworks).
+            if user_instructions_exist:
+                variation_text = message_instructions.instructions_to_generate_message or ""
+            else:
+                # Otherwise, pick from known frameworks (circular indexing)
+                variation_text = FRAMEWORK_VARIATIONS[i % len(FRAMEWORK_VARIATIONS)]
+
+            message_copy = await generate_custom_message_copy(
+                message_context=generation_context,
+                message_instructions=message_instructions,
+                variation_text=variation_text,
+                tool_config=tool_config
+            )
+            message_variations.append(message_copy)
+
+        except Exception as e:
+            raise e
+    return message_variations

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/google_oauth_tools.py

@@ -145,6 +145,12 @@ 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
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        message[header] = str(value)
+
     raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
 
     payload: Dict[str, Any] = {"raw": raw_message}

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/google_workspace_tools.py

@@ -179,6 +179,12 @@ async def send_email_using_service_account_async(
     message['from'] = f"{send_email_context.sender_name} <{send_email_context.sender_email}>"
     message['subject'] = send_email_context.subject
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        message[header] = str(value)
+
     # Base64-encode the message
     raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
 
@@ -531,6 +537,7 @@ class SendEmailContext(BaseModel):
     sender_email: str
     labels: Optional[List[str]]
     body_format: BodyFormat = BodyFormat.AUTO
+    headers: Optional[Dict[str, str]] = None
     
 @assistant_tool
 async def send_email_using_service_account_async(

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/mailgun_tools.py

@@ -126,6 +126,12 @@ async def send_email_using_mailgun_async(
         "html": html_body,
     }
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        data[f"h:{header}"] = str(value)
+
     async with aiohttp.ClientSession() as session:
         async with session.post(
             f"https://api.mailgun.net/v3/{domain}/messages",

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/microsoft365_tools.py

@@ -168,6 +168,14 @@ async def send_email_using_microsoft_graph_async(
         ],
     }
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    if extra_headers:
+        message_payload["internetMessageHeaders"] = [
+            {"name": header, "value": str(value)}
+            for header, value in extra_headers.items()
+            if header and value is not None
+        ]
+
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/sendgrid_tools.py

@@ -59,6 +59,7 @@ async def send_email_with_sendgrid(
     message: str,
     tool_config: Optional[List[Dict]] = None,
     body_format: Optional[str] = None,
+    custom_headers: Optional[Dict[str, str]] = None,
 ):
     """
     Send an email using SendGrid's v3 Mail Send API.
@@ -69,6 +70,7 @@ async def send_email_with_sendgrid(
     - subject: Subject string.
     - message: HTML body content.
     - tool_config: Optional integration configuration list.
+    - custom_headers: Optional mapping of header names to values.
     """
     api_key = get_sendgrid_api_key(tool_config)
 
@@ -98,6 +100,13 @@ async def send_email_with_sendgrid(
         "content": content,
     }
 
+    if custom_headers:
+        payload["headers"] = {
+            header: str(value)
+            for header, value in custom_headers.items()
+            if header and value is not None
+        }
+
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json",
@@ -143,6 +152,7 @@ async def send_email_using_sendgrid_async(
         message=ctx.body or "",
         body_format=getattr(ctx, "body_format", None),
         tool_config=tool_config,
+        custom_headers=getattr(ctx, "headers", None),
     )
     # Normalise output to a string id-like value
     if isinstance(result, dict) and result.get("status") == 202:

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana/utils/smtp_email_tools.py

@@ -174,6 +174,12 @@ async def send_email_via_smtp_async(
     generated_id = f"<{uuid.uuid4()}@{domain_part}>"
     msg["Message-ID"] = generated_id
 
+    extra_headers = getattr(ctx, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        msg[header] = str(value)
+
     smtp_kwargs = dict(
         hostname=smtp_server,
         port=smtp_port,

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana.egg-info/PKG-INFO

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

{dhisana-0.0.1.dev240 → dhisana-0.0.1.dev242}/src/dhisana.egg-info/SOURCES.txt

@@ -47,6 +47,7 @@ src/dhisana/utils/fetch_openai_config.py
 src/dhisana/utils/field_validators.py
 src/dhisana/utils/g2_tools.py
 src/dhisana/utils/generate_content.py
+src/dhisana/utils/generate_custom_message.py
 src/dhisana/utils/generate_email.py
 src/dhisana/utils/generate_email_response.py
 src/dhisana/utils/generate_flow.py