refactor: packages

Author: giancarloromeo

packages/models-library/src/models_library/rpc/notifications/account.py

@@ -2,7 +2,7 @@
 
 from pydantic import EmailStr
 
-from .notifications import Event
+from .schemas import Event
 
 
 class AccountRequestedEvent(Event):

packages/models-library/src/models_library/rpc/notifications/notifications.py renamed to packages/models-library/src/models_library/rpc/notifications/schemas.py

@@ -2,7 +2,7 @@
 
 from models_library.api_schemas_notifications import NOTIFICATIONS_RPC_NAMESPACE
 from models_library.rabbitmq_basic_types import RPCMethodName
-from models_library.rpc.notifications.notifications import Notification
+from models_library.rpc.notifications.schemas import Notification
 from pydantic import NonNegativeInt, TypeAdapter
 
 from ... import RabbitMQRPCClient

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/notifications/messages.py

@@ -1,4 +1,4 @@
-from models_library.rpc.notifications.notifications import Notification
+from models_library.rpc.notifications.schemas import Notification
 from servicelib.celery.task_manager import TaskManager
 from servicelib.rabbitmq import RPCRouter
 

services/notifications/src/simcore_service_notifications/api/rpc/_notifications.py

@@ -6,7 +6,7 @@
 from celery_library.types import register_celery_types, register_pydantic_types
 from fastapi import FastAPI
 from fastapi_lifespan_manager import State
-from models_library.rpc.notifications.notifications import (
+from models_library.rpc.notifications.schemas import (
     EmailChannel,
     Notification,
     SMSChannel,

services/notifications/src/simcore_service_notifications/clients/celery.py

@@ -3,7 +3,7 @@
 import logging
 
 from celery import Task
-from models_library.rpc.notifications.notifications import EmailChannel, Notification
+from models_library.rpc.notifications.schemas import EmailChannel, Notification
 from servicelib.celery.models import TaskID
 
 _logger = logging.getLogger(__name__)

services/notifications/src/simcore_service_notifications/modules/celery/_email_tasks.py

@@ -5,7 +5,7 @@
 from celery_library.task import register_task
 from celery_library.types import register_celery_types, register_pydantic_types
 from models_library.rpc.notifications.account import AccountRequestedEvent
-from models_library.rpc.notifications.notifications import (
+from models_library.rpc.notifications.schemas import (
     EmailChannel,
     SMSChannel,
 )

services/notifications/src/simcore_service_notifications/modules/celery/tasks.py

@@ -1,6 +1,6 @@
 import logging
 
-from models_library.rpc.notifications.notifications import Notification
+from models_library.rpc.notifications.schemas import Notification
 from servicelib.celery.models import TaskContext
 from servicelib.celery.task_manager import TaskManager
 

services/notifications/src/simcore_service_notifications/services/notifications_service.py

@@ -1,9 +1,7 @@
 import pytest
 from faker import Faker
-from models_library.rpc.notifications.notifications import (
-    AccountRequestedEvent,
-    Notification,
-)
+from models_library.rpc.notifications.account import AccountRequestedEvent
+from models_library.rpc.notifications.schemas import Notification
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.notifications.messages import (
     send_notification,
@@ -38,3 +36,5 @@ async def test_account_requested(
             channel=EmailChannel(to=email),
         ),
     )
+
+    # TODO: wait for the email to be sent and check