vswmc-cli 2.2.1.dev357__tar.gz → 2.2.3__tar.gz

{vswmc_cli-2.2.1.dev357/vswmc_cli.egg-info → vswmc_cli-2.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vswmc-cli
-Version: 2.2.1.dev357
+Version: 2.2.3
 Summary: VSWMC Command-Line Tools
 Home-page: https://spaceweather.hpc.kuleuven.be
 Author: Rays of Space

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3}/setup.py

@@ -11,7 +11,7 @@ packages = [
 
 setuptools.setup(
     name="vswmc-cli",
-    version="2.2.1.dev357",
+    version="2.2.3",
     description="VSWMC Command-Line Tools",
     long_description=readme,
     long_description_content_type="text/markdown",

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3}/vswmc/cli/cp.py

@@ -26,7 +26,7 @@ def do_cp(args):
 def do_cp_new(args):
     client = utils.create_client(args)
     run, src_file = args.src.split(":")
-    content = client.get_run_output_presign_content(run, src_file)
+    content = client.get_run_result_presign_content(run, src_file)
     _, src_filename = os.path.split(src_file)
 
     if os.path.isdir(args.dst):

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3}/vswmc/cli/ls.py

@@ -5,27 +5,9 @@ from vswmc.cli import utils
 
 def do_ls(args):
     client = utils.create_client(args)
-    run = client.get_run(args.run)
+    results = client.list_run_results(args.run)
     rows = []
-    for result in run["results"]:
-        if args.l:
-            rows.append(
-                [
-                    str(result["size"]),
-                    result["updated"],
-                    result["path"],
-                ]
-            )
-        else:
-            rows.append([result["path"]])
-    utils.print_table(rows)
-
-
-def do_ls_new(args):
-    client = utils.create_client(args)
-    outputs = client.list_run_outputs(args.run)
-    rows = []
-    for result in outputs:
+    for result in results:
         if args.l:
             rows.append(
                 [
@@ -39,6 +21,6 @@ def do_ls_new(args):
 
 
 def configure_parser(parser):
-    parser.set_defaults(func=do_ls_new)
+    parser.set_defaults(func=do_ls)
     parser.add_argument("run", metavar="RUN", help="The run to query")
     parser.add_argument("-l", action="store_true", help="Print long listing")

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3}/vswmc/cli/save.py

@@ -17,14 +17,15 @@ def do_save(args):
 
 def do_save_new(args):
     client = utils.create_client(args)
-    outputs = client.list_run_outputs(args.run)
-    if not outputs:
-        print("No outputs available for run {}".format(args.run))
+    results = client.list_run_results(args.run)
+    if not results:
+        print("No results available for run {}".format(args.run))
         return
-    os.path.makedirs(args.run, exist_ok=True)
-    for output in outputs:
-        content = client.get_run_output_presign_content(args.run, output["path"])
-        target_file = os.path.join(args.run, output["path"])
+    os.makedirs(args.run, exist_ok=True)
+    for result in results:
+        content = client.get_run_result_presign_content(args.run, result["path"])
+        target_file = os.path.join(args.run, result["path"])
+        os.makedirs(os.path.dirname(target_file), exist_ok=True)
         print("Saving {}".format(target_file))
         with open(target_file, "wb") as f:
             f.write(content)

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3}/vswmc/client.py

@@ -97,20 +97,20 @@ class VswmcClient(object):
         path = "{}/runs/{}".format(self.api_root, run)
         return self._request("get", path=path).json()
 
-    def list_run_outputs(self, run):
-        path = "{}/runs/{}/outputs".format(self.api_root, run)
+    def list_run_results(self, run):
+        path = "{}/runs/{}/results".format(self.api_root, run)
         return self._request("get", path=path).json()
 
-    def get_run_output(self, run, name):
-        path = "{}/runs/{}/outputs/{}".format(self.api_root, run, name)
+    def get_run_result(self, run, name):
+        path = "{}/runs/{}/results/{}".format(self.api_root, run, name)
         return self._request("get", path=path).content
     
-    def get_run_output_presign_url(self, run, name):
-        path = "{}/runs/{}/outputs/{}/presign".format(self.api_root, run, name)
+    def get_run_result_presign_url(self, run, name):
+        path = "{}/runs/{}/results/{}/presign".format(self.api_root, run, name)
         return self._request("get", path=path).json()
     
-    def get_run_output_presign_content(self, run, name):
-        presign = self.get_run_output_presign_url(run, name)
+    def get_run_result_presign_content(self, run, name):
+        presign = self.get_run_result_presign_url(run, name)
         return requests.get(url=presign["url"]).content
 
     def download_logs(self, run):
@@ -122,7 +122,7 @@ class VswmcClient(object):
         return self._request("get", path=path).content
 
     def download_results(self, run):
-        path = "{}/runs/{}/results".format(self.api_root, run)
+        path = "{}/runs/{}/results/archive".format(self.api_root, run)
         return self._request("get", path=path).content
 
     def follow_logs(self, run, on_data):

{vswmc_cli-2.2.1.dev357 → vswmc_cli-2.2.3/vswmc_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vswmc-cli
-Version: 2.2.1.dev357
+Version: 2.2.3
 Summary: VSWMC Command-Line Tools
 Home-page: https://spaceweather.hpc.kuleuven.be
 Author: Rays of Space