vswmc-cli 2.2.1.dev357__py2.py3-none-any.whl → 2.2.3__py2.py3-none-any.whl

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/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/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/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.dist-info → vswmc_cli-2.2.3.dist-info}/METADATA

@@ -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.dist-info → vswmc_cli-2.2.3.dist-info}/RECORD

@@ -1,17 +1,17 @@
 vswmc/__init__.py,sha256=IPsitsCPgSqTEDw0JGVZvpBuNFE5ERXtYKnxuJm-EZE,41
-vswmc/client.py,sha256=IQIjSFtuXdni_VVs37HJ4-w1zUcjqtiyCT1b9tplA0s,7078
+vswmc/client.py,sha256=H87WlOIgk9XTkqd8MBdERAv94iVd7exMi3Gd0LXPTCo,7086
 vswmc/sockjs.py,sha256=E4Ng4cgILrL8J6UUSdp7I478CdrzDPb45tCwdIWrwPQ,2459
 vswmc/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vswmc/cli/__main__.py,sha256=ayilQ5mMSiZNC0U5NPWw2LLpW20PTZ1rMNKVGoJZjQ4,3433
-vswmc/cli/cp.py,sha256=3fJeLPCD0ZSaq_dMwUPtbnaG2CaF3VOFuI2az4ODzrY,1141
+vswmc/cli/cp.py,sha256=4yp40TaCK0PgTeMNc3DXFtE44QhMt0Ik3qpY2MtULP0,1141
 vswmc/cli/logs.py,sha256=YKOklqEp4uvGDib4GO25byoQDBa57S4mgdD0Ia6kGDA,741
-vswmc/cli/ls.py,sha256=UYvBgx_WCK0BS0VCZTItl_7Vcdghoyr0QAk9I717yp4,1129
+vswmc/cli/ls.py,sha256=PSMzQP2pl9ydM_YKhlDBdCwklGmbcB62V8QScjzietQ,686
 vswmc/cli/models.py,sha256=q4zUzBlH0kceoPrwp7O4o90JjywMlZ9P-xffpPr5eho,1012
 vswmc/cli/products.py,sha256=wYhwgT_JjEBzDL_OfWuynZb08nMGEKWFceTuXbxns4Y,3719
 vswmc/cli/ps.py,sha256=PlTzf55iFNiV2nDGNMkDcqY8dNyl0_EUpkU96YUoZNA,1035
 vswmc/cli/rm.py,sha256=iqIyp08CAWJYtwu9LVX4mzFnpQ0qHdZZDu-OLN_ceNo,352
 vswmc/cli/run.py,sha256=mRMLkWs9KMuEGhOJyxiPvYeKpsa55rgomjQjW2eeXEo,2368
-vswmc/cli/save.py,sha256=5l3ikPwZ5sooL4CWsOQfXdB4SfKixyFuSDBrkKUU0DU,1022
+vswmc/cli/save.py,sha256=KeXppOqlI4vrPxlVfx0O05Lcr4mwnLMfnJo0ImjsZEE,1082
 vswmc/cli/simulations.py,sha256=lP0lBV-VGUBQ8WBL-lCCz2_vcJDxfu15zIZlmaPJj-s,1509
 vswmc/cli/stop.py,sha256=txJ3DRxBsTe6EZ1WOL8rKt0rOluzkLhPCaHa19CCZq8,352
 vswmc/cli/utils.py,sha256=IJChPtvrV04G5tYxcm5_89ylpRW0Bx2bS0aM4jid0yY,1583
@@ -19,9 +19,9 @@ vswmc/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 vswmc/core/auth.py,sha256=YclGruWgPZb2SyZiX_uJIuVbDYvsYbxg9fEMSV6FUKU,95
 vswmc/core/exceptions.py,sha256=nbQEgCg1SSnJYr9iomXJaKzK-Heu2njpW_SioibR9UY,443
 vswmc/core/helpers.py,sha256=BeIpbz9CpCE4cS9TTQwTtVi35cUsWN-6e7lmVu82sDY,719
-vswmc_cli-2.2.1.dev357.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-vswmc_cli-2.2.1.dev357.dist-info/METADATA,sha256=rDFtlHtZql6hKZiZn1e83UiMTztwd36gNmAHIKlMlng,4751
-vswmc_cli-2.2.1.dev357.dist-info/WHEEL,sha256=TdQ5LtNwLuxTCjgxN51AgdU5w-KkB9ttmLbzjTH02pg,109
-vswmc_cli-2.2.1.dev357.dist-info/entry_points.txt,sha256=Lc1-M9eBt4eCnnRb8Q-NWM1OSwyO6UDdK7l97nQ_RO0,50
-vswmc_cli-2.2.1.dev357.dist-info/top_level.txt,sha256=SSaXSamS4BaN_CDCtVo95MfjZ2bo7x7KYnVvPN_CtY4,6
-vswmc_cli-2.2.1.dev357.dist-info/RECORD,,
+vswmc_cli-2.2.3.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+vswmc_cli-2.2.3.dist-info/METADATA,sha256=ijMGyIzkv5lGBBDymjh3UWnGVtQn-bAVhq49UEjlbyI,4744
+vswmc_cli-2.2.3.dist-info/WHEEL,sha256=TdQ5LtNwLuxTCjgxN51AgdU5w-KkB9ttmLbzjTH02pg,109
+vswmc_cli-2.2.3.dist-info/entry_points.txt,sha256=Lc1-M9eBt4eCnnRb8Q-NWM1OSwyO6UDdK7l97nQ_RO0,50
+vswmc_cli-2.2.3.dist-info/top_level.txt,sha256=SSaXSamS4BaN_CDCtVo95MfjZ2bo7x7KYnVvPN_CtY4,6
+vswmc_cli-2.2.3.dist-info/RECORD,,