dhisana 0.0.1.dev274__tar.gz → 0.0.1.dev276__tar.gz

{dhisana-0.0.1.dev274 → dhisana-0.0.1.dev276}/PKG-INFO

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

{dhisana-0.0.1.dev274 → dhisana-0.0.1.dev276}/setup.py

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

{dhisana-0.0.1.dev274 → dhisana-0.0.1.dev276}/src/dhisana/utils/generate_email.py

@@ -231,6 +231,10 @@ async def generate_email_from_instructions(
         - If there is a link provided, use it as is without wrapping in any HTML tags.
         """
 
+    html_template_note = ""
+    if allow_html and getattr(message_instructions, "html_template", None):
+        html_template_note = f"\nHTML Template to follow: {message_instructions.html_template}"
+
     email_prompt = f"""
 Generate a personalized business email based on these specifications:
 
@@ -258,6 +262,8 @@ CALL TO ACTION:
 FORMATTING REQUIREMENTS:
 {instructions.formatting_requirements}
 
+{html_template_note}
+
 {output_requirements}
 
 ADDITIONAL REQUIREMENTS:

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

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