Merge pull request #485 from tutorcruncher/catch-exception

Catch spam service exception

Author: Pager07

setup.cfg

@@ -6,6 +6,7 @@ filterwarnings =
 timeout = 20
 markers =
     spam: Using this marker on a test will mark the emails that test as spam.
+    spam_service_error: Using this marker on a test will mark the emails that test as spam service error.
 
 [flake8]
 max-line-length = 120

src/spam/email_checker.py

@@ -1,11 +1,12 @@
 import logging
 import re
 from html import unescape
+from openai import OpenAIError
 from typing import Optional, Union
 
 from src.render.main import MessageDef, render_email
 from src.schemas.messages import EmailSendModel
-from src.spam.services import OpenAISpamEmailService, SpamCacheService
+from src.spam.services import OpenAISpamEmailService, SpamCacheService, SpamCheckResult
 
 logger = logging.getLogger('spam.email_checker')
 
@@ -57,21 +58,38 @@ async def check_spam(self, m: EmailSendModel):
         company_name = m.context.get("company_name", "no_company")
         subject = email_info.subject
 
-        spam_result = await self.spam_service.is_spam_email(email_info, company_name)
+        try:
+            spam_result = await self.spam_service.is_spam_email(email_info, company_name)
+            # Cache all results (both spam and non-spam) - only when successful
+            await self.cache_service.set(m, spam_result)
 
-        # Cache all results (both spam and non-spam)
-        await self.cache_service.set(m, spam_result)
-
-        if spam_result.spam:
+            if spam_result.spam:
+                logger.error(
+                    "Email flagged as spam",
+                    extra={
+                        "reason": spam_result.reason,
+                        "number of recipients": len(m.recipients),
+                        "subject": subject,
+                        "company": company_name,
+                        "company_code": m.company_code,
+                        "email_main_body": _clean_html_body(context.get('main_message__render')) or 'no main body',
+                    },
+                )
+        except OpenAIError as e:
+            # Use the same logging structure for consistency
             logger.error(
-                "Email flagged as spam",
+                "LLM Provider Error during spam check",
                 extra={
-                    "reason": spam_result.reason,
-                    "number of recipients": len(m.recipients),
-                    "subject": subject,
+                    "reason": str(e),
+                    "subject": email_info.subject,
+                    "email_main_body": _clean_html_body(context.get('main_message__render')) or 'no main body',
                     "company": company_name,
                     "company_code": m.company_code,
-                    "email_main_body": _clean_html_body(context.get('main_message__render')) or 'no main body',
                 },
             )
+            # Return a safe default when spam check fails
+            spam_result = SpamCheckResult(
+                spam=False, reason="Spam check failed - defaulting to not spam due to service error"
+            )
+
         return spam_result

tests/conftest.py

@@ -308,7 +308,13 @@ class FakeResponse:
 
     # Create a fake client with a mocked responses.parse method
     fake_client = AsyncMock()
-    fake_client.responses.parse.return_value = FakeResponse()
+    if 'spam_service_error' in request.keywords:
+        # This will RAISE OpenAIError when fake_client.responses.parse() is called
+        from openai import OpenAIError
+
+        fake_client.responses.parse.side_effect = OpenAIError('Openai test error')
+    else:
+        fake_client.responses.parse.return_value = FakeResponse()
 
     fake_service = OpenAISpamEmailService(client=fake_client)
     fake_cache = SpamCacheService(glove.redis)

tests/test_email.py

@@ -1213,3 +1213,51 @@ def test_spam_logging_includes_body(cli: TestClient, sync_db: SyncDb, worker, ca
         body == 'Hi {{ recipient_first_name }}, Dont miss out on FREE MONEY! '
         'Click [here]({{ login_link }}) now! Regards, {{ company_name }}'
     )
+
+
+@pytest.mark.spam_service_error
+def test_openai_service_error(cli: TestClient, sync_db: SyncDb, worker, caplog):
+    caplog.set_level(logging.ERROR, logger='spam.email_checker')
+
+    recipients = []
+    for i in range(21):
+        recipients.append(
+            {
+                'first_name': f'User{i}',
+                'last_name': f'Last{i}',
+                'address': f'user{i}@example.org',
+                'tags': ['test'],
+            }
+        )
+
+    data = {
+        'uid': str(uuid4()),
+        'company_code': 'foobar',
+        'from_address': 'Spammer <[email protected]>',
+        'method': 'email-test',
+        'subject_template': 'Urgent: {{ company_name }} Alert!',
+        'main_template': '{{{ main_message }}}',
+        'context': {
+            'main_message__render': 'Hi {{ recipient_first_name }},\n\nDont miss out on <b>FREE MONEY</b>! '
+            'Click [here]({{ login_link }}) now!\n\nRegards,\n{{ company_name }}',
+            'company_name': 'TestCorp',
+            'login_link': 'https://spam.example.com/click',
+        },
+        'recipients': recipients,
+    }
+
+    r = cli.post('/send/email/', json=data, headers={'Authorization': 'testing-key'})
+    assert r.status_code == 201, r.text
+    assert worker.test_run() == len(recipients)
+
+    records = [r for r in caplog.records if r.name == 'spam.email_checker' and r.levelno == logging.ERROR]
+    assert len(records) == 1
+    record = records[0]
+    assert record.reason == 'Openai test error'
+    assert record.subject == 'Urgent: TestCorp Alert!'
+    assert (
+        record.email_main_body == 'Hi {{ recipient_first_name }}, Dont miss out on FREE MONEY! '
+        'Click [here]({{ login_link }}) now! Regards, {{ company_name }}'
+    )
+    assert record.company == 'TestCorp'
+    assert record.company_code == 'foobar'