toms comments

Author: Pager07

src/spam/email_checker.py

@@ -26,8 +26,8 @@ async def check_spam(self, m: EmailSendModel):
 
         # prepare email info for spam check for the first recipient email only
         recipient = m.recipients[0]
-        context = dict(m.context, **(recipient.context if hasattr(recipient, "context") else {}))
-        headers = dict(m.headers, **(recipient.headers if hasattr(recipient, "headers") else {}))
+        context = dict(m.context, **recipient.context)
+        headers = dict(m.headers, **recipient.headers)
         message_def = MessageDef(
             first_name=recipient.first_name,
             last_name=recipient.last_name,

src/spam/services.py

@@ -84,7 +84,7 @@ def get_cache_key(self, m: EmailSendModel) -> str:
 
     async def get(self, m: EmailSendModel) -> Optional[SpamCheckResult]:
         key = self.get_cache_key(m)
-        cached_data = await self.redis.get(key)
+        cached_data: Optional[str] = await self.redis.get(key)
         if cached_data:
             return SpamCheckResult.parse_raw(cached_data)
         return None