Merge pull request #11088 from opaduchak/feature/ENG-7756

[ENG-7310] [ENG-7756] Implemnted communication from GV to OSF and addon action logging

Author: cslzchen

osf/__init__.py

@@ -0,0 +1,2 @@
+from .tasks import log_gv_addon
+__all__ = ['log_gv_addon']

osf/tasks.py

@@ -0,0 +1,47 @@
+import logging
+import re
+
+from django.db.models import Model
+
+from framework.celery_tasks import app
+from framework.sentry import log_message
+
+logger = logging.getLogger(__name__)
+iri_regex = re.compile(r'http://[^/]+/(?P<id>\w{5})/?')
+
+def get_object_by_url[T: Model](url: str, model: type[T]) -> T | None:
+    if not (match := iri_regex.match(url)):
+        log_message(f"received invalid {model.__name__} {url=}. ", skip_session=True)
+        return None
+    try:
+        return model.objects.get(guids___id=match['id'])
+    except model.DoesNotExist:
+        log_message(f"Could not find {model.__name__} with id={match['id']}", skip_session=True)
+        return None
+
+@app.task(max_retries=5, name='osf.tasks.log_gv_addon', default_retry_delay=10)
+def log_gv_addon(node_url: str, action: str, user_url: str, addon: str):
+    from osf.models import NodeLog, OSFUser, Node
+
+    PERMITTED_GV_ACTIONS = frozenset({
+        NodeLog.ADDON_ADDED,
+        NodeLog.ADDON_REMOVED
+    })
+    if action not in PERMITTED_GV_ACTIONS:
+        log_message(f"{action} is not permitted to be logged from GV", skip_session=True)
+        return
+
+    node = get_object_by_url(node_url, Node)
+    user = get_object_by_url(user_url, OSFUser)
+    if not node or not user:
+        return
+
+    node.add_log(
+        action=action,
+        auth=user,
+        params={
+            'node': node._id,
+            'project': node.parent_id,
+            'addon': addon
+        }
+    )

website/settings/defaults.py

@@ -421,6 +421,8 @@ class CeleryConfig:
     task_high_queue = 'high'
     task_remote_computing_queue = 'remote'
     task_account_status_changes_queue = 'account_status_changes'
+    task_external_high_queue = 'external_high'
+    task_external_low_queue = 'external_low'
 
     remote_computing_modules = {
         'addons.boa.tasks.submit_to_boa',
@@ -489,17 +491,53 @@ class CeleryConfig:
         pass
     else:
         task_queues = (
-            Queue(task_remote_computing_queue, Exchange(task_remote_computing_queue),
-                  routing_key=task_remote_computing_queue, consumer_arguments={'x-priority': -10}),
-            Queue(task_low_queue, Exchange(task_low_queue),
-                  routing_key=task_low_queue,  consumer_arguments={'x-priority': -1}),
-            Queue(task_default_queue, Exchange(task_default_queue),
-                  routing_key=task_default_queue, consumer_arguments={'x-priority': 0}),
-            Queue(task_med_queue, Exchange(task_med_queue),
-                  routing_key=task_med_queue, consumer_arguments={'x-priority': 1}),
-            Queue(task_high_queue, Exchange(task_high_queue),
-                  routing_key=task_high_queue, consumer_arguments={'x-priority': 10}),
-            Queue(task_account_status_changes_queue, Exchange(task_account_status_changes_queue), routing_key=task_account_status_changes_queue)
+            Queue(
+                task_remote_computing_queue,
+                Exchange(task_remote_computing_queue),
+                routing_key=task_remote_computing_queue,
+                consumer_arguments={'x-priority': -10},
+            ),
+            Queue(
+                task_low_queue,
+                Exchange(task_low_queue),
+                routing_key=task_low_queue,
+                consumer_arguments={'x-priority': -1},
+            ),
+            Queue(
+                task_default_queue,
+                Exchange(task_default_queue),
+                routing_key=task_default_queue,
+                consumer_arguments={'x-priority': 0},
+            ),
+            Queue(
+                task_med_queue,
+                Exchange(task_med_queue),
+                routing_key=task_med_queue,
+                consumer_arguments={'x-priority': 1},
+            ),
+            Queue(
+                task_high_queue,
+                Exchange(task_high_queue),
+                routing_key=task_high_queue,
+                consumer_arguments={'x-priority': 10},
+            ),
+            Queue(
+                task_account_status_changes_queue,
+                Exchange(task_account_status_changes_queue),
+                routing_key=task_account_status_changes_queue,
+            ),
+            Queue(
+                task_external_high_queue,
+                Exchange(task_external_high_queue),
+                routing_key=task_external_high_queue,
+                consumer_arguments={'x-priority': 9},
+            ),
+            Queue(
+                task_external_low_queue,
+                Exchange(task_external_low_queue),
+                routing_key=task_external_low_queue,
+                consumer_arguments={'x-priority': -2},
+            ),
         )
 
         task_default_exchange_type = 'direct'