coiled 1.124.1.dev5__tar.gz → 1.125.1.dev2__tar.gz

{coiled-1.124.1.dev5 → coiled-1.125.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coiled
-Version: 1.124.1.dev5
+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.1.dev2/coiled/cli/file.py

@@ -0,0 +1,116 @@
+import click
+
+import coiled
+from coiled.filestore import FilestoreManager
+
+from .cluster.utils import find_cluster
+from .utils import CONTEXT_SETTINGS
+
+
+@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).",
+)
+@click.option("--into", default=".")
+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=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-1.124.1.dev5 → coiled-1.125.1.dev2}/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-1.124.1.dev5 → coiled-1.125.1.dev2}/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.124.1.dev5/coiled/cli/file.py

@@ -1,41 +0,0 @@
-import click
-
-import coiled
-from coiled.filestore import FilestoreManager
-
-from .cluster.utils import find_cluster
-from .utils import CONTEXT_SETTINGS
-
-
-@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("--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"]:
-            coiled.filestore.download_from_filestore_with_ui(
-                fs=attachment["filestore"],
-                into=download,
-            )
-
-
-@click.group(name="file", context_settings=CONTEXT_SETTINGS)
-def file_group(): ...
-
-
-file_group.add_command(download)