udata 9.2.5.dev32160__py2.py3-none-any.whl → 9.2.5.dev32170__py2.py3-none-any.whl

udata/core/dataset/events.py

@@ -1,4 +1,6 @@
 import datetime
+from collections.abc import Callable
+from typing import Any
 
 import requests
 from flask import current_app
@@ -38,23 +40,28 @@ def serialize_resource_for_event(resource):
     return resource_dict
 
 
+def payload_for_resource(document: Any, resource_id: str | None) -> dict | None:
+    if resource_id is None:  # On delete, there is no resource_id, and no need for a payload.
+        return None
+    resource: dict = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
+    return {
+        "resource_id": str(resource_id),
+        "dataset_id": str(document.id),
+        "document": resource,
+    }
+
+
 @task(route="high.resource")
-def publish(url, document, resource_id, action):
+def publish(url: str, document: Any, resource_id: str, action: str) -> None:
+    method: Callable
     match action:
         case EventMessageType.CREATED:
             method = requests.post
-            resource = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
         case EventMessageType.MODIFIED:
             method = requests.put
-            resource = serialize_resource_for_event(get_by(document.resources, "id", resource_id))
         case EventMessageType.DELETED:
             method = requests.delete
-            resource = None
-    payload = {
-        "resource_id": str(resource_id),
-        "dataset_id": str(document.id),
-        "document": resource,
-    }
+    payload: dict | None = payload_for_resource(document, resource_id)
     headers = {}
     if current_app.config["RESOURCES_ANALYSER_API_KEY"]:
         headers = {"Authorization": f"Bearer {current_app.config['RESOURCES_ANALYSER_API_KEY']}"}
@@ -63,7 +70,7 @@ def publish(url, document, resource_id, action):
 
 
 @Dataset.on_resource_added.connect
-def publish_added_resource_message(sender, document, **kwargs):
+def publish_added_resource_message(sender, document, **kwargs) -> None:
     if current_app.config.get("PUBLISH_ON_RESOURCE_EVENTS") and current_app.config.get(
         "RESOURCES_ANALYSER_URI"
     ):
@@ -76,26 +83,28 @@ def publish_added_resource_message(sender, document, **kwargs):
 
 
 @Dataset.on_resource_updated.connect
-def publish_updated_resource_message(sender, document, **kwargs):
+def publish_updated_resource_message(sender, document, **kwargs) -> None:
     if current_app.config.get("PUBLISH_ON_RESOURCE_EVENTS") and current_app.config.get(
         "RESOURCES_ANALYSER_URI"
     ):
+        resource_id: str = kwargs["resource_id"]
         publish.delay(
-            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/",
+            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/{resource_id}",
             document,
-            kwargs["resource_id"],
+            resource_id,
             EventMessageType.MODIFIED,
         )
 
 
 @Dataset.on_resource_removed.connect
-def publish_removed_resource_message(sender, document, **kwargs):
+def publish_removed_resource_message(sender, document, **kwargs) -> None:
     if current_app.config.get("PUBLISH_ON_RESOURCE_EVENTS") and current_app.config.get(
         "RESOURCES_ANALYSER_URI"
     ):
+        resource_id: str = kwargs["resource_id"]
         publish.delay(
-            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/",
+            f"{current_app.config.get('RESOURCES_ANALYSER_URI')}/api/resources/{resource_id}",
             document,
-            kwargs["resource_id"],
+            None,
             EventMessageType.DELETED,
         )