dhisana 0.0.1.dev273__tar.gz → 0.0.1.dev275__tar.gz

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/PKG-INFO

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

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/setup.py

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

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana/utils/email_parse_helpers.py

@@ -1,19 +1,86 @@
 import base64
 import email.utils
+import quopri
+from email.message import Message
 from email.utils import parseaddr
 from typing import Any, Dict, List, Optional, Tuple
+
 from bs4 import BeautifulSoup
 
-def decode_base64_url(data: str) -> str:
+def decode_base64_url(data: str) -> bytes:
     """
-    Decodes a Base64-url-encoded string (Gmail API uses URL-safe Base64).
+    Decode a Base64-url-encoded string (Gmail API uses URL-safe Base64).
     """
     data = data.replace('-', '+').replace('_', '/')
     # Fix padding
     missing_padding = len(data) % 4
     if missing_padding:
         data += '=' * (4 - missing_padding)
-    return base64.b64decode(data).decode('utf-8', errors='ignore')
+    return base64.b64decode(data)
+
+
+def _get_charset(headers_list: List[Dict[str, str]], mime_type: str) -> Optional[str]:
+    content_type = find_header(headers_list, "Content-Type") or mime_type or ""
+    if not content_type:
+        return None
+    msg = Message()
+    msg["Content-Type"] = content_type
+    return msg.get_content_charset()
+
+
+def _decode_transfer_encoding(payload: bytes, transfer_encoding: str) -> bytes:
+    encoding = (transfer_encoding or "").lower()
+    if "quoted-printable" in encoding:
+        return quopri.decodestring(payload)
+    if "base64" in encoding:
+        try:
+            return base64.b64decode(payload, validate=False)
+        except Exception:
+            return payload
+    return payload
+
+
+_MOJIBAKE_MARKERS = (
+    "\u00e2\u0080\u0099",
+    "\u00e2\u0080\u0093",
+    "\u00e2\u0080\u0094",
+    "\u00e2\u0080\u009c",
+    "\u00e2\u0080\u009d",
+    "\u00e2\u0080\u00a6",
+    "\u00c3\u00a9",
+    "\u00c3\u00a0",
+    "\u00c3\u00b6",
+)
+
+
+def _repair_mojibake(text: str) -> str:
+    if not text or not any(marker in text for marker in _MOJIBAKE_MARKERS):
+        return text
+    try:
+        repaired = text.encode("latin-1").decode("utf-8")
+    except UnicodeError:
+        return text
+    if any(marker in repaired for marker in _MOJIBAKE_MARKERS):
+        return text
+    return repaired
+
+
+def _decode_part_text(
+    data: str, headers_list: List[Dict[str, str]], mime_type: str
+) -> str:
+    raw_bytes = decode_base64_url(data)
+    transfer_encoding = find_header(headers_list, "Content-Transfer-Encoding") or ""
+    decoded_bytes = _decode_transfer_encoding(raw_bytes, transfer_encoding)
+
+    charset = _get_charset(headers_list, mime_type)
+    tried = [charset, "utf-8", "windows-1252", "latin-1"]
+    for enc in [e for e in tried if e]:
+        try:
+            text = decoded_bytes.decode(enc)
+            return _repair_mojibake(text)
+        except (LookupError, UnicodeDecodeError):
+            continue
+    return _repair_mojibake(decoded_bytes.decode("utf-8", errors="replace"))
 
 
 def parse_plain_text_from_parts(parts: List[Dict[str, Any]]) -> str:
@@ -30,7 +97,9 @@ def parse_plain_text_from_parts(parts: List[Dict[str, Any]]) -> str:
             mime_type = part.get('mimeType', '')
             data = part.get('body', {}).get('data', '')
             if data:
-                decoded_data = decode_base64_url(data)
+                decoded_data = _decode_part_text(
+                    data, part.get("headers", []), mime_type
+                )
                 if 'text/plain' in mime_type:
                     text_chunks.append(decoded_data)
                 elif 'text/html' in mime_type:
@@ -49,7 +118,9 @@ def extract_email_body_in_plain_text(message_data: Dict[str, Any]) -> str:
     # If top-level body has data (i.e. single-part message)
     if payload.get('body', {}).get('data'):
         raw_data = payload['body']['data']
-        decoded_data = decode_base64_url(raw_data)
+        decoded_data = _decode_part_text(
+            raw_data, payload.get("headers", []), payload.get("mimeType", "")
+        )
         # Check if it might be HTML
         mime_type = payload.get('mimeType', '')
         if 'text/html' in mime_type:
@@ -85,7 +156,7 @@ def find_header(headers_list: List[Dict[str, str]], header_name: str) -> Optiona
     return None
 
 
-def parse_single_address(display_str: str) -> (str, str):
+def parse_single_address(display_str: str) -> Tuple[str, str]:
     """
     Parses a single display string like "Alice <alice@example.com>" 
     returning (name, email).
@@ -112,7 +183,7 @@ def parse_address_list(display_str: str) -> List[Tuple[str, str]]:
     return addresses
 
 
-def find_all_recipients_in_headers(headers_list: List[Dict[str, str]]) -> (str, str):
+def find_all_recipients_in_headers(headers_list: List[Dict[str, str]]) -> Tuple[str, str]:
     """
     Collect 'To', 'Cc', 'Bcc' headers, parse each address, and return:
       (comma-separated receiver names, comma-separated receiver emails)

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana/utils/generate_email_response.py

@@ -71,7 +71,6 @@ async def get_inbound_email_triage_action(
         "SCHEDULE_MEETING",
         "SEND_REPLY",
         "OOF_MESSAGE",
-        "NEED_MORE_INFO",
         "FORWARD_TO_OTHER_USER",
         "NO_MORE_IN_ORGANIZATION",
         "OBJECTION_RAISED",
@@ -93,6 +92,8 @@ async def get_inbound_email_triage_action(
         allowed_actions = 
         {allowed_actions}
 
+        If you need more info, use SEND_REPLY and ask a short clarifying question.
+
         1. Email thread or conversation:
         {[thread_item.model_dump() for thread_item in cleaned_context.current_conversation_context.current_email_thread]}
 
@@ -129,8 +130,7 @@ async def get_inbound_email_triage_action(
         Handling interest & objections
         ------------------------------
         • If the prospect asks for **pricing, docs, case studies, or more info**  
-        → **NEED_MORE_INFO** and craft a short response that promises to send
-            the material (or includes it if ≤ 150 words fits).
+        → **SEND_REPLY** and ask a short clarifying question or promise a follow-up.
 
         • If they mention **budget, timing, or competitor concerns**  
         → **OBJECTION_RAISED** and reply with a brief acknowledgement
@@ -183,7 +183,7 @@ async def get_inbound_email_triage_action(
         "triage_status": "...",
         "triage_reason": null or "<reason>",
         "response_action_to_take": "one of {allowed_actions}",
-        "response_message": "<only if SEND_REPLY/SCHEDULE_MEETING, else empty>"
+        "response_message": "<only if SEND_REPLY/SCHEDULE_MEETING/OBJECTION_RAISED, else empty>"
         }}
 
         Current date is: {current_date_iso}.
@@ -251,7 +251,6 @@ async def generate_inbound_email_response_copy(
         "UNSUBSCRIBE",
         "OOF_MESSAGE",
         "NOT_INTERESTED",
-        "NEED_MORE_INFO",
         "FORWARD_TO_OTHER_USER",
         "NO_MORE_IN_ORGANIZATION",
         "OBJECTION_RAISED",
@@ -282,7 +281,7 @@ async def generate_inbound_email_response_copy(
         if cleaned_context.current_conversation_context.current_email_thread else []}
 
     2) Lead information:
-    {lead_data.dict()}
+    {lead_data.model_dump()}
 
     Sender information:
     - Full name: {sender_data.sender_full_name or ''}
@@ -316,16 +315,17 @@ async def generate_inbound_email_response_copy(
     Choose exactly ONE action from:
     {allowed_actions}
 
+    If you need more info, use SEND_REPLY and ask a short clarifying question.
+
     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
+    6. OBJECTION_RAISED
+    7. SEND_REPLY
+    8. END_CONVERSATION
 
     =====================================================
     HOW THE RESPONSE SHOULD SOUND
@@ -391,7 +391,7 @@ async def generate_inbound_email_response_copy(
     "triage_status": "AUTOMATIC" or "END_CONVERSATION",
     "triage_reason": "<string if END_CONVERSATION, otherwise null>",
     "response_action_to_take": "one of {allowed_actions}",
-    "response_message": "<reply body only if SEND_REPLY or SCHEDULE_MEETING, otherwise empty>"
+    "response_message": "<reply body only if SEND_REPLY/SCHEDULE_MEETING/OBJECTION_RAISED, otherwise empty>"
     }}
 
     =====================================================
@@ -446,6 +446,12 @@ async def generate_inbound_email_response_copy(
                 f"Campaign ID: {campaign_id}"
             )
 
+    response_action = initial_response.response_action_to_take
+    if response_action == "NEED_MORE_INFO":
+        response_action = "SEND_REPLY"
+
+    response_message = initial_response.response_message or ""
+
     response_item = MessageItem(
         message_id="",  # or generate one if appropriate
         thread_id="",
@@ -455,7 +461,7 @@ async def generate_inbound_email_response_copy(
         receiver_email=campaign_context.lead_info.email or "",
         iso_datetime=datetime.datetime.utcnow().isoformat(),
         subject="",  # or set some triage subject if needed
-        body=initial_response.response_message
+        body=response_message
     )
 
     # Build a MessageResponse that includes triage metadata plus your message item
@@ -463,9 +469,8 @@ async def generate_inbound_email_response_copy(
         triage_status=initial_response.triage_status,
         triage_reason=initial_response.triage_reason,
         message_item=response_item,
-        response_action_to_take=initial_response.response_action_to_take
+        response_action_to_take=response_action
     )
-    print(response_message.model_dump())
     return response_message.model_dump()
 
 

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana/utils/openai_assistant_and_file_utils.py

@@ -9,7 +9,7 @@ import json
 import logging
 import re
 import traceback
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 from fastapi import HTTPException
 
@@ -52,6 +52,14 @@ async def delete_vector_store(
     client = create_openai_client(tool_config)
     try:
         client.vector_stores.delete(vector_store_id=vector_store_id)
+    except openai.NotFoundError:
+        logging.warning(f"Vector store not found during delete: {vector_store_id}")
+    except openai.APIStatusError as e:
+        if getattr(e, "status_code", None) == 404:
+            logging.warning(f"Vector store not found during delete: {vector_store_id}")
+            return
+        logging.error(f"Error deleting vector store {vector_store_id}: {e}")
+        raise HTTPException(status_code=400, detail=str(e))
     except Exception as e:
         logging.error(f"Error deleting vector store {vector_store_id}: {e}")
         raise HTTPException(status_code=400, detail=str(e))
@@ -74,10 +82,11 @@ async def upload_file_openai_and_vector_store(
 
     try:
         if isinstance(file_path_or_bytes, str):
-            file_upload = client.files.create(
-                file=open(file_path_or_bytes, "rb"),
-                purpose=purpose,
-            )
+            with open(file_path_or_bytes, "rb") as f:
+                file_upload = client.files.create(
+                    file=f,
+                    purpose=purpose,
+                )
         elif isinstance(file_path_or_bytes, bytes):
             file_upload = client.files.create(
                 file=(file_name, file_path_or_bytes, mime_type),
@@ -108,10 +117,11 @@ async def upload_file_openai(
 
     try:
         if isinstance(file_path_or_bytes, str):
-            file_upload = client.files.create(
-                file=open(file_path_or_bytes, "rb"),
-                purpose=purpose,
-            )
+            with open(file_path_or_bytes, "rb") as f:
+                file_upload = client.files.create(
+                    file=f,
+                    purpose=purpose,
+                )
         else:
             file_upload = client.files.create(
                 file=(file_name, file_path_or_bytes, mime_type),
@@ -217,7 +227,7 @@ async def run_response_text(
     max_tokens: int = 2048,
     store: bool = True,
     tool_config: Optional[List[Dict]] = None,
-) -> (str, str):
+) -> Tuple[str, str]:
     """Plain text completion via the Responses API."""
     client = create_openai_client(tool_config)
 
@@ -241,7 +251,7 @@ async def run_response_structured(
     max_tokens: int = 1024,
     store: bool = True,
     tool_config: Optional[List[Dict]] = None,
-) -> (Any, str):
+) -> Tuple[Any, str]:
     """Structured JSON output via Responses API."""
     client = create_openai_client(tool_config)
 

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana/utils/smtp_email_tools.py

@@ -1,9 +1,8 @@
-# dhisana/email_io.py
+# dhisana/smtp_email_tools.py
 # ─────────────────────────────────────────────────────────────────────────────
 # Standard library
 # ─────────────────────────────────────────────────────────────────────────────
 import asyncio
-import datetime
 import email
 import email.utils
 import hashlib
@@ -105,11 +104,6 @@ def _to_datetime(val: Union[datetime, str]) -> datetime:
         ) from exc
 
 
-def _looks_like_html(text: str) -> bool:
-    """Heuristically determine whether the body contains HTML markup."""
-    return bool(text and re.search(r"<[a-zA-Z][^>]*>", text))
-
-
 def _html_to_plain_text(html: str) -> str:
     """
     Produce a very lightweight plain-text version of an HTML fragment.
@@ -186,18 +180,18 @@ async def send_email_via_smtp_async(
         username=username,
         password=password,
     )
-    # Decide whether to use STARTTLS or TLS
+    # Decide whether to use STARTTLS or implicit TLS; otherwise connect plaintext.
     if use_starttls:
         smtp_kwargs["start_tls"] = True
-    else:
-        smtp_kwargs["tls"] = True
+    elif smtp_port == 465:
+        # aiosmtplib expects `use_tls` for implicit TLS (e.g., port 465)
+        smtp_kwargs["use_tls"] = True
 
     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)
         logging.info("SMTP send OK – msg id %s", generated_id)
-        await asyncio.sleep(20)
         return generated_id
     except Exception:
         logging.exception("SMTP send failed")
@@ -557,8 +551,8 @@ async def reply_to_email_via_smtp_async(
     )
     if use_starttls_smtp:
         smtp_kwargs["start_tls"] = True
-    else:
-        smtp_kwargs["tls"] = True
+    elif smtp_port == 465:
+        smtp_kwargs["use_tls"] = True
 
     await aiosmtplib.send(msg, **smtp_kwargs)
 

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana/utils/test_connect.py

@@ -17,7 +17,6 @@ from googleapiclient.discovery import build
 import imaplib
 import aiosmtplib
 from simple_salesforce import Salesforce
-from urllib.parse import urljoin, urlparse
 
 from dhisana.utils.clay_tools import push_to_clay_table
 
@@ -1030,9 +1029,10 @@ async def test_smtp_accounts(
     try:
         smtp_kwargs = dict(hostname=smtp_host, port=smtp_port, timeout=10)
         if smtp_port == 587:
-            smtp_kwargs["start_tls"] = True  # STARTTLS upgrade
+            smtp_kwargs["start_tls"] = True  # STARTTLS upgrade on submission port
         else:
-            smtp_kwargs["tls"] = (smtp_port == 465)  # implicit SSL on 465
+            # aiosmtplib uses `use_tls` for implicit TLS (e.g., port 465)
+            smtp_kwargs["use_tls"] = (smtp_port == 465)
 
         smtp = aiosmtplib.SMTP(**smtp_kwargs)
         await smtp.connect()

{dhisana-0.0.1.dev273 → dhisana-0.0.1.dev275}/src/dhisana.egg-info/PKG-INFO

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