fal 1.35.0__py3-none-any.whl → 1.36.1__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.35.0'
-__version_tuple__ = version_tuple = (1, 35, 0)
+__version__ = version = '1.36.1'
+__version_tuple__ = version_tuple = (1, 36, 1)
 
 __commit_id__ = commit_id = None

fal/cli/apps.py

@@ -297,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/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,43 @@ 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,
-        )
+    # NOTE: might be used by other commands that don't have the --output/--json flag
+    output = getattr(args, "output", "pretty")
+    if 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 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: {output}")
 
 
 def _unset_account(args):

fal/cli/doctor.py

@@ -1,37 +1,54 @@
+import json
 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)
+    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.add_row("fal", fal.__version__)
-    table.add_row("isolate", isolate.__version__)
+        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("", "")
-    table.add_row("python", platform.python_version())
-    table.add_row("platform", platform.platform())
+        table.add_row("fal", fal.__version__)
+        table.add_row("isolate", isolate.__version__)
 
-    table.add_row("", "")
-    table.add_row("FAL_HOST", fal.flags.GRPC_HOST)
-    table.add_row("FAL_KEY", os.getenv("FAL_KEY", "").split(":")[0])
+        table.add_row("", "")
+        table.add_row("python", platform.python_version())
+        table.add_row("platform", platform.platform())
 
-    args.console.print(table)
+        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,
+        parents=[*parents, get_output_parser()],
     )
     parser.set_defaults(func=_doctor)

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/cli/parser.py

@@ -115,4 +115,11 @@ def get_output_parser():
         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/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/cli/runners.py

@@ -81,7 +81,7 @@ def _kill(args):
         connection.kill_runner(args.id)
 
 
-def _list_json(args, runners: list[RunnerInfo], pending_runners: list[RunnerInfo]):
+def _list_json(args, runners: list[RunnerInfo]):
     json_runners = [
         {
             "alias": r.alias,
@@ -108,16 +108,23 @@ def _list(args):
         pending_runners = [
             runner for runner in runners if runner.state == RunnerState.PENDING
         ]
+        setup_runners = [
+            runner for runner in runners if runner.state == RunnerState.SETUP
+        ]
         if args.output == "pretty":
-            args.console.print(f"Runners: {len(runners) - len(pending_runners)}")
-            args.console.print(f"Pending Runners: {len(pending_runners)}")
+            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)
         elif args.output == "json":
-            _list_json(args, runners, pending_runners)
+            _list_json(args, runners)
         else:
             raise AssertionError(f"Invalid output format: {args.output}")
 

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/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/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.35.0.dist-info → fal-1.36.1.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.35.0
+Version: 1.36.1
 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.35.0.dist-info → fal-1.36.1.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=fEVxpsnggVq-NSPWN73JVJO3FDQoAjIv54D7dJagIpE,706
+fal/_fal_version.py,sha256=3O5R5kfC2NAQSY39lwr4Di6e6T8ez4E255wTzoz-vaE,706
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
 fal/api.py,sha256=oWSPxefwyYF93s54mtyYGKWYMax9ll9B-wxijOyARb4,49244
@@ -13,7 +13,7 @@ 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=TdDj86WFWiK1g4g6MdxiA6vbMVc9ix8Iges2UtBGt4g,27406
+fal/sdk.py,sha256=cs7AlrgXEOavTSF8c8MgZy6QyLe_SowaDGlHagFcYJg,27523
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=iQTBG3-i6JZgHkkwbY_I4210g0xoW-as51yrke608u0,2208
 fal/workflows.py,sha256=Zl4f6Bs085hY40zmqScxDUyCu7zXkukDbW02iYOLTTI,14805
@@ -23,22 +23,22 @@ fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
 fal/cli/_utils.py,sha256=ulYezhr3G29nTIF8MDQ6tsW01Oj1zPo-YSqMoBi05Ic,1871
 fal/cli/api.py,sha256=ZuDE_PIC-czzneTAWMwvC7P7WnwIyluNZSuJqzCFhqI,2640
-fal/cli/apps.py,sha256=9eflKmU0J3FTF87jSambA4xuNa6-M2nS4S3ZjOvXpvg,11200
-fal/cli/auth.py,sha256=Qe-Z3ycXJnOzHimz5PjCQYoni8MF4csmdL19yGN7a1o,5171
+fal/cli/apps.py,sha256=v7Hgx5blO-YHfLnScq6QyDgBZQiumJ37tOppbtPn41Q,11411
+fal/cli/auth.py,sha256=ZLjxuF4LobETJ2CLGMj_QurE0PiJxzKdFJZkux8uLHM,5977
 fal/cli/cli_nested_json.py,sha256=veSZU8_bYV3Iu1PAoxt-4BMBraNIqgH5nughbs2UKvE,13539
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=mTCjSpEZaNKcX225VZtry-BspFKSHURUuxUFuX6x5Cc,1488
 fal/cli/deploy.py,sha256=aezafp-g8vvLoARl1i84uGd-zIR1TtlSKi9E0dm-Z7E,8703
-fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
+fal/cli/doctor.py,sha256=8SZrYG9Ku0F6LLUHtFdKopdIgZfFkw5E3Mwrxa9KOSk,1613
 fal/cli/files.py,sha256=-j0q4g53A7CWSczGLdfeUCTSd4zXoV3pfZFdman7JOw,3450
-fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
+fal/cli/keys.py,sha256=iQVMr3WT8CUqSQT3qeCCiy6rRwoux9F-UEaC4bCwMWo,3754
 fal/cli/main.py,sha256=s_LxEyz9z64dewk3oiGEI33_h3vJ3IVdu8aY3qydkMo,3345
-fal/cli/parser.py,sha256=PyD6Fv8xx0x4iD9OEtls9jSQImdYhgxMPW3UMGdsun8,3274
-fal/cli/profile.py,sha256=agyGFQRLHOtzJEdN3Pn9317rg044XaszNCZrf0ELK-8,6016
+fal/cli/parser.py,sha256=WxbO5pgMhcerEFl4uUdaCoFlTQF14PJVctiWRo55jHQ,3459
+fal/cli/profile.py,sha256=PAY_ffifCT71VJ8VxfDVaXPT0U1oN8drvWZDFRXwvek,6678
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
-fal/cli/runners.py,sha256=IssWo5lhySLl9yRbpYdmWn3llkChdqTDhwWfqHxco-Y,4837
-fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
-fal/cli/teams.py,sha256=6fR2rKJtiUJPThP7QsO4NLo9UdhUxraGvQZk3_Di6Ow,1218
+fal/cli/runners.py,sha256=ctAlD1C9tmVFZDvFFJ9tszjLcL972mm27GQ1AhY1WPk,5047
+fal/cli/secrets.py,sha256=HfIeO2IZpCEiBC6Cs5Kpi3zckfDnc7GsLwLdgj3NnPU,3085
+fal/cli/teams.py,sha256=_JcNcf659ZoLBFOxKnVP5A6Pyk1jY1vh4_xzMweYIDo,1285
 fal/console/__init__.py,sha256=lGPUuTqIM9IKTa1cyyA-MA2iZJKVHp2YydsITZVlb6g,148
 fal/console/icons.py,sha256=De9MfFaSkO2Lqfne13n3PrYfTXJVIzYZVqYn5BWsdrA,108
 fal/console/ux.py,sha256=KMQs3UHQvVHDxDQQqlot-WskVKoMQXOE3jiVkkfmIMY,356
@@ -143,8 +143,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.35.0.dist-info/METADATA,sha256=xW5NzNmxI3-XwxpsLMII25JT-mpw_pbHfvumwU2D6Y8,4054
-fal-1.35.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.35.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.35.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.35.0.dist-info/RECORD,,
+fal-1.36.1.dist-info/METADATA,sha256=i_q8gLTH7qG8Ps72_RUgBLFluBgH2cu3Eugx-HfxsTs,4054
+fal-1.36.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.36.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.36.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.36.1.dist-info/RECORD,,