fix: Use since for search and add some description (#3)

* fix: Use since for search and add some description

* Support address

Author: Wh1isper

.gitignore

@@ -140,3 +140,4 @@ cython_debug/
 #.idea/
 
 tests/config.toml
+local/

mcp_email_server/app.py

@@ -33,18 +33,32 @@ async def add_email_account(email: EmailSettings) -> None:
     settings.store()
 
 
-@mcp.tool()
+@mcp.tool(description="Paginate emails, page start at 1, before and since as UTC datetime.")
 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,
+    since: datetime | None = None,
+    subject: str | None = None,
+    body: str | None = None,
+    text: str | None = None,
+    from_address: str | None = None,
+    to_address: 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)
+    return await handler.get_emails(
+        page=page,
+        page_size=page_size,
+        before=before,
+        since=since,
+        subject=subject,
+        body=body,
+        text=text,
+        from_address=from_address,
+        to_address=to_address,
+    )
 
 
 @mcp.tool()

mcp_email_server/emails/__init__.py

@@ -14,7 +14,11 @@ async def get_emails(
         page_size: int = 10,
         before: datetime | None = None,
         after: datetime | None = None,
-        include: str | None = None,
+        subject: str | None = None,
+        body: str | None = None,
+        text: str | None = None,
+        from_address: str | None = None,
+        to_address: str | None = None,
     ) -> "EmailPageResponse":
         """
         Get emails

mcp_email_server/emails/classic.py

@@ -12,6 +12,7 @@
 from mcp_email_server.config import EmailServer, EmailSettings
 from mcp_email_server.emails import EmailHandler
 from mcp_email_server.emails.models import EmailData, EmailPageResponse
+from mcp_email_server.log import logger
 
 
 class EmailClient:
@@ -82,13 +83,17 @@ def _parse_email_data(self, raw_email: bytes) -> dict[str, Any]:  # noqa: C901
             "attachments": attachments,
         }
 
-    async def get_emails_stream(  # noqa: C901
+    async def get_emails_stream(
         self,
         page: int = 1,
         page_size: int = 10,
         before: datetime | None = None,
-        after: datetime | None = None,
-        include: str | None = None,
+        since: datetime | None = None,
+        subject: str | None = None,
+        body: str | None = None,
+        text: str | None = None,
+        from_address: str | None = None,
+        to_address: str | None = None,
     ) -> AsyncGenerator[dict[str, Any], None]:
         imap = self.imap_class(self.email_server.host, self.email_server.port)
         try:
@@ -100,22 +105,13 @@ async def get_emails_stream(  # noqa: C901
             await imap.login(self.email_server.user_name, self.email_server.password)
             await imap.select("INBOX")
 
-            # Build search criteria
-            search_criteria = []
-            if before:
-                search_criteria.extend(["BEFORE", before.isoformat()])
-            if after:
-                search_criteria.extend(["AFTER", after.isoformat()])
-            if include:
-                search_criteria.extend(["TEXT", include])
-
-            # If no specific criteria, search for ALL
-            if not search_criteria:
-                search_criteria = ["ALL"]
-
+            search_criteria = self._build_search_criteria(before, since, subject, body, text, from_address, to_address)
             # Search for messages
             _, messages = await imap.search(*search_criteria)
+            logger.info(f"Get: Search criteria: {search_criteria}")
+            logger.debug(f"Raw messages: {messages}")
             message_ids = messages[0].split()
+            logger.debug(f"Message IDs: {message_ids}")
             start = (page - 1) * page_size
             end = start + page_size
 
@@ -151,23 +147,59 @@ async def get_emails_stream(  # noqa: C901
                             yield parsed_email
                         except Exception as e:
                             # Log error but continue with other emails
-                            print(f"Error parsing email: {e!s}")
+                            logger.error(f"Error parsing email: {e!s}")
                     else:
-                        print(f"Could not find email data in response for message ID: {message_id_str}")
+                        logger.error(f"Could not find email data in response for message ID: {message_id_str}")
                 except Exception as e:
-                    print(f"Error fetching message {message_id}: {e!s}")
+                    logger.error(f"Error fetching message {message_id}: {e!s}")
         finally:
             # Ensure we logout properly
             try:
                 await imap.logout()
             except Exception as e:
-                print(f"Error during logout: {e}")
+                logger.info(f"Error during logout: {e}")
+
+    @staticmethod
+    def _build_search_criteria(
+        before: datetime | None = None,
+        since: datetime | None = None,
+        subject: str | None = None,
+        body: str | None = None,
+        text: str | None = None,
+        from_address: str | None = None,
+        to_address: str | None = None,
+    ):
+        search_criteria = []
+        if before:
+            search_criteria.extend(["BEFORE", before.strftime("%d-%b-%Y").upper()])
+        if since:
+            search_criteria.extend(["SINCE", since.strftime("%d-%b-%Y").upper()])
+        if subject:
+            search_criteria.extend(["SUBJECT", subject])
+        if body:
+            search_criteria.extend(["BODY", body])
+        if text:
+            search_criteria.extend(["TEXT", text])
+        if from_address:
+            search_criteria.extend(["FROM", from_address])
+        if to_address:
+            search_criteria.extend(["TO", to_address])
+
+        # If no specific criteria, search for ALL
+        if not search_criteria:
+            search_criteria = ["ALL"]
+
+        return search_criteria
 
     async def get_email_count(
         self,
         before: datetime | None = None,
-        after: datetime | None = None,
-        include: str | None = None,
+        since: datetime | None = None,
+        subject: str | None = None,
+        body: str | None = None,
+        text: str | None = None,
+        from_address: str | None = None,
+        to_address: str | None = None,
     ) -> int:
         imap = self.imap_class(self.email_server.host, self.email_server.port)
         try:
@@ -178,20 +210,8 @@ async def get_email_count(
             # Login and select inbox
             await imap.login(self.email_server.user_name, self.email_server.password)
             await imap.select("INBOX")
-
-            # Build search criteria
-            search_criteria = []
-            if before:
-                search_criteria.extend(["BEFORE", before.isoformat()])
-            if after:
-                search_criteria.extend(["AFTER", after.isoformat()])
-            if include:
-                search_criteria.extend(["TEXT", include])
-
-            # If no specific criteria, search for ALL
-            if not search_criteria:
-                search_criteria = ["ALL"]
-
+            search_criteria = self._build_search_criteria(before, since, subject, body, text, from_address, to_address)
+            logger.info(f"Count: Search criteria: {search_criteria}")
             # Search for messages and count them
             _, messages = await imap.search(*search_criteria)
             return len(messages[0].split())
@@ -200,7 +220,7 @@ async def get_email_count(
             try:
                 await imap.logout()
             except Exception as e:
-                print(f"Error during logout: {e}")
+                logger.info(f"Error during logout: {e}")
 
     async def send_email(self, recipient: str, subject: str, body: str):
         msg = MIMEText(body)
@@ -232,19 +252,27 @@ async def get_emails(
         page: int = 1,
         page_size: int = 10,
         before: datetime | None = None,
-        after: datetime | None = None,
-        include: str | None = None,
+        since: datetime | None = None,
+        subject: str | None = None,
+        body: str | None = None,
+        text: str | None = None,
+        from_address: str | None = None,
+        to_address: str | None = None,
     ) -> EmailPageResponse:
         emails = []
-        async for email_data in self.incoming_client.get_emails_stream(page, page_size, before, after, include):
+        async for email_data in self.incoming_client.get_emails_stream(
+            page, page_size, before, since, subject, body, text, from_address, to_address
+        ):
             emails.append(EmailData.from_email(email_data))
-        total = await self.incoming_client.get_email_count(before, after, include)
+        total = await self.incoming_client.get_email_count(before, since, subject, body, text, from_address, to_address)
         return EmailPageResponse(
             page=page,
             page_size=page_size,
             before=before,
-            after=after,
-            include=include,
+            since=since,
+            subject=subject,
+            body=body,
+            text=text,
             emails=emails,
             total=total,
         )

mcp_email_server/emails/models.py

@@ -26,7 +26,9 @@ class EmailPageResponse(BaseModel):
     page: int
     page_size: int
     before: datetime | None
-    after: datetime | None
-    include: str | None
+    since: datetime | None
+    subject: str | None
+    body: str | None
+    text: str | None
     emails: list[EmailData]
     total: int