latch 2.52.1.dev2__tar.gz → 2.52.2__tar.gz

{latch-2.52.1.dev2/latch.egg-info → latch-2.52.2}/PKG-INFO

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

{latch-2.52.1.dev2 → latch-2.52.2/latch.egg-info}/PKG-INFO

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

{latch-2.52.1.dev2 → latch-2.52.2}/latch.egg-info/SOURCES.txt

@@ -63,6 +63,7 @@ latch_cli/__init__.py
 latch_cli/click_utils.py
 latch_cli/constants.py
 latch_cli/main.py
+latch_cli/menus.py
 latch_cli/tinyrequests.py
 latch_cli/workflow_config.py
 latch_cli/auth/__init__.py
@@ -79,11 +80,6 @@ latch_cli/exceptions/cache.py
 latch_cli/exceptions/errors.py
 latch_cli/exceptions/handler.py
 latch_cli/exceptions/traceback.py
-latch_cli/menus/__init__.py
-latch_cli/menus/common.py
-latch_cli/menus/vt100.py
-latch_cli/menus/win32.py
-latch_cli/menus/win32_types.py
 latch_cli/nextflow/__init__.py
 latch_cli/nextflow/config.py
 latch_cli/nextflow/utils.py
@@ -115,13 +111,7 @@ latch_cli/services/execute/utils.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-39.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/__pycache__/init.cpython-39.pyc
 latch_cli/services/init/assemble_and_sort/.env
 latch_cli/services/init/assemble_and_sort/LICENSE
 latch_cli/services/init/assemble_and_sort/README.md
@@ -129,22 +119,18 @@ latch_cli/services/init/assemble_and_sort/__init__.py
 latch_cli/services/init/assemble_and_sort/assemble.py
 latch_cli/services/init/assemble_and_sort/sort.py
 latch_cli/services/init/assemble_and_sort/system-requirements.txt
-latch_cli/services/init/assemble_and_sort/__pycache__/__init__.cpython-310.pyc
 latch_cli/services/init/common/.dockerignore
 latch_cli/services/init/example_conda/__init__.py
 latch_cli/services/init/example_conda/conda_task.py
 latch_cli/services/init/example_conda/environment.yaml
-latch_cli/services/init/example_conda/__pycache__/__init__.cpython-310.pyc
 latch_cli/services/init/example_docker/__init__.py
 latch_cli/services/init/example_docker/task.py
-latch_cli/services/init/example_nf_integration/latch_metadata/__pycache__/__init__.cpython-311.pyc
 latch_cli/services/init/example_nfcore/Dockerfile
 latch_cli/services/init/example_nfcore/__init__.py
 latch_cli/services/init/example_nfcore/task.py
 latch_cli/services/init/example_r/__init__.py
 latch_cli/services/init/example_r/environment.R
 latch_cli/services/init/example_r/r_task.py
-latch_cli/services/init/example_r/__pycache__/__init__.cpython-310.pyc
 latch_cli/services/init/example_snakemake/Dockerfile
 latch_cli/services/init/example_snakemake/Snakefile
 latch_cli/services/init/example_snakemake/config.yaml
@@ -157,7 +143,6 @@ latch_cli/services/init/template/LICENSE
 latch_cli/services/init/template/README.md
 latch_cli/services/init/template/__init__.py
 latch_cli/services/init/template/task.py
-latch_cli/services/init/template/__pycache__/__init__.cpython-310.pyc
 latch_cli/services/register/__init__.py
 latch_cli/services/register/constants.py
 latch_cli/services/register/register.py
@@ -176,6 +161,7 @@ latch_cli/snakemake/workflow.py
 latch_cli/snakemake/config/__init__.py
 latch_cli/snakemake/config/parser.py
 latch_cli/snakemake/config/utils.py
+latch_cli/tui/__init__.py
 latch_cli/utils/__init__.py
 latch_cli/utils/path.py
 tests/__init__.py

{latch-2.52.1.dev2 → latch-2.52.2}/latch_cli/constants.py

@@ -22,7 +22,7 @@ class LatchConstants:
     base_image: str = (
         "812206152185.dkr.ecr.us-west-2.amazonaws.com/latch-base:fe0b-main"
     )
-    nextflow_latest_version: str = "v1.1.7"
+    nextflow_latest_version: str = "v1.1.8"
 
     file_max_size: int = 4 * Units.MiB
     file_chunk_size: int = 64 * Units.MiB

latch-2.52.1.dev2/latch_cli/menus/vt100.py → latch-2.52.2/latch_cli/menus.py

@@ -1,25 +1,37 @@
 import os
 import sys
-import termios
-import tty
-from functools import wraps
-from typing import Callable, List, Optional, Tuple, TypeVar
+from typing import Any, Callable, Generic, List, Optional, Tuple, TypeVar
 
-from typing_extensions import ParamSpec
+from typing_extensions import TypedDict
 
 from latch_cli.click_utils import AnsiCodes
 
-from . import common
 
-P = ParamSpec("P")
-T = TypeVar("T")
+def buffered_print() -> Tuple[Callable, Callable]:
+    buffer = []
+
+    def __print(*args):
+        for arg in args:
+            buffer.append(arg)
+
+    def __show():
+        nonlocal buffer
+        print("".join(buffer), flush=True, end="")
+        buffer = []
+
+    return __print, __show
+
+
+# Allows for exactly one print per render, removing any weird flashing
+# behavior and also speeding things up considerably
+_print, _show = buffered_print()
 
 
 def clear(k: int):
     """
-    Clear `k` lines below the cursor, returning the cursor to the start of its original line
+    Clear `k` lines below the cursor, returning the cursor to its original position
     """
-    print(f"\x1b[2K\x1b[1E" * (k) + f"\x1b[{k}F")
+    _print(f"\x1b[2K\x1b[1E" * (k) + f"\x1b[{k}F")
 
 
 def draw_box(
@@ -38,15 +50,15 @@ def draw_box(
 
 
 def clear_screen():
-    print("\x1b[2J")
+    _print("\x1b[2J")
 
 
 def remove_cursor():
-    print("\x1b[?25l")
+    _print("\x1b[?25l")
 
 
 def reveal_cursor():
-    print("\x1b[?25h")
+    _print("\x1b[?25h")
 
 
 def move_cursor(pos: Tuple[int, int]):
@@ -56,45 +68,55 @@ def move_cursor(pos: Tuple[int, int]):
     x, y = pos
     if x < 0 or y < 0:
         return
-    print(f"\x1b[{y};{x}H")
+    _print(f"\x1b[{y};{x}H")
 
 
 def move_cursor_up(n: int):
     if n <= 0:
         return
-    print(f"\x1b[{n}A")
+    _print(f"\x1b[{n}A")
 
 
 def line_up(n: int):
     """Moves to the start of the destination line"""
     if n <= 0:
         return
-    print(f"\x1b[{n}F")
+    _print(f"\x1b[{n}F")
 
 
 def move_cursor_down(n: int):
     if n <= 0:
         return
-    print(f"\x1b[{n}B")
+    _print(f"\x1b[{n}B")
 
 
 def line_down(n: int):
     """Moves to the start of the destination line"""
     if n <= 0:
         return
-    print(f"\x1b[{n}E")
+    _print(f"\x1b[{n}E")
 
 
 def move_cursor_right(n: int):
     if n <= 0:
         return
-    print(f"\x1b[{n}C")
+    _print(f"\x1b[{n}C")
 
 
 def move_cursor_left(n: int):
     if n <= 0:
         return
-    print(f"\x1b[{n}D")
+    _print(f"\x1b[{n}D")
+
+
+def current_cursor_position() -> Tuple[int, int]:
+    res = b""
+    sys.stdout.write("\x1b[6n")
+    sys.stdout.flush()
+    while not res.endswith(b"R"):
+        res += sys.stdin.buffer.read(1)
+    y, x = res.strip(b"\x1b[R").split(b";")
+    return int(x), int(y)
 
 
 def draw_vertical_line(
@@ -112,16 +134,16 @@ def draw_vertical_line(
         return
 
     if color is not None:
-        print(color)
+        _print(color)
     sep = "\x1b[1A" if up else "\x1b[1B"
     for i in range(height):
         if i == 0 and make_corner:
             corner = "\u2514" if up else "\u2510"
-            print(f"{corner}\x1b[1D{sep}")
+            _print(f"{corner}\x1b[1D{sep}")
         else:
-            print(f"\u2502\x1b[1D{sep}")
+            _print(f"\u2502\x1b[1D{sep}")
     if color is not None:
-        print("\x1b[0m")
+        _print("\x1b[0m")
 
 
 def draw_horizontal_line(
@@ -139,30 +161,16 @@ def draw_horizontal_line(
         return
 
     if color is not None:
-        print(color)
+        _print(color)
     sep = "\x1b[2D" if left else ""
     for i in range(width):
         if i == 0 and make_corner:
             corner = "\u2518" if left else "\u250c"
-            print(f"{corner}{sep}")
+            _print(f"{corner}{sep}")
         else:
-            print(f"\u2500{sep}")
+            _print(f"\u2500{sep}")
     if color is not None:
-        print("\x1b[0m")
-
-
-def raw_input(f: Callable[P, T]) -> Callable[P, T]:
-    @wraps(f)
-    def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
-        old_settings = termios.tcgetattr(sys.stdin.fileno())
-        tty.setraw(sys.stdin.fileno())
-
-        try:
-            return f(*args, **kwargs)
-        finally:
-            termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, old_settings)
-
-    return wrapper
+        _print("\x1b[0m")
 
 
 def read_next_byte() -> bytes:
@@ -186,9 +194,16 @@ def read_bytes(num_bytes: int) -> bytes:
     return result
 
 
-@raw_input
+T = TypeVar("T")
+
+
+class SelectOption(TypedDict, Generic[T]):
+    display_name: str
+    value: T
+
+
 def select_tui(
-    title: str, options: List[common.SelectOption[T]], clear_terminal: bool = True
+    title: str, options: List[SelectOption[T]], clear_terminal: bool = True
 ) -> Optional[T]:
     """
     Renders a terminal UI that allows users to select one of the options
@@ -213,7 +228,7 @@ def select_tui(
         if curr_selected < 0 or curr_selected >= len(options):
             curr_selected = 0
 
-        print(title)
+        _print(title)
         line_down(2)
 
         num_lines_rendered = 4  # 4 "extra" lines for header + footer
@@ -229,21 +244,27 @@ def select_tui(
 
                 prefix = indent[:-2] + "> "
 
-                print(f"{color}{bold}{prefix}{name}{reset}\x1b[1E")
+                _print(f"{color}{bold}{prefix}{name}{reset}\x1b[1E")
             else:
-                print(f"{indent}{name}\x1b[1E")
+                _print(f"{indent}{name}\x1b[1E")
             num_lines_rendered += 1
 
         line_down(1)
 
         control_str = "[ARROW-KEYS] Navigate\t[ENTER] Select\t[Q] Quit"
-        print(control_str)
+        _print(control_str)
         line_up(num_lines_rendered - 1)
 
-        common.show()
+        _show()
 
         return num_lines_rendered
 
+    import termios
+    import tty
+
+    old_settings = termios.tcgetattr(sys.stdin.fileno())
+    tty.setraw(sys.stdin.fileno())
+
     curr_selected = 0
     start_index = 0
     _, term_height = os.get_terminal_size()
@@ -298,4 +319,5 @@ def select_tui(
     finally:
         clear(num_lines_rendered)
         reveal_cursor()
-        common.show()
+        _show()
+        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, old_settings)

{latch-2.52.1.dev2 → latch-2.52.2}/latch_cli/services/execute/main.py

@@ -4,14 +4,13 @@ import json
 import os
 import signal
 import sys
-from typing import Literal, Optional, TypedDict, Union
+from typing import Generic, Literal, Optional, Tuple, TypedDict, TypeVar, Union
 from urllib.parse import urljoin, urlparse
 
 import websockets.client as websockets
 from latch_sdk_config.latch import NUCLEUS_URL
 from typing_extensions import TypeAlias
 
-from latch_cli.menus import raw_input
 from latch_cli.services.execute.utils import (
     ContainerNode,
     EGNNode,
@@ -173,7 +172,6 @@ async def connect(egn_info: EGNNode, container_info: Optional[ContainerNode]):
             pass
 
 
-@raw_input
 def exec(
     execution_id: Optional[str] = None,
     egn_id: Optional[str] = None,
@@ -186,4 +184,13 @@ def exec(
     egn_info = get_egn_info(execution_info, egn_id)
     container_info = get_container_info(egn_info, container_index)
 
-    asyncio.run(connect(egn_info, container_info))
+    import termios
+    import tty
+
+    old_settings_stdin = termios.tcgetattr(sys.stdin.fileno())
+    tty.setraw(sys.stdin)
+
+    try:
+        asyncio.run(connect(egn_info, container_info))
+    finally:
+        termios.tcsetattr(sys.stdin.fileno(), termios.TCSANOW, old_settings_stdin)