fix: Fix lint, and removed generated code

Author: Robin Van de Merghel

src/DIRAC/WorkloadManagementSystem/FutureClient/PilotManagerClient.py

@@ -1,4 +1,3 @@
-from diracx.client._generated.models import BodyPilotsAddJobsToPilot, BodyPilotsAddPilotStamps, ScalarSearchSpec, SearchParams
 from DIRAC.Core.Utilities.ReturnValues import convertToReturnValue
 
 from DIRAC.Core.Security.DiracX import DiracXClient
@@ -9,20 +8,14 @@ class PilotManagerClient:
     def addPilotReferences(self, pilot_stamps, VO, gridType="DIRAC", pilot_references={}):
         with DiracXClient() as api:
             # We will move toward a stamp as identifier for the pilot
-            return api.pilots.add_pilot_stamps(BodyPilotsAddPilotStamps(
-                pilot_stamps=pilot_stamps,
-                vo=VO,
-                grid_type=gridType,
-                pilot_references=pilot_references
-            ))
-
+            return api.pilots.add_pilot_stamps(
+                {"pilot_stamps": pilot_stamps, "vo": VO, "grid_type": gridType, "pilot_references": pilot_references}
+            )
 
     def set_pilot_field(self, pilot_stamp, values_dict):
         with DiracXClient() as api:
             values_dict["PilotStamp"] = pilot_stamp
-            return api.pilots.update_pilot_fields(
-                values_dict
-            )
+            return api.pilots.update_pilot_fields(values_dict)
 
     @convertToReturnValue
     def setPilotBenchmark(self, pilotStamp, mark):
@@ -34,68 +27,52 @@ def setAccountingFlag(self, pilotStamp, flag):
 
     @convertToReturnValue
     def setPilotStatus(self, pilot_stamp, status, destination=None, reason=None, grid_site=None, queue=None):
-        return self.set_pilot_field(pilot_stamp, {
-            "Status": status,
-            "DestinationSite": destination,
-            "StatusReason": reason,
-            "GridSite": grid_site,
-            "Queue": queue
-        })
-    
+        return self.set_pilot_field(
+            pilot_stamp,
+            {
+                "Status": status,
+                "DestinationSite": destination,
+                "StatusReason": reason,
+                "GridSite": grid_site,
+                "Queue": queue,
+            },
+        )
+
     @convertToReturnValue
     def clearPilots(self, interval=30, aborted_interval=7):
         with DiracXClient() as api:
-            api.pilots.delete_pilots(
-                age_in_days=interval,
-                delete_only_aborted=False
-            )
-            api.pilots.delete_pilots(
-                age_in_days=aborted_interval,
-                delete_only_aborted=True
-            )
+            api.pilots.delete_pilots(age_in_days=interval, delete_only_aborted=False)
+            api.pilots.delete_pilots(age_in_days=aborted_interval, delete_only_aborted=True)
 
     @convertToReturnValue
     def deletePilots(self, pilot_stamps):
         with DiracXClient() as api:
-            api.pilots.delete_pilots(
-                pilot_stamps=pilot_stamps 
-            )
+            api.pilots.delete_pilots(pilot_stamps=pilot_stamps)
 
     @convertToReturnValue
     def setJobForPilot(self, job_id, pilot_stamp, destination=None):
         with DiracXClient() as api:
-            api.pilots.add_jobs_to_pilot(BodyPilotsAddJobsToPilot(
-                pilot_stamp=pilot_stamp, 
-                job_ids=[job_id]
-            ))
+            api.pilots.add_jobs_to_pilot({"pilot_stamp": pilot_stamp, "job_ids": [job_id]})
+
+            self.set_pilot_field(
+                pilot_stamp,
+                {
+                    "DestinationSite": destination,
+                },
+            )
 
-            self.set_pilot_field(pilot_stamp, {
-                "DestinationSite": destination,
-            })
-    
     @convertToReturnValue
     def getPilots(self, job_id):
         with DiracXClient() as api:
-            pilot_ids = api.pilots.get_pilot_jobs(
-                job_id=job_id
-            )
+            pilot_ids = api.pilots.get_pilot_jobs(job_id=job_id)
 
             query = [{"parameter": "PilotID", "operator": "in", "value": pilot_ids}]
 
-            return api.pilots.search(
-                parameters=[],
-                search=query,
-                sort=[]
-            )
+            return api.pilots.search(parameters=[], search=query, sort=[])
 
-    
     @convertToReturnValue
     def getPilotInfo(self, pilot_stamp):
         with DiracXClient() as api:
             query = [{"parameter": "PilotStamp", "operator": "eq", "value": pilot_stamp}]
 
-            return api.pilots.search(
-                parameters=[],
-                search=query,
-                sort=[]
-            )
+            return api.pilots.search(parameters=[], search=query, sort=[])

src/DIRAC/WorkloadManagementSystem/Service/PilotManagerHandler.py

@@ -194,7 +194,6 @@ def _getRemotePilotOutput(self, pilotReference, pilotDict):
         # return res, correct or not
         return res
 
-
     ##############################################################################
     types_selectPilots = [dict]
 
@@ -274,7 +273,6 @@ def export_getGroupedPilotSummary(cls, columnList):
         """
         return cls.pilotAgentsDB.getGroupedPilotSummary(columnList)
 
-
     types_countPilots = [dict]
 
     @classmethod
@@ -283,7 +281,6 @@ def export_countPilots(cls, condDict, older=None, newer=None, timeStamp="Submiss
 
         return cls.pilotAgentsDB.countPilots(condDict, older, newer, timeStamp)
 
-
     # --------------- Moved to DiracX ---------------
 
     #############################################
@@ -296,13 +293,11 @@ def export_addPilotReferences(cls, pilotStamps, VO, gridType="DIRAC", pilotRefDi
         pilot_references = pilotRefDict.values()
         pilot_stamp_dict = dict(zip(pilotStamps, pilot_references))
 
-
         return cls.pilotAgentsDB.addPilotReferences(pilot_references, VO, gridType, pilot_stamp_dict)
 
-
     #############################################
     types_setJobForPilot = [[str, int], str]
-    
+
     @classmethod
     def export_setJobForPilot(cls, jobID, pilotRef, destination=None):
         """Report the DIRAC job ID which is executed by the given pilot job"""
@@ -334,7 +329,6 @@ def export_setAccountingFlag(cls, pilotRef, mark="True"):
         """Set the pilot AccountingSent flag"""
         return cls.pilotAgentsDB.setAccountingFlag(pilotRef, mark)
 
-
     #############################################
     types_setPilotStatus = [str, str]
 
@@ -348,12 +342,12 @@ def export_setPilotStatus(cls, pilotRef, status, destination=None, reason=None,
 
     #############################################
     types_deletePilots = [[list, str, int]]
-    
+
     @classmethod
     def export_deletePilots(cls, pilotIDs):
         if isinstance(pilotIDs, str):
             return cls.pilotAgentsDB.deletePilot(pilotIDs)
-        
+
         # And list[str]????
         # pilot_id>>>S<<<
 
@@ -374,8 +368,8 @@ def export_deletePilots(cls, pilotIDs):
     @classmethod
     def export_clearPilots(cls, interval=30, aborted_interval=7):
         return cls.pilotAgentsDB.clearPilots(interval, aborted_interval)
-    
-    ##############################################################################
+
+    #############################################
     types_getPilots = [[str, int]]
 
     @classmethod
@@ -386,8 +380,8 @@ def export_getPilots(cls, jobID):
             return S_ERROR(f"Failed to get pilot for Job {int(jobID)}: {result.get('Message', '')}")
 
         return cls.pilotAgentsDB.getPilotInfo(pilotID=result["Value"])
-    
-    ##############################################################################
+
+    #############################################
     types_getPilotInfo = [[list, str]]
 
     @classmethod