Update failed posts function

Author: stephen-riggs

src/murfey/cli/repost_failed_calls.py

@@ -2,13 +2,29 @@
 import json
 from datetime import datetime
 from functools import partial
+from inspect import getfullargspec
 from pathlib import Path
 from queue import Empty, Queue
 
-import requests
-from jose import jwt
+from sqlmodel import Session
 from workflows.transport.pika_transport import PikaTransport
 
+import murfey.server.api.auth
+import murfey.server.api.bootstrap
+import murfey.server.api.clem
+import murfey.server.api.display
+import murfey.server.api.file_io_frontend
+import murfey.server.api.file_io_instrument
+import murfey.server.api.hub
+import murfey.server.api.instrument
+import murfey.server.api.mag_table
+import murfey.server.api.processing_parameters
+import murfey.server.api.prometheus
+import murfey.server.api.session_control
+import murfey.server.api.session_info
+import murfey.server.api.websocket
+import murfey.server.api.workflow
+from murfey.server.murfey_db import get_murfey_db_session
 from murfey.util.config import security_from_file
 
 
@@ -85,26 +101,43 @@ def handle_dlq_messages(messages_path: list[Path], rabbitmq_credentials: Path):
     transport.disconnect()
 
 
-def handle_failed_posts(messages_path: list[Path], token: str):
+def handle_failed_posts(messages_path: list[Path], murfey_db: Session):
     """Deal with any messages that have been sent as failed client posts"""
     for json_file in messages_path:
         with open(json_file, "r") as json_data:
             message = json.load(json_data)
-
-        if not message.get("message") or not message["message"].get("url"):
-            print(f"{json_file} is not a failed client post")
+        router_name = message.get("router_name", "")
+        router_base = router_name.split(".")[0]
+        function_name = message.get("function_name", "")
+        if not router_name or not function_name:
+            print(
+                f"Cannot repost {json_file} as it does not have a router or function name"
+            )
             continue
-        dest = message["message"]["url"]
-        message_json = message["message"]["json"]
 
-        response = requests.post(
-            dest, json=message_json, headers={"Authorization": f"Bearer {token}"}
+        function_to_call = getattr(
+            getattr(murfey.server.api, router_base), function_name
         )
-        if response.status_code != 200:
-            print(f"Failed to repost {json_file}")
-        else:
+        expected_args = getfullargspec(function_to_call).args
+
+        call_kwargs = message.get("kwargs", {})
+        call_data = message.get("data", {})
+        function_call_dict = {}
+
+        for call_arg in expected_args:
+            if call_arg in call_kwargs.keys():
+                function_call_dict[call_arg] = call_kwargs[call_arg]
+            elif call_arg == "db":
+                function_call_dict["db"] = murfey_db
+            else:
+                function_call_dict[call_arg] = call_data
+
+        try:
+            function_to_call(**function_call_dict)
             print(f"Reposted {json_file}")
             json_file.unlink()
+        except Exception as e:
+            print(f"Failed to post {json_file} to {function_name}: {e}")
 
 
 def run():
@@ -123,26 +156,14 @@ def run():
         help="Security config file",
         required=True,
     )
-    parser.add_argument(
-        "-u",
-        "--username",
-        help="Token username",
-        required=True,
-    )
     parser.add_argument(
         "-d", "--dir", default="DLQ", help="Directory to export messages to"
     )
     args = parser.parse_args()
 
     # Read the security config file
     security_config = security_from_file(args.config)
-
-    # Get the token to post to the api with
-    token = jwt.encode(
-        {"user": args.username},
-        security_config.auth_key,
-        algorithm=security_config.auth_algorithm,
-    )
+    murfey_db = get_murfey_db_session(security_config)
 
     # Purge the queue and repost/reinject any messages found
     dlq_dump_path = Path(args.dir)
@@ -152,7 +173,7 @@ def run():
         security_config.feedback_queue,
         security_config.rabbitmq_credentials,
     )
-    handle_failed_posts(exported_messages, token)
+    handle_failed_posts(exported_messages, murfey_db)
     handle_dlq_messages(exported_messages, security_config.rabbitmq_credentials)
 
     # Clean up any created directories