Merge pull request #67 from eth-cscs/RESTAPI-1507-add-account-param

Add account parameter

Author: jpdorsch

CHANGELOG.md

@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Path parameter for submitting jobs from a remote file
+- `account` optional parameter to job submission request
+- `script_path` optional parameter for submitting jobs from a remote file
 - JupyterHub example
 - Documentation for logging architecture
 - Workflow orchestrator example

src/firecrest/compute/models.py

@@ -24,6 +24,7 @@ class PostJobSubmitRequest(JobSubmitRequestModel):
                 {
                     "job": {
                         "name": "Example with inline script",
+                        "account": "myproject",
                         "working_directory": "{{home_path}}",
                         "standard_input": "/dev/null",
                         "standard_output": "count_to_100.out",
@@ -38,6 +39,7 @@ class PostJobSubmitRequest(JobSubmitRequestModel):
                 {
                     "job": {
                         "name": "Example with script path",
+                        "account": "myproject",
                         "working_directory": "{{home_path}}",
                         "standard_input": "/dev/null",
                         "standard_output": "count_to_100.out",

src/lib/scheduler_clients/slurm/cli_commands/sbatch_command.py

@@ -23,6 +23,8 @@ def get_command(self) -> str:
                        in self.job_description.environment.items())
         cmd += [f"--export='ALL,{env}'"]
         cmd += [f"--chdir='{self.job_description.current_working_directory}'"]
+        if self.job_description.account:
+            cmd.append(f"--account='{self.job_description.account}'")
         if self.job_description.name:
             cmd.append(f"--job-name='{self.job_description.name}'")
         if self.job_description.standard_error:

src/lib/scheduler_clients/slurm/models.py

@@ -36,6 +36,7 @@ def __init__(self, **kwargs):
 
 class SlurmJobDescription(JobDescriptionModel):
     name: Optional[str] = Field(default=None, description="Name for the job")
+    account: Optional[str] = Field(default=None, description="Charge job resources to specified account")
     current_working_directory: str = Field(alias="working_directory", description="Job working directory")
     standard_input: Optional[str] = Field(default=None, description="Standard input file name")
     standard_output: Optional[str] = Field(default=None, description="Standard output file name")