fal 1.11.5__py3-none-any.whl → 1.12.0__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.5'
-__version_tuple__ = version_tuple = (1, 11, 5)
+__version__ = version = '1.12.0'
+__version_tuple__ = version_tuple = (1, 12, 0)

fal/auth/__init__.py

@@ -142,25 +142,23 @@ def _fetch_teams(bearer_token: str) -> list[dict]:
     )
     try:
         with urlopen(request) as response:
-            teams = json.load(response)
+            return json.load(response)
     except HTTPError as exc:
         raise FalServerlessException("Failed to fetch teams") from exc
 
-    return [team for team in teams if not team["is_personal"]]
-
 
 @dataclass
 class UserAccess:
     _access_token: str | None = field(repr=False, default=None)
     _user_info: dict | None = field(repr=False, default=None)
     _exc: Exception | None = field(repr=False, default=None)
-    _teams: list[dict] | None = field(repr=False, default=None)
+    _accounts: list[dict] | None = field(repr=False, default=None)
 
     def invalidate(self) -> None:
         self._access_token = None
         self._user_info = None
         self._exc = None
-        self._teams = None
+        self._accounts = None
 
     @property
     def info(self) -> dict:
@@ -191,13 +189,17 @@ class UserAccess:
         return "Bearer " + self.access_token
 
     @property
-    def teams(self) -> list[dict]:
-        if self._teams is None:
-            self._teams = _fetch_teams(self.bearer_token)
-        return self._teams
+    def accounts(self) -> list[dict]:
+        if self._accounts is None:
+            self._accounts = _fetch_teams(self.bearer_token)
+            self._accounts = sorted(
+                self._accounts, key=lambda x: (not x["is_personal"], x["nickname"])
+            )
+
+        return self._accounts
 
-    def get_team(self, team: str) -> dict:
-        for t in self.teams:
+    def get_account(self, team: str) -> dict:
+        for t in self.accounts:
             if t["nickname"].lower() == team.lower():
                 return t
         raise ValueError(f"Team {team} not found")

fal/cli/auth.py

@@ -3,44 +3,13 @@ from fal.auth import USER, login, logout
 
 def _login(args):
     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
-
-    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_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")
+        config.unset("team")
+
+    _set_account(args)
 
 
 def _logout(args):
@@ -51,10 +20,85 @@ def _logout(args):
         config.unset("team")
 
 
+def _list_accounts(args):
+    from rich.style import Style
+    from rich.table import Table
+
+    from fal.config import Config
+
+    config = Config()
+    current_account = config.get("team") or USER.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.accounts):
+        selected = account["nickname"] == current_account
+        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)
+
+
+def _set_account(args):
+    from rich.prompt import Prompt
+
+    from fal.config import Config
+
+    if hasattr(args, "account") and args.account:
+        if args.account.isdigit():
+            acc_index = int(args.account) - 1
+            account = USER.accounts[acc_index]
+        else:
+            account = USER.get_account(args.account)
+    else:
+        _list_accounts(args)
+        indices = list(map(str, range(1, len(USER.accounts) + 1)))
+        team_names = [account["nickname"] for account in USER.accounts]
+        acc_choice = Prompt.ask(
+            "Select an account by number",
+            choices=indices + team_names,
+            show_choices=False,
+        )
+        if acc_choice in indices:
+            acc_index = int(acc_choice) - 1
+            account = USER.accounts[acc_index]
+        else:
+            account = USER.get_account(acc_choice)
+
+    if account["is_personal"]:
+        args.console.print(f"Using personal account {account['nickname']}")
+    else:
+        args.console.print(f"Using team account {account['nickname']}")
+
+    with Config().edit() as config:
+        config.set("team", account["nickname"])
+
+
 def _whoami(args):
-    user_name = USER.info["name"]
-    sub = USER.info["sub"]
-    args.console.print(f"Hello, {user_name} - '{sub}'")
+    from fal.config import Config
+
+    config = Config()
+
+    team = config.get("team")
+    if team:
+        account = USER.get_account(team)
+    else:
+        account = USER.get_account(USER.info["nickname"])
+
+    nickname = account["nickname"]
+    full_name = account["full_name"]
+    user_id = account["user_id"]
+
+    args.console.print(f"Hello, {full_name}: {nickname!r} - {user_id!r}")
 
 
 def add_parser(main_subparsers, parents):

fal/cli/teams.py

@@ -1,39 +1,4 @@
-def _list(args):
-    from rich.table import Table
-
-    from fal.auth import USER
-    from fal.config import Config
-
-    table = Table()
-    table.add_column("Default")
-    table.add_column("Team")
-    table.add_column("Full Name")
-    table.add_column("ID")
-
-    default_team = Config().get("team")
-
-    for team in USER.teams:
-        default = default_team and default_team.lower() == team["nickname"].lower()
-        table.add_row(
-            "*" if default else "", team["nickname"], team["full_name"], team["user_id"]
-        )
-
-    args.console.print(table)
-
-
-def _set(args):
-    from fal.config import Config
-    from fal.sdk import USER
-
-    team = args.team.lower()
-    for team_info in USER.teams:
-        if team_info["nickname"].lower() == team:
-            break
-    else:
-        raise ValueError(f"Team {args.team} not found")
-
-    with Config().edit() as config:
-        config.set("team", team)
+from fal.cli.auth import _list_accounts, _set_account
 
 
 def _unset(args):
@@ -67,7 +32,7 @@ def add_parser(main_subparsers, parents):
         help=list_help,
         parents=parents,
     )
-    list_parser.set_defaults(func=_list)
+    list_parser.set_defaults(func=_list_accounts)
 
     set_help = "Set the current team."
     set_parser = subparsers.add_parser(
@@ -76,8 +41,8 @@ def add_parser(main_subparsers, parents):
         help=set_help,
         parents=parents,
     )
-    set_parser.add_argument("team", help="The team to set.")
-    set_parser.set_defaults(func=_set)
+    set_parser.add_argument("account", help="The team to set.")
+    set_parser.set_defaults(func=_set_account)
 
     unset_help = "Unset the current team."
     unset_parser = subparsers.add_parser(

fal/sdk.py

@@ -183,7 +183,7 @@ def get_default_credentials(team: str | None = None) -> Credentials:
     else:
         config = Config()
         team = team or config.get("team")
-        team_id = USER.get_team(team)["user_id"] if team else None
+        team_id = USER.get_account(team)["user_id"] if team else None
         return AuthenticatedCredentials(team_id=team_id)
 
 

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

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

{fal-1.11.5.dist-info → fal-1.12.0.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=C9jc23h2VfZSE0orSfoOaBMqebv8jMlmnPO1wUWfXak,513
+fal/_fal_version.py,sha256=X7AXkrxMLYa0fUCdwZA2oOfiFkQJiuenTXzRghkc4eU,513
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
 fal/api.py,sha256=aoA0-7JsO6dWhudzmDOidbPwxnJmIJaQWhGV1kqLCbw,44814
@@ -12,18 +12,18 @@ 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=b-1J3nO5I4f69L2APqDZ0hLNo7qVhWA2bhCvrjhpQV4,25420
+fal/sdk.py,sha256=lS-nVp35qwlovQWhmkhWhBmTMCG-ntMekdrIIgzK-2A,25423
 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=zk0CqYxwTFud-9vdh3og6zMWkFf_1gM5CbLrAP49lcQ,5837
+fal/auth/__init__.py,sha256=WSDXxkrshGyOvfN6WomHGKrflbmJvPiDUSQRsp4mqsI,5932
 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=vKeTUw_uUxz5M9hlP0jcJ23qjR0GTz7ifeS4HBjKECo,10101
-fal/cli/auth.py,sha256=3wq2NYhlA3tFOSQOhQQnbzcPBMVWTU2IZzTEVWke1BY,2604
+fal/cli/auth.py,sha256=iHXxreitWubR7meV7DEbSP8djvdb6QxMw6nHZFv9udw,3779
 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
@@ -36,7 +36,7 @@ fal/cli/profile.py,sha256=vWngqkX7UizQIUQOpXauFz1UGJwDeh38Si6wXcIj3Eo,3396
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
 fal/cli/runners.py,sha256=z7WkZZC9rCW2mU5enowVQsxd1W18iBtLNOnPjrzhEf0,3491
 fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
-fal/cli/teams.py,sha256=ZrWdMvLRqPt1EuxoOKAfbP6sxJeOCaMeZ2LgZqw2S_w,2153
+fal/cli/teams.py,sha256=lIY4uT8TGjk9g0z2tY4cGDU8PGqowncEMKh9K_dJYUY,1314
 fal/console/__init__.py,sha256=ernZ4bzvvliQh5SmrEqQ7lA5eVcbw6Ra2jalKtA7dxg,132
 fal/console/icons.py,sha256=De9MfFaSkO2Lqfne13n3PrYfTXJVIzYZVqYn5BWsdrA,108
 fal/console/ux.py,sha256=KMQs3UHQvVHDxDQQqlot-WskVKoMQXOE3jiVkkfmIMY,356
@@ -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.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,,
+fal-1.12.0.dist-info/METADATA,sha256=aOSYnbFBCtE2_UnXsu0QrBd5s8sHWJUoOh6FwxqhSTM,4062
+fal-1.12.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fal-1.12.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.12.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.12.0.dist-info/RECORD,,