dhisana 0.0.1.dev265__py3-none-any.whl → 0.0.1.dev266__py3-none-any.whl

dhisana/utils/email_provider.py

@@ -124,9 +124,12 @@ async def send_email_async(
 
     Returns whatever the underlying provider helper returns:
 
+        * Mailgun           → str                (message-id from Mailgun)
+        * SendGrid          → str                (X-Message-Id from SendGrid)
         * SMTP              → str                (Message-ID)
         * Microsoft 365     → str                (message-id)
         * Google Workspace  → str                (message-id)
+        * Google OAuth      → str                (message-id)
     """
     # ------------------------------------------------------------------ #
     # 1) Try the preferred providers in order

dhisana/utils/mailgun_tools.py

@@ -1,4 +1,3 @@
-import asyncio
 import logging
 import os
 from typing import Optional, List, Dict
@@ -21,7 +20,7 @@ def get_mailgun_notify_key(tool_config: Optional[List[Dict]] = None) -> str:
     if tool_config:
         cfg = next((item for item in tool_config if item.get("name") == "mailgun"), None)
         if cfg:
-            cfg_map = {i["name"]: i["value"] for i in cfg.get("configuration", []) if i}
+            cfg_map = {i.get("name"): i.get("value") for i in cfg.get("configuration", []) if i}
             key = cfg_map.get("apiKey")
     key = key or os.getenv("MAILGUN_NOTIFY_KEY")
     if not key:
@@ -43,7 +42,7 @@ def get_mailgun_notify_domain(tool_config: Optional[List[Dict]] = None) -> str:
     if tool_config:
         cfg = next((item for item in tool_config if item.get("name") == "mailgun"), None)
         if cfg:
-            cfg_map = {i["name"]: i["value"] for i in cfg.get("configuration", []) if i}
+            cfg_map = {i.get("name"): i.get("value") for i in cfg.get("configuration", []) if i}
             domain = cfg_map.get("domain") or cfg_map.get("notifyDomain")
     domain = domain or os.getenv("MAILGUN_DOMAIN") or os.getenv("MAILGUN_NOTIFY_DOMAIN")
     if not domain:
@@ -96,11 +95,15 @@ async def send_email_with_mailgun(
                 # Try to return JSON payload if available
                 try:
                     return await response.json()
-                except Exception:
+                except Exception as parse_ex:
+                    logging.debug(f"Could not parse Mailgun response as JSON: {parse_ex}")
                     return await response.text()
-    except Exception as ex:
+    except (aiohttp.ClientError, ValueError) as ex:
         logging.warning(f"Error sending email via Mailgun: {ex}")
         return {"error": str(ex)}
+    except Exception as ex:
+        logging.exception(f"Unexpected error sending email via Mailgun: {ex}")
+        raise
 
 
 async def send_email_using_mailgun_async(
@@ -147,10 +150,10 @@ async def send_email_using_mailgun_async(
                 raise RuntimeError(f"Mailgun send failed: {detail}")
             try:
                 payload = await response.json()
-            except Exception:
+            except Exception as parse_ex:
+                logging.debug(f"Could not parse Mailgun response as JSON: {parse_ex}")
                 payload = {"message": await response.text()}
 
     # Normalise return value akin to other providers
     msg_id = payload.get("id") if isinstance(payload, dict) else None
-    await asyncio.sleep(20)
     return msg_id or str(payload)

dhisana/utils/sendgrid_tools.py

@@ -119,13 +119,17 @@ async def send_email_with_sendgrid(
                 headers=headers,
                 json=payload,
             ) as response:
-                # SendGrid returns 202 Accepted on success with empty body
+                # SendGrid returns 202 Accepted on success with empty body but includes X-Message-Id header
                 if response.status == 202:
-                    return {"status": 202, "message": "accepted"}
+                    message_id = response.headers.get("X-Message-Id")
+                    if not message_id:
+                        logging.warning("SendGrid did not return X-Message-Id header")
+                    return {"status": 202, "message": "accepted", "message_id": message_id}
                 # On error, try to parse JSON for helpful message
                 try:
                     err = await response.json()
-                except Exception:
+                except Exception as parse_ex:
+                    logging.debug(f"Could not parse SendGrid error as JSON: {parse_ex}")
                     err = {"text": await response.text()}
                 return {"error": err, "status": response.status}
     except Exception as ex:
@@ -139,12 +143,8 @@ async def send_email_using_sendgrid_async(
 ) -> str:
     """
     Provider-style wrapper for SendGrid using SendEmailContext.
-    Returns an opaque token since SendGrid does not return a message id.
+    Returns the message ID from SendGrid's X-Message-Id response header.
     """
-    plain_body, html_body, _ = body_variants(
-        ctx.body,
-        getattr(ctx, "body_format", None),
-    )
     result = await send_email_with_sendgrid(
         sender=f"{ctx.sender_name} <{ctx.sender_email}>",
         recipients=[ctx.recipient],
@@ -156,6 +156,10 @@ async def send_email_using_sendgrid_async(
     )
     # Normalise output to a string id-like value
     if isinstance(result, dict) and result.get("status") == 202:
+        message_id = result.get("message_id")
+        if message_id:
+            return message_id
+        # Fallback if header wasn't present (shouldn't happen)
         return f"sent:{ctx.sender_email}:{ctx.recipient}:{ctx.subject}"
     if isinstance(result, dict) and "error" in result:
         raise RuntimeError(f"SendGrid send failed: {result['error']}")

{dhisana-0.0.1.dev265.dist-info → dhisana-0.0.1.dev266.dist-info}/METADATA

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

{dhisana-0.0.1.dev265.dist-info → dhisana-0.0.1.dev266.dist-info}/RECORD

@@ -31,7 +31,7 @@ dhisana/utils/dataframe_tools.py,sha256=R6eUXjwR5SG6_K87rWjj4T5PT2w6xvVF2EKBajIv
 dhisana/utils/domain_parser.py,sha256=Kw5MPP06wK2azWQzuSiOE-DffOezLqDyF-L9JEBsMSU,1206
 dhisana/utils/email_body_utils.py,sha256=rlCVjdBlqNnEiUberJGXGcrYY1GQOkW0-aB6AEpS3L4,2302
 dhisana/utils/email_parse_helpers.py,sha256=LIdm1B1IyGSW50y8EkxOk6YRjvxO2SJTgTKPLxYls_o,4613
-dhisana/utils/email_provider.py,sha256=spjbNdnaVfCZEUw62EEHKijuXjI7vTVNqsftxJ15Erw,14352
+dhisana/utils/email_provider.py,sha256=ukW_0nHcjTQmpnE9pdJci78LrZcsK1_0v6kcgc2ChPY,14573
 dhisana/utils/enrich_lead_information.py,sha256=O0fV-8MlXFT_z5aXvmvXVT76AISN94GpvAOlq3q_Phw,39411
 dhisana/utils/extract_email_content_for_llm.py,sha256=SQmMZ3YJtm3ZI44XiWEVAItcAwrsSSy1QzDne7LTu_Q,3713
 dhisana/utils/fetch_openai_config.py,sha256=LjWdFuUeTNeAW106pb7DLXZNElos2PlmXRe6bHZJ2hw,5159
@@ -54,7 +54,7 @@ dhisana/utils/hubspot_crm_tools.py,sha256=lbXFCeq690_TDLjDG8Gm5E-2f1P5EuDqNf5j8P
 dhisana/utils/instantly_tools.py,sha256=hhqjDPyLE6o0dzzuvryszbK3ipnoGU2eBm6NlsUGJjY,4771
 dhisana/utils/linkedin_crawler.py,sha256=6fMQTY5lTw2kc65SFHgOAM6YfezAS0Yhg-jkiX8LGHo,6533
 dhisana/utils/lusha_tools.py,sha256=MdiWlxBBjSNpSKz8rhNOyLPtbeh-YWHgGiUq54vN_gM,12734
-dhisana/utils/mailgun_tools.py,sha256=OTesN8spYrvoH4Q5BheC8TPUvUlfbZhliYOhzCrD7Mg,5506
+dhisana/utils/mailgun_tools.py,sha256=brOgfEx-ciqEdDkXEfzMBfXkG0kRWVscg76tQDXb_lk,5826
 dhisana/utils/mailreach_tools.py,sha256=uJ_gIcg8qrj5-k3jnYYhpwLVnQncoA1swzr5Jfkc1JU,3864
 dhisana/utils/microsoft365_tools.py,sha256=ClqBzTrJ2SZM5K9nsOFyyHRfV-d-6jlxXNpNONtgLlY,18596
 dhisana/utils/openai_assistant_and_file_utils.py,sha256=-eyPcxFvtS-DDtYQGle1SU6C6CuxjulVIojFy27HeWc,8957
@@ -70,7 +70,7 @@ dhisana/utils/sales_navigator_crawler.py,sha256=z8yurwUTLXdM71xWPDSAFNuDyA_SlanT
 dhisana/utils/salesforce_crm_tools.py,sha256=r6tROej4PtfcRN2AViPD7tV24oxBNm6QCE7uwhDH5Hc,17169
 dhisana/utils/search_router.py,sha256=p_1MPHbjalBM8gZuU4LADbmqSLNtZ4zll6CbPOc0POU,4610
 dhisana/utils/search_router_jobs.py,sha256=LgCHNGLMSv-ovgzF32muprfaDTdTpIKgrP5F7swAqhk,1721
-dhisana/utils/sendgrid_tools.py,sha256=VyiLbQfa0xYY-onWqhHRcNKL7z-Wev-t4lim1d-vDVw,5526
+dhisana/utils/sendgrid_tools.py,sha256=0aafzCxcmCtKVt7kWYNTH_Np9KF0-RPqAZ9LsslMlqs,5931
 dhisana/utils/serarch_router_local_business.py,sha256=n9yZjeXKOSgBnr0lCSQomP1nN3ucbC9ZTTSmSHQLeVo,2920
 dhisana/utils/serpapi_additional_tools.py,sha256=Xb1tc_oK-IjI9ZrEruYhFg8UJMLHQDaO9B51YiNbeBs,10569
 dhisana/utils/serpapi_google_jobs.py,sha256=HUJFZEW8UvYqsW0sWlEDXgI_IUomh5fTkzRJzEgsDGc,4509
@@ -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.dev265.dist-info/METADATA,sha256=S6o7HBV1UGxYP3ltCxcwGEYDhpQ5VsZ_sEUXvf_cIcY,1190
-dhisana-0.0.1.dev265.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev265.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev265.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev265.dist-info/RECORD,,
+dhisana-0.0.1.dev266.dist-info/METADATA,sha256=KEVAlP8-K5O412xaBb3WeJWM6S1thO8dRYiEu3PQKvw,1190
+dhisana-0.0.1.dev266.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev266.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev266.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev266.dist-info/RECORD,,