interloper-api 0.49.0__tar.gz → 0.50.0__tar.gz

{interloper_api-0.49.0 → interloper_api-0.50.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: interloper-api
-Version: 0.49.0
+Version: 0.50.0
 Summary: Interloper FastAPI routes
 Author: Guillaume Onfroy
 Author-email: Guillaume Onfroy <guillaume@digitlcloud.com>

{interloper_api-0.49.0 → interloper_api-0.50.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "interloper-api"
-version = "0.49.0"
+version = "0.50.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 requires-python = ">=3.10"

{interloper_api-0.49.0 → interloper_api-0.50.0}/pyproject.toml.orig

@@ -3,7 +3,7 @@
 # ###############
 [project]
 name = "interloper-api"
-version = "0.49.0"
+version = "0.50.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 authors = [{ name = "Guillaume Onfroy", email = "guillaume@digitlcloud.com" }]

interloper_api-0.50.0/src/interloper_api/email.py

@@ -0,0 +1,153 @@
+"""SMTP email utilities for sending invitation emails."""
+
+from __future__ import annotations
+
+import html
+import logging
+import smtplib
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+from typing import Any
+
+from interloper_db.store.auth import INVITATION_EXPIRY_DAYS
+
+logger = logging.getLogger(__name__)
+
+# Email clients ignore <style> blocks and external assets, so everything is
+# table-based with inline styles. Colors are the design tokens: navy #0B2A42
+# (header), accent #2D7DF6 (button/links), grays from the app palette.
+_FONT_STACK = "-apple-system, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif"
+
+
+def render_invite_text(org_name: str, inviter_name: str, invite_url: str) -> str:
+    """Render the plain-text alternative of the invitation email."""
+    return (
+        f"{inviter_name} has invited you to join the {org_name} organisation on Interloper.\n\n"
+        f"Accept the invitation:\n{invite_url}\n\n"
+        f"This invitation expires in {INVITATION_EXPIRY_DAYS} days. If you weren't expecting it,\n"
+        "you can safely ignore this email."
+    )
+
+
+def render_invite_html(org_name: str, inviter_name: str, invite_url: str, logo_url: str | None = None) -> str:
+    """Render the HTML body of the invitation email.
+
+    The logo is a hosted PNG (``logo_url``), not an inline SVG: Gmail and
+    Outlook strip ``<svg>`` and block ``data:`` URIs. The text wordmark stays
+    next to it so the header still reads when images are blocked.
+    """
+    org = html.escape(org_name)
+    inviter = html.escape(inviter_name)
+    url = html.escape(invite_url, quote=True)
+    logo = (
+        f'<img src="{html.escape(logo_url, quote=True)}" width="26" height="26" alt=""'
+        ' style="vertical-align: middle; margin-right: 10px;">'
+        if logo_url
+        else ""
+    )
+
+    return f"""\
+<!DOCTYPE html>
+<html>
+<body style="margin: 0; padding: 0; background: #fbfbfc;">
+    <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background: #fbfbfc;">
+        <tr>
+            <td align="center" style="padding: 40px 16px;">
+                <table role="presentation" width="560" cellpadding="0" cellspacing="0"
+                       style="max-width: 560px; width: 100%; background: #ffffff; border: 1px solid #e8e8ec;
+                              border-radius: 12px; overflow: hidden;">
+                    <tr>
+                        <td style="background: #0b2a42; padding: 16px 32px;">
+                            {logo}<span style="font-family: {_FONT_STACK}; font-size: 17px; font-weight: 600;
+                                         letter-spacing: -0.01em; color: #ffffff; vertical-align: middle;">
+                                Interloper
+                            </span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="padding: 32px;">
+                            <h1 style="margin: 0 0 12px; font-family: {_FONT_STACK}; font-size: 20px;
+                                       font-weight: 700; letter-spacing: -0.01em; color: #1d1d1f;">
+                                Join {org} on Interloper
+                            </h1>
+                            <p style="margin: 0 0 24px; font-family: {_FONT_STACK}; font-size: 14px;
+                                      line-height: 1.6; color: #6b6b70;">
+                                <strong style="color: #1d1d1f;">{inviter}</strong> has invited you to join the
+                                <strong style="color: #1d1d1f;">{org}</strong> organisation on Interloper.
+                            </p>
+                            <a href="{url}"
+                               style="display: inline-block; padding: 11px 22px; background: #2d7df6;
+                                      font-family: {_FONT_STACK}; font-size: 14px; font-weight: 600;
+                                      color: #ffffff; text-decoration: none; border-radius: 10px;">
+                                Accept invitation
+                            </a>
+                            <p style="margin: 24px 0 0; font-family: {_FONT_STACK}; font-size: 12.5px;
+                                      line-height: 1.6; color: #9a9aa0;">
+                                Or copy and paste this link into your browser:<br>
+                                <a href="{url}" style="color: #2d7df6; word-break: break-all;">{url}</a>
+                            </p>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="padding: 16px 32px; border-top: 1px solid #f0f0f3;">
+                            <p style="margin: 0; font-family: {_FONT_STACK}; font-size: 12.5px;
+                                      line-height: 1.6; color: #9a9aa0;">
+                                This invitation expires in {INVITATION_EXPIRY_DAYS} days.
+                                If you weren't expecting it, you can safely ignore this email.
+                            </p>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</body>
+</html>"""
+
+
+def send_invite_email(
+    smtp_config: Any,
+    to: str,
+    org_name: str,
+    inviter_name: str,
+    invite_url: str,
+    logo_url: str | None = None,
+) -> None:
+    """Send an organisation invitation email via SMTP.
+
+    Args:
+        smtp_config: SmtpConfig instance with host, port, user, password, from_addr.
+        to: Recipient email address.
+        org_name: Name of the organisation.
+        inviter_name: Display name of the person who sent the invite.
+        invite_url: Full URL to accept the invitation.
+        logo_url: Absolute URL of the header logo image, if available.
+
+    Raises:
+        RuntimeError: If SMTP is not configured.
+        smtplib.SMTPException: If sending fails.
+    """
+    if not smtp_config.enabled:
+        raise RuntimeError("SMTP is not configured. Set smtp.host, smtp.user, and smtp.password.")
+
+    msg = MIMEMultipart("alternative")
+    msg["Subject"] = f"You've been invited to join {org_name} on Interloper"
+    msg["From"] = smtp_config.from_addr
+    msg["To"] = to
+
+    msg.attach(MIMEText(render_invite_text(org_name, inviter_name, invite_url), "plain"))
+    msg.attach(MIMEText(render_invite_html(org_name, inviter_name, invite_url, logo_url), "html"))
+
+    logger.info("Sending invite email to %s", to)
+
+    if smtp_config.port == 465:
+        with smtplib.SMTP_SSL(smtp_config.host, smtp_config.port) as server:
+            server.login(smtp_config.user, smtp_config.password)
+            server.sendmail(smtp_config.from_addr, to, msg.as_string())
+    else:
+        with smtplib.SMTP(smtp_config.host, smtp_config.port) as server:
+            server.starttls()
+            server.login(smtp_config.user, smtp_config.password)
+            server.sendmail(smtp_config.from_addr, to, msg.as_string())
+
+    logger.info("Invite email sent to %s", to)

{interloper_api-0.49.0 → interloper_api-0.50.0}/src/interloper_api/routes/components.py

@@ -299,6 +299,8 @@ def update_component(
         raise HTTPException(status_code=400, detail=str(e))
     except NotFoundError as e:
         raise HTTPException(status_code=404, detail=str(e))
+    except InUseError as e:
+        raise HTTPException(status_code=409, detail={"message": str(e), "used_by": e.referrers})
     return _to_response(row, store, include_config=True)
 
 
@@ -353,9 +355,15 @@ def remove_relation(
     user: Profile = Depends(get_current_user),
     store: Store = Depends(get_store),
 ) -> None:
-    """Remove a component's relations of one type toward one destination."""
+    """Remove a component's relations of one type toward one destination.
+
+    Refused (400) for required dependency slots — repoint them instead.
+    """
     load_authorized(store.get_component, component_id, user, store, label="Component", minimum="editor")
-    store.remove_relation(component_id, type=type, dst_id=dst_id)
+    try:
+        store.remove_relation(component_id, type=type, dst_id=dst_id)
+    except ConfigError as e:
+        raise HTTPException(status_code=400, detail=str(e))
 
 
 # -- Partition endpoint ---------------------------------------------------------

{interloper_api-0.49.0 → interloper_api-0.50.0}/src/interloper_api/routes/organisations.py

@@ -101,6 +101,7 @@ def _send_invitation_email(
             org_name=org_name,
             inviter_name=inviter_name,
             invite_url=invite_url,
+            logo_url=f"{base_url}/logo-email.png",
         )
     except Exception:
         logger.exception("Failed to send invitation email to %s", email)

interloper_api-0.49.0/src/interloper_api/email.py

@@ -1,79 +0,0 @@
-"""SMTP email utilities for sending invitation emails."""
-
-from __future__ import annotations
-
-import logging
-import smtplib
-from email.mime.multipart import MIMEMultipart
-from email.mime.text import MIMEText
-from typing import Any
-
-logger = logging.getLogger(__name__)
-
-
-def send_invite_email(
-    smtp_config: Any,
-    to: str,
-    org_name: str,
-    inviter_name: str,
-    invite_url: str,
-) -> None:
-    """Send an organisation invitation email via SMTP.
-
-    Args:
-        smtp_config: SmtpConfig instance with host, port, user, password, from_addr.
-        to: Recipient email address.
-        org_name: Name of the organisation.
-        inviter_name: Display name of the person who sent the invite.
-        invite_url: Full URL to accept the invitation.
-
-    Raises:
-        RuntimeError: If SMTP is not configured.
-        smtplib.SMTPException: If sending fails.
-    """
-    if not smtp_config.enabled:
-        raise RuntimeError("SMTP is not configured. Set smtp.host, smtp.user, and smtp.password.")
-
-    msg = MIMEMultipart("alternative")
-    msg["Subject"] = f"You've been invited to join {org_name} on Interloper"
-    msg["From"] = smtp_config.from_addr
-    msg["To"] = to
-
-    text = (
-        f"{inviter_name} has invited you to join the {org_name} organisation on Interloper.\n\n"
-        f"Click the link below to accept the invitation:\n{invite_url}\n\n"
-        "This invitation expires in 7 days."
-    )
-
-    html = f"""\
-<html>
-<body style="font-family: sans-serif; color: #333;">
-    <h2>You've been invited to join {org_name}</h2>
-    <p>{inviter_name} has invited you to join the <strong>{org_name}</strong> organisation on Interloper.</p>
-    <p>
-        <a href="{invite_url}"
-           style="display: inline-block; padding: 10px 20px; background: #2563eb;
-                  color: #fff; text-decoration: none; border-radius: 6px;">
-            Accept Invitation
-        </a>
-    </p>
-    <p style="color: #666; font-size: 0.875rem;">This invitation expires in 7 days.</p>
-</body>
-</html>"""
-
-    msg.attach(MIMEText(text, "plain"))
-    msg.attach(MIMEText(html, "html"))
-
-    logger.info("Sending invite email to %s", to)
-
-    if smtp_config.port == 465:
-        with smtplib.SMTP_SSL(smtp_config.host, smtp_config.port) as server:
-            server.login(smtp_config.user, smtp_config.password)
-            server.sendmail(smtp_config.from_addr, to, msg.as_string())
-    else:
-        with smtplib.SMTP(smtp_config.host, smtp_config.port) as server:
-            server.starttls()
-            server.login(smtp_config.user, smtp_config.password)
-            server.sendmail(smtp_config.from_addr, to, msg.as_string())
-
-    logger.info("Invite email sent to %s", to)