fal 1.36.1__tar.gz → 1.38.0__tar.gz

{fal-1.36.1/fal.egg-info → fal-1.38.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.36.1
+Version: 1.38.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.20.0,>=0.18.0
-Requires-Dist: isolate-proto<0.15.0,>=0.14.1
+Requires-Dist: isolate-proto<0.17.0,>=0.16.0
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
@@ -28,6 +28,8 @@ Requires-Dist: httpx>=0.15.4
 Requires-Dist: attrs>=21.3.0
 Requires-Dist: python-dateutil<3,>=2.8.0
 Requires-Dist: types-python-dateutil<3,>=2.8.0
+Requires-Dist: dateparser<2,>=1.2.0
+Requires-Dist: types-dateparser<2,>=1.2.0
 Requires-Dist: importlib-metadata>=4.4; python_version < "3.10"
 Requires-Dist: msgpack<2,>=1.0.7
 Requires-Dist: websockets>=12.0

{fal-1.36.1 → fal-1.38.0/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.36.1
+Version: 1.38.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.20.0,>=0.18.0
-Requires-Dist: isolate-proto<0.15.0,>=0.14.1
+Requires-Dist: isolate-proto<0.17.0,>=0.16.0
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
@@ -28,6 +28,8 @@ Requires-Dist: httpx>=0.15.4
 Requires-Dist: attrs>=21.3.0
 Requires-Dist: python-dateutil<3,>=2.8.0
 Requires-Dist: types-python-dateutil<3,>=2.8.0
+Requires-Dist: dateparser<2,>=1.2.0
+Requires-Dist: types-dateparser<2,>=1.2.0
 Requires-Dist: importlib-metadata>=4.4; python_version < "3.10"
 Requires-Dist: msgpack<2,>=1.0.7
 Requires-Dist: websockets>=12.0

{fal-1.36.1 → fal-1.38.0}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
 isolate[build]<0.20.0,>=0.18.0
-isolate-proto<0.15.0,>=0.14.1
+isolate-proto<0.17.0,>=0.16.0
 grpcio<2,>=1.64.0
 dill==0.3.7
 cloudpickle==3.0.0
@@ -21,6 +21,8 @@ httpx>=0.15.4
 attrs>=21.3.0
 python-dateutil<3,>=2.8.0
 types-python-dateutil<3,>=2.8.0
+dateparser<2,>=1.2.0
+types-dateparser<2,>=1.2.0
 msgpack<2,>=1.0.7
 websockets>=12.0
 pillow<11,>=10.2.0

{fal-1.36.1 → fal-1.38.0}/pyproject.toml

@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "isolate[build]>=0.18.0,<0.20.0",
-    "isolate-proto>=0.14.1,<0.15.0",
+    "isolate-proto>=0.16.0,<0.17.0",
     "grpcio>=1.64.0,<2",
     "dill==0.3.7",
     "cloudpickle==3.0.0",
@@ -47,6 +47,8 @@ dependencies = [
     "attrs>=21.3.0",
     "python-dateutil>=2.8.0,<3",
     "types-python-dateutil>=2.8.0,<3",
+    "dateparser>=1.2.0,<2",
+    "types-dateparser>=1.2.0,<2",
     # For 3.9 and earlier, importlib-metadata's newer versions are included in the standard library.
     'importlib-metadata>=4.4; python_version < "3.10"',
     "msgpack>=1.0.7,<2",

{fal-1.36.1 → fal-1.38.0}/src/fal/_fal_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.36.1'
-__version_tuple__ = version_tuple = (1, 36, 1)
+__version__ = version = '1.38.0'
+__version_tuple__ = version_tuple = (1, 38, 0)
 
 __commit_id__ = commit_id = None

{fal-1.36.1 → fal-1.38.0}/src/fal/cli/apps.py

@@ -8,7 +8,7 @@ import fal.cli.runners as runners
 from fal.sdk import RunnerState
 
 from ._utils import get_client
-from .parser import FalClientParser, get_output_parser
+from .parser import FalClientParser, SinceAction, get_output_parser
 
 if TYPE_CHECKING:
     from fal.sdk import AliasInfo, ApplicationInfo
@@ -291,27 +291,38 @@ def _add_set_rev_parser(subparsers, parents):
 def _runners(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        alias_runners = connection.list_alias_runners(alias=args.app_name)
-
-    runners_table = runners.runners_table(alias_runners)
-    pending_runners = [
-        runner for runner in alias_runners if runner.state == RunnerState.PENDING
-    ]
-    setup_runners = [
-        runner for runner in alias_runners if runner.state == RunnerState.SETUP
-    ]
-    args.console.print(
-        f"Runners: {len(alias_runners) - len(pending_runners) - len(setup_runners)}"
-    )
-    args.console.print(f"Runners Pending: {len(pending_runners)}")
-    args.console.print(f"Runners Setting Up: {len(setup_runners)}")
-    # Drop the alias column, which is the first column
-    runners_table.columns.pop(0)
-    args.console.print(runners_table)
+        start_time = getattr(args, "since", None)
+        alias_runners = connection.list_alias_runners(
+            alias=args.app_name, start_time=start_time
+        )
+    if getattr(args, "state", None):
+        states = set(args.state)
+        if "all" not in states:
+            alias_runners = [r for r in alias_runners if r.state.value in states]
+    if args.output == "pretty":
+        runners_table = runners.runners_table(alias_runners)
+        pending_runners = [
+            runner for runner in alias_runners if runner.state == RunnerState.PENDING
+        ]
+        setup_runners = [
+            runner for runner in alias_runners if runner.state == RunnerState.SETUP
+        ]
+        args.console.print(
+            f"Runners: {len(alias_runners) - len(pending_runners) - len(setup_runners)}"
+        )
+        args.console.print(f"Runners Pending: {len(pending_runners)}")
+        args.console.print(f"Runners Setting Up: {len(setup_runners)}")
+        # Drop the alias column, which is the first column
+        runners_table.columns.pop(0)
+        args.console.print(runners_table)
 
-    requests_table = runners.runners_requests_table(alias_runners)
-    args.console.print(f"Requests: {len(requests_table.rows)}")
-    args.console.print(requests_table)
+        requests_table = runners.runners_requests_table(alias_runners)
+        args.console.print(f"Requests: {len(requests_table.rows)}")
+        args.console.print(requests_table)
+    elif args.output == "json":
+        runners._list_json(args, alias_runners)
+    else:
+        raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_runners_parser(subparsers, parents):
@@ -320,12 +331,30 @@ def _add_runners_parser(subparsers, parents):
         "runners",
         description=runners_help,
         help=runners_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     parser.add_argument(
         "app_name",
         help="Application name.",
     )
+    parser.add_argument(
+        "--since",
+        default=None,
+        action=SinceAction,
+        limit="1 day",
+        help=(
+            "Show dead runners since the given time. "
+            "Accepts 'now', relative like '30m', '1h', '1d', "
+            "or an ISO timestamp. Max 24 hours."
+        ),
+    )
+    parser.add_argument(
+        "--state",
+        choices=["all", "running", "pending", "setup", "dead"],
+        nargs="+",
+        default=None,
+        help=("Filter by runner state(s). Choose one or more, or 'all'(default)."),
+    )
     parser.set_defaults(func=_runners)
 
 

{fal-1.36.1 → fal-1.38.0}/src/fal/cli/parser.py

@@ -1,5 +1,7 @@
 import argparse
 import sys
+from datetime import datetime, timedelta
+from typing import Optional
 
 import rich_argparse
 
@@ -55,6 +57,61 @@ class DictAction(argparse.Action):
         setattr(args, self.dest, d)
 
 
+class SinceAction(argparse.Action):
+    LIMIT_LEEWAY = timedelta(minutes=1)
+
+    def _parse_since(self, value: str) -> Optional[datetime]:
+        import dateparser
+
+        return dateparser.parse(
+            value,
+            settings={
+                "PREFER_DATES_FROM": "past",
+            },
+        )
+
+    def __init__(self, *args, **kwargs):
+        self._limit = kwargs.pop("limit", None)
+        if self._limit:
+            if not isinstance(self._limit, str):
+                raise ValueError(
+                    f"Invalid 'limit' value for SinceAction: {self._limit!r}"
+                )
+
+            self._limit_dt = self._parse_since(self._limit)
+            if not self._limit_dt:
+                raise ValueError(
+                    f"Invalid 'limit' value for SinceAction: {self._limit!r}"
+                )
+
+        super().__init__(*args, **kwargs)
+
+    def __call__(self, parser, args, values, option_string=None):  # noqa: ARG002
+        if values is None:
+            setattr(args, self.dest, None)
+            return
+
+        dt = self._parse_since(values)
+        if not dt:
+            raise argparse.ArgumentError(
+                self,
+                (
+                    f"Invalid since value: {values}. "
+                    "Use 'now', relative like '15m' or '24h ago', "
+                    "or an ISO timestamp."
+                ),
+            )
+
+        if self._limit_dt is not None:
+            if dt < self._limit_dt - self.LIMIT_LEEWAY:
+                raise argparse.ArgumentError(
+                    self,
+                    f"Since value is older than the allowed limit {self._limit}.",
+                )
+
+        setattr(args, self.dest, dt)
+
+
 def _find_parser(parser, func):
     defaults = parser._defaults
     if not func or func == defaults.get("func"):

{fal-1.36.1 → fal-1.38.0}/src/fal/cli/runners.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 import json
+from datetime import timedelta
 from typing import List
 
 from fal.sdk import RunnerInfo, RunnerState
 
 from ._utils import get_client
-from .parser import FalClientParser, get_output_parser
+from .parser import FalClientParser, SinceAction, get_output_parser
 
 
 def runners_table(runners: List[RunnerInfo]):
@@ -15,8 +16,7 @@ def runners_table(runners: List[RunnerInfo]):
     table = Table()
     table.add_column("Alias")
     table.add_column("Runner ID")
-    table.add_column("In Flight Requests")
-    table.add_column("Missing Leases")
+    table.add_column("In Flight\nRequests")
     table.add_column("Expires In")
     table.add_column("Uptime")
     table.add_column("Revision")
@@ -34,18 +34,29 @@ def runners_table(runners: List[RunnerInfo]):
             ]
         )
 
+        in_flight = str(runner.in_flight_requests)
+        missing_leases = runner.in_flight_requests - num_leases_with_request
+        if missing_leases > 0:
+            # Show a small indicator of in flight requests that are not visible in the
+            # leases lists
+            # This can be due to race conditions, so only important to report if it's
+            # consistent
+            in_flight = f"{in_flight} [dim]({missing_leases})[/]"
+
+        uptime = timedelta(
+            seconds=int(runner.uptime.total_seconds()),
+        )
         table.add_row(
             runner.alias,
             # Mark lost runners in red
             runner.runner_id if present else f"[red]{runner.runner_id}[/]",
-            str(runner.in_flight_requests),
-            str(runner.in_flight_requests - num_leases_with_request),
+            in_flight,
             (
-                "N/A (active)"
+                "N/A"
                 if runner.expiration_countdown is None
                 else f"{runner.expiration_countdown}s"
             ),
-            f"{runner.uptime} ({runner.uptime.total_seconds()}s)",
+            f"{uptime} ({uptime.total_seconds():.0f}s)",
             runner.revision,
             runner.state.value,
         )
@@ -104,17 +115,31 @@ def _list_json(args, runners: list[RunnerInfo]):
 def _list(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        runners = connection.list_runners()
+        start_time = getattr(args, "since", None)
+        runners = connection.list_runners(start_time=start_time)
+
+        if getattr(args, "state", None):
+            states = set(args.state)
+            if "all" not in states:
+                runners = [r for r in runners if r.state.value in states]
         pending_runners = [
             runner for runner in runners if runner.state == RunnerState.PENDING
         ]
         setup_runners = [
             runner for runner in runners if runner.state == RunnerState.SETUP
         ]
+        dead_runners = [
+            runner for runner in runners if runner.state == RunnerState.DEAD
+        ]
         if args.output == "pretty":
             args.console.print(
                 "Runners: "
-                + str(len(runners) - len(pending_runners) - len(setup_runners))
+                + str(
+                    len(runners)
+                    - len(pending_runners)
+                    - len(setup_runners)
+                    - len(dead_runners)
+                )
             )
             args.console.print(f"Runners Pending: {len(pending_runners)}")
             args.console.print(f"Runners Setting Up: {len(setup_runners)}")
@@ -152,6 +177,24 @@ def _add_list_parser(subparsers, parents):
         help=list_help,
         parents=[*parents, get_output_parser()],
     )
+    parser.add_argument(
+        "--since",
+        default=None,
+        action=SinceAction,
+        limit="1 day",
+        help=(
+            "Show dead runners since the given time. "
+            "Accepts 'now', relative like '30m', '1h', '1d', "
+            "or an ISO timestamp. Max 24 hours."
+        ),
+    )
+    parser.add_argument(
+        "--state",
+        choices=["all", "running", "pending", "setup", "dead"],
+        nargs="+",
+        default=None,
+        help=("Filter by runner state(s). Choose one or more, or 'all'(default)."),
+    )
     parser.set_defaults(func=_list)
 
 

{fal-1.36.1 → fal-1.38.0}/src/fal/sdk.py

@@ -265,6 +265,7 @@ class RunnerState(Enum):
     RUNNING = "running"
     PENDING = "pending"
     SETUP = "setup"
+    DEAD = "dead"
     UNKNOWN = "unknown"
 
     @staticmethod
@@ -275,6 +276,8 @@ class RunnerState(Enum):
             return RunnerState.PENDING
         elif proto is isolate_proto.RunnerInfo.State.SETUP:
             return RunnerState.SETUP
+        elif proto is isolate_proto.RunnerInfo.State.DEAD:
+            return RunnerState.DEAD
         else:
             return RunnerState.UNKNOWN
 
@@ -811,8 +814,18 @@ class FalServerlessConnection:
         response: isolate_proto.ListAliasesResult = self.stub.ListAliases(request)
         return [from_grpc(alias) for alias in response.aliases]
 
-    def list_alias_runners(self, alias: str) -> list[RunnerInfo]:
-        request = isolate_proto.ListAliasRunnersRequest(alias=alias, list_pending=True)
+    def list_alias_runners(
+        self,
+        alias: str,
+        *,
+        list_pending: bool = True,
+        start_time: datetime | None = None,
+    ) -> list[RunnerInfo]:
+        kwargs = {"alias": alias, "list_pending": list_pending}
+        if start_time:
+            kwargs["start_time"] = isolate_proto.timestamp_from_datetime(start_time)
+
+        request = isolate_proto.ListAliasRunnersRequest(**kwargs)
         response = self.stub.ListAliasRunners(request)
         return [from_grpc(runner) for runner in response.runners]
 
@@ -839,7 +852,13 @@ class FalServerlessConnection:
         request = isolate_proto.KillRunnerRequest(runner_id=runner_id)
         self.stub.KillRunner(request)
 
-    def list_runners(self) -> list[RunnerInfo]:
-        request = isolate_proto.ListRunnersRequest(list_pending=True)
+    def list_runners(self, start_time: datetime | None = None) -> list[RunnerInfo]:
+        kwargs = {
+            "list_pending": True,
+        }
+        if start_time:
+            kwargs["start_time"] = isolate_proto.timestamp_from_datetime(start_time)
+
+        request = isolate_proto.ListRunnersRequest(**kwargs)
         response = self.stub.ListRunners(request)
         return [from_grpc(runner) for runner in response.runners]