dhisana 0.0.1.dev239__py3-none-any.whl → 0.0.1.dev241__py3-none-any.whl

dhisana/schemas/common.py

@@ -378,6 +378,7 @@ class SendEmailContext(BaseModel):
     sender_email: str
     labels: Optional[List[str]]
     body_format: BodyFormat = BodyFormat.AUTO
+    headers: Optional[Dict[str, str]] = None
     
 class QueryEmailContext(BaseModel):
     start_time: str

dhisana/utils/google_oauth_tools.py

@@ -145,6 +145,12 @@ async def send_email_using_google_oauth_async(
     message["from"] = f"{send_email_context.sender_name} <{send_email_context.sender_email}>"
     message["subject"] = send_email_context.subject
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        message[header] = str(value)
+
     raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
 
     payload: Dict[str, Any] = {"raw": raw_message}

dhisana/utils/google_workspace_tools.py

@@ -179,6 +179,12 @@ async def send_email_using_service_account_async(
     message['from'] = f"{send_email_context.sender_name} <{send_email_context.sender_email}>"
     message['subject'] = send_email_context.subject
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        message[header] = str(value)
+
     # Base64-encode the message
     raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
 
@@ -531,6 +537,7 @@ class SendEmailContext(BaseModel):
     sender_email: str
     labels: Optional[List[str]]
     body_format: BodyFormat = BodyFormat.AUTO
+    headers: Optional[Dict[str, str]] = None
     
 @assistant_tool
 async def send_email_using_service_account_async(

dhisana/utils/mailgun_tools.py

@@ -126,6 +126,12 @@ async def send_email_using_mailgun_async(
         "html": html_body,
     }
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        data[f"h:{header}"] = str(value)
+
     async with aiohttp.ClientSession() as session:
         async with session.post(
             f"https://api.mailgun.net/v3/{domain}/messages",

dhisana/utils/mailreach_tools.py

@@ -0,0 +1,123 @@
+import os
+import aiohttp
+import logging
+from typing import List, Dict, Any, Optional
+from dhisana.utils.assistant_tool_tag import assistant_tool
+
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
+
+base_url = 'https://api.mailreach.co/api/v1'
+
+
+def get_mailreach_api_key(tool_config: Optional[List[Dict]] = None) -> str:
+    """
+    Retrieves the MailReach API key from the provided tool configuration or environment variables.
+
+    Args:
+        tool_config (list): A list of dictionaries containing the tool configuration. 
+                            Each dictionary should have a "name" key and a "configuration" key,
+                            where "configuration" is a list of dictionaries containing "name" and "value" keys.
+
+    Returns:
+        str: The MailReach API key.
+
+    Raises:
+        ValueError: If the MailReach integration has not been configured.
+    """
+    api_key = None
+    
+    if tool_config:
+        mailreach_config = next(
+            (item for item in tool_config if item.get("name") == "mailreach"), None
+        )
+        if mailreach_config:
+            config_map = {
+                item["name"]: item["value"]
+                for item in mailreach_config.get("configuration", [])
+                if item
+            }
+            api_key = config_map.get("apiKey")
+    
+    api_key = api_key or os.getenv("MAILREACH_API_KEY")
+    
+    if not api_key:
+        raise ValueError(
+            "MailReach integration is not configured. Please configure the connection to MailReach in Integrations."
+        )
+    
+    return api_key
+
+
+def get_mailreach_headers(tool_config: Optional[List[Dict]] = None) -> Dict[str, str]:
+    """
+    Get the headers required for MailReach API requests.
+
+    Args:
+        tool_config (list): Optional tool configuration containing API credentials.
+
+    Returns:
+        Dict[str, str]: Headers dictionary with x-api-key and Content-Type.
+    """
+    api_key = get_mailreach_api_key(tool_config)
+    headers = {
+        "x-api-key": api_key,
+        "Content-Type": "application/json"
+    }
+    return headers
+
+
+async def _handle_mailreach_response(response: aiohttp.ClientResponse) -> Any:
+    """
+    Handle MailReach API responses consistently.
+
+    Args:
+        response: The aiohttp ClientResponse object.
+
+    Returns:
+        The JSON response data.
+
+    Raises:
+        aiohttp.ClientResponseError: For rate limits or other errors.
+    """
+    if response.status == 200:
+        return await response.json()
+    elif response.status == 429:
+        raise aiohttp.ClientResponseError(
+            request_info=response.request_info,
+            history=response.history,
+            status=response.status,
+            message="Rate limit exceeded",
+            headers=response.headers
+        )
+    else:
+        error_message = await response.text()
+        logger.error(f"MailReach API Error {response.status}: {error_message}")
+        response.raise_for_status()
+
+
+@assistant_tool
+async def ping_mailreach(
+    tool_config: Optional[List[Dict]] = None
+) -> Dict[str, Any]:
+    """
+    Ping the MailReach API to verify connectivity and authentication.
+    
+    This is a simple endpoint to test if your API key is valid and the service is accessible.
+
+    Args:
+        tool_config (list): Optional tool configuration containing API credentials.
+
+    Returns:
+        Dict[str, Any]: Response from the ping endpoint, typically containing a success message.
+    """
+    url = f"{base_url}/ping"
+    headers = get_mailreach_headers(tool_config)
+    
+    logger.info("Pinging MailReach API...")
+    
+    async with aiohttp.ClientSession() as session:
+        async with session.get(url, headers=headers) as response:
+            result = await _handle_mailreach_response(response)
+            logger.info("MailReach ping successful")
+            return result

dhisana/utils/microsoft365_tools.py

@@ -168,6 +168,14 @@ async def send_email_using_microsoft_graph_async(
         ],
     }
 
+    extra_headers = getattr(send_email_context, "headers", None) or {}
+    if extra_headers:
+        message_payload["internetMessageHeaders"] = [
+            {"name": header, "value": str(value)}
+            for header, value in extra_headers.items()
+            if header and value is not None
+        ]
+
     headers = {
         "Authorization": f"Bearer {token}",
         "Content-Type": "application/json",

dhisana/utils/sendgrid_tools.py

@@ -59,6 +59,7 @@ async def send_email_with_sendgrid(
     message: str,
     tool_config: Optional[List[Dict]] = None,
     body_format: Optional[str] = None,
+    custom_headers: Optional[Dict[str, str]] = None,
 ):
     """
     Send an email using SendGrid's v3 Mail Send API.
@@ -69,6 +70,7 @@ async def send_email_with_sendgrid(
     - subject: Subject string.
     - message: HTML body content.
     - tool_config: Optional integration configuration list.
+    - custom_headers: Optional mapping of header names to values.
     """
     api_key = get_sendgrid_api_key(tool_config)
 
@@ -98,6 +100,13 @@ async def send_email_with_sendgrid(
         "content": content,
     }
 
+    if custom_headers:
+        payload["headers"] = {
+            header: str(value)
+            for header, value in custom_headers.items()
+            if header and value is not None
+        }
+
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json",
@@ -143,6 +152,7 @@ async def send_email_using_sendgrid_async(
         message=ctx.body or "",
         body_format=getattr(ctx, "body_format", None),
         tool_config=tool_config,
+        custom_headers=getattr(ctx, "headers", None),
     )
     # Normalise output to a string id-like value
     if isinstance(result, dict) and result.get("status") == 202:

dhisana/utils/smtp_email_tools.py

@@ -174,6 +174,12 @@ async def send_email_via_smtp_async(
     generated_id = f"<{uuid.uuid4()}@{domain_part}>"
     msg["Message-ID"] = generated_id
 
+    extra_headers = getattr(ctx, "headers", None) or {}
+    for header, value in extra_headers.items():
+        if not header or value is None:
+            continue
+        msg[header] = str(value)
+
     smtp_kwargs = dict(
         hostname=smtp_server,
         port=smtp_port,

dhisana/utils/test_connect.py

@@ -483,6 +483,31 @@ async def test_sendgrid(api_key: str) -> Dict[str, Any]:
         return {"success": False, "status_code": 0, "error_message": str(e)}
 
 
+async def test_mailreach(api_key: str) -> Dict[str, Any]:
+    """
+    Basic MailReach connectivity check using the Ping endpoint.
+    
+    Uses the /v1/ping endpoint to verify API key validity and service availability.
+    Reference: https://docs.mailreach.co/reference/getv1ping
+    """
+    url = "https://api.mailreach.co/api/v1/ping"
+    headers = {"x-api-key": api_key}
+    try:
+        async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=10)) as session:
+            async with session.get(url, headers=headers) as response:
+                status = response.status
+                data = await safe_json(response)
+                if status != 200:
+                    msg = None
+                    if data and isinstance(data, dict):
+                        msg = data.get("message") or data.get("error")
+                    return {"success": False, "status_code": status, "error_message": msg or f"MailReach non-200: {status}"}
+                return {"success": True, "status_code": status, "error_message": None}
+    except Exception as e:
+        logger.error(f"MailReach test failed: {e}")
+        return {"success": False, "status_code": 0, "error_message": str(e)}
+
+
 async def test_samgov(api_key: str) -> Dict[str, Any]:
     """Test SAM.gov connectivity by fetching a single opportunity."""
 
@@ -1789,6 +1814,7 @@ async def test_connectivity(tool_config: List[Dict[str, Any]]) -> Dict[str, Dict
         "mcpServer":        test_mcp_server,
         "slack":            test_slack,
         "mailgun":          test_mailgun,
+        "mailreach":        test_mailreach,
         "sendgrid":         test_sendgrid,
         "samgov":          test_samgov,
         "scraperapi":       test_scraperapi,

{dhisana-0.0.1.dev239.dist-info → dhisana-0.0.1.dev241.dist-info}/METADATA

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

{dhisana-0.0.1.dev239.dist-info → dhisana-0.0.1.dev241.dist-info}/RECORD

@@ -5,7 +5,7 @@ dhisana/cli/datasets.py,sha256=OwzoCrVQqmh0pKpUAKAg_w9uGYncbWU7ZrAL_QukxAk,839
 dhisana/cli/models.py,sha256=IzUFZW_X32mL3fpM1_j4q8AF7v5nrxJcxBoqvG-TTgA,706
 dhisana/cli/predictions.py,sha256=VYgoLK1Ksv6MFImoYZqjQJkds7e5Hso65dHwbxTNNzE,646
 dhisana/schemas/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
-dhisana/schemas/common.py,sha256=rt1ho4nzVhTwTQ_1Kx5TI-xZSbnyDpYN0fQ8Fgf8z6k,9332
+dhisana/schemas/common.py,sha256=WZJDobtNRJaqY51UhRL2axhft8AHHiD1kw794IaR-W8,9377
 dhisana/schemas/sales.py,sha256=XGPdTuHoNjvkq-xQtEh5Qfg5MQQoaJdDmu46aObBCV0,34219
 dhisana/ui/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 dhisana/ui/components.py,sha256=4NXrAyl9tx2wWwoVYyABO-EOGnreGMvql1AkXWajIIo,14316
@@ -46,15 +46,16 @@ dhisana/utils/generate_linkedin_connect_message.py,sha256=WZThEun-DMuAOqlzMI--hG
 dhisana/utils/generate_linkedin_response_message.py,sha256=-jg-u5Ipf4-cn9q0yjEHsEBe1eJhYLCLrjZDtOXnCyQ,14464
 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=RbZvmjnueb8At35_kJOfFwDR36PN3ofh3iVV8ugJMwM,28307
-dhisana/utils/google_workspace_tools.py,sha256=6z2PngTumEwtS9L9zXEpdtpAoD2sFYfpc7md6z7_p_o,48869
+dhisana/utils/google_oauth_tools.py,sha256=ReG5lCpXL3_e_s0yn6ai4U7B4-feOWHJVtbv_c0g0rE,28525
+dhisana/utils/google_workspace_tools.py,sha256=axHOrbSs5Yod0kREdu11T53GMjZn4pyuVjQCA51UntY,49132
 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
 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=qUD-jFMZpmkkkKtyihVSe9tgFzYe-UiiBDHQKtsLq0M,5284
-dhisana/utils/microsoft365_tools.py,sha256=aNIUBBz56HhvnEd0ZMy5EGAtsXcBJ_VOMO5Yy4dyojQ,18289
+dhisana/utils/mailgun_tools.py,sha256=OTesN8spYrvoH4Q5BheC8TPUvUlfbZhliYOhzCrD7Mg,5506
+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
 dhisana/utils/openai_helpers.py,sha256=ZK9S5-jcLCpiiD6XBLkCqYcNz-AGYmO9xh4e2H-FDLo,40155
 dhisana/utils/openapi_spec_to_tools.py,sha256=oBLVq3WeDWvW9O02NCvY8bxQURQdKwHJHGcX8bC_b2I,1926
@@ -68,7 +69,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=Q3Mr7mF0iM_zoF-Vhb1lH5r8AyqkVGgYXaCMR2i7zLQ,5157
+dhisana/utils/sendgrid_tools.py,sha256=VyiLbQfa0xYY-onWqhHRcNKL7z-Wev-t4lim1d-vDVw,5526
 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
@@ -78,8 +79,8 @@ dhisana/utils/serpapi_search_tools.py,sha256=xiiYi6Rd6Mqn94mjSKEs5nNZk1l2-PW_hTL
 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
-dhisana/utils/smtp_email_tools.py,sha256=_1FoN6e-rgkjAKnCVym_IvihJFKz_dOo-43iM6CVqhA,21855
-dhisana/utils/test_connect.py,sha256=_FHEWUvEjqMjxrjMuZQY9c2hrB_HJjxY09IcikH130A,85459
+dhisana/utils/smtp_email_tools.py,sha256=J9uDHCEu2BTyFzDBru0e1lC8bsAMt9c_mYXTzJgk9Kc,22054
+dhisana/utils/test_connect.py,sha256=pYR1Ki6WKx-vAhLJxQ6At627xfOnlQeVRjnW7FBdGKM,86702
 dhisana/utils/trasform_json.py,sha256=7V72XNDpuxUX0GHN5D83z4anj_gIf5zabaHeQm7b1_E,6979
 dhisana/utils/web_download_parse_tools.py,sha256=ouXwH7CmjcRjoBfP5BWat86MvcGO-8rLCmWQe_eZKjc,7810
 dhisana/utils/workflow_code_model.py,sha256=YPWse5vBb3O6Km2PvKh1Q3AB8qBkzLt1CrR5xOL9Mro,99
@@ -93,8 +94,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.dev239.dist-info/METADATA,sha256=NYr1O3aYqoYayCOSP6MFlS5SsYhqN2vZn13XbOY7_JE,1190
-dhisana-0.0.1.dev239.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dhisana-0.0.1.dev239.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
-dhisana-0.0.1.dev239.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
-dhisana-0.0.1.dev239.dist-info/RECORD,,
+dhisana-0.0.1.dev241.dist-info/METADATA,sha256=anx7v-Bxc5EhcMORORWmPkw2a2WYadN-xGZcNhnr-es,1190
+dhisana-0.0.1.dev241.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dhisana-0.0.1.dev241.dist-info/entry_points.txt,sha256=jujxteZmNI9EkEaK-pOCoWuBujU8TCevdkfl9ZcKHek,49
+dhisana-0.0.1.dev241.dist-info/top_level.txt,sha256=NETTHt6YifG_P7XtRHbQiXZlgSFk9Qh9aR-ng1XTf4s,8
+dhisana-0.0.1.dev241.dist-info/RECORD,,