fal 1.49.3__py3-none-any.whl → 1.50.0__py3-none-any.whl

fal/_fal_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.49.3'
-__version_tuple__ = version_tuple = (1, 49, 3)
+__version__ = version = '1.50.0'
+__version_tuple__ = version_tuple = (1, 50, 0)
 
 __commit_id__ = commit_id = None

fal/api/client.py

@@ -66,6 +66,12 @@ class _RunnersNamespace:
     def list(self, *, since=None) -> List[RunnerInfo]:
         return runners_api.list_runners(self.client, since=since)
 
+    def stop(self, runner_id: str) -> None:
+        return runners_api.stop_runner(self.client, runner_id)
+
+    def kill(self, runner_id: str) -> None:
+        return runners_api.kill_runner(self.client, runner_id)
+
 
 @dataclass
 class SyncServerlessClient:

fal/api/runners.py

@@ -14,3 +14,13 @@ def list_runners(
 ) -> List[RunnerInfo]:
     with FalServerlessClient(client._grpc_host, client._credentials).connect() as conn:
         return conn.list_runners(start_time=since)
+
+
+def stop_runner(client: SyncServerlessClient, runner_id: str) -> None:
+    with FalServerlessClient(client._grpc_host, client._credentials).connect() as conn:
+        conn.stop_runner(runner_id)
+
+
+def kill_runner(client: SyncServerlessClient, runner_id: str) -> None:
+    with FalServerlessClient(client._grpc_host, client._credentials).connect() as conn:
+        conn.kill_runner(runner_id)

fal/cli/runners.py

@@ -1,12 +1,23 @@
 from __future__ import annotations
 
+import argparse
+import fcntl
 import json
+import os
+import signal
+import struct
+import sys
+import termios
+import tty
 from collections import deque
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
 from http import HTTPStatus
+from queue import Empty, Queue
+from threading import Thread
 from typing import Iterator, List
 
+import grpc
 import httpx
 from httpx_sse import connect_sse
 from rich.console import Console
@@ -14,7 +25,7 @@ from structlog.typing import EventDict
 
 from fal.api.client import SyncServerlessClient
 from fal.rest_client import REST_CLIENT
-from fal.sdk import FalServerlessClient, RunnerInfo, RunnerState
+from fal.sdk import RunnerInfo, RunnerState
 
 from .parser import FalClientParser, SinceAction, get_output_parser
 
@@ -95,12 +106,108 @@ def runners_requests_table(runners: list[RunnerInfo]):
     return table
 
 
+def _get_tty_size():
+    """Get current terminal dimensions."""
+    try:
+        h, w = struct.unpack("HH", fcntl.ioctl(0, termios.TIOCGWINSZ, b"\0" * 4))[:2]
+        return h, w
+    except (OSError, ValueError):
+        return 24, 80  # Fallback to standard size
+
+
+def _shell(args):
+    """Execute interactive shell in runner."""
+    import isolate_proto
+
+    client = SyncServerlessClient(host=args.host, team=args.team)
+    stub = client._create_host()._connection.stub
+    runner_id = args.id
+
+    # Setup terminal for raw mode
+    fd = sys.stdin.fileno()
+    old_settings = termios.tcgetattr(fd)
+    tty.setraw(fd)
+
+    # Message queue for stdin data and resize events
+    messages = Queue()  # type: ignore
+    stop_flag = False
+
+    def handle_resize(*_):
+        messages.put(("resize", None))
+
+    signal.signal(signal.SIGWINCH, handle_resize)
+
+    def read_stdin():
+        """Read stdin in a background thread."""
+        nonlocal stop_flag
+        while not stop_flag:
+            try:
+                data = os.read(fd, 4096)
+                if not data:
+                    break
+                messages.put(("data", data))
+            except OSError:
+                break
+
+    reader = Thread(target=read_stdin, daemon=True)
+    reader.start()
+
+    def stream_inputs():
+        """Generate input stream for gRPC."""
+        # Send initial message with runner_id and terminal size
+        msg = isolate_proto.ShellRunnerInput(runner_id=runner_id)
+        h, w = _get_tty_size()
+        msg.tty_size.height = h
+        msg.tty_size.width = w
+        yield msg
+
+        # Stream stdin data and resize events
+        while True:
+            try:
+                msg_type, data = messages.get(timeout=0.1)
+            except Empty:
+                continue
+
+            if msg_type == "data":
+                yield isolate_proto.ShellRunnerInput(data=data)
+            elif msg_type == "resize":
+                msg = isolate_proto.ShellRunnerInput()
+                h, w = _get_tty_size()
+                msg.tty_size.height = h
+                msg.tty_size.width = w
+                yield msg
+
+    exit_code = 1
+    try:
+        for output in stub.ShellRunner(stream_inputs()):
+            if output.HasField("exit_code"):
+                exit_code = output.exit_code
+                break
+            if output.data:
+                sys.stdout.buffer.write(output.data)
+                sys.stdout.buffer.flush()
+            if output.close:
+                break
+        exit_code = exit_code or 0
+    except grpc.RpcError as exc:
+        args.console.print(f"\n[red]Connection error:[/] {exc.details()}")
+    except Exception as exc:
+        args.console.print(f"\n[red]Error:[/] {exc}")
+    finally:
+        stop_flag = True
+        termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
+
+    return exit_code
+
+
+def _stop(args):
+    client = SyncServerlessClient(host=args.host, team=args.team)
+    client.runners.stop(args.id)
+
+
 def _kill(args):
     client = SyncServerlessClient(host=args.host, team=args.team)
-    with FalServerlessClient(
-        client._grpc_host, client._credentials
-    ).connect() as connection:
-        connection.kill_runner(args.id)
+    client.runners.kill(args.id)
 
 
 def _list_json(args, runners: list[RunnerInfo]):
@@ -161,6 +268,21 @@ def _list(args):
         raise AssertionError(f"Invalid output format: {args.output}")
 
 
+def _add_stop_parser(subparsers, parents):
+    stop_help = "Stop a runner gracefully."
+    parser = subparsers.add_parser(
+        "stop",
+        description=stop_help,
+        help=stop_help,
+        parents=parents,
+    )
+    parser.add_argument(
+        "id",
+        help="Runner ID.",
+    )
+    parser.set_defaults(func=_stop)
+
+
 def _add_kill_parser(subparsers, parents):
     kill_help = "Kill a runner."
     parser = subparsers.add_parser(
@@ -546,6 +668,17 @@ def _add_logs_parser(subparsers, parents):
     parser.set_defaults(func=_logs)
 
 
+def _add_shell_parser(subparsers, parents):
+    """Add hidden shell command parser."""
+    parser = subparsers.add_parser(
+        "shell",
+        help=argparse.SUPPRESS,
+        parents=parents,
+    )
+    parser.add_argument("id", help="Runner ID.")
+    parser.set_defaults(func=_shell)
+
+
 def add_parser(main_subparsers, parents):
     runners_help = "Manage fal runners."
     parser = main_subparsers.add_parser(
@@ -563,6 +696,8 @@ def add_parser(main_subparsers, parents):
         parser_class=FalClientParser,
     )
 
+    _add_stop_parser(subparsers, parents)
     _add_kill_parser(subparsers, parents)
     _add_list_parser(subparsers, parents)
     _add_logs_parser(subparsers, parents)
+    _add_shell_parser(subparsers, parents)

fal/logging/__init__.py

@@ -7,11 +7,6 @@ from structlog.typing import EventDict, WrappedLogger
 
 from .style import LEVEL_STYLES
 
-# Unfortunately structlog console processor does not support
-# more general theming as a public API. Consider a PR on the
-# structlog repo to add better support for it.
-structlog.dev._ColorfulStyles.bright = ""
-
 
 class DebugConsoleLogProcessor:
     """

fal/sdk.py

@@ -884,6 +884,10 @@ class FalServerlessConnection:
             for secret in response.secrets
         ]
 
+    def stop_runner(self, runner_id: str) -> None:
+        request = isolate_proto.StopRunnerRequest(runner_id=runner_id)
+        self.stub.StopRunner(request)
+
     def kill_runner(self, runner_id: str) -> None:
         request = isolate_proto.KillRunnerRequest(runner_id=runner_id)
         self.stub.KillRunner(request)

fal/toolkit/file/providers/fal.py

@@ -56,21 +56,44 @@ def _should_retry(exc: Exception) -> bool:
     return False
 
 
+class _RetryingRequestContext:
+    def __init__(self, request: Request, kwargs: dict[str, Any]):
+        self.request = request
+        self.kwargs = kwargs
+        self._cm: Any | None = None
+        self._response: addinfourl | None = None
+
+    def __enter__(self) -> addinfourl:
+        def _enter_once() -> addinfourl:
+            # Obtain the original context manager and explicitly enter it
+            self._cm = _urlopen(self.request, **self.kwargs)
+            return self._cm.__enter__()
+
+        _enter_with_retry = retry(
+            max_retries=MAX_ATTEMPTS,
+            base_delay=BASE_DELAY,
+            max_delay=MAX_DELAY,
+            backoff_type="exponential",
+            jitter=True,
+            should_retry=_should_retry,
+        )(_enter_once)
+
+        self._response = _enter_with_retry()
+        assert self._response is not None
+        return self._response
+
+    def __exit__(self, exc_type, exc_val, exc_tb) -> bool:
+        if self._cm is not None:
+            return self._cm.__exit__(exc_type, exc_val, exc_tb)
+        return False
+
+
 @contextmanager
 def _maybe_retry_request(
     request: Request,
     **kwargs: Any,
 ) -> Generator[addinfourl, None, None]:
-    _urlopen_with_retry = retry(
-        max_retries=MAX_ATTEMPTS,
-        base_delay=BASE_DELAY,
-        max_delay=MAX_DELAY,
-        backoff_type="exponential",
-        jitter=True,
-        should_retry=_should_retry,
-    )(_urlopen)
-
-    with _urlopen_with_retry(request, **kwargs) as response:
+    with _RetryingRequestContext(request, kwargs) as response:
         yield response
 
 

{fal-1.49.3.dist-info → fal-1.50.0.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.49.3
+Version: 1.50.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: isolate[build]<0.21.0,>=0.18.0
-Requires-Dist: isolate-proto<0.20.0,>=0.19.0
+Requires-Dist: isolate-proto<0.23.0,>=0.22.0
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.49.3.dist-info → fal-1.50.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=Fm2Lp5OuT8uPpdd9Zw-cA1A-4engOTbwXFkIEgRRG9s,706
+fal/_fal_version.py,sha256=_Pf-vbXKGGS2hP-Yx1JBi6Y-zBGNCXuwL2wRrnt_z_s,706
 fal/_serialization.py,sha256=2hPQhinTWinTTs2gDjPG6SxVCwkL_i6S8TfOSoCqLUs,7626
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
 fal/app.py,sha256=mW7H2k41y4-BTEyvVmwTMEfVy2a5_ctAHTZEtQCn2ig,31061
@@ -13,16 +13,16 @@ fal/flags.py,sha256=QonyDM7R2GqfAB1bJr46oriu-fHJCkpUwXuSdanePWg,987
 fal/project.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
-fal/sdk.py,sha256=e4ZzTn4qjUeRc0puqdITtI0omDrClenZNwmuUea4Z8I,29508
+fal/sdk.py,sha256=ksxXaSKzsK5KehDsmPzuhh-RX6kJazttuAY41NN-kqQ,29669
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=GSDJFdGBM7MtjkWIZW-VHcA6T99nZVYcRClLcoKNHuk,2309
 fal/workflows.py,sha256=Zl4f6Bs085hY40zmqScxDUyCu7zXkukDbW02iYOLTTI,14805
 fal/api/__init__.py,sha256=dcPgWqbf3xA0BSv1rKsZMOmIyZeHjiIwTrGLYQHnhjI,88
 fal/api/api.py,sha256=m67EqjDcCiCHFdBDkVpCqFEgiW2panqKXay-JZxpXzo,51940
 fal/api/apps.py,sha256=YSy2RUvFGBmXp8OrtWf49FMLvzwS79e0LD426naaMx0,2219
-fal/api/client.py,sha256=DGKL-FAc_JNTacZ7MW6zDWkozTbECQSeo3lQQoaFIRY,3925
+fal/api/client.py,sha256=KCHZ6_Eom5j4n0hAujsGBjjXaOySg1KBh3dk0V8Qaw8,4141
 fal/api/deploy.py,sha256=1HpvVbdKxJHXjq6Y7KzSHTKfe_MYDs_a2vR5tKMAykA,6447
-fal/api/runners.py,sha256=4P1llGDhcl0xM5UayK8XvxGMU-o07gzZaAchkUUKREY,484
+fal/api/runners.py,sha256=QE7SnczoIC5ZEmeTFShkhaSFOMMkHBHrt-3y_IuFruE,878
 fal/auth/__init__.py,sha256=mtyQou8DGHC-COjW9WbtRyyzjyt7fMlhVmsB4U-CBh4,6509
 fal/auth/auth0.py,sha256=g5OgEKe4rsbkLQp6l7EauOAVL6WsmKjuA1wmzmyvvhc,5354
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
@@ -43,7 +43,7 @@ fal/cli/parser.py,sha256=siSY1kxqczZIs3l_jLwug_BpVzY_ZqHpewON3am83Ow,6658
 fal/cli/profile.py,sha256=PAY_ffifCT71VJ8VxfDVaXPT0U1oN8drvWZDFRXwvek,6678
 fal/cli/queue.py,sha256=YhcD0URGeqaJXqTl1hPEV9-UqdWsQ-4beG5xE9AGLJI,2727
 fal/cli/run.py,sha256=l3wq-Fa3bCznKrdsC-4ouAU_74rAjrb-SqRCWEuGJQM,1432
-fal/cli/runners.py,sha256=29SQqBQQidABiDYaW-SA68HjxVw4tbxfXwimevX_xkw,17282
+fal/cli/runners.py,sha256=JaqSQWQXRjM3vatllLUp8KnfElhUpih9kyPCuaHUedY,20980
 fal/cli/secrets.py,sha256=HfIeO2IZpCEiBC6Cs5Kpi3zckfDnc7GsLwLdgj3NnPU,3085
 fal/cli/teams.py,sha256=_JcNcf659ZoLBFOxKnVP5A6Pyk1jY1vh4_xzMweYIDo,1285
 fal/console/__init__.py,sha256=lGPUuTqIM9IKTa1cyyA-MA2iZJKVHp2YydsITZVlb6g,148
@@ -56,7 +56,7 @@ fal/exceptions/__init__.py,sha256=4hq-sy3dMZs6YxvbO_p6R-bK4Tzf7ubvA8AyUR0GVPo,34
 fal/exceptions/_base.py,sha256=PLSOHQs7lftDaRYDHKz9xkB6orQvynmUTi4DrdPnYMs,1797
 fal/exceptions/_cuda.py,sha256=L3qvDNaPTthp95IFSBI6pMt3YbRfn1H0inQkj_7NKF8,1719
 fal/exceptions/auth.py,sha256=fHea3SIeguInJVB5M33IuP4I5e_pVEifck1C_XJTYvc,351
-fal/logging/__init__.py,sha256=U7DhMpnNqmVdC2XCT5xZkNmYhpL0Q85iDYPeSo_56LU,1532
+fal/logging/__init__.py,sha256=SRuG6TpTmxFmPtAKH0ZBqhpvahfBccFbaKNvKRZPPd0,1320
 fal/logging/isolate.py,sha256=jIryi46ZVlJ1mfan4HLNQQ3jwMi8z-WwfqqLlttQVkc,2449
 fal/logging/style.py,sha256=ckIgHzvF4DShM5kQh8F133X53z_vF46snuDHVmo_h9g,386
 fal/logging/trace.py,sha256=OhzB6d4rQZimBc18WFLqH_9BGfqFFumKKTAGSsmWRMg,1904
@@ -70,7 +70,7 @@ fal/toolkit/audio/audio.py,sha256=gt458h989iQ-EhQSH-mCuJuPBY4RneLJE05f_QWU1E0,57
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
 fal/toolkit/file/file.py,sha256=_KCKmtmBkBIKD_gFOZALV10dCtOFZTC9MQw2qmdeevw,11013
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
-fal/toolkit/file/providers/fal.py,sha256=P9hm11uKVe6ilmL7CjFztBHswZEHOm4k-K4B36UZe6M,47543
+fal/toolkit/file/providers/fal.py,sha256=S1DjzKtM69IvHLhhID2Lf4atKiYBWLB4EVEiC52-x9g,48374
 fal/toolkit/file/providers/gcp.py,sha256=DKeZpm1MjwbvEsYvkdXUtuLIJDr_UNbqXj_Mfv3NTeo,2437
 fal/toolkit/file/providers/r2.py,sha256=YqnYkkAo_ZKIa-xoSuDnnidUFwJWHdziAR34PE6irdI,3061
 fal/toolkit/file/providers/s3.py,sha256=EI45T54Mox7lHZKROss_O8o0DIn3CHP9k1iaNYVrxvg,2714
@@ -152,8 +152,8 @@ openapi_fal_rest/models/workflow_node_type.py,sha256=-FzyeY2bxcNmizKbJI8joG7byRi
 openapi_fal_rest/models/workflow_schema.py,sha256=4K5gsv9u9pxx2ItkffoyHeNjBBYf6ur5bN4m_zePZNY,2019
 openapi_fal_rest/models/workflow_schema_input.py,sha256=2OkOXWHTNsCXHWS6EGDFzcJKkW5FIap-2gfO233EvZQ,1191
 openapi_fal_rest/models/workflow_schema_output.py,sha256=EblwSPAGfWfYVWw_WSSaBzQVju296is9o28rMBAd0mc,1196
-fal-1.49.3.dist-info/METADATA,sha256=JTZT-DHUU8hNp1OqHcXcQOHMxLV6yAf6hjGKw-tVjXs,4250
-fal-1.49.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.49.3.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.49.3.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.49.3.dist-info/RECORD,,
+fal-1.50.0.dist-info/METADATA,sha256=_lrQ7svffHYjyo3QCatmTJJuzm1FGuHrddF7IQw9_F8,4250
+fal-1.50.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.50.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.50.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.50.0.dist-info/RECORD,,