add event when deleting file

Author: giancarloromeo

packages/models-library/src/models_library/rabbitmq_messages.py

@@ -316,3 +316,13 @@ class WalletCreditsLimitReachedMessage(RabbitMessageBase):
 
     def routing_key(self) -> str | None:
         return f"{self.wallet_id}.{self.credits_limit}"
+
+
+class FileDeletedMessage(RabbitMessageBase):
+    channel_name: Literal[
+        "io.simcore.service.storage.file-deleted"
+    ] = "io.simcore.service.storage.file-deleted"
+    file_id: str
+
+    def routing_key(self) -> str | None:
+        return None

services/storage/src/simcore_service_storage/rabbitmq.py

@@ -1,3 +1,5 @@
+from typing import cast
+
 from aiohttp import web
 from servicelib.rabbitmq._client import RabbitMQClient
 from servicelib.rabbitmq._utils import wait_till_rabbitmq_responsive
@@ -26,3 +28,7 @@ async def _rabbitmq_client(app: web.Application):
 def setup_rabbitmq(app: web.Application):
     if _rabbitmq_client not in app.cleanup_ctx:
         app.cleanup_ctx.append(_rabbitmq_client)
+
+
+def get_rabbitmq_client(app: web.Application) -> RabbitMQClient:
+    return cast(RabbitMQClient, app[_APP_RABBITMQ_CLIENT_KEY])

services/storage/src/simcore_service_storage/simcore_s3_dsm.py

@@ -35,6 +35,7 @@
     SimcoreS3FileID,
     StorageFileID,
 )
+from models_library.rabbitmq_messages import FileDeletedMessage
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, NonNegativeInt, TypeAdapter
 from servicelib.aiohttp.client_session import get_client_session
@@ -77,6 +78,7 @@
     UploadLinks,
     UserOrProjectFilter,
 )
+from .rabbitmq import get_rabbitmq_client
 from .s3 import get_s3_client
 from .s3_utils import S3TransferDataCB, update_task_progress
 from .settings import Settings
@@ -537,6 +539,12 @@ async def delete_file(
             _logger.warning("File %s not found in S3", file_id)
             # we still need to clean up the database entry (it exists)
             # and to invalidate the size of the parent directory
+        else:
+            rabbit_client = get_rabbitmq_client(self.app)
+            msg = FileDeletedMessage(
+                file_id=file_id,
+            )
+            await rabbit_client.publish(msg.channel_name, msg)
 
         async with self.engine.acquire() as conn:
             await db_file_meta_data.delete(conn, [file_id])

services/web/server/src/simcore_service_webserver/notifications/_rabbitmq_nonexclusive_queue_consumers.py

@@ -3,7 +3,10 @@
 from typing import Final
 
 from aiohttp import web
-from models_library.rabbitmq_messages import InstrumentationRabbitMessage
+from models_library.rabbitmq_messages import (
+    FileDeletedMessage,
+    InstrumentationRabbitMessage,
+)
 from servicelib.aiohttp.monitor_services import (
     MONITOR_SERVICE_STARTED_LABELS,
     MONITOR_SERVICE_STOPPED_LABELS,
@@ -43,12 +46,24 @@ async def _instrumentation_message_parser(app: web.Application, data: bytes) ->
     return True
 
 
+async def _file_deleted_message_parser(app: web.Application, data: bytes) -> bool:
+    rabbit_message = FileDeletedMessage.model_validate_json(data)
+    _logger.error("File %s deleted", rabbit_message.file_id)
+
+    return True
+
+
 _EXCHANGE_TO_PARSER_CONFIG: Final[tuple[SubcribeArgumentsTuple, ...,]] = (
     SubcribeArgumentsTuple(
         InstrumentationRabbitMessage.get_channel_name(),
         _instrumentation_message_parser,
         {"exclusive_queue": False},
     ),
+    SubcribeArgumentsTuple(
+        FileDeletedMessage.get_channel_name(),
+        _file_deleted_message_parser,
+        {"exclusive_queue": False},
+    ),
 )