integrate new settings and add mailing tests

blossomtune_gradio/mail.py

@@ -74,7 +74,8 @@ class MailjetSender(EmailSender):
         """
         Sends an email using the Mailjet transactional API v3.1.
         """
-        if not all([hasattr(cfg, "SMTP_USER"), hasattr(cfg, "SMTP_PASSWORD")]):
+        # Check for truthy values, not just attribute existence.
+        if not (cfg.SMTP_USER and cfg.SMTP_PASSWORD):
             error_msg = "Mailjet API keys are not configured."
             log(f"[Email] {error_msg}")
             return False, error_msg

blossomtune_gradio/settings/blossomtune.schema.json

@@ -60,11 +60,11 @@
           "type": "string",
           "description": "Message for a denied participant. JINJA2: {{ participant_id }}"
         },
-        "participant_not_activated_warning": {
+        "participant_not_activated_warning_md": {
           "type": "string",
           "description": "Admin warning when trying to approve a non-activated user."
         },
-        "partition_in_use_warning": {
+        "partition_in_use_warning_md": {
           "type": "string",
           "description": "Admin warning for an already assigned partition ID. JINJA2: {{ partition_id }}"
         },
@@ -99,7 +99,7 @@
         "status_approved_md",
         "status_pending_md",
         "status_denied_md",
-        "participant_not_activated_warning",
+        "participant_not_activated_warning_md",
         "partition_in_use_warning",
         "auth_status_logged_in_owner_md",
         "auth_status_logged_in_user_md",

blossomtune_gradio/settings/blossomtune.yaml

@@ -62,7 +62,7 @@ ui:
     Your request for ID `{{ participant_id }}` has been denied.
 
   # --- Admin Panel ---
-  participant_not_activated_warning: |
+  participant_not_activated_warning_md: |
     This participant has not activated their email yet. Approval is not allowed.
     
   partition_in_use_warning: |

blossomtune_gradio/ui/callbacks.py

@@ -7,6 +7,7 @@ from blossomtune_gradio import config as cfg
 from blossomtune_gradio.logs import log
 from blossomtune_gradio import federation as fed
 from blossomtune_gradio import processing
+from blossomtune_gradio.settings import settings
 
 from . import components
 from . import auth
@@ -23,23 +24,26 @@ def get_full_status_update(
     profile: gr.OAuthProfile | None, oauth_token: gr.OAuthToken | None
 ):
     owner = auth.is_space_owner(profile, oauth_token)
-    auth_status = "Authenticating..."
+    auth_status = "Authenticating..."  # Initial state, not in schema
     is_on_space = cfg.SPACE_OWNER is not None
     hf_handle_val = ""
     hf_handle_interactive = not is_on_space
 
     if is_on_space:
         if profile:
-            auth_status = (
-                f"✅ Logged in as **{profile.username}**. You are the space owner."
-                if owner
-                else f"Logged in as: {profile.username}."
-            )
+            if owner:
+                auth_status = settings.get_text(
+                    "auth_status_logged_in_owner_md", profile=profile
+                )
+            else:
+                auth_status = settings.get_text(
+                    "auth_status_logged_in_user_md", profile=profile
+                )
             hf_handle_val = profile.username
         else:
-            auth_status = "⚠️ You are not logged in. Please log in with Hugging Face."
+            auth_status = settings.get_text("auth_status_not_logged_in_md")
     else:
-        auth_status = "Running in local mode. Admin controls enabled."
+        auth_status = settings.get_text("auth_status_local_mode_md")
 
     with sqlite3.connect(cfg.DB_PATH) as conn:
         pending_rows = conn.execute(
@@ -58,11 +62,11 @@ def get_full_status_update(
         and processing.process_store["runner"].poll() is None
     )
 
+    # Hardcode status text as it's not in the schema
     superlink_status = "🟢 Running" if superlink_is_running else "🔴 Not Running"
     runner_status = "🟢 Running" if runner_is_running else "🔴 Not Running"
 
-    # --- Start of Fix ---
-    # Use gr.update() to modify existing components instead of creating new ones.
+    # Hardcode button text as it's not in the schema
     if superlink_is_running:
         superlink_btn_update = gr.update(value="🛑 Stop Superlink", variant="stop")
     else:
@@ -78,7 +82,6 @@ def get_full_status_update(
     return {
         components.admin_panel: gr.update(visible=owner),
         components.auth_status_md: gr.update(value=auth_status),
-        # components.log_output: gr.update(value=log.output),
         components.superlink_status_public_txt: gr.update(value=superlink_status),
         components.superlink_status_admin_txt: gr.update(value=superlink_status),
         components.runner_status_txt: gr.update(value=runner_status),
@@ -107,6 +110,7 @@ def toggle_superlink(
 ):
     """Toggles the Superlink process on or off."""
     if not auth.is_space_owner(profile, oauth_token):
+        # Hardcode warning text as it's not in the schema
         gr.Warning("You are not authorized to perform this operation.")
         return
     if (
@@ -127,6 +131,7 @@ def toggle_runner(
 ):
     """Toggles the Runner process on or off."""
     if not auth.is_space_owner(profile, oauth_token):
+        # Hardcode warning text as it's not in the schema
         gr.Warning("You are not authorized to perform this operation.")
         return
     if (
@@ -147,17 +152,14 @@ def on_select_pending(pending_data: list, evt: gr.SelectData):
     if not evt.index:
         return "", ""
 
-    # Ensure pending_data is a Pandas DataFrame
     pending_df = pd.DataFrame(
         pending_data, columns=["Participant ID", "HF Handle", "Email"]
     )
 
     row_index = evt.index[0]
-    # Use pending_df.empty to check for truthiness
     if pending_df.empty or row_index >= len(pending_df):
         return "", ""
 
-    # Use .iloc to safely access the row by index
     participant_id = pending_df.iloc[row_index, 0]
     return participant_id, str(fed.get_next_partion_id())
 
@@ -169,7 +171,7 @@ def on_check_participant_status(
     if is_on_space and not profile:
         return {
             components.request_status_md: gr.update(
-                "### ❌ Authentication Required\n**Please log in with Hugging Face to request to join the federation.**"
+                value=settings.get_text("auth_required_md")
             )
         }
 
@@ -177,13 +179,14 @@ def on_check_participant_status(
     if not user_hf_handle or not user_hf_handle.strip():
         return {
             components.request_status_md: gr.update(
-                value="Hugging Face handle cannot be empty."
+                value=settings.get_text("hf_handle_empty_md")
             )
         }
 
     pid_to_check = user_hf_handle.strip()
     email_to_add = email.strip()
     activation_code_to_check = activation_code.strip()
+    # The federation module is responsible for getting the correct text from settings
     _, message = fed.check_participant_status(
         pid_to_check, email_to_add, activation_code_to_check
     )
@@ -191,6 +194,7 @@ def on_check_participant_status(
 
 
 def on_manage_fed_request(participant_id: str, partition_id: str, action: str):
+    # The federation module is responsible for getting the correct text from settings
     result, message = fed.manage_request(participant_id, partition_id, action)
     if result:
         gr.Info(message)

blossomtune_gradio/ui/components.py

@@ -1,7 +1,10 @@
 import gradio as gr
 
 
+# This component's value is updated dynamically by callbacks.
+# We'll use a simple initial value here as the schema doesn't define an "authenticating" state.
 auth_status_md = gr.Markdown("Authenticating...", render=False)
+
 superlink_status_public_txt = gr.Textbox(
     "🔴 Not Running", label="Superlink Status", interactive=False, render=False
 )
@@ -13,11 +16,13 @@ log_output = gr.Textbox(
     show_copy_button=True,
     render=False,
 )
+# The button's text/variant is updated dynamically by callbacks.
 superlink_toggle_btn = gr.Button("🚀 Start Superlink", variant="secondary")
+
 hf_handle_tb = gr.Textbox(
     label="Your Hugging Face Handle",
     placeholder="Enter for local testing...",
-    interactive=True,  # Will be updated by get_full_status_update
+    interactive=True,  # This is controlled by callbacks
     render=False,
 )
 email_tb = gr.Textbox(
@@ -37,7 +42,6 @@ superlink_status_admin_txt = gr.Textbox(
     interactive=False,
     render=False,
 )
-superlink_toggle_btn = gr.Button("🚀 Start Superlink", variant="secondary")
 runner_status_txt = gr.Textbox(
     "🔴 Not Running", label="Runner Status", interactive=False, render=False
 )
@@ -52,7 +56,9 @@ run_id_tb = gr.Textbox(label="Run ID", placeholder="e.g., run_123")
 num_partitions_tb = gr.Textbox(
     label="Total Partitions", value="10", placeholder="e.g., 10", render=False
 )
-request_status_md = gr.Markdown()
+# This component is populated by callbacks using the settings file.
+request_status_md = gr.Markdown(render=False)
+
 pending_requests_df = gr.DataFrame(
     headers=["Participant ID", "HF Handle", "Email"],
     label="Pending Requests (click a row to select)",

pyproject.toml

@@ -69,6 +69,7 @@ convention = "google"  # Accepts: "google", "numpy", or "pep257".
 [dependency-groups]
 dev = [
     "pytest>=8.4.1",
+    "pytest-mock>=3.15.1",
 ]
 
 [tool.pytest.ini_options]

tests/test_mail.py

@@ -0,0 +1,149 @@
+import requests
+import pytest
+from unittest.mock import MagicMock, patch
+
+from blossomtune_gradio import mail
+from blossomtune_gradio import config as cfg
+
+
+class TestSMTPMailSender:
+    """Tests for the SMTPMailSender class."""
+
+    @pytest.fixture
+    def sender(self):
+        return mail.SMTPMailSender()
+
+    def test_send_email_success(self, sender, mocker):
+        """Verify that a successful email send works as expected."""
+        mock_smtp = mocker.patch("smtplib.SMTP")
+        recipient = "test@example.com"
+        subject = "Test Subject"
+        body = "Test Body"
+
+        success, message = sender.send_email(recipient, subject, body)
+
+        assert success is True
+        assert message == ""
+        mock_smtp.assert_called_once_with(cfg.SMTP_SERVER, cfg.SMTP_PORT)
+        # Check that send_message was called on the context manager's result
+        mock_smtp.return_value.__enter__.return_value.send_message.assert_called_once()
+
+    def test_send_email_failure(self, sender, mocker):
+        """Verify that an SMTP error is handled correctly."""
+        mocker.patch("smtplib.SMTP", side_effect=Exception("SMTP Connection Error"))
+        recipient = "test@example.com"
+        subject = "Test Subject"
+        body = "Test Body"
+
+        success, message = sender.send_email(recipient, subject, body)
+
+        assert success is False
+        assert "SMTP Connection Error" in message
+
+
+class TestMailjetSender:
+    """Tests for the MailjetSender class."""
+
+    @pytest.fixture
+    def sender(self):
+        return mail.MailjetSender()
+
+    def test_send_email_success(self, sender, mocker):
+        """Verify a successful send via the Mailjet API."""
+        mock_post = mocker.patch("requests.post")
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.raise_for_status.return_value = None
+        mock_post.return_value = mock_response
+
+        # Mock config attributes
+        mocker.patch.object(cfg, "SMTP_USER", "test_api_key")
+        mocker.patch.object(cfg, "SMTP_PASSWORD", "test_api_secret")
+
+        success, message = sender.send_email("test@example.com", "Subject", "Body")
+
+        assert success is True
+        assert message == ""
+        mock_post.assert_called_once()
+
+    def test_send_email_api_failure(self, sender, mocker):
+        """Verify that a Mailjet API error is handled correctly."""
+        mock_post = mocker.patch(
+            "requests.post",
+            side_effect=requests.exceptions.RequestException("API Error"),
+        )
+        # Mock the response attribute on the exception
+        mock_post.side_effect.response = MagicMock(text="Bad Request")
+
+        mocker.patch.object(cfg, "SMTP_USER", "test_api_key")
+        mocker.patch.object(cfg, "SMTP_PASSWORD", "test_api_secret")
+
+        success, message = sender.send_email("test@example.com", "Subject", "Body")
+
+        assert success is False
+        assert "API Error" in message
+
+    def test_send_email_no_credentials(self, sender, mocker):
+        """Verify failure when Mailjet credentials are not configured."""
+        # Ensure the attributes don't exist
+        if hasattr(cfg, "SMTP_USER"):
+            mocker.stopall()  # Stop any previous mocks if needed
+            mocker.patch.object(cfg, "SMTP_USER", None)
+
+        success, message = sender.send_email("test@example.com", "Subject", "Body")
+        assert success is False
+        assert "Mailjet API keys are not configured" in message
+
+
+class TestEmailFactory:
+    """Tests for the get_email_sender factory function."""
+
+    def test_get_smtp_sender_by_default(self, mocker):
+        """Verify it returns SMTP sender if provider is not set."""
+        # Ensure EMAIL_PROVIDER is not set on cfg
+        if hasattr(cfg, "EMAIL_PROVIDER"):
+            mocker.patch.object(cfg, "EMAIL_PROVIDER", None)
+        sender = mail.get_email_sender()
+        assert isinstance(sender, mail.SMTPMailSender)
+
+    def test_get_smtp_sender_explicitly(self, mocker):
+        """Verify it returns SMTP sender when configured."""
+        mocker.patch.object(cfg, "EMAIL_PROVIDER", "smtp")
+        sender = mail.get_email_sender()
+        assert isinstance(sender, mail.SMTPMailSender)
+
+    def test_get_mailjet_sender(self, mocker):
+        """Verify it returns Mailjet sender when configured."""
+        mocker.patch.object(cfg, "EMAIL_PROVIDER", "mailjet")
+        sender = mail.get_email_sender()
+        assert isinstance(sender, mail.MailjetSender)
+
+
+@patch("blossomtune_gradio.mail.get_email_sender")
+def test_send_activation_email_success(mock_get_sender):
+    """Test successful activation email dispatch."""
+    mock_sender_instance = MagicMock()
+    mock_sender_instance.send_email.return_value = (True, "")
+    mock_get_sender.return_value = mock_sender_instance
+
+    success, message = mail.send_activation_email("test@example.com", "12345")
+
+    assert success is True
+    assert message == ""
+    mock_sender_instance.send_email.assert_called_once()
+    # Check that the subject contains the right text
+    call_args, _ = mock_sender_instance.send_email.call_args
+    assert "Your BlossomTune Activation Code" in call_args[1]
+
+
+@patch("blossomtune_gradio.mail.get_email_sender")
+def test_send_activation_email_failure(mock_get_sender):
+    """Test failed activation email dispatch."""
+    mock_sender_instance = MagicMock()
+    mock_sender_instance.send_email.return_value = (False, "Provider Error")
+    mock_get_sender.return_value = mock_sender_instance
+
+    success, message = mail.send_activation_email("test@example.com", "12345")
+
+    assert success is False
+    assert "Provider Error" in message

uv.lock

@@ -242,6 +242,7 @@ dependencies = [
 [package.dev-dependencies]
 dev = [
     { name = "pytest" },
+    { name = "pytest-mock" },
 ]
 
 [package.metadata]
@@ -259,7 +260,10 @@ requires-dist = [
 ]
 
 [package.metadata.requires-dev]
-dev = [{ name = "pytest", specifier = ">=8.4.1" }]
+dev = [
+    { name = "pytest", specifier = ">=8.4.1" },
+    { name = "pytest-mock", specifier = ">=3.15.1" },
+]
 
 [[package]]
 name = "brotli"
@@ -2081,6 +2085,18 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/a8/a4/20da314d277121d6534b3a980b29035dcd51e6744bd79075a6ce8fa4eb8d/pytest-8.4.2-py3-none-any.whl", hash = "sha256:872f880de3fc3a5bdc88a11b39c9710c3497a547cfa9320bc3c5e62fbf272e79", size = 365750, upload-time = "2025-09-04T14:34:20.226Z" },
 ]
 
+[[package]]
+name = "pytest-mock"
+version = "3.15.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/68/14/eb014d26be205d38ad5ad20d9a80f7d201472e08167f0bb4361e251084a9/pytest_mock-3.15.1.tar.gz", hash = "sha256:1849a238f6f396da19762269de72cb1814ab44416fa73a8686deac10b0d87a0f", size = 34036, upload-time = "2025-09-16T16:37:27.081Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/cc/06253936f4a7fa2e0f48dfe6d851d9c56df896a9ab09ac019d70b760619c/pytest_mock-3.15.1-py3-none-any.whl", hash = "sha256:0a25e2eb88fe5168d535041d09a4529a188176ae608a6d249ee65abc0949630d", size = 10095, upload-time = "2025-09-16T16:37:25.734Z" },
+]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"