latch 2.51.2.dev6__tar.gz → 2.51.2.dev8__tar.gz

{latch-2.51.2.dev6/latch.egg-info → latch-2.51.2.dev8}/PKG-INFO

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

{latch-2.51.2.dev6 → latch-2.51.2.dev8/latch.egg-info}/PKG-INFO

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

latch-2.51.2.dev8/latch_cli/menus/common.py

@@ -0,0 +1,35 @@
+import sys
+from typing import Callable, Generic, Tuple
+
+from git import Optional
+from typing_extensions import TypedDict, TypeVar
+
+old_print = print
+
+
+def buffered_print() -> Tuple[Callable, Callable]:
+    buffer = []
+
+    def __print(*args):
+        for arg in args:
+            buffer.append(arg)
+
+    def __show():
+        nonlocal buffer
+        old_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()
+
+
+T = TypeVar("T")
+
+
+class SelectOption(TypedDict, Generic[T]):
+    display_name: str
+    value: T

{latch-2.51.2.dev6 → latch-2.51.2.dev8}/latch_cli/menus/vt100.py

@@ -3,7 +3,7 @@ import sys
 import termios
 import tty
 from functools import wraps
-from typing import Callable, List, Optional, TypeVar
+from typing import Callable, List, Optional, Tuple, TypeVar
 
 from typing_extensions import ParamSpec
 
@@ -15,6 +15,142 @@ P = ParamSpec("P")
 T = TypeVar("T")
 
 
+def clear(k: int):
+    """
+    Clear `k` lines below the cursor, returning the cursor to the start of its original line
+    """
+    print(f"\x1b[2K\x1b[1E" * (k) + f"\x1b[{k}F")
+
+
+def draw_box(
+    ul_corner_pos: Tuple[int, int],
+    height: int,
+    width: int,
+    color: Optional[str] = None,
+):
+    if height <= 0 or width <= 0:
+        return
+    move_cursor(ul_corner_pos)
+    draw_horizontal_line(width, make_corner=True, color=color)
+    draw_vertical_line(height, make_corner=True, color=color)
+    draw_horizontal_line(width, left=True, make_corner=True, color=color)
+    draw_vertical_line(height, up=True, make_corner=True, color=color)
+
+
+def clear_screen():
+    print("\x1b[2J")
+
+
+def remove_cursor():
+    print("\x1b[?25l")
+
+
+def reveal_cursor():
+    print("\x1b[?25h")
+
+
+def move_cursor(pos: Tuple[int, int]):
+    """
+    Move the cursor to a given (x, y) coordinate
+    """
+    x, y = pos
+    if x < 0 or y < 0:
+        return
+    print(f"\x1b[{y};{x}H")
+
+
+def move_cursor_up(n: int):
+    if n <= 0:
+        return
+    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")
+
+
+def move_cursor_down(n: int):
+    if n <= 0:
+        return
+    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")
+
+
+def move_cursor_right(n: int):
+    if n <= 0:
+        return
+    print(f"\x1b[{n}C")
+
+
+def move_cursor_left(n: int):
+    if n <= 0:
+        return
+    print(f"\x1b[{n}D")
+
+
+def draw_vertical_line(
+    height: int,
+    up: bool = False,
+    make_corner: bool = False,
+    color: Optional[str] = None,
+):
+    """
+    Draws a vertical line with given `height`, going upwards if `up` is True
+    and downwards otherwise.
+    """
+
+    if height <= 0:
+        return
+
+    if color is not None:
+        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}")
+        else:
+            print(f"\u2502\x1b[1D{sep}")
+    if color is not None:
+        print("\x1b[0m")
+
+
+def draw_horizontal_line(
+    width: int,
+    left: bool = False,
+    make_corner: bool = False,
+    color: Optional[str] = None,
+):
+    """
+    Draws a horizontal line with given `width`, going to the left if `left` is True
+    and to the right otherwise.
+    """
+
+    if width <= 0:
+        return
+
+    if color is not None:
+        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}")
+        else:
+            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:
@@ -78,7 +214,7 @@ def select_tui(
             curr_selected = 0
 
         print(title)
-        common.line_down(2)
+        line_down(2)
 
         num_lines_rendered = 4  # 4 "extra" lines for header + footer
 
@@ -98,11 +234,11 @@ def select_tui(
                 print(f"{indent}{name}\x1b[1E")
             num_lines_rendered += 1
 
-        common.line_down(1)
+        line_down(1)
 
         control_str = "[ARROW-KEYS] Navigate\t[ENTER] Select\t[Q] Quit"
         print(control_str)
-        common.line_up(num_lines_rendered - 1)
+        line_up(num_lines_rendered - 1)
 
         common.show()
 
@@ -111,16 +247,16 @@ def select_tui(
     curr_selected = 0
     start_index = 0
     _, term_height = os.get_terminal_size()
-    common.remove_cursor()
+    remove_cursor()
 
     max_per_page = min(len(options), term_height - 4)
 
     if clear_terminal:
-        common.clear_screen()
-        common.move_cursor((0, 0))
+        clear_screen()
+        move_cursor((0, 0))
     else:
         print("\n" * (max_per_page + 3))
-        common.move_cursor_up(max_per_page + 4)
+        move_cursor_up(max_per_page + 4)
 
     num_lines_rendered = render(
         curr_selected,
@@ -151,7 +287,7 @@ def select_tui(
                         start_index += 1
                 else:
                     continue
-            common.clear(num_lines_rendered)
+            clear(num_lines_rendered)
             num_lines_rendered = render(
                 curr_selected,
                 start_index=start_index,
@@ -160,6 +296,6 @@ def select_tui(
     except KeyboardInterrupt:
         ...
     finally:
-        common.clear(num_lines_rendered)
-        common.reveal_cursor()
+        clear(num_lines_rendered)
+        reveal_cursor()
         common.show()

{latch-2.51.2.dev6 → latch-2.51.2.dev8}/latch_cli/menus/win32.py

@@ -1,12 +1,12 @@
 import msvcrt
 import os
 import sys
-from ctypes import c_ulong, pointer, windll
+from ctypes import byref, c_char, c_long, c_ulong, pointer, windll
 from ctypes.wintypes import DWORD, HANDLE
 from dataclasses import dataclass
 from enum import Enum
 from functools import wraps
-from typing import TYPE_CHECKING, Callable, List, Optional, TypeVar
+from typing import Callable, List, Optional, Tuple, TypeVar
 
 from typing_extensions import ParamSpec
 
@@ -14,19 +14,168 @@ from latch_cli.click_utils import AnsiCodes
 
 from . import common
 from .win32_types import (
+    CONSOLE_SCREEN_BUFFER_INFO,
+    COORD,
     INPUT_RECORD,
     KEY_EVENT_RECORD,
     MOUSE_EVENT_RECORD,
     STD_INPUT_HANDLE,
+    STD_OUTPUT_HANDLE,
     EventTypes,
 )
 
-# assert sys.platform == "win32"
-
 P = ParamSpec("P")
 T = TypeVar("T")
 
 
+hconsole = HANDLE(windll.kernel32.GetStdHandle(STD_OUTPUT_HANDLE))
+
+
+# convenience dataclasses for readability
+@dataclass
+class Pair:
+    x: int
+    y: int
+
+
+@dataclass
+class ConsoleScreenBufferInfo:
+    raw: CONSOLE_SCREEN_BUFFER_INFO
+    buffer_size: Pair
+    cursor_position: Pair
+    attributes: int
+    window_top_left: Pair
+    window_bottom_right: Pair
+    max_window_size: Pair
+
+    def window_dimensions(self) -> Pair:
+        return Pair(
+            x=self.window_bottom_right.x - self.window_top_left.x,
+            y=self.window_bottom_right.y - self.window_top_left.y,
+        )
+
+
+def get_win32_screen_buffer_info() -> ConsoleScreenBufferInfo:
+    """
+    https://github.com/prompt-toolkit/python-prompt-toolkit/blob/669541123c9a72da1fda662cbd0a18ffe9e6d113/src/prompt_toolkit/output/win32.py#L185
+    """
+
+    sbinfo = CONSOLE_SCREEN_BUFFER_INFO()
+
+    success = windll.kernel32.GetConsoleScreenBufferInfo(hconsole, byref(sbinfo))
+
+    if success:
+        return ConsoleScreenBufferInfo(
+            raw=sbinfo,
+            buffer_size=Pair(
+                x=sbinfo.dwSize.X,
+                y=sbinfo.dwSize.Y,
+            ),
+            cursor_position=Pair(
+                x=sbinfo.dwCursorPosition.X,
+                y=sbinfo.dwCursorPosition.Y,
+            ),
+            attributes=sbinfo.wAttributes,
+            window_top_left=Pair(
+                x=sbinfo.srWindow.Left,
+                y=sbinfo.srWindow.Top,
+            ),
+            window_bottom_right=Pair(
+                x=sbinfo.srWindow.Right,
+                y=sbinfo.srWindow.Bottom,
+            ),
+            max_window_size=Pair(
+                x=sbinfo.dwMaximumWindowSize.X,
+                y=sbinfo.dwMaximumWindowSize.Y,
+            ),
+        )
+    else:
+        raise RuntimeError("No windows console found")
+
+
+def _erase(start: COORD, length: int) -> None:
+    """
+    https://github.com/prompt-toolkit/python-prompt-toolkit/blob/669541123c9a72da1fda662cbd0a18ffe9e6d113/src/prompt_toolkit/output/win32.py#L255
+    """
+    chars_written = c_ulong()
+
+    windll.kernel32.FillConsoleOutputCharacterA(
+        hconsole, c_char(b" "), DWORD(length), start, byref(chars_written)
+    )
+
+    # Reset attributes.
+    sbinfo = get_win32_screen_buffer_info()
+    windll.kernel32.FillConsoleOutputAttribute(
+        hconsole, sbinfo.attributes, length, start, byref(chars_written)
+    )
+
+
+def clear(k: int):
+    """
+    Clear `k` lines below the cursor, returning the cursor to the start of its original line
+    """
+    sbinfo = get_win32_screen_buffer_info()
+
+    length = sbinfo.window_dimensions().x * k
+    _erase(sbinfo.raw.dwCursorPosition, length)
+
+    # does the cursor move at all here? do we need to move back to the original line?
+
+
+def clear_screen():
+    sbinfo = get_win32_screen_buffer_info()
+    dims = sbinfo.window_dimensions()
+
+    start = COORD(X=sbinfo.window_top_left.x, Y=sbinfo.window_top_left.y)
+    length = dims.x * dims.y
+
+    _erase(start, length)
+
+
+def remove_cursor():
+    pass  # not supported in windows afaict
+
+
+def reveal_cursor():
+    pass  # not supported in windows afaict
+
+
+def move_cursor(x: int, y: int):
+    """
+    Move the cursor to a given (x, y) coordinate
+    """
+    if x < 0 or y < 0:
+        return
+
+    windll.kernel32.SetConsoleCursorPosition(hconsole, COORD(X=x, Y=y))
+
+
+def move_cursor_up(n: int):
+    if n <= 0:
+        return
+
+    sbinfo = get_win32_screen_buffer_info()
+
+    x = sbinfo.cursor_position.x
+    y = sbinfo.cursor_position.y - n
+    move_cursor(x, y)
+
+
+def line_up(n: int):
+    """Moves to the start of the destination line"""
+    sbinfo = get_win32_screen_buffer_info()
+
+    x = 0
+    y = sbinfo.cursor_position.y - n
+    move_cursor(x, y)
+
+
+def line_down(n: int):
+    """Moves to the start of the destination line"""
+
+    line_up(-n)
+
+
 def raw_input(f: Callable[P, T]) -> Callable[P, T]:
     # ayush: got most of this from
     # https://github.com/prompt-toolkit/python-prompt-toolkit/blob/669541123c9a72da1fda662cbd0a18ffe9e6d113/src/prompt_toolkit/input/win32.py
@@ -153,7 +302,7 @@ def select_tui(
             curr_selected = 0
 
         print(title)
-        common.line_down(2)
+        line_down(2)
 
         num_lines_rendered = 4  # 4 "extra" lines for header + footer
 
@@ -162,22 +311,30 @@ def select_tui(
                 break
             name = options[i]["display_name"]
             if i == curr_selected:
-                color = AnsiCodes.color
-                bold = AnsiCodes.bold
-                reset = AnsiCodes.full_reset
-
                 prefix = indent[:-2] + "> "
 
-                print(f"{color}{bold}{prefix}{name}{reset}\x1b[1E")
+                sbinfo = get_win32_screen_buffer_info()
+                attrs = sbinfo.attributes
+
+                # light blue
+                color = 0x9
+                attrs = attrs & ~0xF
+                attrs |= color
+
+                attrs |= 1 << 8  # bold
+
+                windll.kernel32.SetConsoleTextAttribute(hconsole, attrs)
+                print(f"{prefix}{name}\n")
+                windll.kernel32.SetConsoleTextAttribute(hconsole, sbinfo.attributes)
             else:
-                print(f"{indent}{name}\x1b[1E")
+                print(f"{indent}{name}\n")
             num_lines_rendered += 1
 
-        common.line_down(1)
+        line_down(1)
 
         control_str = "[ARROW-KEYS] Navigate\t[ENTER] Select\t[Q] Quit"
         print(control_str)
-        common.line_up(num_lines_rendered - 1)
+        line_up(num_lines_rendered - 1)
 
         common.show()
 
@@ -186,16 +343,16 @@ def select_tui(
     curr_selected = 0
     start_index = 0
     _, term_height = os.get_terminal_size()
-    common.remove_cursor()
+    remove_cursor()
 
     max_per_page = min(len(options), term_height - 4)
 
     if clear_terminal:
-        common.clear_screen()
-        common.move_cursor((0, 0))
+        clear_screen()
+        move_cursor(0, 0)
     else:
         print("\n" * (max_per_page + 3))
-        common.move_cursor_up(max_per_page + 4)
+        move_cursor_up(max_per_page + 4)
 
     num_lines_rendered = render(
         curr_selected,
@@ -227,7 +384,7 @@ def select_tui(
             else:
                 continue
 
-            common.clear(num_lines_rendered)
+            clear(num_lines_rendered)
             num_lines_rendered = render(
                 curr_selected,
                 start_index=start_index,
@@ -236,6 +393,6 @@ def select_tui(
     except KeyboardInterrupt:
         ...
     finally:
-        common.clear(num_lines_rendered)
-        common.reveal_cursor()
+        clear(num_lines_rendered)
+        reveal_cursor()
         common.show()