Merge pull request #661 from chaen/inputdatapolicy_fix

fix InputDataPolicy schema definition

Author: chrisburr

diracx-core/src/diracx/core/config/schema.py

@@ -147,20 +147,29 @@ class JobDescriptionConfig(BaseModel):
     AllowedJobTypes: list[str] = ["User", "Test", "Hospital"]
 
 
-class InputDataPolicyConfig(BaseModel):
-    InputDataModule: str = "LocalInputData"
+class InputDataPolicyProtocolsConfig(BaseModel):
+    Remote: list[str] = []
+    Local: list[str] = []
 
 
-class ExternalsPolicyConfig(BaseModel):
-    SoftwareDistModule: str = "LocalSoftwareDist"
+class InputDataPolicyConfig(BaseModel):
+    # TODO: Remove this once the model is extended to support everything
+    model_config = ConfigDict(extra="ignore", frozen=True)
+
+    Default: str = "Default = DIRAC.WorkloadManagementSystem.Client.InputDataByProtocol"
+    Download: str = "DIRAC.WorkloadManagementSystem.Client.DownloadInputData"
+    Protocol: str = "DIRAC.WorkloadManagementSystem.Client.InputDataByProtocol"
+    AllReplicas: bool = True
+    Protocols: InputDataPolicyProtocolsConfig = InputDataPolicyProtocolsConfig()
+    InputDataModule: str = "DIRAC.Core.Utilities.InputDataResolution"
 
 
 class OperationsConfig(BaseModel):
     EnableSecurityLogging: bool = False
-    ExternalsPolicy: ExternalsPolicyConfig = ExternalsPolicyConfig()
     InputDataPolicy: InputDataPolicyConfig = InputDataPolicyConfig()
     JobDescription: JobDescriptionConfig = JobDescriptionConfig()
     Services: ServicesConfig = ServicesConfig()
+    SoftwareDistModule: str = "LocalSoftwareDist"
 
     Cloud: MutableMapping[str, Any] | None = None
     DataConsistency: MutableMapping[str, Any] | None = None

diracx-logic/src/diracx/logic/jobs/utils.py

@@ -39,7 +39,7 @@ def make_check_and_prepare_job_config(config: Config, vo: str):
     ops = config.Operations[vo]
     return {
         "inputDataPolicyForVO": ops.InputDataPolicy.InputDataModule,
-        "softwareDistModuleForVO": ops.ExternalsPolicy.SoftwareDistModule,
+        "softwareDistModuleForVO": ops.SoftwareDistModule,
         "defaultCPUTimeForOwnerGroup": ops.JobDescription.DefaultCPUTime,
         "getDIRACPlatform": partial(find_compatible_platforms, config=config),
     }