dhisana 0.0.1.dev85__py3-none-any.whl → 0.0.1.dev236__py3-none-any.whl

dhisana/utils/fetch_openai_config.py

@@ -0,0 +1,129 @@
+"""
+Unified OpenAI / Azure OpenAI helper (no env-fallback for secrets)
+=================================================================
+
+Resolution order
+----------------
+1. If `tool_config` has a **"openai"** block  → public OpenAI
+2. Else if it has an **"azure_openai"** block → Azure OpenAI
+3. Otherwise                            → raise ValueError
+
+`api_key` **and** `endpoint` (for Azure) must therefore be supplied in
+`tool_config`.  They will never be read from the host environment.
+
+Optional:
+  • `AZURE_OPENAI_API_VERSION` – defaults to 2025-03-01-preview
+"""
+
+from __future__ import annotations
+
+import os
+from typing import Dict, List, Optional, Tuple, Union
+
+from openai import AsyncOpenAI, OpenAI, AzureOpenAI, AsyncAzureOpenAI
+
+
+# ─────────────────────────────────────────────────────────────────────────────
+# 1. Helpers: config parsing
+# ─────────────────────────────────────────────────────────────────────────────
+
+def _extract_config(
+    tool_config: Optional[List[Dict]], provider_name: str
+) -> Dict[str, str]:
+    """Return the config map for the requested provider name, else {}."""
+    if not tool_config:
+        return {}
+    block = next((b for b in tool_config if b.get("name") == provider_name), {})
+    return {entry["name"]: entry["value"] for entry in block.get("configuration", []) if entry}
+
+
+def _discover_credentials(
+    tool_config: Optional[List[Dict]] = None,
+) -> Tuple[str, str, Optional[str]]:
+    """
+    Return (provider, api_key, endpoint_or_None).
+
+    provider ∈ {"public", "azure"}
+    """
+    # 1️⃣ Public OpenAI
+    openai_cfg = _extract_config(tool_config, "openai")
+    if openai_cfg:
+        key = openai_cfg.get("apiKey")
+        if not key:
+            raise ValueError(
+                "OpenAI integration is not configured. Please configure the connection to OpenAI in Integrations."
+            )
+        return "public", key, None
+
+    # 2️⃣ Azure OpenAI
+    azure_cfg = _extract_config(tool_config, "azure_openai")
+    if azure_cfg:
+        key = azure_cfg.get("apiKey")
+        endpoint = azure_cfg.get("endpoint")
+        if not key or not endpoint:
+            raise ValueError(
+                "Azure OpenAI integration is not configured. Please configure the connection to Azure OpenAI in Integrations."
+            )
+        return "azure", key, endpoint
+
+    # 3️⃣ Neither block present → error
+    raise ValueError(
+        "OpenAI integration is not configured. Please configure the connection to OpenAI in Integrations."
+    )
+
+
+# ─────────────────────────────────────────────────────────────────────────────
+# 2. Client factories
+# ─────────────────────────────────────────────────────────────────────────────
+
+def _api_version() -> str:
+    """Return the Azure API version (env-controlled, no secret)."""
+    return os.getenv("AZURE_OPENAI_API_VERSION", "2025-03-01-preview")
+
+
+def create_openai_client(
+    tool_config: Optional[List[Dict]] = None,
+) -> Union[OpenAI, AzureOpenAI]:
+    """
+    Return a *synchronous* client:
+        • openai.OpenAI      – public service
+        • openai.AzureOpenAI – Azure
+    """
+    provider, key, endpoint = _discover_credentials(tool_config)
+
+    if provider == "public":
+        return OpenAI(api_key=key)
+
+    # Azure
+    return AzureOpenAI(api_key=key, azure_endpoint=endpoint, api_version=_api_version())
+
+
+def create_async_openai_client(
+    tool_config: Optional[List[Dict]] = None,
+) -> AsyncOpenAI:
+    """
+    Return an *async* client (AsyncOpenAI).
+
+    For Azure we pass both `azure_endpoint` and `api_version`.
+    """
+    provider, key, endpoint = _discover_credentials(tool_config)
+
+    if provider == "public":
+        return AsyncOpenAI(api_key=key)
+
+    return AsyncAzureOpenAI(
+        api_key=key,
+        azure_endpoint=endpoint,
+        api_version=_api_version(),
+    )
+
+
+
+# ─────────────────────────────────────────────────────────────────────────────
+# 3. Convenience helper (legacy)
+# ─────────────────────────────────────────────────────────────────────────────
+
+def get_openai_access_token(tool_config: Optional[List[Dict]] = None) -> str:
+    """Return just the API key (legacy helper)."""
+    _, key, _ = _discover_credentials(tool_config)
+    return key

dhisana/utils/field_validators.py

@@ -1,5 +1,5 @@
 import logging
-from urllib.parse import urlparse, urlunparse
+from urllib.parse import urlparse
 import urllib.parse
 import re
 

dhisana/utils/g2_tools.py

@@ -1,5 +1,4 @@
 import asyncio
-import json
 import logging
 import os
 from typing import Optional

dhisana/utils/generate_content.py

@@ -1,4 +1,3 @@
-from enum import Enum
 from typing import Dict, List, Optional
 from dhisana.schemas.sales import ChannelType, ContentGenerationContext
 from dhisana.utils.generate_email_response import generate_inbound_email_response_variations

dhisana/utils/generate_email.py

@@ -1,12 +1,10 @@
 # Import necessary modules
-import os
-from typing import Any, Dict, List, Optional
-import aiohttp
+import html as html_lib
+import re
+from typing import Dict, List, Optional
 from pydantic import BaseModel
-from enum import Enum
 
-from dhisana.schemas.sales import CampaignContext, ContentGenerationContext, ConversationContext, Lead, MessageGenerationInstructions, MessageItem, PromptEngineeringGuidance, SenderInfo
-from dhisana.utils.assistant_tool_tag import assistant_tool
+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
@@ -20,9 +18,22 @@ from pydantic import BaseModel, ConfigDict
 class EmailCopy(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)
 # -----------------------------------------------------------------------------
@@ -93,6 +104,42 @@ async def generate_personalized_email_copy(
     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 email (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 email.
+        - Use conversational names for company/person placeholders when provided.
+        - Email has salutation Hi <First Name>, unless otherwise specified.
+        - Make sure the signature in body has the sender_first_name correct and in the format the user specified.
+        - Do Not Make up information. use the information provided in the context and instructions only.
+        - Do Not use em dash in the generated output.
+    """
+    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 in email use it as is. dont 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 email.
+        - User conversational name for company name if used.
+        - Email has saluation Hi <First Name>, unless otherwise specified.
+        - <First Name> is the first name of the lead. Its conversational name. It does not have any special characters or spaces.
+        - Make sure the signature in body has the sender_first_name is correct and in the format user has specified.
+        - 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.
+    """
+
     # Construct the consolidated prompt
     initial_prompt = f"""
         Hi AI Assistant,
@@ -118,7 +165,7 @@ async def generate_personalized_email_copy(
         Triage Guidelines (LinkedIn): {campaign_data.linkedin_triage_guidelines or ''}
 
         4) Messaging Instructions (template/framework):
-        {selected_instructions}
+        {selected_instructions}{html_note}
 
         5) External Data / Vector Store:
         (I will be provided with file_search tool if present.)
@@ -127,48 +174,54 @@ async def generate_personalized_email_copy(
         Email Thread: {conversation_data.current_email_thread or ''}
         LinkedIn Thread: {conversation_data.current_linkedin_thread or ''}
 
-        IMPORTANT REQUIREMENTS:
-        - Output must be JSON with "subject" and "body" fields only.
-        - Keep it concise and relevant. No placeholders or extra instructions.
-        - Do not include PII or internal references, guids or content identifiers in the email.
+        {important_requirements}
     """
 
     # Check if a vector store is available
     vector_store_id = (email_context.external_known_data.external_openai_vector_store_id
                        if email_context.external_known_data else None)
 
-    used_vector_store = False
     initial_response = None
     initial_status = ""
 
     # Generate initial draft
     if vector_store_id:
-        used_vector_store = True
         initial_response, initial_status = await get_structured_output_with_assistant_and_vector_store(
             prompt=initial_prompt,
             response_format=EmailCopy,
             vector_store_id=vector_store_id,
-            tool_config=tool_config
+            model="gpt-5.1-chat",
+            tool_config=tool_config,
+            use_cache=email_context.message_instructions.use_cache if email_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=EmailCopy,
-            tool_config=tool_config
+            model="gpt-5.1-chat",
+            tool_config=tool_config,
+            use_cache=email_context.message_instructions.use_cache if email_context.message_instructions else True
         )
 
     if initial_status != "SUCCESS":
         raise Exception("Error: Could not generate initial draft for the personalized email.")
+    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=email_context.sender_info.sender_full_name or "",
         sender_email=email_context.sender_info.sender_email or "",
         receiver_name=email_context.lead_info.full_name or "",
         receiver_email=email_context.lead_info.email or "",
         iso_datetime=datetime.utcnow().isoformat(),
         subject=initial_response.subject,
-        body=initial_response.body
+        body=plain_body,
+        html_body=html_body if getattr(message_instructions, "allow_html", False) else None,
     )
     return response_item.model_dump()