Merge pull request #442 from PanDAWMS/interface_2

Clean up of userinterface module (Client.py and UserIF.py)
PanDAWMS · Oct 31, 2024 · 4ae2c27 · 4ae2c27
2 parents cd8de62 + 6912c21
commit 4ae2c27
Show file tree

Hide file tree

Showing 8 changed files with 1,064 additions and 4,553 deletions.
diff --git a/pandaserver/daemons/scripts/datasetManager.py b/pandaserver/daemons/scripts/datasetManager.py
@@ -31,7 +31,7 @@ def main(tbuf=None, **kwargs):
     # memory checker
     def _memoryCheck(str):
         try:
-            proc_status = "/proc/%d/status" % os.getpid()
+            proc_status = f"/proc/{os.getpid()}/status"
             procfile = open(proc_status)
             name = ""
             vmSize = ""

diff --git a/pandaserver/server/panda.py b/pandaserver/server/panda.py
@@ -81,12 +81,10 @@
 from pandaserver.userinterface.UserIF import (
     addHarvesterDialogs,
     avalancheTask,
-    changeJobPriorities,
     changeTaskAttributePanda,
     changeTaskModTimePanda,
     changeTaskPriority,
     changeTaskSplitRulePanda,
-    checkMergeGenerationStatus,
     checkSandboxFile,
     enableJumboJobs,
     execute_idds_workflow_command,
@@ -95,38 +93,19 @@
     get_files_in_datasets,
     get_job_statistics_per_site_label_resource,
     get_user_secrets,
-    getActiveDatasets,
-    getCloudSpecs,
-    getDisInUseForAnal,
-    getFilesInUseForAnal,
     getFullJobStatus,
-    getGShareStatus,
-    getHighestPrioJobStat,
     getJediTaskDetails,
     getJediTasksInTimeRange,
-    getJobIDsInTimeRange,
     getJobStatistics,
     getJobStatisticsForBamboo,
     getJobStatisticsPerSite,
     getJobStatisticsPerSiteResource,
-    getJobStatisticsPerUserSite,
-    getJobStatisticsWithLabel,
     getJobStatus,
-    getJobsToBeUpdated,
     getJumboJobDatasets,
-    getLFNsInUseForAnal,
-    getNumPilots,
     getPandaClientVer,
-    getPandaIDsSite,
     getPandaIDsWithTaskID,
-    getPandaIDwithJobExeID,
-    getPandIDsWithJobID,
-    getQueuedAnalJobs,
-    getRetryHistory,
     getScriptOfflineRunning,
-    getSerialNumberForGroupJob,
     getSiteSpecs,
-    getSlimmedFileInfoPandaIDs,
     getTaskParamsMap,
     getTaskStatus,
     getUserJobMetadata,
@@ -138,11 +117,7 @@
     killJobs,
     killTask,
     killUnfinishedJobs,
-    listTasksInShare,
     pauseTask,
-    queryJobInfoPerCloud,
-    queryLastFilesInDataset,
-    queryPandaIDs,
     reactivateTask,
     reassignJobs,
     reassignShare,
@@ -152,17 +127,14 @@
     reloadInput,
     reportWorkerStats,
     reportWorkerStats_jobtype,
-    resubmitJobs,
     resumeTask,
-    retryFailedJobsInActive,
     retryTask,
     send_command_to_job,
     set_user_secret,
     setDebugMode,
     setNumSlotsForWP,
     submitJobs,
     sweepPQ,
-    updateProdDBUpdateTimes,
     updateServiceMetrics,
     updateWorkers,
     userIF,

diff --git a/pandaserver/srvcore/allowed_methods.py b/pandaserver/srvcore/allowed_methods.py
@@ -48,50 +48,24 @@
 allowed_methods += [
     "submitJobs",
     "getJobStatus",
-    "queryPandaIDs",
     "killJobs",
     "reassignJobs",
     "getJobStatistics",
     "getJobStatisticsPerSite",
-    "resubmitJobs",
-    "queryLastFilesInDataset",
-    "getPandaIDsSite",
-    "getJobsToBeUpdated",
-    "updateProdDBUpdateTimes",
     "getSiteSpecs",
-    "getCloudSpecs",
-    "queryJobInfoPerCloud",
-    "getJobIDsInTimeRange",
-    "getPandIDsWithJobID",
     "getFullJobStatus",
     "getJobStatisticsForBamboo",
-    "getFilesInUseForAnal",
     "getPandaClientVer",
-    "getSlimmedFileInfoPandaIDs",
-    "getQueuedAnalJobs",
-    "getHighestPrioJobStat",
-    "getActiveDatasets",
-    "getSerialNumberForGroupJob",
-    "checkMergeGenerationStatus",
-    "getNumPilots",
-    "retryFailedJobsInActive",
-    "getJobStatisticsWithLabel",
-    "getPandaIDwithJobExeID",
-    "getJobStatisticsPerUserSite",
-    "getDisInUseForAnal",
-    "getLFNsInUseForAnal",
     "getScriptOfflineRunning",
     "setDebugMode",
     "insertSandboxFileInfo",
     "checkSandboxFile",
-    "changeJobPriorities",
     "insertTaskParams",
     "killTask",
     "finishTask",
     "getJediTasksInTimeRange",
     "getJediTaskDetails",
     "retryTask",
-    "getRetryHistory",
     "changeTaskPriority",
     "reassignTask",
     "changeTaskAttributePanda",
@@ -106,7 +80,6 @@
     "reactivateTask",
     "getTaskStatus",
     "reassignShare",
-    "listTasksInShare",
     "getTaskParamsMap",
     "updateWorkers",
     "harvesterIsAlive",
@@ -121,7 +94,6 @@
     "updateServiceMetrics",
     "getUserJobMetadata",
     "getJumboJobDatasets",
-    "getGShareStatus",
     "sweepPQ",
     "get_job_statistics_per_site_label_resource",
     "relay_idds_command",