dhisana 0.0.1.dev255__py3-none-any.whl → 0.0.1.dev257__py3-none-any.whl

dhisana/utils/generate_email_response.py

@@ -246,129 +246,144 @@ async def generate_inbound_email_response_copy(
     sender_data = cleaned_context.sender_info or SenderInfo()
 
     prompt = f"""
-        You are a specialized email assistant. 
-        Your task is to analyze the user's email thread, the user/company info,
-        and the provided triage guidelines to craft an appropriate response.
-
-        Follow these instructions to generate the reply: 
-        {variation}
-
-        1. Email thread or conversation to respond to:
-        {[thread_item.model_dump() for thread_item in cleaned_context.current_conversation_context.current_email_thread] 
-            if cleaned_context.current_conversation_context.current_email_thread else []}
-
-        2)  Lead Information:
-            {lead_data.dict()}
-
-            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-specific triage guidelines (user overrides always win):
-        {cleaned_context.campaign_context.email_triage_guidelines}
-
-        -----------------------------------------------------------------
-        Core decision logic
-        -----------------------------------------------------------------
-        • If the request is routine, non-sensitive, and clearly actionable  
-        → **triage_status = "AUTOMATIC"**.  
-        • If the thread contains PII, finance, legal, or any sensitive/NSFW content  
-        → **triage_status = "END_CONVERSATION"** and give a concise **triage_reason**.
-
-        4. Choose exactly ONE of: {allowed_actions}
-
-        -----------------------------------------------------------------
-        Response best practices
-        -----------------------------------------------------------------
-        • MAX 150 words, friendly & concise, single clear CTA.  
-        • Begin with a thank-you, mirror the prospect’s wording briefly, then answer /
-        propose next step.  
-        • Never contradict, trash-talk, or disparage {campaign_context.lead_info.organization_name}.  
-        • Plain-text only – NO HTML tags (<a>, <b>, <i>, etc.).  
-        • If a link already exists in the inbound email, include it verbatim—do not re-wrap or shorten.
-
-        Meeting & follow-up rules
-        -------------------------
-        1. Let `meeting_offer_sent` = **true** if any earlier assistant message offered a
-        meeting.  
-        2. If First “Thanks / Sounds good” & *no* prior meeting offer  
-            → **SEND_REPLY** asking for a 15-min call (≤150 words).  
-        3. If Second non-committal reply *after* meeting_offer_sent, or explicit “not interested”  
-            → **END_CONVERSATION**.  
-        4. If prospect explicitly asks for times / requests your link  
-            → **SCHEDULE_MEETING** and confirm or propose times.  
-        5. If One unsolicited follow-up maximum; stop unless prospect re-engages.
-
-        If you have not proposed a meeting even once in the thread, and the user response is polite acknowledgment then you MUST request for a meeting.
-
-
-        Objections & info requests
-        --------------------------
-        • Pricing / docs / case-studies request → **NEED_MORE_INFO**.  
-        • Budget, timing, or competitor concerns → **OBJECTION_RAISED**  
-        (acknowledge + one clarifying Q or concise value point).  
-        • “Loop in {{colleague_name}}” → **FORWARD_TO_OTHER_USER**.
-
-        Unsubscribe & priority handling
-        -------------------------------
-        1. “Unsubscribe / Remove me” → **UNSUBSCRIBE**  
-        2. Clear lack of interest → **NOT_INTERESTED**  
-        3. Auto OOO reply → **OOF_MESSAGE**  
-        4. Explicit meeting request → **SCHEDULE_MEETING**  
-        5. Otherwise follow the Meeting & follow-up rules above  
-        6. Default → **END_CONVERSATION**
-
-        Style guard-rails
-        -----------------
-        • Plain language; no jargon or filler.  
-        • Do **not** repeat previous messages verbatim.  
-        • Signature must include sender_first_name exactly as provided.  
-        • Check UNSUBSCRIBE / NOT_INTERESTED first before other triage.
-
-        If you have not proposed a meeting even once in the thread, and the user response is polite acknowledgment then you MUST request for a meeting.
-         
-        • Meeting ask template example:
-        Hi {{lead_first_name}}, would you be open to a quick 15-min call to
-        understand your use-case and share notes?
-
-        • Competitor-stack mention template example:
-        Hi {{lead_first_name}}, thanks for sharing your current stack. Would you be
-        open to a 15-min call to explore where we can add value?
-        
-    Use conversational name for company name.
-    Use conversational name when using lead first name.
-    Do not use special characters or spaces when using lead’s first name.
-    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 the email, use it as is; do not wrap it in any HTML tags.
-    DO NOT make up information. Use only the information provided in the context and instructions.
-    Do NOT repeat the same message sent to the user in the past.
-    Keep the thread conversational and friendly as a good account executive would respond.
-    Do NOT rehash/repeat the same previous message already sent. Keep the reply to the point.
-    DO NOT try to spam users with multiple messages. 
-    Current date is: {current_date_iso}.
-    DO NOT share any link to internal or made up document. You can attach or send any document.
-    If the user is asking for any additional document END_CONVERSATION and let Account executive handle it.
-    - 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.
-
-    Required JSON output
-    --------------------
-    {{
+    You are a B2B account executive replying to warm inbound or engaged leads.
+
+    Your goal is to sound natural, helpful, and human while following all triage,
+    compliance, and action rules below.
+
+    Write responses the way a strong AE would type them, not like a system message.
+
+    =====================================================
+    INPUT CONTEXT
+    =====================================================
+
+    1) Email thread to respond to:
+    {[thread_item.model_dump() for thread_item in cleaned_context.current_conversation_context.current_email_thread]
+        if cleaned_context.current_conversation_context.current_email_thread else []}
+
+    2) Lead information:
+    {lead_data.dict()}
+
+    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-specific triage guidelines
+    (User overrides always take priority):
+    {cleaned_context.campaign_context.email_triage_guidelines}
+
+    =====================================================
+    TRIAGE DECISION LOGIC
+    =====================================================
+
+    Decide first. Write second.
+
+    • Routine, non-sensitive, clearly actionable  
+    → triage_status = "AUTOMATIC"
+
+    • PII, finance, legal, contracts, compliance, NSFW,
+    or document requests  
+    → triage_status = "END_CONVERSATION"
+    → Include a brief triage_reason
+
+    =====================================================
+    ACTION SELECTION
+    =====================================================
+
+    Choose exactly ONE action from:
+    {allowed_actions}
+
+    Priority order:
+    1. UNSUBSCRIBE
+    2. NOT_INTERESTED
+    3. OOF_MESSAGE
+    4. SCHEDULE_MEETING
+    5. FORWARD_TO_OTHER_USER
+    6. NEED_MORE_INFO
+    7. OBJECTION_RAISED
+    8. SEND_REPLY
+    9. END_CONVERSATION
+
+    =====================================================
+    HOW THE RESPONSE SHOULD SOUND
+    =====================================================
+
+    This is a warm lead. Assume positive intent.
+
+    • Friendly, relaxed, and conversational
+    • Short sentences. Natural pacing.
+    • One clear idea per paragraph
+    • No sales pressure. No hype. No buzzwords.
+    • Helpful first. Next step second.
+
+    Think:
+    "Thanks for reaching out. Happy to help."
+    Not:
+    "Thank you for your inquiry regarding..."
+
+    =====================================================
+    RESPONSE STRUCTURE (LOOSE, NOT FORMAL)
+    =====================================================
+
+    Typical flow:
+    1. Quick thank-you or acknowledgement
+    2. Briefly mirror what they said or asked
+    3. Answer or clarify in plain language
+    4. Suggest a simple next step, if appropriate
+
+    Do not force all steps if it feels unnatural.
+
+    =====================================================
+    HARD RULES
+    =====================================================
+
+    • Plain text only. No HTML.
+    • Do not repeat previous messages verbatim.
+    • Do not invent information, pricing, links, or docs.
+    • If a link exists in the inbound email, reuse it exactly.
+    • Do not add new links or attachments.
+    • If documents are requested, END_CONVERSATION.
+    • Never contradict or disparage {campaign_context.lead_info.organization_name}.
+    • Do not spam or over-message.
+
+    =====================================================
+    NAMING AND STYLE
+    =====================================================
+
+    • Use conversational company name
+    • Use conversational lead first name
+    • Do not use special characters or spaces when referencing lead first name
+    • Signature must include sender_first_name exactly as provided
+    • Preserve clean spacing and newlines
+    • Do NOT use em dash
+    • Keep it human. Avoid templates.
+
+    =====================================================
+    OUTPUT FORMAT (STRICT JSON)
+    =====================================================
+
+    Return valid JSON only.
+
+    {
     "triage_status": "AUTOMATIC" or "END_CONVERSATION",
-    "triage_reason": "<reason if END_CONVERSATION; otherwise null>",
+    "triage_reason": "<string if END_CONVERSATION, otherwise null>",
     "response_action_to_take": "one of {allowed_actions}",
-    "response_message": "<the reply body if response_action_to_take is SEND_REPLY or SCHEDULE_MEETING; otherwise empty>"
-    }}
+    "response_message": "<reply body only if SEND_REPLY or SCHEDULE_MEETING, otherwise empty>"
+    }
+
+    =====================================================
+    SYSTEM CONTEXT
+    =====================================================
 
-    Current date is: {current_date_iso}.
-    -----------------------------------------------------------------
+    • Current date: {current_date_iso}
+    • Use only provided context
+    • If unsure, choose END_CONVERSATION
     """
 
 
+
     # If there's a vector store ID, use that approach
     if (
         cleaned_context.external_known_data

dhisana/utils/google_workspace_tools.py

@@ -33,7 +33,7 @@ from dhisana.schemas.common import (SendEmailContext, QueryEmailContext, ReplyEm
 #                               HELPER FUNCTIONS
 ################################################################################
 
-def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
+def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> Any:
     """
     Retrieves the GOOGLE_SERVICE_KEY (base64-encoded JSON) from the provided tool configuration or environment.
 
@@ -43,7 +43,7 @@ def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
                             where "configuration" is a list of dictionaries containing "name" and "value" keys.
 
     Returns:
-        str: The base64-encoded JSON string for the service account credentials.
+        Any: The service account payload (JSON string, base64 string, or dict) for credentials.
 
     Raises:
         ValueError: If the Google Workspace integration has not been configured.
@@ -75,6 +75,29 @@ def get_google_workspace_token(tool_config: Optional[List[Dict]] = None) -> str:
     return GOOGLE_SERVICE_KEY
 
 
+def _normalize_service_account_info(service_account_json: Any) -> Dict[str, Any]:
+    """
+    Normalize a service account payload into a dict for Credentials.from_service_account_info.
+    Accepts dict, JSON string, or base64-encoded JSON string.
+    """
+    if isinstance(service_account_json, dict):
+        return service_account_json
+    if isinstance(service_account_json, (bytes, bytearray)):
+        service_account_json = service_account_json.decode("utf-8")
+    if not isinstance(service_account_json, str):
+        raise TypeError(
+            "Google Workspace service account payload must be a dict, str, bytes, or bytearray."
+        )
+    try:
+        return json.loads(service_account_json)
+    except json.JSONDecodeError:
+        try:
+            decoded = base64.b64decode(service_account_json).decode("utf-8")
+        except (ValueError, UnicodeDecodeError) as exc:
+            raise ValueError("Invalid Google Workspace service account payload.") from exc
+        return json.loads(decoded)
+
+
 
 def get_google_credentials(
     sender_email: str, 
@@ -97,7 +120,7 @@ def get_google_credentials(
         raise ValueError("sender_email is required to impersonate via service account.")
 
     service_account_json = get_google_workspace_token(tool_config)
-    service_account_info = json.loads(service_account_json)
+    service_account_info = _normalize_service_account_info(service_account_json)
 
     # Create Credentials object and impersonate the sender_email
     credentials = service_account.Credentials.from_service_account_info(

dhisana/utils/serpapi_search_tools.py

@@ -709,8 +709,8 @@ def extract_company_page(url: str) -> str:
 @assistant_tool
 async def find_organization_linkedin_url_with_google_search(
     company_name: str,
-    company_location: Optional[str] = None,
-    company_domain: Optional[str] = None,
+    company_location: str = "",
+    company_domain: str = "",
     use_strict_check: bool = True,
     tool_config: Optional[List[Dict]] = None,
 ) -> str:

{dhisana-0.0.1.dev255.dist-info → dhisana-0.0.1.dev257.dist-info}/METADATA

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

{dhisana-0.0.1.dev255.dist-info → dhisana-0.0.1.dev257.dist-info}/RECORD

@@ -40,7 +40,7 @@ dhisana/utils/g2_tools.py,sha256=a4vmBYCBvLae5CdpOhMN1oNlvO8v9J1B5Sd8T5PzuU8,334
 dhisana/utils/generate_content.py,sha256=kkf-aPuA32BNgwk_j5N6unYHOZpO7zIfO6zP95XM9fA,2298
 dhisana/utils/generate_custom_message.py,sha256=_m_8akk5eHyD6nNvzbhnFVmOp_v14rB-jDTVKk1PHOQ,11988
 dhisana/utils/generate_email.py,sha256=YUhrku9meo3ee5Ft2ybtLTUTAfUf4quPmJp9hmSkdzM,12895
-dhisana/utils/generate_email_response.py,sha256=3pggNoJKwZ0bAZ3aKaelw7Qip7AsySh16Qw_36Q0Mh4,21212
+dhisana/utils/generate_email_response.py,sha256=lFcpgOthpce4tSoB8xhlqD5yVEC_nJrFvyJYoZZ0z6E,19420
 dhisana/utils/generate_flow.py,sha256=QMn6bWo0nH0fBvy2Ebub1XfH5udnVAqsPsbIqCtQPXU,4728
 dhisana/utils/generate_leads_salesnav.py,sha256=AONP1KXDJdg95JQBmKx5PQXUD2BHctc-MZOMuRfuK9U,12156
 dhisana/utils/generate_linkedin_connect_message.py,sha256=WZThEun-DMuAOqlzMI--hGmrDuQUYEb4Hl2DoMv3s80,9885
@@ -48,7 +48,7 @@ dhisana/utils/generate_linkedin_response_message.py,sha256=-jg-u5Ipf4-cn9q0yjEHs
 dhisana/utils/generate_structured_output_internal.py,sha256=DmZ5QzW-79Jo3JL5nDCZQ-Fjl8Nz7FHK6S0rZxXbKyg,20705
 dhisana/utils/google_custom_search.py,sha256=5rQ4uAF-hjFpd9ooJkd6CjRvSmhZHhqM0jfHItsbpzk,10071
 dhisana/utils/google_oauth_tools.py,sha256=ReG5lCpXL3_e_s0yn6ai4U7B4-feOWHJVtbv_c0g0rE,28525
-dhisana/utils/google_workspace_tools.py,sha256=zTKMyqRj1kAVCBrUPZXjkxANamKFhbvp1er0ftHD3S4,49175
+dhisana/utils/google_workspace_tools.py,sha256=fuV0UcvAqF9drLzj7-p6D5zh7d5jMXl1jNJTICk4XOo,50224
 dhisana/utils/hubspot_clearbit.py,sha256=keNX1F_RnDl9AOPxYEOTMdukV_A9g8v9j1fZyT4tuP4,3440
 dhisana/utils/hubspot_crm_tools.py,sha256=lbXFCeq690_TDLjDG8Gm5E-2f1P5EuDqNf5j8PYpMm8,99298
 dhisana/utils/instantly_tools.py,sha256=hhqjDPyLE6o0dzzuvryszbK3ipnoGU2eBm6NlsUGJjY,4771
@@ -76,7 +76,7 @@ dhisana/utils/serpapi_additional_tools.py,sha256=Xb1tc_oK-IjI9ZrEruYhFg8UJMLHQDa
 dhisana/utils/serpapi_google_jobs.py,sha256=HUJFZEW8UvYqsW0sWlEDXgI_IUomh5fTkzRJzEgsDGc,4509
 dhisana/utils/serpapi_google_search.py,sha256=B3sVq2OXdrYmPbH7cjQN4RFoek96qgKzXIayKXn0HLU,7318
 dhisana/utils/serpapi_local_business_search.py,sha256=vinmuXLaQ_0BpEdwnONZ2vLTq5xnRh6ICmPbnpckSN4,5775
-dhisana/utils/serpapi_search_tools.py,sha256=xiiYi6Rd6Mqn94mjSKEs5nNZk1l2-PW_hTL4grvxUpI,31722
+dhisana/utils/serpapi_search_tools.py,sha256=Wsvy6JDYWBGhIomWcjZiYcWe7ALTO7CORsNG8whyyQg,31698
 dhisana/utils/serperdev_google_jobs.py,sha256=m5_2f_5y79FOFZz1A_go6m0hIUfbbAoZ0YTjUMO2BSI,4508
 dhisana/utils/serperdev_local_business.py,sha256=JoZfTg58Hojv61cyuwA2lcnPdLT1lawnWaBNrUYWnuQ,6447
 dhisana/utils/serperdev_search.py,sha256=_iBKIfHMq4gFv5StYz58eArriygoi1zW6VnLlux8vto,9363
@@ -95,8 +95,8 @@ dhisana/workflow/agent.py,sha256=esv7_i_XuMkV2j1nz_UlsHov_m6X5WZZiZm_tG4OBHU,565
 dhisana/workflow/flow.py,sha256=xWE3qQbM7j2B3FH8XnY3zOL_QXX4LbTW4ArndnEYJE0,1638
 dhisana/workflow/task.py,sha256=HlWz9mtrwLYByoSnePOemBUBrMEcj7KbgNjEE1oF5wo,1830
 dhisana/workflow/test.py,sha256=E7lRnXK0PguTNzyasHytLzTJdkqIPxG5_4qk4hMEeKc,3399
-dhisana-0.0.1.dev255.dist-info/METADATA,sha256=lwJJzuSsIrzXyK7pli9XTZzeEy8aTJAkYLKAeWDgT9c,1190
-dhisana-0.0.1.dev255.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev255.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev255.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev255.dist-info/RECORD,,
+dhisana-0.0.1.dev257.dist-info/METADATA,sha256=7R2CrO9xKlOsUiKt0px0PABQv_WjlLPLTOEGDdHcP3Q,1190
+dhisana-0.0.1.dev257.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev257.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev257.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev257.dist-info/RECORD,,