notifyfork 0.1.2__tar.gz → 0.1.3__tar.gz

{notifyfork-0.1.2 → notifyfork-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: notifyfork
-Version: 0.1.2
+Version: 0.1.3
 Summary: Provider-agnostic notification gateway for Django. Send to SMS, Email, WhatsApp, Push, and Slack via a single API.
 Project-URL: Homepage, https://github.com/marioasaraujo/notifyfork
 Project-URL: Documentation, https://github.com/marioasaraujo/notifyfork#readme

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/application/use_cases/send_notification.py

@@ -57,18 +57,39 @@ class SendNotificationUseCase:
 
         error = "Unknown provider error"
         for index, provider in enumerate(candidates):
-            # Provider handles LOCAL vs EXTERNAL rendering internally
-            result = await provider.send_with_template(
-                recipient=dto.recipient,
-                template=template,
-                context=dto.context,
-            )
+            has_fallback = index < len(candidates) - 1
+            try:
+                # Provider handles LOCAL vs EXTERNAL rendering internally
+                result = await provider.send_with_template(
+                    recipient=dto.recipient,
+                    template=template,
+                    context=dto.context,
+                )
+            except Exception as exc:
+                # A provider raising instead of returning ProviderResult(success=False)
+                # must not escape this loop: an uncaught exception here propagates to
+                # the Celery task, which retries the whole use case from scratch
+                # (creating a brand-new Notification each time) and this notification
+                # is never saved as FAILED — it's left stuck in QUEUED forever, even
+                # after Celery's own retries are exhausted.
+                error = str(exc)
+                logger.warning(
+                    "Provider raised an exception"
+                    + (", falling back to next provider" if has_fallback else ""),
+                    extra={
+                        "provider": provider.name,
+                        "channel": dto.channel,
+                        "error": error,
+                        "fallback_available": has_fallback,
+                    },
+                )
+                continue
+
             if result.success:
-                notification.mark_sent(provider.name)
+                notification.mark_sent(provider.name, result.external_id)
                 break
 
             error = result.error or "Unknown provider error"
-            has_fallback = index < len(candidates) - 1
             logger.warning(
                 "Provider failed" + (", falling back to next provider" if has_fallback else ""),
                 extra={

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/domain/entities/notification.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from enum import Enum
 from typing import Any
 from uuid import UUID, uuid4
@@ -61,7 +61,7 @@ class Notification:
     attempts: int = 0
     max_attempts: int = 3
     error_detail: str | None = None
-    created_at: datetime = field(default_factory=datetime.utcnow)
+    created_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
     sent_at: datetime | None = None
     delivered_at: datetime | None = None
 
@@ -75,7 +75,7 @@ class Notification:
         self.status = NotificationStatus.SENT
         self.provider_used = provider
         self.provider_message_id = provider_message_id
-        self.sent_at = datetime.utcnow()
+        self.sent_at = datetime.now(timezone.utc)
         logger.info("Notification sent — awaiting delivery confirmation", extra={
             "notification_id": str(self.id),
             "provider": provider,
@@ -90,7 +90,7 @@ class Notification:
                 "notification_id": str(self.id), "current_status": self.status,
             })
         self.status = NotificationStatus.DELIVERED
-        self.delivered_at = datetime.utcnow()
+        self.delivered_at = datetime.now(timezone.utc)
         logger.info("Notification delivered", extra={
             "notification_id": str(self.id),
             "provider": self.provider_used,

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/domain/events/notification_events.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass, field
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import UUID
 
 
@@ -8,14 +8,14 @@ class NotificationQueued:
     notification_id: UUID
     channel: str
     recipient: str
-    occurred_at: datetime = field(default_factory=datetime.utcnow)
+    occurred_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
 class NotificationSent:
     notification_id: UUID
     provider: str
-    occurred_at: datetime = field(default_factory=datetime.utcnow)
+    occurred_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))
 
 
 @dataclass(frozen=True)
@@ -23,4 +23,4 @@ class NotificationFailed:
     notification_id: UUID
     reason: str
     attempts: int
-    occurred_at: datetime = field(default_factory=datetime.utcnow)
+    occurred_at: datetime = field(default_factory=lambda: datetime.now(timezone.utc))

notifyfork-0.1.3/notifyfork/core/infrastructure/admin.py

@@ -0,0 +1,36 @@
+from django.contrib import admin
+
+from notifyfork.core.infrastructure.models import NotificationTemplateModel
+
+
+@admin.register(NotificationTemplateModel)
+class NotificationTemplateAdmin(admin.ModelAdmin):
+    list_display = ("id", "mode", "body_kind", "is_active", "updated_at")
+    list_filter = ("mode", "is_active")
+    search_fields = ("id",)
+    readonly_fields = ("created_at", "updated_at")
+
+    fieldsets = (
+        (None, {"fields": ("id", "mode", "is_active")}),
+        (
+            "Conteúdo",
+            {
+                "fields": ("body", "subject"),
+                "description": (
+                    "Modo LOCAL: \"body\" é o texto/HTML enviado, com $variaveis "
+                    "(ex: \"Seu código é: $code\"). "
+                    "Modo EXTERNAL: \"body\" NÃO é texto de mensagem — é o ID do "
+                    "template no provider. Para WhatsApp (Twilio) é o Content SID "
+                    "(HXxxx); para SendGrid é o Dynamic Template ID (d-xxxx)."
+                ),
+            },
+        ),
+        ("Mapeamento de variáveis", {"fields": ("variable_mapping",)}),
+        ("Timestamps", {"fields": ("created_at", "updated_at")}),
+    )
+
+    @admin.display(description="body é...")
+    def body_kind(self, obj: NotificationTemplateModel) -> str:
+        if obj.mode == NotificationTemplateModel.ModeChoices.EXTERNAL:
+            return f"ID externo: {obj.body[:24]}"
+        return f"conteúdo local: {obj.body[:40]}"

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/infrastructure/providers/twilio_provider.py

@@ -51,7 +51,7 @@ class TwilioSMSProvider(NotificationProvider):
             return ProviderResult(success=True, provider_name=self.name, external_id=message.sid)
 
         except TwilioRestException as e:
-            logger.error("Twilio SMS error", extra={"code": e.code, "msg": e.msg})
+            logger.error("Twilio SMS error", extra={"code": e.code, "twilio_message": e.msg})
             return ProviderResult(
                 success=False, provider_name=self.name, error=f"Twilio [{e.code}]: {e.msg}"
             )

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/infrastructure/providers/whatsapp_provider.py

@@ -1,3 +1,4 @@
+import json
 import logging
 from typing import Any
 
@@ -99,7 +100,7 @@ class TwilioWhatsAppProvider(NotificationProvider):
         try:
             message = self._client.messages.create(
                 content_sid=template.external_template_id,
-                content_variables=str(translated),  # Twilio expects JSON string
+                content_variables=json.dumps(translated),  # Twilio expects JSON string
                 from_=self._from_number,
                 to=to,
             )
@@ -107,7 +108,10 @@ class TwilioWhatsAppProvider(NotificationProvider):
                 success=True, provider_name=self.name, external_id=message.sid
             )
         except TwilioRestException as e:
-            logger.error("WhatsApp external template error", extra={"code": e.code, "msg": e.msg})
+            logger.error(
+                "WhatsApp external template error",
+                extra={"code": e.code, "twilio_message": e.msg},
+            )
             return ProviderResult(
                 success=False,
                 provider_name=self.name,

{notifyfork-0.1.2 → notifyfork-0.1.3}/notifyfork/core/infrastructure/repositories/notification_repository.py

@@ -21,6 +21,7 @@ class DjangoNotificationRepository(NotificationRepository):
                 "context": notification.context,
                 "status": notification.status.value,
                 "provider_used": notification.provider_used,
+                "provider_message_id": notification.provider_message_id,
                 "attempts": notification.attempts,
                 "max_attempts": notification.max_attempts,
                 "error_detail": notification.error_detail,
@@ -64,6 +65,7 @@ class DjangoNotificationRepository(NotificationRepository):
             created_at=obj.created_at,
             sent_at=obj.sent_at,
             provider_used=obj.provider_used,
+            provider_message_id=obj.provider_message_id,
         )
         n.status = NotificationStatus(obj.status)
         return n

{notifyfork-0.1.2 → notifyfork-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "notifyfork"
-version = "0.1.2"
+version = "0.1.3"
 description = "Provider-agnostic notification gateway for Django. Send to SMS, Email, WhatsApp, Push, and Slack via a single API."
 readme = "README.md"
 license = { file = "LICENSE" }