dhisana 0.0.1.dev265__tar.gz → 0.0.1.dev266__tar.gz

{dhisana-0.0.1.dev265 → dhisana-0.0.1.dev266}/PKG-INFO

@@ -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 → dhisana-0.0.1.dev266}/setup.py

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

{dhisana-0.0.1.dev265 → dhisana-0.0.1.dev266}/src/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-0.0.1.dev265 → dhisana-0.0.1.dev266}/src/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-0.0.1.dev265 → dhisana-0.0.1.dev266}/src/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 → dhisana-0.0.1.dev266}/src/dhisana.egg-info/PKG-INFO

@@ -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