Fixes wrong inheritances

vintasoftware · Dec 2, 2024 · ea47934 · ea47934
1 parent df19974
commit ea47934
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/vintasend/services/helpers.py b/vintasend/services/helpers.py
@@ -5,9 +5,7 @@
 
 from vintasend.services.notification_adapters.base import BaseNotificationAdapter
 from vintasend.services.notification_backends.base import BaseNotificationBackend
-from vintasend.services.notification_template_renderers.base_templated_email_renderer import (
-    BaseTemplateRenderer,
-)
+from vintasend.services.notification_template_renderers.base import BaseNotificationTemplateRenderer
 
 
 def _import_class(import_string: str) -> Any:
@@ -85,7 +83,7 @@ def get_notification_backend(
     return cast(BaseNotificationBackend, backend)
 
 
-def get_template_renderer(template_renderer_import_str: str) -> BaseTemplateRenderer:
+def get_template_renderer(template_renderer_import_str: str) -> BaseNotificationTemplateRenderer:
     try:
         template_renderer_cls = _import_class(template_renderer_import_str)
     except (ImportError, ModuleNotFoundError) as e:
@@ -100,9 +98,9 @@ def get_template_renderer(template_renderer_import_str: str) -> BaseTemplateRend
             f"Notifications Template Renderer Error: Could not instantiate {template_renderer_import_str}"
         ) from e
 
-    if not isinstance(template_renderer, BaseTemplateRenderer):
+    if not isinstance(template_renderer, BaseNotificationTemplateRenderer):
         raise ValueError(
             f"Notifications Template Renderer Error: {template_renderer_import_str} is not a valid template renderer"
         )
 
-    return cast(BaseTemplateRenderer, template_renderer)
+    return cast(BaseNotificationTemplateRenderer, template_renderer)
diff --git a/vintasend/services/notification_adapters/base.py b/vintasend/services/notification_adapters/base.py
@@ -2,7 +2,7 @@
 from typing import TYPE_CHECKING, cast, Generic, TypeVar, overload
 
 from vintasend.services.notification_backends.base import BaseNotificationBackend
-from vintasend.services.notification_template_renderers.base_templated_email_renderer import BaseTemplateRenderer
+from vintasend.services.notification_template_renderers.base import BaseNotificationTemplateRenderer
 
 
 if TYPE_CHECKING:
@@ -12,7 +12,7 @@
 
 
 B = TypeVar("B", bound=BaseNotificationBackend)
-T = TypeVar("T", bound=BaseTemplateRenderer)
+T = TypeVar("T", bound=BaseNotificationTemplateRenderer)
 
 class BaseNotificationAdapter(Generic[B, T], ABC):
     """

diff --git a/vintasend/services/notification_adapters/stubs/fake_adapter.py b/vintasend/services/notification_adapters/stubs/fake_adapter.py
@@ -7,11 +7,11 @@
 from vintasend.services.notification_adapters.async_base import AsyncBaseNotificationAdapter
 from vintasend.services.helpers import get_notification_backend, get_template_renderer
 from vintasend.services.notification_backends.base import BaseNotificationBackend
-from vintasend.services.notification_template_renderers.base_templated_email_renderer import BaseTemplateRenderer
+from vintasend.services.notification_template_renderers.base_templated_email_renderer import BaseTemplatedEmailRenderer
 
 
 B = TypeVar("B", bound=BaseNotificationBackend)
-T = TypeVar("T", bound=BaseTemplateRenderer)
+T = TypeVar("T", bound=BaseTemplatedEmailRenderer)
 
 class FakeEmailAdapter(Generic[B, T], BaseNotificationAdapter[B, T]):
     notification_type = NotificationTypes.EMAIL

diff --git a/vintasend/services/notification_adapters/stubs/fake_in_app_adapter.py b/vintasend/services/notification_adapters/stubs/fake_in_app_adapter.py
@@ -2,9 +2,8 @@
 
 from vintasend.constants import NotificationTypes
 from vintasend.services.notification_adapters.base import BaseNotificationAdapter
-from vintasend.services.helpers import get_notification_backend, get_template_renderer
 from vintasend.services.notification_backends.base import BaseNotificationBackend
-from vintasend.services.notification_template_renderers.base_templated_email_renderer import BaseTemplateRenderer
+from vintasend.services.notification_template_renderers.base import BaseNotificationTemplateRenderer
 
 
 if TYPE_CHECKING:
@@ -13,7 +12,7 @@
 
 
 B = TypeVar("B", bound=BaseNotificationBackend)
-T = TypeVar("T", bound=BaseTemplateRenderer)
+T = TypeVar("T", bound=BaseNotificationTemplateRenderer)
 
 
 class FakeInAppAdapter(Generic[B, T], BaseNotificationAdapter[B, T]):

diff --git a/vintasend/services/notification_template_renderers/base_templated_email_renderer.py b/vintasend/services/notification_template_renderers/base_templated_email_renderer.py
@@ -19,7 +19,7 @@ class TemplatedEmail(NotificationSendInput):
     body: str
 
 
-class BaseTemplateRenderer(BaseNotificationTemplateRenderer):
+class BaseTemplatedEmailRenderer(BaseNotificationTemplateRenderer):
     @abstractmethod
     def render(
         self, notification: Notification, context: "NotificationContextDict"

diff --git a/vintasend/services/notification_template_renderers/stubs/fake_templated_email_renderer.py b/vintasend/services/notification_template_renderers/stubs/fake_templated_email_renderer.py
@@ -1,18 +1,18 @@
 from vintasend.exceptions import NotificationBodyTemplateRenderingError
 from vintasend.services.notification_template_renderers.base_templated_email_renderer import (
-    BaseTemplateRenderer,
+    BaseTemplatedEmailRenderer,
     TemplatedEmail,
 )
 
 
-class FakeTemplateRenderer(BaseTemplateRenderer):
+class FakeTemplateRenderer(BaseTemplatedEmailRenderer):
     def render(self, notification, context):
         return TemplatedEmail(
             subject=notification.subject_template, body=notification.body_template
         )
 
 
-class FakeTemplateRendererWithException(BaseTemplateRenderer):
+class FakeTemplateRendererWithException(BaseTemplatedEmailRenderer):
     def render(self, notification, context):
         raise NotificationBodyTemplateRenderingError("Fake error")