coiled 1.125.0__py3-none-any.whl → 1.125.1.dev2__py3-none-any.whl

coiled/cli/file.py

@@ -16,26 +16,101 @@ from .utils import CONTEXT_SETTINGS
     default=None,
     help="Coiled workspace (uses default workspace if not specified).",
 )
+@click.option(
+    "--filestore",
+    default=None,
+    help="Name of filestore (optional).",
+)
+@click.option(
+    "--filter",
+    "name_includes",
+    default=None,
+    help="Filter on file paths and/or names to download (optional).",
+)
 @click.option("--into", default=".")
-def download(cluster, workspace, into):
-    with coiled.Cloud(workspace=workspace) as cloud:
-        cluster_info = find_cluster(cloud, cluster)
-        cluster_id = cluster_info["id"]
-        attachments = FilestoreManager.get_cluster_attachments(cluster_id)
-    if not attachments:
-        print(f"No filestore found for {cluster_info['name']} ({cluster_info['id']})")
-
-    # TODO (possible enhancement) if there are multiple output filestores, let user pick which to download
-    for attachment in attachments:
-        if attachment["output"]:
+def download(cluster, workspace, filestore, name_includes, into):
+    if filestore:
+        filestores = FilestoreManager.get_filestore(name=filestore) or []
+        if not filestores:
+            print(f"{filestore} filestore not found")
+
+        for fs in filestores:
             coiled.filestore.download_from_filestore_with_ui(
-                fs=attachment["filestore"],
-                into=download,
+                fs=fs,
+                into=into,
+                name_includes=name_includes,
+            )
+
+    else:
+        with coiled.Cloud(workspace=workspace) as cloud:
+            cluster_info = find_cluster(cloud, cluster)
+            cluster_id = cluster_info["id"]
+            attachments = FilestoreManager.get_cluster_attachments(cluster_id)
+        if not attachments:
+            print(f"No filestore found for {cluster_info['name']} ({cluster_info['id']})")
+
+        # TODO (possible enhancement) if there are multiple output filestores, let user pick which to download
+        for attachment in attachments:
+            if attachment["output"]:
+                coiled.filestore.download_from_filestore_with_ui(
+                    fs=attachment["filestore"],
+                    into=into,
+                    name_includes=name_includes,
+                )
+
+
+@click.command(
+    context_settings=CONTEXT_SETTINGS,
+)
+@click.argument("cluster", default="", required=False)
+@click.option(
+    "--workspace",
+    default=None,
+    help="Coiled workspace (uses default workspace if not specified).",
+)
+@click.option(
+    "--filestore",
+    default=None,
+    help="Name of filestore (optional).",
+)
+@click.option(
+    "--filter",
+    "name_includes",
+    default=None,
+    help="Filter on file paths and/or names to download (optional).",
+)
+def list_files(cluster, workspace, filestore, name_includes):
+    if filestore:
+        filestores = FilestoreManager.get_filestore(name=filestore) or []
+        if not filestores:
+            print(f"{filestore} filestore not found")
+
+        for fs in filestores:
+            coiled.filestore.list_files_ui(
+                fs=fs,
+                name_includes=name_includes,
             )
 
+    else:
+        with coiled.Cloud(workspace=workspace) as cloud:
+            cluster_info = find_cluster(cloud, cluster)
+            cluster_id = cluster_info["id"]
+            attachments = FilestoreManager.get_cluster_attachments(cluster_id)
+        if not attachments:
+            print(f"No filestore found for {cluster_info['name']} ({cluster_info['id']})")
+
+        # TODO (possible enhancement) if there are multiple output filestores, let user pick which to download
+        for attachment in attachments:
+            if attachment["output"]:
+                coiled.filestore.list_files_ui(
+                    fs=attachment["filestore"],
+                    name_includes=name_includes,
+                )
+
 
 @click.group(name="file", context_settings=CONTEXT_SETTINGS)
 def file_group(): ...
 
 
 file_group.add_command(download)
+file_group.add_command(list_files, "list")

coiled/cli/hello/hello.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 import asyncio
-import json
-import subprocess
 import sys
 import time
 
@@ -18,6 +16,7 @@ import coiled
 from coiled.scan import scan_prefix
 from coiled.utils import login_if_required
 
+from ..curl import sync_request
 from .examples import examples
 from .utils import PRIMARY_COLOR, Panel, console, has_macos_system_python, log_interactions
 
@@ -41,8 +40,10 @@ def needs_login():
 
 
 def get_interactions():
-    response = subprocess.check_output(["coiled", "curl", "/api/v2/interactions/user-interactions/hello"])
-    return json.loads(response, strict=False)
+    with coiled.Cloud() as cloud:
+        return sync_request(
+            cloud, url=f"{cloud.server}/api/v2/interactions/user-interactions/hello", method="get", json_output=True
+        )
 
 
 def get_already_run_examples():

coiled/filestore.py

@@ -33,10 +33,24 @@ def wait_until_complete(cluster_id, wait_for_output=True, wait_for_input=False):
     return attachments
 
 
-def download_from_filestore_with_ui(fs, into="."):
+def list_files_ui(fs, name_includes=None):
+    blobs = FilestoreManager.get_download_list_with_urls(fs["id"])
+
+    if name_includes:
+        blobs = [blob for blob in blobs if name_includes in blob["relative_path"]]
+
+    for blob in blobs:
+        print(blob["relative_path"])
+
+
+def download_from_filestore_with_ui(fs, into=".", name_includes=None):
     if fs:
         # TODO (possible enhancement) if "has files" flag is set then make sure we do see files to download?
         blobs = FilestoreManager.get_download_list_with_urls(fs["id"])
+
+        if name_includes:
+            blobs = [blob for blob in blobs if name_includes in blob["relative_path"]]
+
         total_bytes = sum(blob["size"] for blob in blobs)
 
         size_label = "Bytes"
@@ -195,6 +209,11 @@ class FilestoreManagerWithoutHttp:
     def make_req(api_path, post=False, data=None):
         raise NotImplementedError()
 
+    @classmethod
+    def get_filestore(cls, name=None):
+        if name:
+            return cls.make_req(f"/api/v2/filestore/name/{name}").get("filestores")
+
     @classmethod
     def get_or_create_filestores(cls, names, workspace, region):
         return cls.make_req(

{coiled-1.125.0.dist-info → coiled-1.125.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coiled
-Version: 1.125.0
+Version: 1.125.1.dev2
 Summary: Python client for coiled.io dask clusters
 Project-URL: Homepage, https://coiled.io
 Maintainer-email: Coiled <info@coiled.io>

{coiled-1.125.0.dist-info → coiled-1.125.1.dev2.dist-info}/RECORD

@@ -12,7 +12,7 @@ coiled/context.py,sha256=MXWsW0swdYU-x32U7NiM0xt-t65maiEO8rvsGGeScFw,4754
 coiled/core.py,sha256=Cu6hKBXRWSztbpF8huAyU_1glnt1gacnO9vExvG-Cwo,110796
 coiled/errors.py,sha256=5aXhNXgidMm0VgPYT3MZMwlHhRE57MeSmqAJFHYaa8Y,305
 coiled/exceptions.py,sha256=jUXgmfO0LitGe8ztSmAlzb9eQV3X5c0kNO2BwtEDTYg,3099
-coiled/filestore.py,sha256=CHec80WmJCI2JouI3SwWLPKq9Ya5ND2stN7oykmvLlA,12873
+coiled/filestore.py,sha256=0WKjjZVAJ2yxA1Oldfc1pUxj391aEAiSDtbC8qJCMvA,13445
 coiled/function.py,sha256=pONtcTUDRr0dykhVV73AWXqU_pb-4-lvOA0tR3i_PlA,21654
 coiled/plugins.py,sha256=w03H2Sck54QmwrVOM1BVscNiVeQsHyGm1yWNzPPPWKs,3424
 coiled/prefect.py,sha256=j1EOg7Xuw82TNRonAGEoZ3ANlwN8GM5aDXRYSjC0lnA,1497
@@ -31,7 +31,7 @@ coiled/cli/core.py,sha256=Yw5g-Y7p75a3k3tVa_jbVhzR6xDyOqwO2yOEB6npUzk,1125
 coiled/cli/curl.py,sha256=N5i-xUMGpP7PH-iGv02rxTWQGWlTtU8eLBQkqsMGCw4,1472
 coiled/cli/diagnostics.py,sha256=1jIeue7xLOaf7LQFsNc6NmO5yU1jqmPFpKZSKjGN4rs,394
 coiled/cli/env.py,sha256=NHh7ZSq9yfongkpFqzon1eLhnH1FwToVvkKFIhqXRBE,6932
-coiled/cli/file.py,sha256=9vvbTN3nBvCmp-7j9vo08R_3TNrPcbfdIZ4oQODTWX4,1246
+coiled/cli/file.py,sha256=fJmOG3YhxpxXokGYu90wpjdwkJpp1XVqPJ_iveb5ShA,3623
 coiled/cli/login.py,sha256=cByVXmMsfGEuY2TkYU_Y8zq1zVTUHAxOe_wpw2uHsBs,2242
 coiled/cli/package_sync.py,sha256=lABDY20yjfLYGfPlQu8ugI-Q8doY4JtN8_0nb9PkcT4,4101
 coiled/cli/prefect.py,sha256=T-SSFey4jlA_jpEI0DqAhVIPwlt2GvBFogEqYCwwevI,302
@@ -56,7 +56,7 @@ coiled/cli/cluster/metrics.py,sha256=mzMEYNX3LvDTXMEf8tBR3qGyHNN7wOBBhiWRGMPmlMA
 coiled/cli/cluster/ssh.py,sha256=ylUw_Gpco9v4w9ktBXq1eIkVIGm4OyJ73vR681Ib-QA,12276
 coiled/cli/cluster/utils.py,sha256=APKvldmBxXaxmEmKz8rV0_W-o1plF9FKAGGsWgIQxJU,1623
 coiled/cli/hello/__init__.py,sha256=iKYsdmn4CNN5LR6vC7emMHuA9D578GkS2yRz-CTsClk,188
-coiled/cli/hello/hello.py,sha256=WlW0aowmlaswlLlsG6LnyTr9ZuZE0_cfo1MXWPMD7mo,11088
+coiled/cli/hello/hello.py,sha256=jiFZuuGHS8rmk3vlEKF6S8-Dikzb5AUHL9rJeBlcn0o,11127
 coiled/cli/hello/utils.py,sha256=4hwBsv0z6p0nnWWEtPGpFRJNrWZYtdm4ZOS_UNUU7ZY,8427
 coiled/cli/hello/examples/__init__.py,sha256=YYvvsblGjJ36AbTv9B2FPM2yvzLNSMBIMeM38yVI_EM,313
 coiled/cli/hello/examples/exit.py,sha256=H-gWgjZtT2ZGwSJu1mRTu8wr0r_bC-WvIXpZlDIz-0E,178
@@ -94,8 +94,8 @@ coiled/v2/widgets/__init__.py,sha256=Bt3GHTTyri-kFUaqGRVydDM-sCg5NdNujDg2RyvgV8U
 coiled/v2/widgets/interface.py,sha256=YeMQ5qdRbbpM04x9qIg2LE1xwxyRxFbdDYnkrwHazPk,301
 coiled/v2/widgets/rich.py,sha256=3rU5-yso92NdeEh3uSvEE-GwPNyp6i0Nb5PE5czXCik,28974
 coiled/v2/widgets/util.py,sha256=Y8qpGqwNzqfCzgyRFRy7vcscBoXqop-Upi4HLPpXLgg,3120
-coiled-1.125.0.dist-info/METADATA,sha256=YXux3UBoTPyqsOa5dbKu-KZx5MomUBjLC1L7p7f3qPs,2176
-coiled-1.125.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-coiled-1.125.0.dist-info/entry_points.txt,sha256=C8dz1ST_bTlTO-kNvuHBJQma9PyJPotg0S4xpPt5aHY,47
-coiled-1.125.0.dist-info/licenses/LICENSE,sha256=ZPwVR73Biwm3sK6vR54djCrhaRiM4cAD2zvOQZV8Xis,3859
-coiled-1.125.0.dist-info/RECORD,,
+coiled-1.125.1.dev2.dist-info/METADATA,sha256=r-YFMAOq9YNiYbo23BJ6kvVkQrzcZ8mIUcCCZGyE24A,2181
+coiled-1.125.1.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+coiled-1.125.1.dev2.dist-info/entry_points.txt,sha256=C8dz1ST_bTlTO-kNvuHBJQma9PyJPotg0S4xpPt5aHY,47
+coiled-1.125.1.dev2.dist-info/licenses/LICENSE,sha256=ZPwVR73Biwm3sK6vR54djCrhaRiM4cAD2zvOQZV8Xis,3859
+coiled-1.125.1.dev2.dist-info/RECORD,,