fal 1.34.1__tar.gz → 1.35.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.34.1
+Version: 1.35.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.34.1
+Version: 1.35.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8

{fal-1.34.1 → fal-1.35.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.35.0'
+__version_tuple__ = version_tuple = (1, 35, 0)
 
 __commit_id__ = commit_id = None

{fal-1.34.1 → fal-1.35.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)
 
 

{fal-1.34.1 → fal-1.35.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.34.1 → fal-1.35.0}/src/fal/cli/parser.py

@@ -103,3 +103,16 @@ 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",
+    )
+    return parser

{fal-1.34.1 → fal-1.35.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], pending_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,18 @@ 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))
+        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_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, pending_runners)
+        else:
+            raise AssertionError(f"Invalid output format: {args.output}")
 
 
 def _add_kill_parser(subparsers, parents):
@@ -117,7 +143,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)