sliderule-cli 5.6.1__tar.gz → 5.6.2__tar.gz

{sliderule_cli-5.6.1/src/sliderule_cli.egg-info → sliderule_cli-5.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sliderule-cli
-Version: 5.6.1
+Version: 5.6.2
 Summary: SlideRule Command Line Tool
 License-Expression: BSD-3-Clause
 Requires-Python: >=3.9

{sliderule_cli-5.6.1 → sliderule_cli-5.6.2/src/sliderule_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sliderule-cli
-Version: 5.6.1
+Version: 5.6.2
 Summary: SlideRule Command Line Tool
 License-Expression: BSD-3-Clause
 Requires-Python: >=3.9

sliderule_cli-5.6.2/src/sliderule_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "5.6.2",
+  "distance": 0,
+  "node": "g76fb3116a5b77c6fbeb8f8df0a2cdffe60a1418b",
+  "dirty": false,
+  "branch": "main",
+  "node_date": "2026-09-23"
+}

{sliderule_cli-5.6.1 → sliderule_cli-5.6.2}/src/sliderule_runner/database.py

@@ -14,6 +14,7 @@
 #             },
 #             "complete": <true|false>,
 #             "results": [ {result 1}, {result 2}, ... {result N} ]
+#             "jobs": { <child_job_id>: {child job status} }
 #         },
 #         ...
 #     }

{sliderule_cli-5.6.1 → sliderule_cli-5.6.2}/src/sliderule_runner/main.py

@@ -122,9 +122,10 @@ class Tool:
             try:
                 if submission["complete"]:
                     print(f"Scraping {name} ...")
-                    for result in submission["results"]:
+                    for i in range(len(submission["results"])):
+                        result = submission["results"][i]
                         if result["status"] in self.args.status:
-                            print(f"{result["arg"]}")
+                            print(f'{i:-5d}: {result["arg"]}')
                             arg_list.append(result["arg"])
                 else:
                     print(f"Skipping {name} because it is still pending")
@@ -142,17 +143,32 @@ class Tool:
             complete = job["complete"]
             print(f"Statusing {name} ...")
             if not complete:
-                report = self.session.runner.queue(job_id=job["job_id"], queue=queue)["report"]
+                queue_status = self.session.runner.queue(job_id=job["job_id"], queue=queue, verbose=True)
+                # jobs
+                child_jobs = queue_status["jobs"]
+                self.database.submissions[name]["jobs"] = {}
+                for child_job in child_jobs:
+                    self.database.submissions[name]["jobs"][int(child_job["index"])] = child_job
+                # report
+                report = queue_status["report"]
                 self.database.submissions[name]["status"] = report
-                if sum([report[s] for s in [JobState.SUBMITTED, JobState.PENDING, JobState.RUNNABLE, JobState.STARTING, JobState.RUNNING]]) == 0:
+                jobs_in_progress = sum([report[s] for s in [JobState.SUBMITTED, JobState.PENDING, JobState.RUNNABLE, JobState.STARTING, JobState.RUNNING]])
+                jobs_complete = sum([report[s] for s in [JobState.SUCCEEDED, JobState.FAILED]])
+                if jobs_in_progress == 0 and jobs_complete > 0:
                     print(f"Job {name} complete, reading results ...")
                     self.database.submissions[name]["complete"] = True
                     self.database.submissions[name]["results"] = self.__get_results(job["run_url"])
                 else:
                     print(f"Job {name} still pending")
-        print(",".join([f"{c:>30}" for c in ["NAME"]] + [f"{c:>10}" for c in list(JobState)]))
-        for name,job in self.database.submissions.items():
-            print(",".join([f"{c:>30}" for c in [name]] + [f"{c:>10}" for c in [job["status"][state] for state in list(JobState)]]))
+        if self.args.verbose:
+            print(",".join([f"{c:>30}" for c in ["NAME"]] + [f"{c:>10}" for c in ["INDEX", "STATUS"]]))
+            for name,job in self.database.submissions.items():
+                for index, child_job in job["jobs"].items():
+                    print(",".join([f"{c:>30}" for c in [name]] + [f"{c:>10}" for c in [index, child_job["status"]]]))
+        else:
+            print(",".join([f"{c:>30}" for c in ["NAME"]] + [f"{c:>10}" for c in list(JobState)]))
+            for name,job in self.database.submissions.items():
+                print(",".join([f"{c:>30}" for c in [name]] + [f"{c:>10}" for c in [job["status"][state] for state in list(JobState)]]))
 
     # Generate Report
     def generate_report(self):
@@ -189,9 +205,18 @@ class Tool:
         rsps = self.session.runner.cancel(job_list=[job_id], queue=queue)
         print(f"Cancelled submission {name}: {rsps}")
 
+    # Get Logs
+    def get_logs(self):
+        name = self.args.name
+        index = self.args.index
+        job_id = self.database.submissions[name]["jobs"][str(index)]["job_id"]
+        events = self.session.runner.logs(job_id=job_id)
+        for event in events:
+            print(event)
+
     # Finish
     def finish(self):
-        if not self.args.dryrun:
+        if not self.args.dryrun and "archive" not in self.args:
             # save database
             self.database.write()
 
@@ -249,6 +274,12 @@ def main():
     cancel.add_argument('--name',       type=str,                   required=True) # name of submission
     cancel.set_defaults(func=Tool.cancel_job)
 
+    # logs
+    logs = subparsers.add_parser("logs", parents=[common], help="get log messages for a child job")
+    logs.add_argument('--name',       type=str,                     required=True) # name of submission
+    logs.add_argument('--index',      type=int,                     required=True) # job index
+    logs.set_defaults(func=Tool.get_logs)
+
     # parse command line
     args = parser.parse_args()
 

sliderule_cli-5.6.1/src/sliderule_cli.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "5.6.1",
-  "distance": 0,
-  "node": "g5bc2a6eb3c8fc3927b3ffb14b511be2698a8261c",
-  "dirty": false,
-  "branch": "main",
-  "node_date": "2026-09-18"
-}