Merge branch 'main' into resource_requirements

Author: Stellatsuu

.gitignore

@@ -169,6 +169,7 @@ cython_debug/
 workernode
 sandboxstore
 filecatalog
+status
 
 # Generated schemas - these are build artifacts generated by CI/CD
 generated_schemas/*

src/dirac_cwl/execution_hooks/core.py

@@ -32,7 +32,7 @@
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr
 
 from dirac_cwl.commands import PostProcessCommand, PreProcessCommand
-from dirac_cwl.data_management_mocks.data_manager import MockDataManager
+from dirac_cwl.mocks.data_manager import MockDataManager
 
 logger = logging.getLogger(__name__)
 
@@ -105,7 +105,7 @@ def name(cls) -> str:
         """Auto-derive hook plugin identifier from class name."""
         return cls.__name__
 
-    def store_output(
+    async def store_output(
         self,
         outputs: dict[str, str | Path | Sequence[str | Path]],
         **kwargs: Any,
@@ -119,14 +119,13 @@ def store_output(
             Additional keyword arguments for extensibility.
         """
         for output_name, src_path in outputs.items():
-            logger.info("Storing output %s, with source %s", output_name, src_path)
-
             if not src_path:
                 raise RuntimeError(f"src_path parameter required for filesystem storage of {output_name}")
 
             lfn = self.output_paths.get(output_name, None)
 
             if lfn:
+                logger.info("Storing output %s, with source %s", output_name, src_path)
                 if isinstance(src_path, str) or isinstance(src_path, Path):
                     src_path = [src_path]
                 for src in src_path:

src/dirac_cwl/job/__init__.py

@@ -231,6 +231,7 @@ def run_job(job_id: int, job: JobModel, logger: logging.Logger) -> bool:
             "-m",
             "dirac_cwl.job.job_wrapper_template",
             str(job_json_path),
+            str(job_id),
         ],
         capture_output=True,
         text=True,

src/dirac_cwl/job/job_report.py

@@ -0,0 +1,108 @@
+"""All classes related to job reports."""
+
+from datetime import datetime, timezone
+from enum import StrEnum
+
+from diracx.client.aio import AsyncDiracClient
+from diracx.core.models.job import JobStatus, JobStatusUpdate
+
+
+class JobMinorStatus(StrEnum):
+    """List of all available job minor statuses."""
+
+    APPLICATION = "Executing Payload"
+    APP_ERRORS = "Application Finished With Errors"
+    # APP_NOT_FOUND = "Application not found"
+    APP_SUCCESS = "Application Finished Successfully"
+    # APP_THREAD_FAILED = "Application thread failed"
+    # APP_THREAD_NOT_COMPLETE = "Application thread did not complete"
+    DOWNLOADING_INPUT_SANDBOX = "Downloading InputSandbox"
+    # DOWNLOADING_INPUT_SANDBOX_LFN = "Downloading InputSandbox LFN(s)"
+    # EXCEPTION_DURING_EXEC = "Exception During Execution"
+    EXEC_COMPLETE = "Execution Complete"
+    FAILED_DOWNLOADING_INPUT_SANDBOX = "Failed Downloading InputSandbox"
+    # FAILED_DOWNLOADING_INPUT_SANDBOX_LFN = "Failed Downloading InputSandbox LFN(s)"
+    # FAILED_SENDING_REQUESTS = "Failed sending requests"
+    # GOING_RESCHEDULE = "Going to reschedule job"
+    # ILLEGAL_JOB_JDL = "Illegal Job JDL"
+    INPUT_DATA_RESOLUTION = "Resolving Input Data"
+    # INPUT_NOT_AVAILABLE = "Input Data Not Available"
+    # JOB_EXCEEDED_CPU = "Job has reached the CPU limit of the queue"
+    # JOB_EXCEEDED_WALL_CLOCK = "Job has exceeded maximum wall clock time"
+    JOB_INITIALIZATION = "Initializing Job"
+    # JOB_INSUFFICIENT_DISK = "Job has insufficient disk space to continue"
+    # JOB_WRAPPER_EXECUTION = "JobWrapper execution"
+    # JOB_WRAPPER_INITIALIZATION = "Job Wrapper Initialization"
+    # MARKED_FOR_TERMINATION = "Marked for termination"
+    # NO_CANDIDATE_SITE_FOUND = "No candidate sites available"
+    OUTPUT_DATA_UPLOADED = "Output Data Uploaded"
+    OUTPUT_SANDBOX_UPLOADED = "Output Sandbox Uploaded"
+    # PENDING_REQUESTS = "Pending Requests"
+    # PILOT_AGENT_SUBMISSION = "Pilot Agent Submission"
+    # RECEIVED_KILL_SIGNAL = "Received Kill signal"
+    # REQUESTS_DONE = "Requests done"
+    # RESCHEDULED = "Job Rescheduled"
+    RESOLVING_OUTPUT_SANDBOX = "Resolving Output Sandbox"
+    # STALLED_PILOT_NOT_RUNNING = "Job stalled: pilot not running"
+    # UPLOADING_JOB_OUTPUTS = "Uploading Outputs"
+    UPLOADING_OUTPUT_DATA = "Uploading Output Data"
+    UPLOADING_OUTPUT_SANDBOX = "Uploading Output Sandbox"
+    # WATCHDOG_STALLED = "Watchdog identified this job as stalled"
+
+
+class JobReport:
+    """JobReport."""
+
+    def __init__(self, job_id: int, source: str, client: AsyncDiracClient) -> None:
+        """
+        Initialize Job Report.
+
+        :param job_id: the job ID
+        :param source: source for the reports
+        :param client: DiracX client instance
+        """
+        self.job_status_info: dict[str, dict[str, str]] = {}  # where job status updates are cumulated
+        self.job_id = job_id
+        self.source = source
+        self._client = client
+
+    def set_job_status(
+        self,
+        status: JobStatus | None = None,
+        minor_status: JobMinorStatus | None = None,
+        application_status: str | None = None,
+    ) -> None:
+        """
+        Add a new job status to the job report.
+
+        :param status: job status
+        :param minor_status: job minor status
+        :param application_status: application status
+        """
+        timestamp = str(datetime.now(timezone.utc))
+        # add job status record
+        self.job_status_info.update(
+            {
+                timestamp: JobStatusUpdate(
+                    Status=status,
+                    MinorStatus=minor_status,
+                    ApplicationStatus=application_status,
+                    Source=self.source,
+                ).model_dump()
+            }
+        )
+
+    async def send_stored_status_info(self):
+        """Send all the accumulated job status information."""
+        if not self.job_status_info:
+            return
+        body = {self.job_id: self.job_status_info}
+        ret = await self._client.jobs.set_job_statuses(body)
+        if ret.success:
+            self.job_status_info = {}
+        else:
+            raise RuntimeError(f"Could not set job statuses: {ret}")
+
+    async def commit(self):
+        """Send all the accumulated information."""
+        await self.send_stored_status_info()