fal 1.11.3__py3-none-any.whl → 1.11.5__py3-none-any.whl

fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.3'
-__version_tuple__ = version_tuple = (1, 11, 3)
+__version__ = version = '1.11.5'
+__version_tuple__ = version_tuple = (1, 11, 5)

fal/api.py

@@ -1088,7 +1088,10 @@ class BaseServable:
                     type(exc), exc, exc.__traceback__
                 )
 
-            print(json.dumps({"traceback": "".join(formatted_exception[::-1])}))
+            print(
+                json.dumps({"traceback": "".join(formatted_exception[::-1])}),
+                flush=True,
+            )
 
             if _is_cuda_oom_exception(exc):
                 return await cuda_out_of_memory_exception_handler(

fal/app.py

@@ -268,7 +268,7 @@ class App(fal.api.BaseServable):
         "keep_alive": 60,
     }
     app_name: ClassVar[str]
-    app_auth: ClassVar[Literal["private", "public", "shared"]] = "private"
+    app_auth: ClassVar[Literal["private", "public", "shared", None]] = None
     request_timeout: ClassVar[int | None] = None
     startup_timeout: ClassVar[int | None] = None
 

fal/auth/__init__.py

@@ -5,12 +5,11 @@ from dataclasses import dataclass, field
 from threading import Lock
 from typing import Optional
 
-import click
-
 from fal.auth import auth0, local
 from fal.config import Config
 from fal.console import console
 from fal.console.icons import CHECK_ICON
+from fal.exceptions import FalServerlessException
 from fal.exceptions.auth import UnauthenticatedException
 
 
@@ -85,7 +84,7 @@ def login():
 def logout():
     refresh_token, _ = local.load_token()
     if refresh_token is None:
-        raise click.ClickException(message="You're not logged in")
+        raise FalServerlessException("You're not logged in")
     auth0.revoke(refresh_token)
     with local.lock_token():
         local.delete_token()

fal/auth/auth0.py

@@ -4,12 +4,12 @@ import functools
 import time
 import warnings
 
-import click
 import httpx
 
 from fal.console import console
 from fal.console.icons import CHECK_ICON
 from fal.console.ux import maybe_open_browser_tab
+from fal.exceptions import FalServerlessException
 
 WEBSITE_URL = "https://fal.ai"
 
@@ -55,7 +55,7 @@ def login() -> dict:
     )
 
     if device_code_response.status_code != 200:
-        raise click.ClickException("Error generating the device code")
+        raise FalServerlessException("Error generating the device code")
 
     device_code_data = device_code_response.json()
     device_user_code = device_code_data["user_code"]
@@ -92,7 +92,7 @@ def login() -> dict:
 
             elif token_data["error"] not in ("authorization_pending", "slow_down"):
                 status.update(spinner=None)
-                raise click.ClickException(token_data["error_description"])
+                raise FalServerlessException(token_data["error_description"])
 
             else:
                 time.sleep(device_code_data["interval"])
@@ -115,7 +115,7 @@ def refresh(token: str) -> dict:
 
         return token_data
     else:
-        raise click.ClickException(token_data["error_description"])
+        raise FalServerlessException(token_data["error_description"])
 
 
 def revoke(token: str):
@@ -130,7 +130,7 @@ def revoke(token: str):
 
     if token_response.status_code != 200:
         token_data = token_response.json()
-        raise click.ClickException(token_data["error_description"])
+        raise FalServerlessException(token_data["error_description"])
 
     _open_browser(logout_url(WEBSITE_URL), None)
 
@@ -142,7 +142,7 @@ def get_user_info(bearer_token: str) -> dict:
     )
 
     if userinfo_response.status_code != 200:
-        raise click.ClickException(userinfo_response.content.decode("utf-8"))
+        raise FalServerlessException(userinfo_response.content.decode("utf-8"))
 
     return userinfo_response.json()
 

fal/cli/apps.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+import fal.cli.runners as runners
+
 from ._utils import get_client
 from .parser import FalClientParser
 
@@ -268,59 +270,17 @@ def _add_set_rev_parser(subparsers, parents):
 
 
 def _runners(args):
-    from rich.table import Table
-
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        runners = connection.list_alias_runners(alias=args.app_name)
-
-    table = Table()
-    table.add_column("Runner ID")
-    table.add_column("In Flight Requests")
-    table.add_column("Missing Leases")
-    table.add_column("Expires In")
-    table.add_column("Uptime")
-
-    for runner in runners:
-        num_leases_with_request = len(
-            [
-                lease
-                for lease in runner.external_metadata.get("leases", [])
-                if lease.get("request_id") is not None
-            ]
-        )
-
-        table.add_row(
-            runner.runner_id,
-            str(runner.in_flight_requests),
-            str(runner.in_flight_requests - num_leases_with_request),
-            (
-                "N/A (active)"
-                if runner.expiration_countdown is None
-                else f"{runner.expiration_countdown}s"
-            ),
-            f"{runner.uptime} ({runner.uptime.total_seconds()}s)",
-        )
-
-    args.console.print(f"Runners: {len(runners)}")
-    args.console.print(table)
-
-    requests_table = Table()
-    requests_table.add_column("Runner ID")
-    requests_table.add_column("Request ID")
-    requests_table.add_column("Caller ID")
-
-    for runner in runners:
-        for lease in runner.external_metadata.get("leases", []):
-            if not (req_id := lease.get("request_id")):
-                continue
+        alias_runners = connection.list_alias_runners(alias=args.app_name)
 
-            requests_table.add_row(
-                runner.runner_id,
-                req_id,
-                lease.get("caller_user_id") or "",
-            )
+    runners_table = runners.runners_table(alias_runners)
+    args.console.print(f"Runners: {len(alias_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)
 

fal/cli/auth.py

@@ -2,29 +2,44 @@ from fal.auth import USER, login, logout
 
 
 def _login(args):
-    from rich.prompt import Prompt
-
     from fal.config import Config
+    from fal.console.prompt import prompt
 
     login()
+
     teams = [team["nickname"].lower() for team in USER.teams]
     if not teams:
         return
 
-    team = Prompt.ask(
-        "\nPlease choose a team account to use or leave blank to "
-        "use your personal account:",
+    args.console.print("")
+    args.console.print(
+        f"You ({USER.info['name']}) are a member of the following teams:\n",
+    )
+    for idx, team in enumerate(USER.teams):
+        args.console.print(f"  {idx + 1}. {team['nickname']}")
+    args.console.print("")
+
+    team_choice = prompt(
+        args.console,
+        "Pick a team account to use (leave blank for personal account)",
         choices=teams,
+        show_choices=False,
         default=None,
     )
+    args.console.print("")
+
     with Config().edit() as config:
-        if team:
+        if team_choice:
             args.console.print(
                 f"Setting team to [cyan]{team}[/]. "
                 "You can change this later with [bold]fal team set[/]."
             )
             config.set("team", team)
         else:
+            args.console.print(
+                "Using your personal account. "
+                "You can change this later with [bold]fal team set[/]."
+            )
             config.unset("team")
 
 

fal/cli/deploy.py

@@ -97,7 +97,7 @@ def _deploy_from_reference(
     )
     isolated_function = loaded.function
     app_name = app_name or loaded.app_name  # type: ignore
-    app_auth = auth or loaded.app_auth or "private"
+    app_auth = auth or loaded.app_auth
     deployment_strategy = deployment_strategy or "recreate"
 
     app_id = host.register(

fal/cli/main.py

@@ -2,7 +2,7 @@ import argparse
 
 import rich
 
-from fal import __version__
+from fal._version import __version__
 from fal.console import console
 from fal.console.icons import CROSS_ICON
 

fal/cli/runners.py

@@ -1,13 +1,91 @@
+from __future__ import annotations
+
+from typing import List
+
+from fal.sdk import RunnerInfo
+
 from ._utils import get_client
 from .parser import FalClientParser
 
 
+def runners_table(runners: List[RunnerInfo]):
+    from rich.table import Table
+
+    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("Expires In")
+    table.add_column("Uptime")
+    table.add_column("Revision")
+
+    for runner in runners:
+        num_leases_with_request = len(
+            [
+                lease
+                for lease in runner.external_metadata.get("leases", [])
+                if lease.get("request_id") is not None
+            ]
+        )
+
+        table.add_row(
+            runner.alias,
+            runner.runner_id,
+            str(runner.in_flight_requests),
+            str(runner.in_flight_requests - num_leases_with_request),
+            (
+                "N/A (active)"
+                if runner.expiration_countdown is None
+                else f"{runner.expiration_countdown}s"
+            ),
+            f"{runner.uptime} ({runner.uptime.total_seconds()}s)",
+            runner.revision,
+        )
+
+    return table
+
+
+def runners_requests_table(runners: list[RunnerInfo]):
+    from rich.table import Table
+
+    table = Table()
+    table.add_column("Runner ID")
+    table.add_column("Request ID")
+    table.add_column("Caller ID")
+
+    for runner in runners:
+        for lease in runner.external_metadata.get("leases", []):
+            if not (req_id := lease.get("request_id")):
+                continue
+
+            table.add_row(
+                runner.runner_id,
+                req_id,
+                lease.get("caller_user_id") or "",
+            )
+
+    return table
+
+
 def _kill(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.kill_runner(args.id)
 
 
+def _list(args):
+    client = get_client(args.host, args.team)
+    with client.connect() as connection:
+        runners = connection.list_runners()
+        args.console.print(f"Runners: {len(runners)}")
+        args.console.print(runners_table(runners))
+
+        requests_table = runners_requests_table(runners)
+        args.console.print(f"Requests: {len(requests_table.rows)}")
+        args.console.print(requests_table)
+
+
 def _add_kill_parser(subparsers, parents):
     kill_help = "Kill a runner."
     parser = subparsers.add_parser(
@@ -23,6 +101,17 @@ def _add_kill_parser(subparsers, parents):
     parser.set_defaults(func=_kill)
 
 
+def _add_list_parser(subparsers, parents):
+    list_help = "List runners."
+    parser = subparsers.add_parser(
+        "list",
+        description=list_help,
+        help=list_help,
+        parents=parents,
+    )
+    parser.set_defaults(func=_list)
+
+
 def add_parser(main_subparsers, parents):
     runners_help = "Manage fal runners."
     parser = main_subparsers.add_parser(
@@ -41,3 +130,4 @@ def add_parser(main_subparsers, parents):
     )
 
     _add_kill_parser(subparsers, parents)
+    _add_list_parser(subparsers, parents)

fal/config.py

@@ -72,7 +72,7 @@ class Config:
         if not self.profile:
             raise ValueError("No profile set.")
 
-        del self._config[self.profile][key]
+        self._config.get(self.profile, {}).pop(key, None)
 
     def get_internal(self, key: str) -> Optional[str]:
         if SETTINGS_SECTION not in self._config:

fal/sdk.py

@@ -246,6 +246,8 @@ class RunnerInfo:
     expiration_countdown: Optional[int]
     uptime: timedelta
     external_metadata: dict[str, Any]
+    revision: str
+    alias: str
 
 
 @dataclass
@@ -392,6 +394,8 @@ def _from_grpc_runner_info(message: isolate_proto.RunnerInfo) -> RunnerInfo:
         ),
         uptime=timedelta(seconds=message.uptime),
         external_metadata=external_metadata,
+        revision=message.revision,
+        alias=message.alias,
     )
 
 
@@ -571,11 +575,12 @@ class FalServerlessConnection:
         else:
             wrapped_requirements = None
 
+        auth_mode = None
         if application_auth_mode == "public":
             auth_mode = isolate_proto.ApplicationAuthMode.PUBLIC
         elif application_auth_mode == "shared":
             auth_mode = isolate_proto.ApplicationAuthMode.SHARED
-        else:
+        elif application_auth_mode == "private":
             auth_mode = isolate_proto.ApplicationAuthMode.PRIVATE
 
         struct_metadata = None
@@ -750,3 +755,8 @@ class FalServerlessConnection:
     def kill_runner(self, runner_id: str) -> None:
         request = isolate_proto.KillRunnerRequest(runner_id=runner_id)
         self.stub.KillRunner(request)
+
+    def list_runners(self) -> list[RunnerInfo]:
+        request = isolate_proto.ListRunnersRequest()
+        response = self.stub.ListRunners(request)
+        return [from_grpc(runner) for runner in response.runners]

{fal-1.11.3.dist-info → fal-1.11.5.dist-info}/METADATA

@@ -1,17 +1,16 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.11.3
+Version: 1.11.5
 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.17.0,>=0.16.1
-Requires-Dist: isolate-proto<0.8.0,>=0.7.0
+Requires-Dist: isolate-proto<0.8.0,>=0.7.2
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
 Requires-Dist: typing-extensions<5,>=4.7.1
-Requires-Dist: click<9,>=8.1.3
 Requires-Dist: structlog<23,>=22.3.0
 Requires-Dist: opentelemetry-api<2,>=1.15.0
 Requires-Dist: opentelemetry-sdk<2,>=1.15.0
@@ -47,6 +46,7 @@ Provides-Extra: test
 Requires-Dist: pytest<8; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"
 Requires-Dist: pytest-xdist; extra == "test"
+Requires-Dist: pytest-timeout; extra == "test"
 Requires-Dist: flaky; extra == "test"
 Requires-Dist: boto3; extra == "test"
 Provides-Extra: dev

{fal-1.11.3.dist-info → fal-1.11.5.dist-info}/RECORD

@@ -1,40 +1,40 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=WW6zlF6Q1ueCOuaHc5EkBPJzZOzGnHZBwCsaXfOySJk,513
+fal/_fal_version.py,sha256=C9jc23h2VfZSE0orSfoOaBMqebv8jMlmnPO1wUWfXak,513
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=jqmQfhRvZMYpWWvbTfARxjywP_72c314pnLPTb5dGwA,44755
-fal/app.py,sha256=3WhjRgJdJ2ajAeZ3IeFb20_Zm6EH19a_WIuDtanaMHE,23308
+fal/api.py,sha256=aoA0-7JsO6dWhudzmDOidbPwxnJmIJaQWhGV1kqLCbw,44814
+fal/app.py,sha256=YZBmQ45QbWCO7OmbNhlzM0AMI6STog3fMjdEtpkAS5g,23309
 fal/apps.py,sha256=RpmElElJnDYjsTRQOdNYiJwd74GEOGYA38L5O5GzNEg,11068
-fal/config.py,sha256=sERAcM-YBk1aF9-z-ZSwQqwgOc4AXJSkWCrDP5n7ktM,2582
+fal/config.py,sha256=26IrSU5LYOGVSULrolAWe6oa7NE8Vk1DLI0-RwS2NIs,2596
 fal/container.py,sha256=PM7e1RloTCexZ64uAv7sa2RSZxPI-X8KcxkdaZqEfjw,1914
 fal/files.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
-fal/sdk.py,sha256=WuYeZREYHElNZJLXyOh-sVj_9nX1E9QQ8lQPG6PIlsA,25045
+fal/sdk.py,sha256=b-1J3nO5I4f69L2APqDZ0hLNo7qVhWA2bhCvrjhpQV4,25420
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=9q_QrQBlQN3nZYA1kEGRfhJWi4RjnO4H1uQswfaei9w,2146
 fal/workflows.py,sha256=Zl4f6Bs085hY40zmqScxDUyCu7zXkukDbW02iYOLTTI,14805
-fal/auth/__init__.py,sha256=i2zA9xiUQP3dxvL-6NFHodCHEktJ-1ApRYunLJamdtU,5807
-fal/auth/auth0.py,sha256=rSG1mgH-QGyKfzd7XyAaj1AYsWt-ho8Y_LZ-FUVWzh4,5421
+fal/auth/__init__.py,sha256=zk0CqYxwTFud-9vdh3og6zMWkFf_1gM5CbLrAP49lcQ,5837
+fal/auth/auth0.py,sha256=_OhfrqF41odNebFTr8SvUm-d9REVG6wfQBHhPIQxsZU,5468
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
 fal/cli/_utils.py,sha256=pHmKzpUWc2n4yPv4R0Y6DuZC5j-rVKU8oqdQDVW_-Lo,1591
 fal/cli/api.py,sha256=-rl50A00CxqVZtDh0iZmpCHMFY0jZySaumbPCe3MSoQ,2090
-fal/cli/apps.py,sha256=bc1QyWVsEOsabNEAB0zZ6IEjkpkkjdoplLFWgoruFGc,11234
-fal/cli/auth.py,sha256=LLyYByasUJdiUGGrnZiKMO8TRt4LVYT7ocAUi_xSg2w,2106
+fal/cli/apps.py,sha256=vKeTUw_uUxz5M9hlP0jcJ23qjR0GTz7ifeS4HBjKECo,10101
+fal/cli/auth.py,sha256=3wq2NYhlA3tFOSQOhQQnbzcPBMVWTU2IZzTEVWke1BY,2604
 fal/cli/cli_nested_json.py,sha256=veSZU8_bYV3Iu1PAoxt-4BMBraNIqgH5nughbs2UKvE,13539
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=u_urnyFzSlNnrq93zz_GXE9FX4VyVxDoamJJyrZpFI0,1312
-fal/cli/deploy.py,sha256=JX1jwyAFE0-u-PGGqU-pphKMCUpaPFbYMjRMhK0VmoQ,7783
+fal/cli/deploy.py,sha256=CWf0Y56w-hNCrht-qrfgiOi9nuvve1Kl5NFZJpt_oRA,7770
 fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
-fal/cli/main.py,sha256=AgT6fpcmSA3NkG_fv4MXOM_fAQ9kmhZHeljyNa3p27U,2225
+fal/cli/main.py,sha256=4TnIno7fvFJbMPlpb8mnT7meKAR-UAOerxuo5qqPZRQ,2234
 fal/cli/parser.py,sha256=jYsGQ0BLQuKI7KtN1jnLVYKMbLtez7hPjwTNfG3UPSk,2964
 fal/cli/profile.py,sha256=vWngqkX7UizQIUQOpXauFz1UGJwDeh38Si6wXcIj3Eo,3396
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
-fal/cli/runners.py,sha256=f5KdIUqNiqjodlKGr-RQq7DKR3hIfVYZmlrFRBkzC-A,1034
+fal/cli/runners.py,sha256=z7WkZZC9rCW2mU5enowVQsxd1W18iBtLNOnPjrzhEf0,3491
 fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
 fal/cli/teams.py,sha256=ZrWdMvLRqPt1EuxoOKAfbP6sxJeOCaMeZ2LgZqw2S_w,2153
 fal/console/__init__.py,sha256=ernZ4bzvvliQh5SmrEqQ7lA5eVcbw6Ra2jalKtA7dxg,132
@@ -134,8 +134,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.11.3.dist-info/METADATA,sha256=-318GV-l4y7SE_kc4RPu3qzu5v2UiwINrsruTh-1KFs,4046
-fal-1.11.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fal-1.11.3.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.11.3.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.11.3.dist-info/RECORD,,
+fal-1.11.5.dist-info/METADATA,sha256=9ObQ73Rb1oolmwZPfD6veK3oeb0AGJ6EVq-QrxTXU28,4062
+fal-1.11.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fal-1.11.5.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.11.5.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.11.5.dist-info/RECORD,,