Skip to content

fix (Interfaces): Dirac().getInputDataCatalog: distinguish correctly between input data policy and input data modules #8409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 1 commit into from
Dec 18, 2025
Merged

fix (Interfaces): Dirac().getInputDataCatalog: distinguish correctly between input data policy and input data modules #8409

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/DIRAC/Interfaces/API/Dirac.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,9 @@ def getInputDataCatalog(

self.log.verbose(localSEList)

if not inputDataPolicy:
inputDataPolicy = Operations().getValue("InputDataPolicy/InputDataModule")
if not inputDataPolicy:
return self._errorReport("Could not retrieve /DIRAC/Operations/InputDataPolicy/InputDataModule for VO")
inputDataModule = Operations().getValue("InputDataPolicy/InputDataModule")
if not inputDataModule:
return self._errorReport("Could not retrieve /DIRAC/Operations/InputDataPolicy/InputDataModule for VO")

self.log.info(f"Attempting to resolve data for {siteName}")
self.log.verbose("%s" % ("\n".join(lfns)))
Expand Down Expand Up @@ -286,11 +285,13 @@ def getInputDataCatalog(

self.log.verbose(configDict)
argumentsDict = {"FileCatalog": resolvedData, "Configuration": configDict, "InputData": lfns}
if inputDataPolicy:
argumentsDict["Job"] = {"InputDataPolicy": inputDataPolicy}
if ignoreMissing:
argumentsDict["IgnoreMissing"] = True
self.log.verbose(argumentsDict)

result = self.objectLoader.loadObject(inputDataPolicy)
result = self.objectLoader.loadObject(inputDataModule)
if not result["OK"]:
return result
module = result["Value"](argumentsDict)
Expand Down
Loading