DIRAC 9.0.0a59__py3-none-any.whl → 9.0.0a60__py3-none-any.whl

DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py

@@ -4,17 +4,17 @@
 # Date: 2013/03/25 07:44:19
 ########################################################################
 
-""" :mod: RemoveFile
+""":mod: RemoveFile
 
-    ================
+================
 
-    .. module: RemoveFile
+.. module: RemoveFile
 
-    :synopsis: removeFile operation handler
+:synopsis: removeFile operation handler
 
-    .. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
+.. moduleauthor:: Krzysztof.Ciba@NOSPAMgmail.com
 
-    removeFile operation handler
+removeFile operation handler
 """
 # #
 # @file RemoveFile.py
@@ -132,6 +132,7 @@ class RemoveFile(DMSRequestOperationsBase):
                     self.rmsMonitoringReporter.addRecord(
                         self.createRMSRecord("Successful", len(toRemoveDict) - len(bulkRemoval["Value"]))
                     )
+                toRemoveDict = bulkRemoval["Value"]
 
             # # 2nd step - single file removal
             for lfn, opFile in toRemoveDict.items():

DIRAC/FrameworkSystem/Client/ComponentInstaller.py

@@ -60,7 +60,6 @@ from collections import defaultdict
 
 import importlib_metadata as metadata
 import importlib_resources
-import MySQLdb
 from diraccfg import CFG
 from prompt_toolkit import prompt
 
@@ -96,7 +95,6 @@ from DIRAC.Core.Utilities.Extensions import (
     findServices,
 )
 from DIRAC.Core.Utilities.File import mkDir, mkLink
-from DIRAC.Core.Utilities.MySQL import MySQL
 from DIRAC.Core.Utilities.PrettyPrint import printTable
 from DIRAC.Core.Utilities.ReturnValues import S_ERROR, S_OK
 from DIRAC.Core.Utilities.Subprocess import systemCall
@@ -2055,6 +2053,8 @@ class ComponentInstaller:
         """
         Install requested DB in MySQL server
         """
+        import MySQLdb
+
         dbName = MySQLdb.escape_string(dbName.encode()).decode()
         if not self.mysqlRootPwd:
             rootPwdPath = cfgInstallPath("Database", "RootPwd")
@@ -2202,6 +2202,8 @@ class ComponentInstaller:
         """
         Execute MySQL Command
         """
+        from DIRAC.Core.Utilities.MySQL import MySQL
+
         if not self.mysqlRootPwd:
             return S_ERROR("MySQL root password is not defined")
         if dbName not in self.db:

DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py

@@ -243,12 +243,13 @@ class DownloadInputData:
             return S_ERROR(msg)
 
     def __getDownloadDir(self, incrementCounter=True):
+        jobIDPath = str(self.configuration.get("JobIDPath", os.getcwd()))
         if self.inputDataDirectory == "PerFile":
             if incrementCounter:
                 self.counter += 1
-            return tempfile.mkdtemp(prefix=f"InputData_{self.counter}", dir=os.getcwd())
+            return tempfile.mkdtemp(prefix=f"InputData_{self.counter}", dir=jobIDPath)
         elif self.inputDataDirectory == "CWD":
-            return os.getcwd()
+            return jobIDPath
         else:
             return self.inputDataDirectory
 

DIRAC/WorkloadManagementSystem/Client/test/Test_Client_DownloadInputData.py

@@ -1,6 +1,8 @@
 """Test for WMS clients."""
 # pylint: disable=protected-access, missing-docstring, invalid-name
 
+from pathlib import Path
+import shutil
 import pytest
 
 from unittest.mock import MagicMock
@@ -280,3 +282,30 @@ def test_DLI_execute_NoLocal(mocker, dli, mockSE):
     assert res["Value"]["Failed"]
     assert "/a/lfn/1.txt" in res["Value"]["Failed"], res
     assert res["Value"]["Failed"][0] == "/a/lfn/1.txt", res
+
+
+def test_DLI_execute_jobIDPath(mocker, dli, mockSE):
+    """Specify a jobIDPath. Output should be in the jobIDPath directory."""
+    mocker.patch("DIRAC.WorkloadManagementSystem.Client.DownloadInputData.gConfig.getValue", return_value=2)
+
+    # Create the jobIDPath directory
+    jobIDPath = Path().cwd() / "job" / "12345"
+    jobIDPath.mkdir(parents=True, exist_ok=True)
+
+    dli.configuration["JobIDPath"] = str(jobIDPath)
+
+    mocker.patch("DIRAC.WorkloadManagementSystem.Client.DownloadInputData.gConfig.getValue", return_value=2)
+    mockObjectSE = mockSE.return_value
+    mockObjectSE.getFileMetadata.return_value = S_OK(
+        {"Successful": {"/a/lfn/1.txt": {"Cached": 1, "Accessible": 0}}, "Failed": {}}
+    )
+    dli._downloadFromSE = MagicMock(side_effect=[S_ERROR("Failed to down"), S_OK({"path": jobIDPath / "1.txt"})])
+    dli._isCache = MagicMock(return_value=True)
+    res = dli.execute(dataToResolve=["/a/lfn/1.txt"])
+
+    assert res["OK"]
+    assert not res["Value"]["Failed"]
+    assert "/a/lfn/1.txt" in res["Value"]["Successful"], res
+
+    # Check that the output path is in the jobIDPath directory
+    assert res["Value"]["Successful"]["/a/lfn/1.txt"]["path"] == jobIDPath / "1.txt", res

{dirac-9.0.0a59.dist-info → dirac-9.0.0a60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DIRAC
-Version: 9.0.0a59
+Version: 9.0.0a60
 Summary: DIRAC is an interware, meaning a software framework for distributed computing.
 Home-page: https://github.com/DIRACGrid/DIRAC/
 License: GPL-3.0-only

{dirac-9.0.0a59.dist-info → dirac-9.0.0a60.dist-info}/RECORD

@@ -351,7 +351,7 @@ DIRAC/DataManagementSystem/Agent/RequestOperations/PutAndRegister.py,sha256=yajU
 DIRAC/DataManagementSystem/Agent/RequestOperations/ReTransfer.py,sha256=UKTx3M9y1R13KUWkCSehWH__LrJC1UT_4Hya8xfbnDY,4470
 DIRAC/DataManagementSystem/Agent/RequestOperations/RegisterFile.py,sha256=21_P-3-qLrCz4H3hvt9bX8c7dZ_7mJYdQOU6QOVxfsc,4858
 DIRAC/DataManagementSystem/Agent/RequestOperations/RegisterReplica.py,sha256=obFQAVy43TCE93X8q9XD0wUzgjsJRV_BpBcasb2dDcs,6647
-DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py,sha256=x-_qzZJ0cAkfOQhfclzQ9LBMST_kasO53zJMkPhohIE,10378
+DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveFile.py,sha256=eXVdBC75bWCSChs4SJLxME_WEGVbnFR7Ce_a5KJzLzU,10409
 DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveReplica.py,sha256=PTXocMcawugGtLhj9lCfFqDRG5D1I8ciFGBeRmrdLGo,8020
 DIRAC/DataManagementSystem/Agent/RequestOperations/ReplicateAndRegister.py,sha256=IMgwgOFYVd6LAG5-5gaqYkjgonDLT78vJBZ_HnAiiG4,27942
 DIRAC/DataManagementSystem/Agent/RequestOperations/StagingCallback.py,sha256=C80Oyd8QEFPXjPRjXeED2WXlBX0hAdtL0JdQfcYHohc,1423
@@ -491,7 +491,7 @@ DIRAC/FrameworkSystem/Agent/ProxyRenewalAgent.py,sha256=FMOx0IWpTISv7RyIeHg1NYr3
 DIRAC/FrameworkSystem/Agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DIRAC/FrameworkSystem/Agent/test/Test_ComponentSupervisionAgent.py,sha256=JAnTVE7fOAmEpboNhIKE2Arc7ibLoRszAbJ3lW8ReIg,32200
 DIRAC/FrameworkSystem/Client/BundleDeliveryClient.py,sha256=bA9QSQpFy1uBLhfRSoRT9Eld40WGlNDKX95TSAaJjkY,7546
-DIRAC/FrameworkSystem/Client/ComponentInstaller.py,sha256=CCpzqHdLeTuF0itwks0-gecpdOBd1GvgWW8O0Sp7M-k,97238
+DIRAC/FrameworkSystem/Client/ComponentInstaller.py,sha256=6kwLgZRZBFLoHp4B2pMx7MHVPXNIWpg3CMRlM5qgcCc,97256
 DIRAC/FrameworkSystem/Client/ComponentMonitoringClient.py,sha256=mnHqmezjPcdL8eJbKhVp3a7Fo051SMMt8uoc_pdKaxc,391
 DIRAC/FrameworkSystem/Client/Logger.py,sha256=_zh5KIH_51tFtPiMfL2fe9qOduUDIP_XBSWkqeO189s,313
 DIRAC/FrameworkSystem/Client/NotificationClient.py,sha256=m21yrr0TCPuesVEeDsgq6Yt6Lg3fLb6x1qWmAcL2GOE,2404
@@ -1143,7 +1143,7 @@ DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_PushJobAgent.py,sha256=YrQE
 DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py,sha256=ynC8NJobwWCRzKAKnQi2qhnPzwQypZRzBrwKGtUmmhs,11440
 DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_StalledJobAgent.py,sha256=uLgHSA3ZITeNxlPdgAYHjgUsL3Xa74g8Oy-0JTbX3K4,1938
 DIRAC/WorkloadManagementSystem/Client/CPUNormalization.py,sha256=txBgRfnTAY5KykpKRrK1jp5x4FInWjv-Rja4R7Dqdis,5423
-DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py,sha256=EJTMf31NyLmQTPWdgMBOxDnZz1r0Aeu7HHyCpgP54Wc,16233
+DIRAC/WorkloadManagementSystem/Client/DownloadInputData.py,sha256=JfidM3U2b0z64hk6j0VpQ7fh6eSkRjm1Hw8X-DAspwI,16303
 DIRAC/WorkloadManagementSystem/Client/InputDataByProtocol.py,sha256=tjK6L8iNqWOBENcGJbG0yJsQYwGvFLRFcTMNnrusFAI,12837
 DIRAC/WorkloadManagementSystem/Client/InputDataResolution.py,sha256=z8K8VKoUH4KtlTPe0mfyVsQKH6BQh80YIUhu61Fpgeg,6162
 DIRAC/WorkloadManagementSystem/Client/JobManagerClient.py,sha256=ySi2lxiwuEf8gx3exIbS_HekJRvpXR7q3h2MdwsRcYA,689
@@ -1175,7 +1175,7 @@ DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/FileCacheLoggingPlugin
 DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/MQPilotLoggingPlugin.py,sha256=ydt0jbc2F057zEkiA6tb3oi5JN2VFuNmY43ykw8xGT4,2105
 DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/PilotLoggingPlugin.py,sha256=MaWB5FhKb4MppfHhosYaS6GJUl99vGSMyHV3VGYn3oE,1415
 DIRAC/WorkloadManagementSystem/Client/PilotLoggingPlugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-DIRAC/WorkloadManagementSystem/Client/test/Test_Client_DownloadInputData.py,sha256=HRiavhMgYzIgkafBJXighnycIgTxs6pT_rw_YQC7b1Y,11094
+DIRAC/WorkloadManagementSystem/Client/test/Test_Client_DownloadInputData.py,sha256=QXEmRjc0Jc_omewIOxiosNES7QCD1yvntN1vIPfW3UI,12347
 DIRAC/WorkloadManagementSystem/Client/test/Test_Client_WorkloadManagementSystem.py,sha256=nlOplAKQQYdEn89jRbWAChXjaM5-aWt-wY4GxbQXD-c,2291
 DIRAC/WorkloadManagementSystem/Client/test/Test_JobReport.py,sha256=QYElAZiyPuMKYSGBRJO0-1K7-0HhEJjSohqC96lWzDs,852
 DIRAC/WorkloadManagementSystem/Client/test/Test_TornadoPilotLoggingClient.py,sha256=GRY5TA34FwLNmvVix5U2nT-5Jw1Cs8K5MJtzQ_ZlLBw,596
@@ -1297,9 +1297,9 @@ DIRAC/tests/Workflow/Integration/exe-script.py,sha256=B_slYdTocEzqfQLRhwuPiLyYUn
 DIRAC/tests/Workflow/Integration/helloWorld.py,sha256=tBgEHH3ZF7ZiTS57gtmm3DW-Qxgm_57HWHpM-Y8XSws,205
 DIRAC/tests/Workflow/Regression/helloWorld.py,sha256=69eCgFuVSYo-mK3Dj2dw1c6g86sF5FksKCf8V2aGVoM,509
 DIRAC/tests/Workflow/Regression/helloWorld.xml,sha256=xwydIcFTAHIX-YPfQfyxuQ7hzvIO3IhR3UAF7ORgkGg,5310
-dirac-9.0.0a59.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
-dirac-9.0.0a59.dist-info/METADATA,sha256=o752F9cu0B28GNuUVM5XdAEXs-5byWLGqVvDQkTmo_c,9957
-dirac-9.0.0a59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dirac-9.0.0a59.dist-info/entry_points.txt,sha256=rTtMPd5AGCg3zNaKE60PuEVFkSRzQlRG-DC_v9FCylM,16824
-dirac-9.0.0a59.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
-dirac-9.0.0a59.dist-info/RECORD,,
+dirac-9.0.0a60.dist-info/licenses/LICENSE,sha256=uyr4oV6jmjUeepXZPPjkJRwa5q5MrI7jqJz5sVXNblQ,32452
+dirac-9.0.0a60.dist-info/METADATA,sha256=SNxluakCtKWSHyDq1jPhCq0Y5P8JHLbwbZC31TwpvSo,9957
+dirac-9.0.0a60.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dirac-9.0.0a60.dist-info/entry_points.txt,sha256=rTtMPd5AGCg3zNaKE60PuEVFkSRzQlRG-DC_v9FCylM,16824
+dirac-9.0.0a60.dist-info/top_level.txt,sha256=RISrnN9kb_mPqmVu8_o4jF-DSX8-h6AcgfkO9cgfkHA,6
+dirac-9.0.0a60.dist-info/RECORD,,