timber-common 1.2.2__tar.gz → 1.2.3__tar.gz

{timber_common-1.2.2 → timber_common-1.2.3}/CHANGELOG.md

@@ -5,6 +5,18 @@ All notable changes to Timber will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.3] - 2026-10-27
+
+### Added
+
+- Resend transactional email transport using runtime-injected credentials and stable delivery identifiers.
+
+### Fixed
+
+- Connect multichannel email delivery to the shared email service and scope message updates by ID.
+- Record provider acceptance separately from delivery and reject unknown email providers.
+- Select the default email provider lazily after runtime configuration loads.
+
 ## [1.2.2] - 2026-10-24
 
 ### Fixed

{timber_common-1.2.2 → timber_common-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: timber-common
-Version: 1.2.2
+Version: 1.2.3
 Summary: Configuration-driven persistence library with ml tools (finance related) config driven db model registration, llm model choice, automatic encryption, caching, vector search, and GDPR compliance for Python applications
 License: Apache-2.0
 Keywords: orm,sqlalchemy,persistence,vector-search,semantic-search,encryption,gdpr,yaml-config,postgres,redis,configuration-driven,data-modeling,machine-learning,embeddings

{timber_common-1.2.2 → timber_common-1.2.3}/common/services/communication/__init__.py

@@ -64,6 +64,7 @@ from .email_service import (
     SESProvider,
     SMTPProvider,
     ConsoleProvider,
+    ResendProvider,
     get_email_service,
     email_service,
 )
@@ -103,6 +104,7 @@ __all__ = [
     'SESProvider',
     'SMTPProvider',
     'ConsoleProvider',
+    'ResendProvider',
     'get_email_service',
     'email_service',
     

{timber_common-1.2.2 → timber_common-1.2.3}/common/services/communication/email_service.py

@@ -608,6 +608,9 @@ class ConsoleProvider(EmailProvider):
 # EMAIL SERVICE
 # =============================================================================
 
+from .resend_provider import ResendProvider
+
+
 class EmailService:
     """
     Main email service with provider abstraction.
@@ -621,6 +624,7 @@ class EmailService:
         'ses': SESProvider,
         'smtp': SMTPProvider,
         'console': ConsoleProvider,
+        'resend': ResendProvider,
     }
     
     def __init__(self, provider: Optional[str] = None):
@@ -631,7 +635,7 @@ class EmailService:
             provider: Provider name ('sendgrid', 'ses', 'smtp', 'console')
                      If not specified, auto-detects from environment.
         """
-        self._provider_name = provider or os.getenv('EMAIL_PROVIDER', 'console')
+        self._provider_name = provider
         self._provider: Optional[EmailProvider] = None
         self._db = None
         
@@ -652,10 +656,10 @@ class EmailService:
     def provider(self) -> EmailProvider:
         """Get the configured email provider."""
         if self._provider is None:
+            self._provider_name = self._provider_name or os.getenv("EMAIL_PROVIDER", "console")
             provider_class = self.PROVIDERS.get(self._provider_name)
             if not provider_class:
-                logger.warning(f"Unknown provider '{self._provider_name}', falling back to console")
-                provider_class = ConsoleProvider
+                raise ValueError(f"Unknown email provider: {self._provider_name}")
             self._provider = provider_class()
         return self._provider
     
@@ -724,14 +728,19 @@ class EmailService:
             metadata=metadata or {},
         )
         
-        # Send via provider
+        return await self.send_message(message)
+
+    async def send_message(self, message: EmailMessage, *, log_delivery: bool = True) -> EmailResult:
+        """Send a prepared message, preserving its identity across retries.
+
+        MessagingService owns its persisted delivery log and disables this log.
+        Provider acceptance is not proof of recipient delivery.
+        """
         result = await self.provider.send(message)
-        
-        # Log to database
-        await self._log_email(message, result)
-        
+        if log_delivery:
+            await self._log_email(message, result)
         return result
-    
+
     async def send_template(
         self,
         to: Union[str, List[str], EmailAddress, List[EmailAddress]],
@@ -894,7 +903,7 @@ class EmailService:
                 },
                 'error_message': result.error,
                 'attempted_at': datetime.now(timezone.utc),
-                'delivered_at': result.sent_at,
+                'delivered_at': None,
             })
         except Exception as e:
             logger.debug(f"Failed to log email: {e}")

{timber_common-1.2.2 → timber_common-1.2.3}/common/services/communication/messaging_service.py

@@ -277,7 +277,7 @@ class MessagingService:
         message = self.db.get('Message', message_id)
         
         if message and message['user_id'] == user_id:
-            self.db.update('Message', message_id, {
+            self.db.update('Message', {'id': message_id}, {
                 'in_app_status': 'read',
                 'in_app_read_at': datetime.now(timezone.utc),
                 'updated_at': datetime.now(timezone.utc),
@@ -298,7 +298,7 @@ class MessagingService:
         count = 0
         now = datetime.now(timezone.utc)
         for msg in messages:
-            self.db.update('Message', msg['id'], {
+            self.db.update('Message', {'id': msg['id']}, {
                 'in_app_status': 'read',
                 'in_app_read_at': now,
                 'updated_at': now,
@@ -312,7 +312,7 @@ class MessagingService:
         message = self.db.get('Message', message_id)
         
         if message and message['user_id'] == user_id:
-            self.db.update('Message', message_id, {
+            self.db.update('Message', {'id': message_id}, {
                 'in_app_status': 'dismissed',
                 'updated_at': datetime.now(timezone.utc),
             })
@@ -358,7 +358,7 @@ class MessagingService:
         rendered: Dict[str, str],
     ) -> None:
         """Deliver in-app message (update status)."""
-        self.db.update('Message', message_id, {
+        self.db.update('Message', {'id': message_id}, {
             'in_app_status': 'delivered',
             'updated_at': datetime.now(timezone.utc),
         })
@@ -375,38 +375,30 @@ class MessagingService:
         preferences: Dict[str, Any],
     ) -> None:
         """Deliver email message."""
+        from .email_service import EmailMessage, EmailAddress, get_email_service
+
         email = preferences.get('email_address')
-        
         if not email:
-            logger.warning(f"No email address for message {message_id}")
-            self.db.update('Message', message_id, {
-                'email_status': 'failed',
-            })
-            return
-        
-        # TODO: Integrate with email provider (SendGrid, SES, etc.)
-        # For now, just log and mark as sent
-        
-        subject = rendered.get('email_subject', rendered.get('in_app_title', ''))
-        body_html = rendered.get('email_body_html', '')
-        body_text = rendered.get('email_body_text', rendered.get('in_app_body', ''))
-        
-        # Placeholder for actual email sending
-        # response = await self._email_provider.send(
-        #     to=email,
-        #     subject=subject,
-        #     html=body_html,
-        #     text=body_text,
-        # )
-        
-        logger.info(f"📧 Email message queued: {message_id} -> {email}")
-        
-        self.db.update('Message', message_id, {
-            'email_status': 'sent',
-            'email_sent_at': datetime.now(timezone.utc),
+            self.db.update('Message', {'id': message_id}, {'email_status': 'failed'})
+            raise ValueError("No email address configured")
+        service = self._email_provider or get_email_service()
+        message = EmailMessage(
+            to=[EmailAddress.parse(email)], message_id=message_id,
+            subject=rendered.get('email_subject', rendered.get('in_app_title', '')),
+            html=rendered.get('email_body_html') or None,
+            text=rendered.get('email_body_text', rendered.get('in_app_body', '')) or None,
+        )
+        result = await service.send_message(message, log_delivery=False)
+        accepted = result.success and result.provider != 'console'
+        self.db.update('Message', {'id': message_id}, {
+            'email_status': result.status.value if accepted else 'failed',
+            'email_message_id': result.provider_message_id,
+            'email_sent_at': result.sent_at if accepted else None,
             'updated_at': datetime.now(timezone.utc),
         })
-    
+        if not accepted:
+            raise RuntimeError(result.error or "Email transport did not accept delivery")
+
     async def _deliver_push(
         self,
         message_id: str,
@@ -418,7 +410,7 @@ class MessagingService:
         
         if not subscription:
             logger.warning(f"No push subscription for message {message_id}")
-            self.db.update('Message', message_id, {
+            self.db.update('Message', {'id': message_id}, {
                 'push_status': 'failed',
             })
             return
@@ -440,7 +432,7 @@ class MessagingService:
         
         logger.info(f"🔔 Push message queued: {message_id}")
         
-        self.db.update('Message', message_id, {
+        self.db.update('Message', {'id': message_id}, {
             'push_status': 'sent',
             'push_sent_at': datetime.now(timezone.utc),
             'updated_at': datetime.now(timezone.utc),
@@ -550,7 +542,7 @@ class MessagingService:
             'provider': provider,
             'error_message': error_message,
             'attempted_at': datetime.now(timezone.utc),
-            'delivered_at': datetime.now(timezone.utc) if status == 'success' else None,
+            'delivered_at': datetime.now(timezone.utc) if status == 'success' and channel == 'in_app' else None,
             'created_at': datetime.now(timezone.utc),
             'updated_at': datetime.now(timezone.utc),
         })

timber_common-1.2.3/common/services/communication/resend_provider.py

@@ -0,0 +1,74 @@
+"""Resend transactional transport. Broadcast campaigns use a separate contract."""
+import asyncio
+import base64
+import json
+import os
+import urllib.error
+import urllib.request
+from datetime import datetime, timezone
+
+from .email_service import EmailAddress, EmailProvider, EmailResult, EmailStatus
+
+
+class ResendProvider(EmailProvider):
+    name = "resend"
+
+    def __init__(self, api_key=None):
+        self.api_key = api_key or os.getenv("RESEND_API_KEY")
+
+    def is_configured(self):
+        return bool(self.api_key)
+
+    async def send(self, message):
+        if not self.is_configured():
+            return EmailResult(False, message.message_id, status=EmailStatus.FAILED,
+                               error="Resend API key not configured", provider=self.name)
+        sender = message.from_email or EmailAddress(os.getenv("EMAIL_FROM_ADDRESS", ""),
+                                                   os.getenv("EMAIL_FROM_NAME", "OakQuant"))
+        if not sender.email:
+            return EmailResult(False, message.message_id, status=EmailStatus.FAILED,
+                               error="Email sender not configured", provider=self.name)
+        payload = {"from": str(sender), "to": [str(r) for r in message.to],
+                   "subject": message.subject}
+        for key in ("html", "text"):
+            if getattr(message, key):
+                payload[key] = getattr(message, key)
+        reply = message.reply_to or os.getenv("EMAIL_REPLY_TO")
+        if reply:
+            payload["reply_to"] = str(reply)
+        for key in ("cc", "bcc"):
+            if getattr(message, key):
+                payload[key] = [str(r) for r in getattr(message, key)]
+        if message.headers:
+            payload["headers"] = message.headers
+        if message.attachments:
+            payload["attachments"] = [dict(filename=a.filename,
+                content=base64.b64encode(a.content).decode(),
+                **({"content_id": a.content_id} if a.content_id else {}))
+                for a in message.attachments]
+        return await asyncio.to_thread(self._send, message.message_id, payload)
+
+    def _send(self, message_id, payload):
+        request = urllib.request.Request("https://api.resend.com/emails",
+            data=json.dumps(payload).encode(), method="POST", headers={
+                "Authorization": "Bearer " + self.api_key,
+                "Content-Type": "application/json", "User-Agent": "timber-common",
+                "Idempotency-Key": message_id})
+        try:
+            with urllib.request.urlopen(request, timeout=25) as response:
+                data = json.load(response)
+            if not data.get("id"):
+                raise ValueError("Missing provider message ID")
+            return EmailResult(True, message_id, provider_message_id=data["id"],
+                status=EmailStatus.QUEUED, provider=self.name,
+                sent_at=datetime.now(timezone.utc))
+        except urllib.error.HTTPError as exc:
+            error = f"Resend rejected request (HTTP {exc.code})"
+        except Exception:
+            # Provider bodies and exception strings may contain recipient data or credentials.
+            error = "Resend request failed; delivery acceptance unknown"
+        return EmailResult(False, message_id, status=EmailStatus.FAILED,
+                           error=error, provider=self.name)
+
+    async def send_bulk(self, messages):
+        return [await self.send(message) for message in messages]

{timber_common-1.2.2 → timber_common-1.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "timber-common"
-version = "1.2.2"
+version = "1.2.3"
 description = "Configuration-driven persistence library with ml tools (finance related) config driven db model registration, llm model choice, automatic encryption, caching, vector search, and GDPR compliance for Python applications"
 authors = ["Pumulo Sikaneta <pumulo@gmail.com>"]
 maintainers = ["Pumulo Sikaneta <pumulo@gmail.com>"]