Support ui and fix some bugs

Author: Wh1isper

mcp_email_server/app.py

@@ -1,3 +1,5 @@
+from datetime import datetime
+
 from mcp.server.fastmcp import FastMCP
 
 from mcp_email_server.config import (
@@ -6,6 +8,8 @@
     ProviderSettings,
     get_settings,
 )
+from mcp_email_server.emails.dispatcher import dispatch_handler
+from mcp_email_server.emails.models import EmailPageResponse
 
 mcp = FastMCP("email")
 
@@ -27,3 +31,24 @@ async def add_email_account(email: EmailSettings) -> None:
     settings = get_settings()
     settings.add_email(email)
     settings.store()
+
+
+@mcp.tool()
+async def page_email(
+    account_name: str,
+    page: int = 1,
+    page_size: int = 10,
+    before: datetime | None = None,
+    after: datetime | None = None,
+    include: str | None = None,
+) -> EmailPageResponse:
+    handler = dispatch_handler(account_name)
+
+    return await handler.get_emails(page=page, page_size=page_size, before=before, after=after, include=include)
+
+
+@mcp.tool()
+async def send_email(account_name: str, recipient: str, subject: str, body: str) -> None:
+    handler = dispatch_handler(account_name)
+    await handler.send_email(recipient, subject, body)
+    return

mcp_email_server/cli.py

@@ -23,7 +23,9 @@ def sse(
 
 @app.command()
 def ui():
-    typer.echo("🚧 UI not implemented yet")
+    from mcp_email_server.ui import main as ui_main
+
+    ui_main()
 
 
 @app.command()

mcp_email_server/config.py

@@ -86,6 +86,7 @@ def init(
         imap_ssl: bool = True,
         smtp_port: int = 465,
         smtp_ssl: bool = True,
+        smtp_start_ssl: bool = False,
         smtp_user_name: str | None = None,
         smtp_password: str | None = None,
     ) -> EmailSettings:
@@ -98,14 +99,15 @@ def init(
                 password=imap_password or password,
                 host=imap_host,
                 port=imap_port,
-                ssl=imap_ssl,
+                use_ssl=imap_ssl,
             ),
             outgoing=EmailServer(
                 user_name=smtp_user_name or user_name,
                 password=smtp_password or password,
                 host=smtp_host,
                 port=smtp_port,
-                ssl=smtp_ssl,
+                use_ssl=smtp_ssl,
+                start_ssl=smtp_start_ssl,
             ),
         )
 

mcp_email_server/emails/__init__.py

@@ -0,0 +1,27 @@
+import abc
+from datetime import datetime
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from mcp_email_server.emails.models import EmailPageResponse
+
+
+class EmailHandler(abc.ABC):
+    @abc.abstractmethod
+    async def get_emails(
+        self,
+        page: int = 1,
+        page_size: int = 10,
+        before: datetime | None = None,
+        after: datetime | None = None,
+        include: str | None = None,
+    ) -> "EmailPageResponse":
+        """
+        Get emails
+        """
+
+    @abc.abstractmethod
+    async def send_email(self, recipient: str, subject: str, body: str) -> None:
+        """
+        Send email
+        """

mcp_email_server/emails/classic.py

@@ -8,37 +8,10 @@
 
 import aioimaplib
 import aiosmtplib
-from pydantic import BaseModel
 
 from mcp_email_server.config import EmailServer, EmailSettings
-
-
-class EmailData(BaseModel):
-    subject: str
-    sender: str
-    body: str
-    date: datetime
-    attachments: list[str]
-
-    @classmethod
-    def from_email(cls, email: dict[str, Any]):
-        return cls(
-            subject=email["subject"],
-            sender=email["from"],
-            body=email["body"],
-            date=email["date"],
-            attachments=email["attachments"],
-        )
-
-
-class EmailPageResponse(BaseModel):
-    page: int
-    page_size: int
-    before: datetime | None
-    after: datetime | None
-    include: str | None
-    emails: list[EmailData]
-    total: int
+from mcp_email_server.emails import EmailHandler
+from mcp_email_server.emails.models import EmailData, EmailPageResponse
 
 
 class EmailClient:
@@ -128,16 +101,20 @@ async def get_emails_stream(  # noqa: C901
             await imap.select("INBOX")
 
             # Build search criteria
-            search_criteria = "ALL"
+            search_criteria = []
             if before:
-                search_criteria = f'(BEFORE "{before.isoformat()}")'
+                search_criteria.extend(["BEFORE", before.isoformat()])
             if after:
-                search_criteria = f'{search_criteria} (AFTER "{after.isoformat()}")'
+                search_criteria.extend(["AFTER", after.isoformat()])
             if include:
-                search_criteria = f'{search_criteria} (TEXT "{include}")'
+                search_criteria.extend(["TEXT", include])
+
+            # If no specific criteria, search for ALL
+            if not search_criteria:
+                search_criteria = ["ALL"]
 
             # Search for messages
-            _, messages = await imap.search(search_criteria)
+            _, messages = await imap.search(*search_criteria)
             message_ids = messages[0].split()
             start = (page - 1) * page_size
             end = start + page_size
@@ -203,16 +180,20 @@ async def get_email_count(
             await imap.select("INBOX")
 
             # Build search criteria
-            search_criteria = "ALL"
+            search_criteria = []
             if before:
-                search_criteria = f'(BEFORE "{before.isoformat()}")'
+                search_criteria.extend(["BEFORE", before.isoformat()])
             if after:
-                search_criteria = f'{search_criteria} (AFTER "{after.isoformat()}")'
+                search_criteria.extend(["AFTER", after.isoformat()])
             if include:
-                search_criteria = f'{search_criteria} (TEXT "{include}")'
+                search_criteria.extend(["TEXT", include])
+
+            # If no specific criteria, search for ALL
+            if not search_criteria:
+                search_criteria = ["ALL"]
 
             # Search for messages and count them
-            _, messages = await imap.search(search_criteria)
+            _, messages = await imap.search(*search_criteria)
             return len(messages[0].split())
         finally:
             # Ensure we logout properly
@@ -237,7 +218,7 @@ async def send_email(self, recipient: str, subject: str, body: str):
             await smtp.send_message(msg)
 
 
-class ClassicEmailHandler:
+class ClassicEmailHandler(EmailHandler):
     def __init__(self, email_settings: EmailSettings):
         self.email_settings = email_settings
         self.incoming_client = EmailClient(email_settings.incoming)
@@ -268,5 +249,5 @@ async def get_emails(
             total=total,
         )
 
-    async def send_email(self, recipient: str, subject: str, body: str):
+    async def send_email(self, recipient: str, subject: str, body: str) -> None:
         await self.outgoing_client.send_email(recipient, subject, body)

mcp_email_server/emails/dispatcher.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from mcp_email_server.config import EmailSettings, ProviderSettings, get_settings
+from mcp_email_server.emails.classic import ClassicEmailHandler
+
+if TYPE_CHECKING:
+    from mcp_email_server.emails import EmailHandler
+
+
+def dispatch_handler(account_name: str) -> EmailHandler:
+    settings = get_settings()
+    account = settings.get_account(account_name)
+    if isinstance(account, ProviderSettings):
+        raise NotImplementedError
+    if isinstance(account, EmailSettings):
+        return ClassicEmailHandler(account)

mcp_email_server/emails/models.py

@@ -0,0 +1,32 @@
+from datetime import datetime
+from typing import Any
+
+from pydantic import BaseModel
+
+
+class EmailData(BaseModel):
+    subject: str
+    sender: str
+    body: str
+    date: datetime
+    attachments: list[str]
+
+    @classmethod
+    def from_email(cls, email: dict[str, Any]):
+        return cls(
+            subject=email["subject"],
+            sender=email["from"],
+            body=email["body"],
+            date=email["date"],
+            attachments=email["attachments"],
+        )
+
+
+class EmailPageResponse(BaseModel):
+    page: int
+    page_size: int
+    before: datetime | None
+    after: datetime | None
+    include: str | None
+    emails: list[EmailData]
+    total: int

mcp_email_server/tools/__init__.py

@@ -0,0 +1,8 @@
+{
+    "mcpServers": {
+        "zerolib-email": {
+            "command": "{{ ENTRYPOINT }}",
+            "args": ["stdio"]
+        }
+    }
+}