latch 2.32.0__tar.gz → 2.32.2__tar.gz

{latch-2.32.0/latch.egg-info → latch-2.32.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: latch
-Version: 2.32.0
+Version: 2.32.2
 Summary: The Latch SDK
 Author-email: kenny@latch.bio
 Classifier: Programming Language :: Python :: 3.8

{latch-2.32.0 → latch-2.32.2}/latch/types/directory.py

@@ -17,8 +17,8 @@ from typing_extensions import Annotated
 
 from latch.types.file import LatchFile
 from latch.types.utils import _is_valid_url
-from latch_cli.services.cp.path_utils import normalize_path
 from latch_cli.utils import urljoins
+from latch_cli.utils.path import normalize_path
 
 
 class Child(TypedDict):

{latch-2.32.0 → latch-2.32.2}/latch/types/file.py

@@ -13,7 +13,7 @@ from latch_sdk_gql.execute import execute
 from typing_extensions import Annotated
 
 from latch.types.utils import _is_valid_url
-from latch_cli.services.cp.path_utils import normalize_path
+from latch_cli.utils.path import normalize_path
 
 is_absolute_node_path = re.compile(r"^(latch)?://\d+.node(/)?$")
 

{latch-2.32.0 → latch-2.32.2/latch.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: latch
-Version: 2.32.0
+Version: 2.32.2
 Summary: The Latch SDK
 Author-email: kenny@latch.bio
 Classifier: Programming Language :: Python :: 3.8

{latch-2.32.0 → latch-2.32.2}/latch.egg-info/SOURCES.txt

@@ -89,7 +89,6 @@ latch_cli/services/cp/glob.py
 latch_cli/services/cp/ldata_utils.py
 latch_cli/services/cp/main.py
 latch_cli/services/cp/manager.py
-latch_cli/services/cp/path_utils.py
 latch_cli/services/cp/progress.py
 latch_cli/services/cp/remote_copy.py
 latch_cli/services/cp/throttle.py
@@ -102,8 +101,10 @@ latch_cli/services/deprecated/touch.py
 latch_cli/services/init/__init__.py
 latch_cli/services/init/init.py
 latch_cli/services/init/__pycache__/__init__.cpython-310.pyc
+latch_cli/services/init/__pycache__/__init__.cpython-311.pyc
 latch_cli/services/init/__pycache__/__init__.cpython-38.pyc
 latch_cli/services/init/__pycache__/init.cpython-310.pyc
+latch_cli/services/init/__pycache__/init.cpython-311.pyc
 latch_cli/services/init/__pycache__/init.cpython-38.pyc
 latch_cli/services/init/assemble_and_sort/.env
 latch_cli/services/init/assemble_and_sort/LICENSE
@@ -148,6 +149,7 @@ latch_cli/snakemake/single_task_snakemake.py
 latch_cli/snakemake/workflow.py
 latch_cli/tui/__init__.py
 latch_cli/utils/__init__.py
+latch_cli/utils/path.py
 tests/__init__.py
 tests/fixtures.py
 tests/test_cli.py

{latch-2.32.0 → latch-2.32.2}/latch_cli/click_utils.py

@@ -102,6 +102,10 @@ def patch():
     click.UsageError.show = colored_usage_error_show
 
 
+def bold(s: str) -> str:
+    return f"{AnsiCodes.bold}{s}{AnsiCodes.reset}"
+
+
 class AnsiCodes:
     bold = "\x1b[1m"
     reset = "\x1b[22m"

{latch-2.32.0 → latch-2.32.2}/latch_cli/main.py

@@ -2,10 +2,9 @@
 
 import os
 import sys
-from collections import OrderedDict
 from pathlib import Path
 from textwrap import dedent
-from typing import List, Optional, Union
+from typing import List, Optional, Tuple, Union
 
 import click
 from packaging.version import parse as parse_version
@@ -45,17 +44,17 @@ def main():
     """
     try:
         get_auth_header()
-    except AuthenticationError:
+    except AuthenticationError as e:
         click.secho(
             dedent("""
             Unable to authenticate with Latch.
 
             If you are on a machine with a browser, run `latch login`.
             If not, navigate to `https://console.latch.bio/settings/developer` on a different machine, select `Access Tokens`, and copy your `API Key` to `~/.latch/token` on this machine.
-            """),
+            """).strip("\n"),
             fg="red",
         )
-        raise click.exceptions.Exit()
+        raise click.exceptions.Exit() from e
 
     local_ver = parse_version(get_local_package_version())
     latest_ver = parse_version(get_latest_package_version())
@@ -357,103 +356,32 @@ def mv(src: str, dest: str):
     is_flag=True,
     default=False,
 )
-# todo(maximsmol): enable once ls uses gql and supports new paths
-# @click.argument("remote_directories", nargs=-1, shell_complete=remote_complete)
-@click.argument("remote_directories", nargs=-1)
-def ls(group_directories_first: bool, remote_directories: Union[None, List[str]]):
+@click.argument("paths", nargs=-1, shell_complete=remote_complete)
+def ls(paths: Tuple[str], group_directories_first: bool):
     """
     List the contents of a Latch Data directory
     """
 
-    crash_handler.message = f"Unable to display contents of {remote_directories}"
+    crash_handler.message = f"Unable to display contents of {paths}"
     crash_handler.pkg_root = str(Path.cwd())
 
-    from datetime import datetime
-
     from latch_cli.services.ls import ls
-    from latch_cli.utils import with_si_suffix
 
     # If the user doesn't provide any arguments, default to root
-    if not remote_directories:
-        remote_directories = ["latch:///"]
-
-    for remote_directory in remote_directories:
-        if len(remote_directories) > 1:
-            click.echo(f"{remote_directory}:")
-
-        output = ls(remote_directory)
-
-        output.sort(key=lambda row: row["name"])
-        if group_directories_first:
-            output.sort(key=lambda row: row["type"])
-
-        formatted = []
-        for row in output:
-            vals = {
-                "contentSize": (
-                    click.style(
-                        with_si_suffix(int(row["contentSize"]), suffix="", styled=True),
-                        fg="bright_green",
-                    )
-                    if row["contentSize"] != "-" and row["type"] != "dir"
-                    else click.style("-", dim=True)
-                ),
-                "modifyTime": (
-                    click.style(
-                        datetime.fromisoformat(row["modifyTime"]).strftime(
-                            "%d %b %H:%M"
-                        ),
-                        fg="blue",
-                    )
-                    if row["modifyTime"] != "-" and row["type"] != "dir"
-                    else click.style("-", dim=True)
-                ),
-                "name": (
-                    row["name"] if len(row["name"]) <= 50 else f"{row['name'][:47]}..."
-                ),
-            }
-
-            if row["type"] == "dir":
-                vals["name"] = (
-                    click.style(row["name"], fg="bright_blue", bold=True) + "/"
-                )
-
-            formatted.append(vals)
-
-        columns = OrderedDict(
-            contentSize="Size", modifyTime="Date Modified", name="Name"
-        )
+    if len(paths) == 0:
+        paths = ("/",)
 
-        column_width = {key: len(title) for key, title in columns.items()}
-        for row in formatted:
-            for key in columns:
-                column_width[key] = max(column_width[key], len(click.unstyle(row[key])))
-
-        def pad_styled(x: str, l: int, align_right=False):
-            cur = len(click.unstyle(x))
-
-            pad = " " * (l - cur)
-            if align_right:
-                return pad + x
-            return x + pad
-
-        click.echo(
-            " ".join(
-                pad_styled(
-                    click.style(title, underline=True),
-                    column_width[key],
-                    key == "contentSize",
-                )
-                for key, title in columns.items()
-            )
+    for path in paths:
+        if len(paths) > 1:
+            click.echo(f"{path}:")
+
+        ls(
+            path,
+            group_directories_first=group_directories_first,
         )
-        for row in formatted:
-            click.echo(
-                " ".join(
-                    pad_styled(row[k], column_width[k], k == "contentSize")
-                    for k in columns
-                )
-            )
+
+        if len(paths) > 1:
+            click.echo("")
 
 
 @main.command("launch")
@@ -576,7 +504,7 @@ def mkdir(remote_directory: str):
     from latch_cli.services.deprecated.mkdir import mkdir
 
     click.secho(
-        f"Warning: `latch mkdir` is deprecated and will be removed soon.",
+        "Warning: `latch mkdir` is deprecated and will be removed soon.",
         fg="yellow",
     )
     mkdir(remote_directory)
@@ -593,7 +521,7 @@ def touch(remote_file: str):
     from latch_cli.services.deprecated.touch import touch
 
     click.secho(
-        f"Warning: `latch touch` is deprecated and will be removed soon.",
+        "Warning: `latch touch` is deprecated and will be removed soon.",
         fg="yellow",
     )
     touch(remote_file)

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/autocomplete.py

@@ -1,10 +1,6 @@
-try:
-    from functools import cache
-except ImportError:
-    from functools import lru_cache as cache
-
 import os
 import re
+from functools import lru_cache
 from pathlib import Path
 from typing import List
 
@@ -16,13 +12,17 @@ from latch_cli.services.cp.ldata_utils import (
     _get_known_domains_for_account,
 )
 
+cache = lru_cache(maxsize=None)
 completion_type = re.compile(
     r"""
     ^
     (latch)?
     :/?/?
     (?P<domain>[^/]*)
-    (?P<path>/.*)?
+    (
+        (?P<parent>(/[^/]*)*)?
+        (?P<path>/[^/]*)
+    )?
     $
     """,
     re.VERBOSE,
@@ -30,7 +30,10 @@ completion_type = re.compile(
 
 
 def complete(
-    ctx: click.Context, param: click.Argument, incomplete: str, allow_local: bool = True
+    ctx: click.Context,
+    param: click.Argument,
+    incomplete: str,
+    allow_local: bool = True,
 ) -> List[sc.CompletionItem]:
     match = completion_type.match(incomplete)
 
@@ -81,9 +84,10 @@ def _complete_local_path(incomplete: str) -> List[sc.CompletionItem]:
 @cache
 def _complete_remote_path(match: re.Match[str]) -> List[sc.CompletionItem]:
     domain = match["domain"]
+    parent = match["parent"]
     path = match["path"][1:]
 
-    parent = f"://{domain}"
+    parent = f"://{domain}{parent}"
     if match[0].startswith("latch"):
         parent = f"latch{parent}"
 

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/download.py

@@ -14,10 +14,10 @@ from latch_cli.constants import Units
 from latch_cli.services.cp.config import CPConfig, Progress
 from latch_cli.services.cp.ldata_utils import LDataNodeType, get_node_data
 from latch_cli.services.cp.manager import CPStateManager
-from latch_cli.services.cp.path_utils import normalize_path
 from latch_cli.services.cp.progress import ProgressBars, get_free_index
 from latch_cli.services.cp.utils import get_max_workers, human_readable_time
 from latch_cli.utils import get_auth_header, with_si_suffix
+from latch_cli.utils.path import normalize_path
 
 
 class GetSignedUrlData(TypedDict):

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/ldata_utils.py

@@ -12,7 +12,7 @@ import graphql.language as l
 from latch_sdk_gql.execute import execute
 from latch_sdk_gql.utils import _name_node, _parse_selection
 
-from latch_cli.services.cp.path_utils import get_path_error, normalize_path
+from latch_cli.utils.path import get_path_error, normalize_path
 
 
 class LDataNodeType(str, Enum):

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/main.py

@@ -4,9 +4,9 @@ from typing import List
 from latch_cli.services.cp.config import CPConfig, Progress
 from latch_cli.services.cp.download import download
 from latch_cli.services.cp.glob import expand_pattern
-from latch_cli.services.cp.path_utils import is_remote_path
 from latch_cli.services.cp.remote_copy import remote_copy
 from latch_cli.services.cp.upload import upload
+from latch_cli.utils.path import is_remote_path
 
 
 # todo(ayush): come up with a better behavior scheme than unix cp

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/remote_copy.py

@@ -4,7 +4,7 @@ from gql.transport.exceptions import TransportQueryError
 from latch_sdk_gql.execute import execute
 
 from latch_cli.services.cp.ldata_utils import LDataNodeType, get_node_data
-from latch_cli.services.cp.path_utils import get_name_from_path, get_path_error
+from latch_cli.utils.path import get_name_from_path, get_path_error
 
 
 # todo(ayush): figure out how to do progress for this

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/throttle.py

@@ -1,7 +1,4 @@
-from multiprocessing.managers import BaseManager
-from typing import Type
-
-from attr import dataclass
+from dataclasses import dataclass
 
 
 @dataclass

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/cp/upload.py

@@ -1,9 +1,5 @@
-import datetime
-import json
-import logging
 import math
 import mimetypes
-import multiprocessing
 import os
 import random
 import time
@@ -25,11 +21,11 @@ from latch_cli.constants import latch_constants, units
 from latch_cli.services.cp.config import CPConfig, Progress
 from latch_cli.services.cp.ldata_utils import LDataNodeType, get_node_data
 from latch_cli.services.cp.manager import CPStateManager
-from latch_cli.services.cp.path_utils import normalize_path
 from latch_cli.services.cp.progress import ProgressBars
 from latch_cli.services.cp.throttle import Throttle
 from latch_cli.services.cp.utils import get_max_workers, human_readable_time
 from latch_cli.utils import get_auth_header, urljoins, with_si_suffix
+from latch_cli.utils.path import normalize_path
 
 if TYPE_CHECKING:
     PathQueueType: TypeAlias = "Queue[Optional[Path]]"
@@ -37,12 +33,6 @@ if TYPE_CHECKING:
     PartsBySrcType: TypeAlias = DictProxy[Path, ListProxy["CompletedPart"]]
     UploadInfoBySrcType: TypeAlias = DictProxy[Path, "StartUploadReturnType"]
 
-logging.basicConfig()
-multiprocessing.get_logger().setLevel(logging.DEBUG)
-
-
-start_upload_batch_size = 100
-
 
 class EmptyUploadData(TypedDict):
     version_id: str

latch-2.32.2/latch_cli/services/ls.py

@@ -0,0 +1,198 @@
+"""Service to list files in a remote directory."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from textwrap import dedent
+from typing import List, Optional, TypedDict
+
+import click
+import gql
+from latch_sdk_gql.execute import execute
+
+from latch_cli.click_utils import bold
+from latch_cli.services.cp.ldata_utils import LDataNodeType
+from latch_cli.utils import with_si_suffix
+from latch_cli.utils.path import normalize_path
+
+
+class _LdataObjectMeta(TypedDict):
+    modifyTime: Optional[str]
+    contentSize: Optional[int]
+
+
+class _Child(TypedDict):
+    name: str
+    ldataObjectMeta: Optional[_LdataObjectMeta]
+    type: str
+
+
+class _Node(TypedDict):
+    child: _Child
+
+
+class _ChildLdataTreeEdges(TypedDict):
+    nodes: List[_Node]
+
+
+class _FinalLinkTarget(TypedDict):
+    childLdataTreeEdges: _ChildLdataTreeEdges
+
+
+class _LdataResolvePathData(TypedDict):
+    name: str
+    type: str
+    ldataObjectMeta: Optional[_LdataObjectMeta]
+    finalLinkTarget: _FinalLinkTarget
+
+
+@dataclass(frozen=True)
+class _Row:
+    name: str
+    type: LDataNodeType
+    size: Optional[int]
+    modify_time: Optional[datetime]
+
+
+def ls(path: str, *, group_directories_first: bool = False):
+    """Lists the children of a remote directory in Latch.
+
+    Args:
+        path: A valid remote path
+        group_directories_first: Option to display directories/links before
+            objects
+
+    This function will list all of the entites under the remote directory
+    specified in the path `path`. Will error if the path is invalid
+    or the directory doesn't exist.
+
+    Examples:
+        >>> ls("")
+            # Lists all entities in the user's root directory
+        >>> ls("latch:///dir1/dir2/dir_name")
+            # Lists all entities inside dir1/dir2/dir_name
+    """
+    if path == "":
+        path = "/"
+
+    normalized_path = normalize_path(path, assume_remote=True)
+
+    query = execute(
+        gql.gql("""
+            query LdataInfo ($argPath: String!) {
+                accountInfoCurrent {
+                    id
+                }
+                ldataResolvePathData(argPath: $argPath) {
+                    name
+                    ldataObjectMeta {
+                        modifyTime
+                        contentSize
+                    }
+                    type
+                    finalLinkTarget {
+                        childLdataTreeEdges(filter: {
+                            child: {
+                                removed: { equalTo: false },
+                                pending: { equalTo: false }
+                            }
+                        }) {
+                            nodes {
+                                child {
+                                    name
+                                    ldataObjectMeta {
+                                        modifyTime
+                                        contentSize
+                                    }
+                                    type
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        """),
+        {"argPath": normalized_path},
+    )
+
+    res: Optional[_LdataResolvePathData] = query["ldataResolvePathData"]
+    acc_id: str = query["accountInfoCurrent"]["id"]
+
+    if res is None:
+        click.secho(
+            dedent(f"""
+            {bold(path)}: no such file or directory.
+
+            {bold("Check that:")}
+            1. The target directory exists,
+            2. Account {bold(acc_id)} has permissions to view the target directory, and
+            3. The correct workspace is selected.
+
+            For privacy reasons, non-viewable objects and non-existent objects are indistinguishable.
+            """).strip("\n"),
+            fg="red",
+        )
+        return
+
+    nodes = res["finalLinkTarget"]["childLdataTreeEdges"]["nodes"]
+    if LDataNodeType(res["type"].lower()) == LDataNodeType.obj:
+        # ls object should just display the object's info
+        nodes.append({"child": res})
+
+    rows: List[_Row] = []
+    for node in nodes:
+        child = node["child"]
+
+        meta = child["ldataObjectMeta"]
+        size = modify_time = None
+        if meta is not None:
+            if meta["contentSize"] is not None:
+                size = int(meta["contentSize"])
+            if meta["modifyTime"] is not None:
+                modify_time = datetime.fromisoformat(meta["modifyTime"])
+
+        rows.append(
+            _Row(
+                name=child["name"],
+                type=LDataNodeType(child["type"].lower()),
+                size=size,
+                modify_time=modify_time,
+            )
+        )
+
+    rows.sort(key=lambda row: row.name)
+    if group_directories_first:
+        rows.sort(key=lambda row: 1 if row.type == LDataNodeType.obj else 0)
+
+    headers = [
+        "  " + click.style("Size", underline=True),
+        click.style("Date Modified", underline=True),
+        click.style("Name", underline=True),
+    ]
+
+    click.echo(" ".join(headers))
+
+    for row in rows:
+        mt_str = f'{"-": <13}'
+        size_str = f'{"-": >6}'
+        if row.type == LDataNodeType.obj:
+            if row.modify_time is not None:
+                mt_str = click.style(
+                    f'{row.modify_time.strftime("%d %b %H:%M"): <13}', fg="blue"
+                )
+
+            if row.size is not None:
+                size_str = with_si_suffix(row.size, suffix="")
+                size_str = click.style(f"{size_str: >6}", fg="bright_green")
+
+        name_str = row.name
+        if len(name_str) > 50:
+            name_str = f"{name_str[:47]}..."
+
+        if row.type != LDataNodeType.obj:
+            color = "bright_blue"
+            if row.type == LDataNodeType.link:
+                color = "bright_magenta"
+
+            name_str = click.style(f"{name_str}/", bold=True, fg=color)
+
+        click.echo(f"{size_str} {mt_str} {name_str}")

{latch-2.32.0 → latch-2.32.2}/latch_cli/services/move.py

@@ -4,11 +4,7 @@ from gql.transport.exceptions import TransportQueryError
 from latch_sdk_gql.execute import execute
 
 from latch_cli.services.cp.ldata_utils import LDataNodeType, get_node_data
-from latch_cli.services.cp.path_utils import (
-    get_name_from_path,
-    get_path_error,
-    is_remote_path,
-)
+from latch_cli.utils.path import get_name_from_path, get_path_error, is_remote_path
 
 
 def move(

latch-2.32.0/latch_cli/services/cp/path_utils.py → latch-2.32.2/latch_cli/utils/path.py

@@ -52,7 +52,11 @@ domain = re.compile(
 #   ://domain/a/b/c => latch://domain/a/b/c
 #   /a/b/c => file:///a/b/c
 #   a/b/c => file://${pwd}/a/b/c
-def append_scheme(path: str) -> str:
+#
+# if assume_remote = True (i.e. in the ls case):
+#   /a/b/c => latch:///a/b/c
+#   a/b/c => latch:///a/b/c
+def append_scheme(path: str, *, assume_remote: bool = False) -> str:
     match = scheme.match(path)
     if match is None:
         raise PathResolutionError(f"{path} is not in a valid format")
@@ -60,9 +64,9 @@ def append_scheme(path: str) -> str:
     if match["implicit_url"] is not None:
         path = f"latch{path}"
     elif match["absolute_path"] is not None:
-        path = f"file://{path}"
+        path = f"latch://{path}" if assume_remote else f"file://{path}"
     elif match["relative_path"] is not None:
-        path = f"file://{Path.cwd()}/{path}"
+        path = f"latch:///{path}" if assume_remote else f"file://{Path.cwd()}/{path}"
 
     return path
 
@@ -108,8 +112,8 @@ def is_account_relative(path: str) -> bool:
     return match["account_relative"] is not None
 
 
-def normalize_path(path: str) -> str:
-    path = append_scheme(path)
+def normalize_path(path: str, *, assume_remote: bool = False) -> str:
+    path = append_scheme(path, assume_remote=assume_remote)
 
     if path.startswith("file://"):
         return path

{latch-2.32.0 → latch-2.32.2}/setup.py

@@ -13,7 +13,7 @@ if cur_ver < (3, 8) or cur_ver > (3, 11):
 
 setup(
     name="latch",
-    version="v2.32.0",
+    version="v2.32.2",
     author_email="kenny@latch.bio",
     description="The Latch SDK",
     packages=find_packages(),