fixing bug with launcher (#34)

* fixing bug with launcher
* unstupidify! harry potter!

the bug is that the launcher is always specified because
when we check for a boolean argument, we always add it to
be true. Instead we need to add it to be the found value
(true or false) and then ensure it does not get passed
to flux

Signed-off-by: vsoch <[email protected]>

Author: vsoch

.github/workflows/build-deploy.yaml

@@ -43,6 +43,11 @@ jobs:
         echo "Tagging and releasing ${{ env.container }}:${tag}"
         docker tag ${{env.container}}:latest ${{env.container}}:${tag}
         docker push ${{env.container}}:${tag}
+        # Named tag
+        tag=$(cat ./VERSION)
+        echo "Tagging and releasing ${{ env.container }}:${tag}"
+        docker tag ${{env.container}}:latest ${{env.container}}:${tag}
+        docker push ${{env.container}}:${tag}
 
     - name: Deploy
       if: (github.event_name != 'pull_request')

CHANGELOG.md

@@ -0,0 +1,18 @@
+# CHANGELOG
+
+This is a manually generated log to track changes to the repository for each release.
+Each section should include general headers such as **Implemented enhancements**
+and **Merged pull requests**. Critical items to know are:
+
+ - renamed commands
+ - deprecated / removed commands
+ - changed defaults
+ - backward incompatible changes (recipe file format? image file format?)
+ - migration guidance (how to convert images?)
+ - changed behaviour (recipe sections work differently)
+
+The versions coincide with releases on pip. Only major versions will be released as tags on Github.
+
+## [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)
+ - Project (faux) skeleton release (0.0.0)

VERSION

@@ -0,0 +1 @@
+0.0.1

app/forms.py

@@ -20,7 +20,6 @@ def __init__(self, request: Request):
         self.is_launcher: Optional[bool] = False
         self.exclusive: Optional[bool] = False
 
-    # STOPPED HERE - serialize in jquery from form, submit as application/json.
     async def load_data(self):
         form = await self.request.form()
         self.command = form.get("command")
@@ -44,6 +43,7 @@ def kwargs(self):
         for key in as_int + as_bool + ["command"]:
             if getattr(self, key, None) is not None:
                 value = getattr(self, key)
+
                 # Form could submit an empty value
                 if value == "":
                     continue
@@ -52,7 +52,7 @@ def kwargs(self):
                 if key in as_int:
                     kwargs[key] = int(value)
                 elif key in as_bool:
-                    kwargs[key] = True
+                    kwargs[key] = value
                 else:
                     kwargs[key] = value
         return kwargs

app/library/flux.py

@@ -60,6 +60,10 @@ def prepare_job(kwargs, runtime=0, workdir=None, envars=None):
 
     # Delete command from the kwargs (we added because is required and validated that way)
     del kwargs["command"]
+
+    # From the command line API client this won't be here, in the UI it will.
+    if "is_launcher" in kwargs:
+        del kwargs["is_launcher"]
     fluxjob = flux.job.JobspecV1.from_command(command, **kwargs)
 
     print(f"⭐️ Workdir provided: {workdir}")