Merge pull request #36 from flux-framework/job/submit-tweaks

wip to fix small issues with submit and fluxjobs

Author: vsoch

CHANGELOG.md

@@ -15,4 +15,5 @@ The versions coincide with releases on pip. Only major versions will be released
 
 ## [0.0.x](https://github.com/flux-framework/flux-restful-api/tree/main) (0.0.x)
  - Fixing bug with launcher always being specified (0.0.1)
+  - catching any errors on creation of fluxjob
  - Project (faux) skeleton release (0.0.0)

app/library/flux.py

@@ -77,6 +77,7 @@ def prepare_job(kwargs, runtime=0, workdir=None, envars=None):
             del kwargs[key]
 
     # Assemble the flux job!
+    print(f"⭐️ Keyword arguments for flux jobspec: {kwargs}")
     fluxjob = flux.job.JobspecV1.from_command(command, **kwargs)
     for option, value in option_flags.items():
         print(f"⭐️ Setting shell option: {option}={value}")

app/routers/api.py

@@ -187,12 +187,11 @@ async def submit_job(request: Request):
         message = launcher.launch(kwargs, workdir=workdir, envars=envars)
         result = jsonable_encoder({"Message": message, "id": "MANY"})
     else:
-        # Prepare the flux job!
-        fluxjob = flux_cli.prepare_job(
-            kwargs, runtime=runtime, workdir=workdir, envars=envars
-        )
-        # Submit the job and return the ID, but allow for error
+        # Prepare and submit the job and return the ID, but allow for error
         try:
+            fluxjob = flux_cli.prepare_job(
+                kwargs, runtime=runtime, workdir=workdir, envars=envars
+            )
             flux_future = flux.job.submit_async(app.handle, fluxjob)
         except Exception as e:
             result = jsonable_encoder(

app/routers/views.py

@@ -139,14 +139,12 @@ def submit_job_helper(request, app, form):
     """
     A helper to submit a flux job (not a launcher)
     """
-
-    # Prepare the flux job! We don't support envars here yet
-    fluxjob = flux_cli.prepare_job(
-        form.kwargs, runtime=form.runtime, workdir=form.workdir
-    )
-
     # Submit the job and return the ID, but allow for error
     try:
+        # Prepare the flux job! We don't support envars here yet
+        fluxjob = flux_cli.prepare_job(
+            form.kwargs, runtime=form.runtime, workdir=form.workdir
+        )
         flux_future = flux.job.submit_async(app.handle, fluxjob)
         jobid = flux_future.get_id()
         intid = int(jobid)

templates/jobs/submit.html

@@ -61,7 +61,7 @@ <h3>Submit a Job</h3>
                 <div class="mb-3">
                     <label for="workdir" class="form-label">Option Flags</label>
                     <input class="form-control" {% if form.option_flags %}value="{{ form.option_flags }}"{% endif %} name="option_fags" id="option_flags" aria-describedby="optionFlagsHelp">
-                    <div id="optionFlagsHelp" class="form-text">One off option flags, space separated (e.g.,) -ompi=openmpi@5 (optional).</div>
+                    <div id="optionFlagsHelp" class="form-text">One off option flags, space separated (e.g., -ompi=openmpi@5) (optional).</div>
                 </div>
                 <div class="mb-3 form-check">
                   <input type="checkbox" class="form-check-input" name="exclusive" {% if form.exclusive %}checked{% endif %} id="exclusive" aria-describedby="exclusiveHelp">