evalforge-runtime 0.2.2__tar.gz → 0.2.5__tar.gz

{evalforge_runtime-0.2.2 → evalforge_runtime-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: evalforge-runtime
-Version: 0.2.2
+Version: 0.2.5
 Summary: Runtime engine for EvalForge generated applications
 Project-URL: Homepage, https://github.com/JannisConen/evalforge-runtime
 Project-URL: Repository, https://github.com/JannisConen/evalforge-runtime

{evalforge_runtime-0.2.2 → evalforge_runtime-0.2.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "evalforge-runtime"
-version = "0.2.2"
+version = "0.2.5"
 description = "Runtime engine for EvalForge generated applications"
 readme = "README.md"
 requires-python = ">=3.10"

{evalforge_runtime-0.2.2 → evalforge_runtime-0.2.5}/src/evalforge_runtime/connectors/gmail.py

@@ -220,8 +220,12 @@ class GmailConnector(Connector):
         headers = {"Authorization": f"Bearer {token}"}
 
         # Add date filter to Gmail search query
+        # Normalize filter value: "unread" → "is:unread" for Gmail API search syntax
+        api_filter = self._filter
+        if api_filter in ("unread", "all"):
+            api_filter = "is:unread" if api_filter == "unread" else ""
         since_date = (datetime.now(timezone.utc) - timedelta(minutes=self._max_age_minutes)).strftime("%Y/%m/%d")
-        query = f"{self._filter} after:{since_date}"
+        query = f"{api_filter} after:{since_date}".strip()
         logger.debug("Gmail API query: %s", query)
 
         async with httpx.AsyncClient() as client:
@@ -459,10 +463,82 @@ class GmailConnector(Connector):
         else:
             await self._forward_api(message_id, to, body)
 
+    def _build_forward_message(
+        self, original: email_lib.message.Message, to: str, fwd_subject: str, comment: str = ""
+    ) -> email.mime.text.MIMEText | email.mime.multipart.MIMEMultipart:
+        """Build a forward message with inline-quoted body and original attachments re-attached."""
+        import email.mime.multipart
+        import email.mime.base
+
+        html_body = self._build_forward_html(original, comment)
+
+        # Collect attachments from the original
+        attachments = []
+        if original.is_multipart():
+            for part in original.walk():
+                cd = str(part.get("Content-Disposition", ""))
+                if "attachment" in cd:
+                    attachments.append(part)
+
+        if attachments:
+            fwd = email.mime.multipart.MIMEMultipart()
+            fwd["Subject"] = fwd_subject
+            fwd["To"] = to
+            fwd.attach(email.mime.text.MIMEText(html_body, "html", "utf-8"))
+            for part in attachments:
+                fwd.attach(part)
+        else:
+            fwd = email.mime.text.MIMEText(html_body, "html", "utf-8")
+            fwd["Subject"] = fwd_subject
+            fwd["To"] = to
+
+        return fwd
+
+    def _build_forward_html(
+        self, original: email_lib.message.Message, comment: str = ""
+    ) -> str:
+        """Build an inline-quoted HTML body for forwarding, like Gmail/Outlook do."""
+        from_addr = str(original.get("From", ""))
+        date = str(original.get("Date", ""))
+        subject = str(original.get("Subject", ""))
+        to_addr = str(original.get("To", ""))
+
+        # Extract plain-text or HTML body from original
+        orig_body = ""
+        if original.is_multipart():
+            for part in original.walk():
+                if part.get_content_type() == "text/html":
+                    payload = part.get_payload(decode=True)
+                    if payload:
+                        orig_body = payload.decode(part.get_content_charset() or "utf-8", errors="replace")
+                        break
+                if part.get_content_type() == "text/plain" and not orig_body:
+                    payload = part.get_payload(decode=True)
+                    if payload:
+                        text = payload.decode(part.get_content_charset() or "utf-8", errors="replace")
+                        orig_body = f"<pre>{text}</pre>"
+        else:
+            payload = original.get_payload(decode=True)
+            if payload:
+                text = payload.decode(original.get_content_charset() or "utf-8", errors="replace")
+                orig_body = f"<pre>{text}</pre>" if original.get_content_type() == "text/plain" else text
+
+        quoted = (
+            f'<div style="border-left:2px solid #ccc;padding-left:8px;margin-top:16px;color:#555">'
+            f'<p><b>---------- Forwarded message ----------</b><br>'
+            f'<b>From:</b> {from_addr}<br>'
+            f'<b>Date:</b> {date}<br>'
+            f'<b>Subject:</b> {subject}<br>'
+            f'<b>To:</b> {to_addr}</p>'
+            f'{orig_body}'
+            f'</div>'
+        )
+        return (comment + "<br><br>" if comment else "") + quoted
+
     async def _forward_smtp(self, message_id: str, to: str, body: str) -> None:
-        """Forward via SMTP — fetches original via IMAP and re-sends."""
+        """Forward via SMTP — fetches original via IMAP and inlines content."""
         def _do_forward() -> None:
-            mail = imaplib.IMAP4_SSL("imap.gmail.com")
+            mail = imaplib.IMAP4_SSL("imap.gmail.com", timeout=30)
             mail.login(self._mailbox, self.secrets["GMAIL_APP_PASSWORD"])
             mail.select("INBOX")
 
@@ -473,22 +549,10 @@ class GmailConnector(Connector):
             original = email_lib.message_from_bytes(msg_data[0][1])
             subject = str(original.get("Subject", ""))
             fwd_subject = subject if subject.lower().startswith("fwd:") else f"Fwd: {subject}"
-
-            import email.mime.multipart
-            fwd = email.mime.multipart.MIMEMultipart()
+            fwd = self._build_forward_message(original, to, fwd_subject, body)
             fwd["From"] = self._mailbox
-            fwd["To"] = to
-            fwd["Subject"] = fwd_subject
-
-            if body:
-                fwd.attach(email.mime.text.MIMEText(body, "html"))
-
-            # Attach original as message/rfc822
-            import email.mime.message
-            attached = email.mime.message.MIMEMessage(original)
-            fwd.attach(attached)
 
-            with smtplib.SMTP_SSL("smtp.gmail.com", 465) as server:
+            with smtplib.SMTP_SSL("smtp.gmail.com", 465, timeout=30) as server:
                 server.login(self._mailbox, self.secrets["GMAIL_APP_PASSWORD"])
                 server.send_message(fwd)
             logger.info("Message %s forwarded via SMTP to %s", message_id, to)
@@ -497,26 +561,11 @@ class GmailConnector(Connector):
         await asyncio.to_thread(_do_forward)
 
     async def _forward_api(self, message_id: str, to: str, body: str) -> None:
-        """Forward via Gmail API — fetches raw message and re-sends."""
+        """Forward via Gmail API — fetches original and inlines content."""
         token = await self._acquire_token()
 
         async with httpx.AsyncClient() as client:
-            # Fetch original metadata for subject
-            resp = await client.get(
-                f"https://gmail.googleapis.com/gmail/v1/users/{self._mailbox}"
-                f"/messages/{message_id}?format=metadata",
-                headers={"Authorization": f"Bearer {token}"},
-            )
-            resp.raise_for_status()
-            msg = resp.json()
-            headers_map = {
-                h["name"].lower(): h["value"]
-                for h in msg.get("payload", {}).get("headers", [])
-            }
-            subject = headers_map.get("subject", "")
-            fwd_subject = subject if subject.lower().startswith("fwd:") else f"Fwd: {subject}"
-
-            # Fetch raw RFC822
+            # Fetch raw RFC822 for full original content
             raw_resp = await client.get(
                 f"https://gmail.googleapis.com/gmail/v1/users/{self._mailbox}"
                 f"/messages/{message_id}?format=raw",
@@ -526,15 +575,10 @@ class GmailConnector(Connector):
             raw_bytes = base64.urlsafe_b64decode(raw_resp.json().get("raw", ""))
 
         original = email_lib.message_from_bytes(raw_bytes)
-
-        import email.mime.multipart
-        import email.mime.message
-        fwd = email.mime.multipart.MIMEMultipart()
-        fwd["to"] = to
-        fwd["subject"] = fwd_subject
-        if body:
-            fwd.attach(email.mime.text.MIMEText(body, "html"))
-        fwd.attach(email.mime.message.MIMEMessage(original))
+        subject = str(original.get("Subject", ""))
+        fwd_subject = subject if subject.lower().startswith("fwd:") else f"Fwd: {subject}"
+        fwd = self._build_forward_message(original, to, fwd_subject, body)
+        fwd["from"] = self._mailbox
 
         raw_fwd = base64.urlsafe_b64encode(fwd.as_bytes()).decode("utf-8")