fal 1.11.5__tar.gz → 1.12.1__tar.gz

{fal-1.11.5/fal.egg-info → fal-1.12.1}/PKG-INFO

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

{fal-1.11.5 → fal-1.12.1/fal.egg-info}/PKG-INFO

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

{fal-1.11.5 → fal-1.12.1}/src/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.1'
+__version_tuple__ = version_tuple = (1, 12, 1)

{fal-1.11.5 → fal-1.12.1}/src/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-1.12.1/src/fal/cli/auth.py

@@ -0,0 +1,151 @@
+from fal.auth import USER, login, logout
+
+
+def _login(args):
+    from fal.config import Config
+
+    login()
+
+    with Config().edit() as config:
+        config.unset("team")
+
+    _set_account(args)
+
+
+def _logout(args):
+    from fal.config import Config
+
+    logout()
+    with Config().edit() as config:
+        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 [cyan]{account['nickname']}[/]. "
+            "You can change this later with [bold]fal team set[/]"
+        )
+    else:
+        args.console.print(
+            f"Using team account [cyan]{account['nickname']}[/]. "
+            "You can change this later with [bold]fal team set[/]"
+        )
+
+    with Config().edit() as config:
+        config.set("team", account["nickname"])
+
+
+def _whoami(args):
+    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):
+    auth_help = "Authenticate with fal."
+    parser = main_subparsers.add_parser(
+        "auth",
+        description=auth_help,
+        help=auth_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        dest="cmd",
+        required=True,
+    )
+
+    login_help = "Log in a user."
+    login_parser = subparsers.add_parser(
+        "login",
+        description=login_help,
+        help=login_help,
+        parents=parents,
+    )
+    login_parser.set_defaults(func=_login)
+
+    logout_help = "Log out the currently logged-in user."
+    logout_parser = subparsers.add_parser(
+        "logout",
+        description=logout_help,
+        help=logout_help,
+        parents=parents,
+    )
+    logout_parser.set_defaults(func=_logout)
+
+    whoami_help = "Show the currently authenticated user."
+    whoami_parser = subparsers.add_parser(
+        "whoami",
+        description=whoami_help,
+        help=whoami_help,
+        parents=parents,
+    )
+    whoami_parser.set_defaults(func=_whoami)

{fal-1.11.5 → fal-1.12.1}/src/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-1.11.5 → fal-1.12.1}/src/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/src/fal/cli/auth.py

@@ -1,101 +0,0 @@
-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")
-
-
-def _logout(args):
-    from fal.config import Config
-
-    logout()
-    with Config().edit() as config:
-        config.unset("team")
-
-
-def _whoami(args):
-    user_name = USER.info["name"]
-    sub = USER.info["sub"]
-    args.console.print(f"Hello, {user_name} - '{sub}'")
-
-
-def add_parser(main_subparsers, parents):
-    auth_help = "Authenticate with fal."
-    parser = main_subparsers.add_parser(
-        "auth",
-        description=auth_help,
-        help=auth_help,
-        parents=parents,
-    )
-
-    subparsers = parser.add_subparsers(
-        title="Commands",
-        metavar="command",
-        dest="cmd",
-        required=True,
-    )
-
-    login_help = "Log in a user."
-    login_parser = subparsers.add_parser(
-        "login",
-        description=login_help,
-        help=login_help,
-        parents=parents,
-    )
-    login_parser.set_defaults(func=_login)
-
-    logout_help = "Log out the currently logged-in user."
-    logout_parser = subparsers.add_parser(
-        "logout",
-        description=logout_help,
-        help=logout_help,
-        parents=parents,
-    )
-    logout_parser.set_defaults(func=_logout)
-
-    whoami_help = "Show the currently authenticated user."
-    whoami_parser = subparsers.add_parser(
-        "whoami",
-        description=whoami_help,
-        help=whoami_help,
-        parents=parents,
-    )
-    whoami_parser.set_defaults(func=_whoami)