fal 1.34.1__tar.gz → 1.36.0__tar.gz

{fal-1.34.1/fal.egg-info → fal-1.36.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.34.1
+Version: 1.36.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.13.0,>=0.12.0
+Requires-Dist: isolate-proto<0.15.0,>=0.14.1
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.34.1 → fal-1.36.0/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.34.1
+Version: 1.36.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.13.0,>=0.12.0
+Requires-Dist: isolate-proto<0.15.0,>=0.14.1
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.34.1 → fal-1.36.0}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
 isolate[build]<0.20.0,>=0.18.0
-isolate-proto<0.13.0,>=0.12.0
+isolate-proto<0.15.0,>=0.14.1
 grpcio<2,>=1.64.0
 dill==0.3.7
 cloudpickle==3.0.0

{fal-1.34.1 → fal-1.36.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.12.0,<0.13.0",
+    "isolate-proto>=0.14.1,<0.15.0",
     "grpcio>=1.64.0,<2",
     "dill==0.3.7",
     "cloudpickle==3.0.0",

{fal-1.34.1 → fal-1.36.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.34.1'
-__version_tuple__ = version_tuple = (1, 34, 1)
+__version__ = version = '1.36.0'
+__version_tuple__ = version_tuple = (1, 36, 0)
 
 __commit_id__ = commit_id = None

{fal-1.34.1 → fal-1.36.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
+from .parser import FalClientParser, get_output_parser
 
 if TYPE_CHECKING:
     from fal.sdk import AliasInfo, ApplicationInfo
@@ -72,6 +72,8 @@ def _list(args):
             apps_as_dicts = [asdict(a) for a in apps]
             res = json.dumps({"apps": apps_as_dicts})
             args.console.print(res)
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_list_parser(subparsers, parents):
@@ -80,7 +82,7 @@ def _add_list_parser(subparsers, parents):
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     parser.add_argument(
         "--sort-by-runners",
@@ -92,13 +94,6 @@ def _add_list_parser(subparsers, parents):
         type=str,
         help="Filter applications by alias contents",
     )
-    parser.add_argument(
-        "--output",
-        type=str,
-        default="pretty",
-        choices=["pretty", "json"],
-        help="Modify the command output",
-    )
     parser.set_defaults(func=_list)
 
 
@@ -302,8 +297,14 @@ def _runners(args):
     pending_runners = [
         runner for runner in alias_runners if runner.state == RunnerState.PENDING
     ]
-    args.console.print(f"Runners: {len(alias_runners) - len(pending_runners)}")
-    args.console.print(f"Pending Runners: {len(pending_runners)}")
+    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)

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/auth.py

@@ -35,8 +35,7 @@ def _logout(args):
 
 
 def _list_accounts(args):
-    from rich.style import Style
-    from rich.table import Table
+    import json
 
     from fal.auth import UserAccess
     from fal.config import Config
@@ -45,23 +44,41 @@ def _list_accounts(args):
     config = Config()
     current_account_name = config.get_internal("team") or user_access.info["nickname"]
 
-    table = Table(border_style=Style(frame=False), show_header=False)
-    table.add_column("#")
-    table.add_column("Nickname")
-    table.add_column("Type")
-
-    for idx, account in enumerate(user_access.accounts):
-        selected = account["nickname"] == current_account_name
-        color = "bold yellow" if selected else None
-
-        table.add_row(
-            f"* {idx + 1}" if selected else f"  {idx + 1}",
-            account["nickname"],
-            "Personal" if account["is_personal"] else "Team",
-            style=color,
-        )
+    if args.output == "json":
+        json_accounts = []
+        for account in user_access.accounts:
+            selected = account["nickname"] == current_account_name
+            json_accounts.append(
+                {
+                    "nickname": account["nickname"],
+                    "type": "personal" if account["is_personal"] else "team",
+                    "is_selected": selected,
+                }
+            )
+        args.console.print(json.dumps({"teams": json_accounts}))
+    elif args.output == "pretty":
+        from rich.style import Style
+        from rich.table import Table
+
+        table = Table(border_style=Style(frame=False), show_header=False)
+        table.add_column("#")
+        table.add_column("Nickname")
+        table.add_column("Type")
+
+        for idx, account in enumerate(user_access.accounts):
+            selected = account["nickname"] == current_account_name
+            color = "bold yellow" if selected else None
+
+            table.add_row(
+                f"* {idx + 1}" if selected else f"  {idx + 1}",
+                account["nickname"],
+                "Personal" if account["is_personal"] else "Team",
+                style=color,
+            )
 
-    args.console.print(table)
+        args.console.print(table)
+    else:
+        raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _unset_account(args):

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/deploy.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from typing import Literal, Optional, Tuple, Union
 
 from ._utils import get_app_data_from_toml, is_app_name
-from .parser import FalClientParser, RefAction
+from .parser import FalClientParser, RefAction, get_output_parser
 
 User = namedtuple("User", ["user_id", "username"])
 
@@ -152,6 +152,8 @@ def _deploy_from_reference(
                 args.console.print(
                     f"\thttps://queue.{endpoint_host}/{user.username}/{app_name}{endpoint}"
                 )
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _deploy(args):
@@ -211,7 +213,11 @@ def add_parser(main_subparsers, parents):
 
     parser = main_subparsers.add_parser(
         "deploy",
-        parents=[*parents, FalClientParser(add_help=False)],
+        parents=[
+            *parents,
+            get_output_parser(),
+            FalClientParser(add_help=False),
+        ],
         description=deploy_help,
         help=deploy_help,
         epilog=epilog,
@@ -261,12 +267,5 @@ def add_parser(main_subparsers, parents):
         dest="app_scale_settings",
         help="Use the application code for scale settings.",
     )
-    parser.add_argument(
-        "--output",
-        type=str,
-        default="pretty",
-        choices=["pretty", "json"],
-        help="Modify the command output",
-    )
 
     parser.set_defaults(func=_deploy)

fal-1.36.0/src/fal/cli/doctor.py

@@ -0,0 +1,54 @@
+import json
+import os
+import platform
+
+
+def _doctor(args):
+    import isolate
+
+    import fal
+
+    if args.output == "json":
+        data = {
+            "fal": fal.__version__,
+            "isolate": isolate.__version__,
+            "python": platform.python_version(),
+            "platform": platform.platform(),
+            "FAL_HOST": fal.flags.GRPC_HOST,
+            "FAL_KEY": os.getenv("FAL_KEY", "").split(":")[0],
+        }
+        args.console.print(json.dumps(data))
+    elif args.output == "pretty":
+        from rich.table import Table
+
+        table = Table(show_header=False, show_lines=False, box=None)
+        table.add_column("name", no_wrap=True, style="bold")
+        table.add_column("value", no_wrap=True)
+
+        table.add_row("fal", fal.__version__)
+        table.add_row("isolate", isolate.__version__)
+
+        table.add_row("", "")
+        table.add_row("python", platform.python_version())
+        table.add_row("platform", platform.platform())
+
+        table.add_row("", "")
+        table.add_row("FAL_HOST", fal.flags.GRPC_HOST)
+        table.add_row("FAL_KEY", os.getenv("FAL_KEY", "").split(":")[0])
+
+        args.console.print(table)
+    else:
+        raise AssertionError(f"Invalid output format: {args.output}")
+
+
+def add_parser(main_subparsers, parents):
+    from .parser import get_output_parser
+
+    doctor_help = "fal version and misc environment information."
+    parser = main_subparsers.add_parser(
+        "doctor",
+        description=doctor_help,
+        help=doctor_help,
+        parents=[*parents, get_output_parser()],
+    )
+    parser.set_defaults(func=_doctor)

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/keys.py

@@ -40,35 +40,54 @@ def _add_create_parser(subparsers, parents):
 
 
 def _list(args):
-    from rich.table import Table
-
-    table = Table()
-    table.add_column("Key ID")
-    table.add_column("Created At")
-    table.add_column("Scope")
-    table.add_column("Description")
+    import json
 
     client = get_client(args.host, args.team)
     with client.connect() as connection:
         keys = connection.list_user_keys()
-        for key in keys:
-            table.add_row(
-                key.key_id,
-                str(key.created_at),
-                str(key.scope.value),
-                key.alias,
-            )
 
-    args.console.print(table)
+        if args.output == "json":
+            json_keys = [
+                {
+                    "key_id": key.key_id,
+                    "created_at": str(key.created_at),
+                    "scope": str(key.scope.value),
+                    "description": key.alias,
+                }
+                for key in keys
+            ]
+            args.console.print(json.dumps({"keys": json_keys}))
+        elif args.output == "pretty":
+            from rich.table import Table
+
+            table = Table()
+            table.add_column("Key ID")
+            table.add_column("Created At")
+            table.add_column("Scope")
+            table.add_column("Description")
+
+            for key in keys:
+                table.add_row(
+                    key.key_id,
+                    str(key.created_at),
+                    str(key.scope.value),
+                    key.alias,
+                )
+
+            args.console.print(table)
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_list_parser(subparsers, parents):
+    from .parser import get_output_parser
+
     list_help = "List keys."
     parser = subparsers.add_parser(
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     parser.set_defaults(func=_list)
 

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/parser.py

@@ -103,3 +103,23 @@ class FalClientParser(FalParser):
             "--team",
             help="The team to use.",
         )
+
+
+def get_output_parser():
+    parser = FalParser(add_help=False)
+    group = parser.add_argument_group(title="Output")
+    group.add_argument(
+        "--output",
+        type=str,
+        default="pretty",
+        choices=["pretty", "json"],
+        help="Modify the command output",
+    )
+    group.add_argument(
+        "--json",
+        action="store_const",
+        const="json",
+        dest="output",
+        help="Output in JSON format (same as --output json)",
+    )
+    return parser

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/profile.py

@@ -6,20 +6,37 @@ from fal.config import Config
 
 
 def _list(args):
-    table = Table()
-    table.add_column("Set")
-    table.add_column("Profile")
-    table.add_column("Settings")
+    import json
 
     config = Config()
-    for profile in config.profiles():
-        table.add_row(
-            "*" if profile == config._profile else "",
-            profile,
-            ", ".join(key for key in config._config[profile]),
-        )
 
-    args.console.print(table)
+    if args.output == "json":
+        json_profiles = []
+        for profile in config.profiles():
+            json_profiles.append(
+                {
+                    "profile": profile,
+                    "is_set": profile == config._profile,
+                    "settings": list(config._config[profile].keys()),
+                }
+            )
+        args.console.print(json.dumps({"profiles": json_profiles}))
+    elif args.output == "pretty":
+        table = Table()
+        table.add_column("Set")
+        table.add_column("Profile")
+        table.add_column("Settings")
+
+        for profile in config.profiles():
+            table.add_row(
+                "*" if profile == config._profile else "",
+                profile,
+                ", ".join(key for key in config._config[profile]),
+            )
+
+        args.console.print(table)
+    else:
+        raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _set(args):
@@ -136,12 +153,14 @@ def add_parser(main_subparsers, parents):
         required=True,
     )
 
+    from .parser import get_output_parser
+
     list_help = "List all profiles."
     list_parser = subparsers.add_parser(
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     list_parser.set_defaults(func=_list)
 

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/runners.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
+import json
 from typing import List
 
 from fal.sdk import RunnerInfo, RunnerState
 
 from ._utils import get_client
-from .parser import FalClientParser
+from .parser import FalClientParser, get_output_parser
 
 
 def runners_table(runners: List[RunnerInfo]):
@@ -80,6 +81,26 @@ def _kill(args):
         connection.kill_runner(args.id)
 
 
+def _list_json(args, runners: list[RunnerInfo]):
+    json_runners = [
+        {
+            "alias": r.alias,
+            "runner_id": r.runner_id,
+            "in_flight_requests": r.in_flight_requests,
+            "expiration_countdown": r.expiration_countdown,
+            "uptime_seconds": int(r.uptime.total_seconds()),
+            "revision": r.revision,
+            "state": r.state.value,
+        }
+        for r in runners
+    ]
+
+    res = {
+        "runners": json_runners,
+    }
+    args.console.print(json.dumps(res))
+
+
 def _list(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
@@ -87,13 +108,25 @@ def _list(args):
         pending_runners = [
             runner for runner in runners if runner.state == RunnerState.PENDING
         ]
-        args.console.print(f"Runners: {len(runners) - len(pending_runners)}")
-        args.console.print(f"Pending Runners: {len(pending_runners)}")
-        args.console.print(runners_table(runners))
+        setup_runners = [
+            runner for runner in runners if runner.state == RunnerState.SETUP
+        ]
+        if args.output == "pretty":
+            args.console.print(
+                "Runners: "
+                + str(len(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)}")
+            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)
+            requests_table = runners_requests_table(runners)
+            args.console.print(f"Requests: {len(requests_table.rows)}")
+            args.console.print(requests_table)
+        elif args.output == "json":
+            _list_json(args, runners)
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_kill_parser(subparsers, parents):
@@ -117,7 +150,7 @@ def _add_list_parser(subparsers, parents):
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     parser.set_defaults(func=_list)
 

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/secrets.py

@@ -31,27 +31,45 @@ def _add_set_parser(subparsers, parents):
 
 
 def _list(args):
-    from rich.table import Table
-
-    table = Table()
-    table.add_column("Secret Name")
-    table.add_column("Created At")
+    import json
 
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        for secret in connection.list_secrets():
-            table.add_row(secret.name, str(secret.created_at))
+        secrets = list(connection.list_secrets())
+
+        if args.output == "json":
+            json_secrets = [
+                {
+                    "name": secret.name,
+                    "created_at": str(secret.created_at),
+                }
+                for secret in secrets
+            ]
+            args.console.print(json.dumps({"secrets": json_secrets}))
+        elif args.output == "pretty":
+            from rich.table import Table
+
+            table = Table()
+            table.add_column("Secret Name")
+            table.add_column("Created At")
 
-    args.console.print(table)
+            for secret in secrets:
+                table.add_row(secret.name, str(secret.created_at))
+
+            args.console.print(table)
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_list_parser(subparsers, parents):
+    from .parser import get_output_parser
+
     list_help = "List secrets."
     parser = subparsers.add_parser(
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     parser.set_defaults(func=_list)
 

{fal-1.34.1 → fal-1.36.0}/src/fal/cli/teams.py

@@ -18,12 +18,14 @@ def add_parser(main_subparsers, parents):
         required=True,
     )
 
+    from .parser import get_output_parser
+
     list_help = "List teams."
     list_parser = subparsers.add_parser(
         "list",
         description=list_help,
         help=list_help,
-        parents=parents,
+        parents=[*parents, get_output_parser()],
     )
     list_parser.set_defaults(func=_list_accounts)
 

{fal-1.34.1 → fal-1.36.0}/src/fal/sdk.py

@@ -264,6 +264,7 @@ class AliasInfo:
 class RunnerState(Enum):
     RUNNING = "running"
     PENDING = "pending"
+    SETUP = "setup"
     UNKNOWN = "unknown"
 
     @staticmethod
@@ -272,6 +273,8 @@ class RunnerState(Enum):
             return RunnerState.RUNNING
         elif proto is isolate_proto.RunnerInfo.State.PENDING:
             return RunnerState.PENDING
+        elif proto is isolate_proto.RunnerInfo.State.SETUP:
+            return RunnerState.SETUP
         else:
             return RunnerState.UNKNOWN
 

fal-1.34.1/src/fal/cli/doctor.py

@@ -1,37 +0,0 @@
-import os
-import platform
-
-
-def _doctor(args):
-    import isolate
-    from rich.table import Table
-
-    import fal
-
-    table = Table(show_header=False, show_lines=False, box=None)
-    table.add_column("name", no_wrap=True, style="bold")
-    table.add_column("value", no_wrap=True)
-
-    table.add_row("fal", fal.__version__)
-    table.add_row("isolate", isolate.__version__)
-
-    table.add_row("", "")
-    table.add_row("python", platform.python_version())
-    table.add_row("platform", platform.platform())
-
-    table.add_row("", "")
-    table.add_row("FAL_HOST", fal.flags.GRPC_HOST)
-    table.add_row("FAL_KEY", os.getenv("FAL_KEY", "").split(":")[0])
-
-    args.console.print(table)
-
-
-def add_parser(main_subparsers, parents):
-    doctor_help = "fal version and misc environment information."
-    parser = main_subparsers.add_parser(
-        "doctor",
-        description=doctor_help,
-        help=doctor_help,
-        parents=parents,
-    )
-    parser.set_defaults(func=_doctor)