refactor: move DIRAC TS WebApp related RPC calls to dedicated service

Author: fstagni

src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py

@@ -6,7 +6,7 @@
 
 from DIRAC import gConfig, gLogger
 from DIRAC.Core.Utilities import TimeUtilities
-from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient
+from DIRAC.MonitoringSystem.Client.WebAppClient import WebAppClient
 
 from WebAppDIRAC.Lib.WebHandler import WebHandler, WErr
 
@@ -18,8 +18,8 @@ def web_getSelectionData(self):
         if self.getUserName().lower() == "anonymous":
             return {"prod": [["Insufficient rights"]]}
 
-        tsClient = TransformationClient()
-        if (result := tsClient.getDistinctAttributeValues("Plugin", {}))["OK"]:
+        waClient = WebAppClient()
+        if (result := waClient.getDistinctAttributeValues("Plugin", {}))["OK"]:
             plugin = []
             if len(result["Value"]) > 0:
                 for i in result["Value"]:
@@ -30,7 +30,7 @@ def web_getSelectionData(self):
             plugin = "Error during RPC call"
         callback = {"plugin": plugin}
 
-        if (result := tsClient.getDistinctAttributeValues("Status", {}))["OK"]:
+        if (result := waClient.getDistinctAttributeValues("Status", {}))["OK"]:
             status = []
             if len(result["Value"]) > 0:
                 for i in result["Value"]:
@@ -41,7 +41,7 @@ def web_getSelectionData(self):
             status = "Error during RPC call"
         callback["prodStatus"] = status
 
-        if (result := tsClient.getDistinctAttributeValues("TransformationGroup", {}))["OK"]:
+        if (result := waClient.getDistinctAttributeValues("TransformationGroup", {}))["OK"]:
             group = []
             if len(result["Value"]) > 0:
                 for i in result["Value"]:
@@ -52,7 +52,7 @@ def web_getSelectionData(self):
             group = "Error during RPC call"
         callback["transformationGroup"] = group
 
-        if (result := tsClient.getDistinctAttributeValues("AgentType", {}))["OK"]:
+        if (result := waClient.getDistinctAttributeValues("AgentType", {}))["OK"]:
             atype = []
             if len(result["Value"]) > 0:
                 for i in result["Value"]:
@@ -63,7 +63,7 @@ def web_getSelectionData(self):
             atype = "Error during RPC call"
         callback["agentType"] = atype
 
-        if (result := tsClient.getDistinctAttributeValues("Type", {}))["OK"]:
+        if (result := waClient.getDistinctAttributeValues("Type", {}))["OK"]:
             transType = []
             if result["Value"]:
                 for i in result["Value"]:
@@ -116,8 +116,8 @@ def web_getTransformationData(
             TransformationFamily,
         )
 
-        tsClient = TransformationClient(timeout=3600)
-        if not (result := tsClient.getTransformationSummaryWeb(params, self.globalSort, start, limit))["OK"]:
+        waClient = WebAppClient(timeout=3600)
+        if not (result := waClient.getTransformationSummaryWeb(params, self.globalSort, start, limit))["OK"]:
             return {"success": "false", "error": result["Message"]}
 
         data = result["Value"]
@@ -175,7 +175,7 @@ def web_action(self, data_kind, id: int, tasks: int = None):
         return {"success": "false", "error": "Action is unknown!!!"}
 
     def web_executeOperation(self, action, ids):
-        tsClient = TransformationClient()
+        waClient = WebAppClient()
 
         agentType = "Manual"
         if action == "clean":
@@ -197,10 +197,10 @@ def web_executeOperation(self, action, ids):
 
         for i in ids.split(","):
             try:
-                result = tsClient.setTransformationParameter(transid := int(i), "Status", status)
+                result = waClient.setTransformationParameter(transid := int(i), "Status", status)
                 if result["OK"]:
                     resString = f"ProdID: {transid} set to {action} successfully"
-                    result = tsClient.setTransformationParameter(transid, "AgentType", agentType)
+                    result = waClient.setTransformationParameter(transid, "AgentType", agentType)
                     if not result["OK"]:
                         resString = f"ProdID: {transid} failed to set to {action}: {result['Message']}"
                 else:
@@ -212,16 +212,16 @@ def web_executeOperation(self, action, ids):
         return {"success": "true", "showResult": callback}
 
     def __fileRetry(self, prodid, mode):
-        tsClient = TransformationClient()
+        waClient = WebAppClient()
         result = None
         if mode == "proc":
-            result = tsClient.getTransformationFilesCount(prodid, "ErrorCount", {"Status": "Processed"})
+            result = waClient.getTransformationFilesCount(prodid, "ErrorCount", {"Status": "Processed"})
         elif mode == "not":
-            result = tsClient.getTransformationFilesCount(
+            result = waClient.getTransformationFilesCount(
                 prodid, "ErrorCount", {"Status": ["Unused", "Assigned", "Failed"]}
             )
         elif mode == "all":
-            result = tsClient.getTransformationFilesCount(prodid, "ErrorCount")
+            result = waClient.getTransformationFilesCount(prodid, "ErrorCount")
 
         if not result["OK"]:
             return {"success": "false", "error": result["Message"]}
@@ -238,12 +238,12 @@ def __fileRetry(self, prodid, mode):
         return {"success": "true", "result": resList}
 
     def __dataQuery(self, prodid):
-        tsClient = TransformationClient()
+        waClient = WebAppClient()
 
         # FIXME: getTransformationInputDataQuery has been replaced by getTransformationMetaQuery in DIRAC v7r0
-        result = tsClient.getTransformationMetaQuery(prodid, "Input")
+        result = waClient.getTransformationMetaQuery(prodid, "Input")
         if not result["OK"] and "Unknown method" in result["Message"]:
-            result = tsClient.getTransformationInputDataQuery(prodid)
+            result = waClient.getTransformationInputDataQuery(prodid)
 
         gLogger.debug("-= #######", result)
         if not result["OK"]:
@@ -253,20 +253,20 @@ def __dataQuery(self, prodid):
         return {"success": "true", "result": back}
 
     def __additionalParams(self, prodid):
-        if not (result := TransformationClient().getAdditionalParameters(prodid))["OK"]:
+        if not (result := WebAppClient().getAdditionalParameters(prodid))["OK"]:
             return {"success": "false", "error": result["Message"]}
         data = result["Value"]
         back = [[i, data[i]] for i in sorted(data)]
         return {"success": "true", "result": back}
 
     def __workflowxml(self, transid):
-        tsClient = TransformationClient()
-        if not (result := tsClient.getTransformations({"TransformationID": transid}))["OK"]:
+        waClient = WebAppClient()
+        if not (result := waClient.getTransformations({"TransformationID": transid}))["OK"]:
             raise WErr.fromSERROR(result)
         return {"success": "true", "result": result["Value"][0]["Body"]}
 
     def __getLoggingInfo(self, transid):
-        if (result := TransformationClient().getTransformationLogging(transid))["OK"]:
+        if (result := WebAppClient().getTransformationLogging(transid))["OK"]:
             if len(data := result["Value"]) > 0:
                 userdb = {}
                 callback = []
@@ -282,8 +282,8 @@ def __getLoggingInfo(self, transid):
         return {"success": "false", "error": result["Message"]}
 
     def __transformationFileStatus(self, transid):
-        tsClient = TransformationClient()
-        if not (result := tsClient.getTransformationFilesCount(transid, "Status"))["OK"]:
+        waClient = WebAppClient()
+        if not (result := waClient.getTransformationFilesCount(transid, "Status"))["OK"]:
             return {"success": "false", "error": result["Message"]}
         resList = []
         if (total := result["Value"].pop("Total")) == 0:
@@ -297,8 +297,8 @@ def __transformationFileStatus(self, transid):
         return {"success": "true", "result": resList}
 
     def __transformationDetail(self, prodid):
-        tsClient = TransformationClient()
-        if not (result := tsClient.getTransformationParameters(prodid, ["DetailedInfo"]))["OK"]:
+        waClient = WebAppClient()
+        if not (result := waClient.getTransformationParameters(prodid, ["DetailedInfo"]))["OK"]:
             return {"success": "false", "error": result["Message"]}
         if callback := result["Value"]:
             return {"success": "true", "result": callback}
@@ -307,15 +307,15 @@ def __transformationDetail(self, prodid):
 
     def __extendTransformation(self, transid, tasks):
         gLogger.info(f"Extend transformation ({transid}, {tasks})")
-        if (result := TransformationClient().extendTransformation(transid, tasks))["OK"]:
+        if (result := WebAppClient().extendTransformation(transid, tasks))["OK"]:
             resString = f"{transid} extended by {tasks} successfully"
         else:
             resString = f"{transid} failed to extend: {result['Message']}"
         gLogger.debug("#######", result)
         return {"success": "true", "showResult": [resString], "result": resString}
 
     def web_showFileStatus(self, start: int, limit: int, transformationId, status):
-        result = TransformationClient().getTransformationFilesSummaryWeb(
+        result = WebAppClient().getTransformationFilesSummaryWeb(
             {"TransformationID": transformationId, "Status": status},
             [["FileID", "ASC"]],
             start,
@@ -357,7 +357,7 @@ def web_getTier1Sites(self):
 
     def web_setSite(self, TransformationId: int, RunNumber: int, Site):
         gLogger.info(f"\033[0;31m setTransformationRunsSite({TransformationId}, {RunNumber}, {Site}) \033[0m")
-        result = TransformationClient().setTransformationRunsSite(TransformationId, RunNumber, Site)
+        result = WebAppClient().setTransformationRunsSite(TransformationId, RunNumber, Site)
         if result["OK"]:
             return {"success": "true", "result": "true"}
         return {"success": "false", "error": result["Message"]}
@@ -379,7 +379,7 @@ def _prepareSearchParameters(
         transformationGroup,
         TransformationFamily,
     ):
-        """Prepare a query dictionary which can be used with TransformationClient.getTransformationSummaryWeb
+        """Prepare a query dictionary which can be used with WebAppClient.getTransformationSummaryWeb
 
         Note: This method can be overridden by extensions
         """