Merge pull request #48 from flux-framework/add/back-runtime

adding back runtime and other job info attributes

Author: vsoch

CHANGELOG.md

@@ -14,6 +14,8 @@ and **Merged pull requests**. Critical items to know are:
 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)
+ - Restore original rpc to get job info (has more information) (0.1.11)
+ - Refactor of FLux Restful to use a database and OAauth2 (0.1.0)
  - Support for basic PAM authentication (0.0.11)
  - Fixing bug with launcher always being specified (0.0.1)
   - catching any errors on creation of fluxjob

VERSION

@@ -1 +1 @@
-0.0.11
+0.1.1

app/library/flux.py

@@ -261,21 +261,31 @@ def get_job(jobid, user=None):
     payload = {"id": jobid, "attrs": ["all"]}
     rpc = flux.job.list.JobListIdRPC(app.handle, "job-list.list-id", payload)
     try:
-        jobinfo = rpc.get_job()
+        jobinfo = rpc.get()
 
     # The job does not exist!
     except FileNotFoundError:
         return None
 
-    # User friendly string from integer
-    jobinfo["state"] = flux.job.info.statetostr(jobinfo["state"])
-
-    # These likely appear only after completion
-    for required in ["result", "returncode", "runtime", "waitstatus", "duration"]:
-        if required not in jobinfo:
-            jobinfo[required] = ""
+    jobinfo = jobinfo["job"]
 
-    # This should be a dictionary
-    if "exception" not in jobinfo:
-        jobinfo["exception"] = {}
+    # User friendly string from integer
+    state = jobinfo["state"]
+    jobinfo["state"] = flux.job.info.statetostr(state)
+
+    # Get job info to add to result
+    info = rpc.get_jobinfo()
+    jobinfo["nnodes"] = info._nnodes
+    jobinfo["result"] = info.result
+    jobinfo["returncode"] = info.returncode
+    jobinfo["runtime"] = info.runtime
+    jobinfo["priority"] = info._priority
+    jobinfo["waitstatus"] = info._waitstatus
+    jobinfo["nodelist"] = info._nodelist
+    jobinfo["nodelist"] = info._nodelist
+    jobinfo["exception"] = info._exception.__dict__
+
+    # Only appears after finished?
+    if "duration" not in jobinfo:
+        jobinfo["duration"] = ""
     return jobinfo

clients/python/flux_restful_client/version.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 AUTHOR = "Vanessa Sochat"
 EMAIL = "[email protected]"
 NAME = "flux-restful-client"