Merge pull request #1041 from jupyter-naas/email-outlook-adapter

feat(email): add Microsoft Outlook email adapter using Graph API

Author: FlorentRvl

libs/naas-abi-cli/uv.lock

@@ -45,8 +45,17 @@ class EmailAdapterSendGridConfiguration(BaseModel):
     base_url: str = "https://api.sendgrid.com/v3"
 
 
+class EmailAdapterMicrosoftOutlookConfiguration(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    tenant_id: str
+    client_id: str
+    client_secret: str
+    user: str
+
+
 class EmailAdapterConfiguration(GenericLoader):
-    adapter: Literal["smtp", "filesystem", "ses", "sendgrid", "custom"]
+    adapter: Literal["smtp", "filesystem", "ses", "sendgrid", "microsoft_outlook", "custom"]
     config: dict | None = None
 
     @model_validator(mode="after")
@@ -80,6 +89,12 @@ def validate_adapter(self) -> "EmailAdapterConfiguration":
                 self.config,
                 "Invalid configuration for services.email.email_adapter 'sendgrid' adapter",
             )
+        elif self.adapter == "microsoft_outlook":
+            pydantic_model_validator(
+                EmailAdapterMicrosoftOutlookConfiguration,
+                self.config,
+                "Invalid configuration for services.email.email_adapter 'microsoft_outlook' adapter",
+            )
 
         return self
 
@@ -114,6 +129,13 @@ def load(self) -> IEmailAdapter:
             )
 
             return SendGridAdapter(**self.config)
+        elif self.adapter == "microsoft_outlook":
+            assert self.config is not None, "config is required for microsoft_outlook adapter"
+            from naas_abi_core.services.email.adapters.secondary.MicrosoftOutlookAdapter import (
+                MicrosoftOutlookAdapter,
+            )
+
+            return MicrosoftOutlookAdapter(**self.config)
         elif self.adapter == "custom":
             return super().load()
         else:

libs/naas-abi-core/naas_abi_core/engine/engine_configuration/EngineConfiguration_EmailService.py

@@ -247,12 +247,17 @@ def _module_ships_models(module_dotted: str) -> bool:
         models_dir = Path(spec.origin).parent / "models"
         if not models_dir.is_dir():
             return False
-        for entry in os.listdir(models_dir):
-            if not entry.endswith(".py"):
-                continue
-            if entry == "__init__.py" or entry.endswith("_test.py"):
-                continue
-            return True
+        # Walk recursively: models may live in provider subdirectories
+        # (e.g. ``models/openai/gpt_4_1_mini.py``) with no source files at the
+        # top level. This mirrors ``ModuleModelLoader.load_models``, which uses
+        # ``os.walk`` to discover those nested models at on_load time.
+        for _dirpath, _dirnames, filenames in os.walk(models_dir):
+            for entry in filenames:
+                if not entry.endswith(".py"):
+                    continue
+                if entry == "__init__.py" or entry.endswith("_test.py"):
+                    continue
+                return True
         return False
 
     def get_modules_dependencies(

libs/naas-abi-core/naas_abi_core/engine/engine_loaders/EngineModuleLoader.py

@@ -4,6 +4,9 @@
 from naas_abi_core.services.email.adapters.secondary.FilesystemAdapter import (
     FilesystemAdapter,
 )
+from naas_abi_core.services.email.adapters.secondary.MicrosoftOutlookAdapter import (
+    MicrosoftOutlookAdapter,
+)
 from naas_abi_core.services.email.adapters.secondary.SESAdapter import SESAdapter
 from naas_abi_core.services.email.adapters.secondary.SendGridAdapter import (
     SendGridAdapter,
@@ -68,3 +71,20 @@ def EmailServiceSendGrid(
                 base_url=base_url,
             )
         )
+
+    @staticmethod
+    def EmailServiceMicrosoftOutlook(
+        *,
+        tenant_id: str,
+        client_id: str,
+        client_secret: str,
+        user: str,
+    ) -> EmailService:
+        return EmailService(
+            MicrosoftOutlookAdapter(
+                tenant_id=tenant_id,
+                client_id=client_id,
+                client_secret=client_secret,
+                user=user,
+            )
+        )

libs/naas-abi-core/naas_abi_core/services/email/EmailFactory.py

@@ -0,0 +1,150 @@
+from __future__ import annotations
+
+import base64
+from typing import Any
+from urllib.parse import quote
+
+from naas_abi_core.services.email.EmailPorts import (
+    EmailAttachment,
+    IEmailAdapter,
+    resolve_recipients,
+)
+
+_GRAPH_BASE = "https://graph.microsoft.com/v1.0"
+_SCOPE = ["https://graph.microsoft.com/.default"]
+
+
+class MicrosoftOutlookAdapter(IEmailAdapter):
+    """Email adapter that sends via Microsoft Graph API (app-only / client-credentials).
+
+    The sender mailbox is determined by ``from_email`` passed to ``send()``, which
+    must be a UPN the registered app has ``Mail.Send`` permission on.
+
+    Limitations:
+    - ``from_name`` is accepted for interface compatibility but silently ignored:
+      the Graph API always uses the Azure AD display name of the sender mailbox.
+    - Attachments must be < 3 MB (Graph API ``fileAttachment`` limit).
+    - When both ``html_body`` and ``text_body`` are provided, the HTML body is used.
+      The Graph API structured payload does not support multipart/alternative natively.
+
+    Args:
+        tenant_id: Azure AD tenant ID.
+        client_id: App registration client ID.
+        client_secret: App registration client secret.
+        user: Default sender mailbox UPN (used when ``from_email`` is absent).
+        client: Optional injectable fake for unit tests. Must expose
+            ``post(url, payload)`` and ``get_token() -> str``.
+    """
+
+    def __init__(
+        self,
+        *,
+        tenant_id: str,
+        client_id: str,
+        client_secret: str,
+        user: str,
+        client: Any | None = None,
+    ) -> None:
+        self._tenant_id = tenant_id
+        self._client_id = client_id
+        self._client_secret = client_secret
+        self._user = user
+        self._client = client
+        self._token: str | None = None
+
+    # ── Auth ──────────────────────────────────────────────────────────────────
+
+    def _get_token(self) -> str:
+        if self._client is not None:
+            return self._client.get_token()
+        if self._token:
+            return self._token
+
+        import msal  # lazy — optional extra
+
+        app = msal.ConfidentialClientApplication(
+            client_id=self._client_id,
+            authority=f"https://login.microsoftonline.com/{self._tenant_id}",
+            client_credential=self._client_secret,
+        )
+        result = app.acquire_token_for_client(scopes=_SCOPE)
+        if "access_token" not in result:
+            raise RuntimeError(
+                f"Microsoft Graph token error: {result.get('error')} — "
+                f"{result.get('error_description')}"
+            )
+        self._token = result["access_token"]
+        return self._token
+
+    # ── HTTP transport ────────────────────────────────────────────────────────
+
+    def _post(self, url: str, payload: dict[str, Any]) -> None:
+        if self._client is not None:
+            self._client.post(url, payload)
+            return
+
+        import requests  # lazy
+
+        response = requests.post(
+            url,
+            headers={
+                "Authorization": f"Bearer {self._get_token()}",
+                "Content-Type": "application/json",
+            },
+            json=payload,
+            timeout=30,
+        )
+        if response.status_code >= 400:
+            detail = response.text.strip() or response.reason
+            raise RuntimeError(
+                f"Microsoft Graph API request failed ({response.status_code}): {detail}"
+            )
+
+    # ── IEmailAdapter ─────────────────────────────────────────────────────────
+
+    def send(
+        self,
+        *,
+        to_email: str | None = None,
+        subject: str,
+        text_body: str,
+        html_body: str | None = None,
+        from_email: str,
+        from_name: str | None = None,
+        reply_to: str | None = None,
+        attachments: list[EmailAttachment] | None = None,
+        to_emails: list[str] | str | None = None,
+    ) -> None:
+        mailbox = quote(from_email or self._user)
+        url = f"{_GRAPH_BASE}/users/{mailbox}/sendMail"
+
+        body_payload = (
+            {"contentType": "HTML", "content": html_body}
+            if html_body
+            else {"contentType": "Text", "content": text_body}
+        )
+
+        message: dict[str, Any] = {
+            "subject": subject,
+            "body": body_payload,
+            "toRecipients": [
+                {"emailAddress": {"address": addr}}
+                for addr in resolve_recipients(to_email, to_emails)
+            ],
+        }
+
+        if reply_to:
+            message["replyTo"] = [{"emailAddress": {"address": reply_to}}]
+
+        if attachments:
+            message["attachments"] = [
+                {
+                    "@odata.type": "#microsoft.graph.fileAttachment",
+                    "name": att.filename,
+                    "contentType": att.mime_type,
+                    "contentBytes": base64.b64encode(att.content).decode("ascii"),
+                }
+                for att in attachments
+            ]
+
+        self._post(url, {"message": message, "saveToSentItems": True})