fal 1.11.0__tar.gz → 1.11.2__tar.gz

{fal-1.11.0/fal.egg-info → fal-1.11.2}/PKG-INFO

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

{fal-1.11.0 → fal-1.11.2/fal.egg-info}/PKG-INFO

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

{fal-1.11.0 → fal-1.11.2}/fal.egg-info/SOURCES.txt

@@ -114,6 +114,7 @@ src/fal/cli/profile.py
 src/fal/cli/run.py
 src/fal/cli/runners.py
 src/fal/cli/secrets.py
+src/fal/cli/teams.py
 src/fal/console/__init__.py
 src/fal/console/icons.py
 src/fal/console/ux.py

{fal-1.11.0 → fal-1.11.2}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.11.0'
-__version_tuple__ = version_tuple = (1, 11, 0)
+__version__ = version = '1.11.2'
+__version_tuple__ = version_tuple = (1, 11, 2)

{fal-1.11.0 → fal-1.11.2}/src/fal/auth/__init__.py

@@ -128,16 +128,40 @@ def _fetch_access_token() -> str:
         return token_data["access_token"]
 
 
+def _fetch_teams(bearer_token: str) -> list[dict]:
+    import json
+    from urllib.error import HTTPError
+    from urllib.request import Request, urlopen
+
+    from fal.exceptions import FalServerlessException
+    from fal.flags import REST_URL
+
+    request = Request(
+        method="GET",
+        url=f"{REST_URL}/users/teams",
+        headers={"Authorization": bearer_token},
+    )
+    try:
+        with urlopen(request) as response:
+            teams = 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)
 
     def invalidate(self) -> None:
         self._access_token = None
         self._user_info = None
         self._exc = None
+        self._teams = None
 
     @property
     def info(self) -> dict:
@@ -167,5 +191,17 @@ class UserAccess:
     def bearer_token(self) -> str:
         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 get_team(self, team: str) -> dict:
+        for t in self.teams:
+            if t["nickname"].lower() == team.lower():
+                return t
+        raise ValueError(f"Team {team} not found")
+
 
 USER = UserAccess()

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/_utils.py

@@ -3,6 +3,13 @@ from __future__ import annotations
 from fal.files import find_project_root, find_pyproject_toml, parse_pyproject_toml
 
 
+def get_client(host: str, team: str | None = None):
+    from fal.sdk import FalServerlessClient, get_default_credentials
+
+    credentials = get_default_credentials(team=team)
+    return FalServerlessClient(host, credentials)
+
+
 def is_app_name(app_ref: tuple[str, str | None]) -> bool:
     is_single_file = app_ref[1] is None
     is_python_file = app_ref[0].endswith(".py")
@@ -25,7 +32,7 @@ def get_app_data_from_toml(app_name):
         raise ValueError(f"App {app_name} not found in pyproject.toml")
 
     try:
-        app_ref = app_data["ref"]
+        app_ref = app_data.pop("ref")
     except KeyError:
         raise ValueError(f"App {app_name} does not have a ref key in pyproject.toml")
 
@@ -33,8 +40,11 @@ def get_app_data_from_toml(app_name):
     project_root, _ = find_project_root(None)
     app_ref = str(project_root / app_ref)
 
-    app_auth = app_data.get("auth", "private")
-    app_deployment_strategy = app_data.get("deployment_strategy", "recreate")
-    app_no_scale = app_data.get("no_scale", False)
+    app_auth = app_data.pop("auth", "private")
+    app_deployment_strategy = app_data.pop("deployment_strategy", "recreate")
+    app_no_scale = app_data.pop("no_scale", False)
+
+    if len(app_data) > 0:
+        raise ValueError(f"Found unexpected keys in pyproject.toml: {app_data}")
 
     return app_ref, app_auth, app_deployment_strategy, app_no_scale

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/apps.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from ._utils import get_client
 from .parser import FalClientParser
 
 if TYPE_CHECKING:
@@ -47,9 +48,7 @@ def _apps_table(apps: list[AliasInfo]):
 
 
 def _list(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         apps = connection.list_aliases()
 
@@ -120,9 +119,7 @@ def _app_rev_table(revs: list[ApplicationInfo]):
 
 
 def _list_rev(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         revs = connection.list_applications()
         table = _app_rev_table(revs)
@@ -142,9 +139,7 @@ def _add_list_rev_parser(subparsers, parents):
 
 
 def _scale(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         if (
             args.keep_alive is None
@@ -240,9 +235,7 @@ def _add_scale_parser(subparsers, parents):
 
 
 def _set_rev(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.create_alias(args.app_name, args.app_rev, args.auth)
 
@@ -277,9 +270,7 @@ def _add_set_rev_parser(subparsers, parents):
 def _runners(args):
     from rich.table import Table
 
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         runners = connection.list_alias_runners(alias=args.app_name)
 
@@ -350,9 +341,7 @@ def _add_runners_parser(subparsers, parents):
 
 
 def _delete(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.delete_alias(args.app_name)
 
@@ -373,9 +362,7 @@ def _add_delete_parser(subparsers, parents):
 
 
 def _delete_rev(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.delete_application(args.app_rev)
 

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/auth.py

@@ -2,11 +2,38 @@ from fal.auth import USER, login, logout
 
 
 def _login(args):
+    from rich.prompt import Prompt
+
+    from fal.config import Config
+
     login()
+    teams = [team["nickname"].lower() for team in USER.teams]
+    if not teams:
+        return
+
+    team = Prompt.ask(
+        "\nPlease choose a team account to use or leave blank to "
+        "use your personal account:",
+        choices=teams,
+        default=None,
+    )
+    with Config().edit() as config:
+        if team:
+            args.console.print(
+                f"Setting team to [cyan]{team}[/]. "
+                "You can change this later with [bold]fal team set[/]."
+            )
+            config.set("team", team)
+        else:
+            config.unset("team")
 
 
 def _logout(args):
+    from fal.config import Config
+
     logout()
+    with Config().edit() as config:
+        config.unset("team")
 
 
 def _whoami(args):

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/keys.py

@@ -1,12 +1,11 @@
 from fal.sdk import KeyScope
 
+from ._utils import get_client
 from .parser import FalClientParser
 
 
 def _create(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         parsed_scope = KeyScope(args.scope)
         result = connection.create_user_key(parsed_scope, args.desc)
@@ -43,15 +42,13 @@ def _add_create_parser(subparsers, parents):
 def _list(args):
     from rich.table import Table
 
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
     table = Table()
     table.add_column("Key ID")
     table.add_column("Created At")
     table.add_column("Scope")
     table.add_column("Description")
 
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         keys = connection.list_user_keys()
         for key in keys:
@@ -77,9 +74,7 @@ def _add_list_parser(subparsers, parents):
 
 
 def _revoke(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.revoke_user_key(args.key_id)
 

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/main.py

@@ -18,6 +18,7 @@ from . import (
     run,
     runners,
     secrets,
+    teams,
 )
 from .debug import debugtools, get_debug_parser
 from .parser import FalParser, FalParserExit
@@ -55,6 +56,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
         doctor,
         create,
         runners,
+        teams,
     ]:
         cmd.add_parser(subparsers, parents)
 

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/parser.py

@@ -99,3 +99,7 @@ class FalClientParser(FalParser):
             default=GRPC_HOST,
             help=argparse.SUPPRESS,
         )
+        self.add_argument(
+            "--team",
+            help="The team to use.",
+        )

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/profile.py

@@ -4,13 +4,12 @@ from fal.config import Config
 
 
 def _list(args):
-    config = Config()
-
     table = Table()
     table.add_column("Default")
     table.add_column("Profile")
     table.add_column("Settings")
 
+    config = Config()
     for profile in config.profiles():
         table.add_row(
             "*" if profile == config._profile else "",
@@ -22,28 +21,24 @@ def _list(args):
 
 
 def _set(args):
-    config = Config()
-    config.set_internal("profile", args.PROFILE)
-    args.console.print(f"Default profile set to [cyan]{args.PROFILE}[/].")
-    config.profile = args.PROFILE
-    if not config.get("key"):
-        args.console.print(
-            "No key set for profile. Use [bold]fal profile key[/] to set a key."
-        )
-    config.save()
+    with Config().edit() as config:
+        config.set_internal("profile", args.PROFILE)
+        args.console.print(f"Default profile set to [cyan]{args.PROFILE}[/].")
+        config.profile = args.PROFILE
+        if not config.get("key"):
+            args.console.print(
+                "No key set for profile. Use [bold]fal profile key[/] to set a key."
+            )
 
 
 def _unset(args):
-    config = Config()
-    config.set_internal("profile", None)
-    args.console.print("Default profile unset.")
-    config.profile = None
-    config.save()
+    with Config().edit() as config:
+        config.set_internal("profile", None)
+        args.console.print("Default profile unset.")
+        config.profile = None
 
 
 def _key_set(args):
-    config = Config()
-
     while True:
         key = input("Enter the key: ")
         if ":" in key:
@@ -52,25 +47,25 @@ def _key_set(args):
             "[red]Invalid key. The key must be in the format [bold]key:value[/].[/]"
         )
 
-    config.set("key", key)
-    args.console.print(f"Key set for profile [cyan]{config.profile}[/].")
-    config.save()
+    with Config().edit() as config:
+        config.set("key", key)
+        args.console.print(f"Key set for profile [cyan]{config.profile}[/].")
 
 
 def _delete(args):
-    config = Config()
-    if config.profile == args.PROFILE:
-        config.set_internal("profile", None)
+    with Config().edit() as config:
+        if config.profile == args.PROFILE:
+            config.set_internal("profile", None)
 
-    config.delete(args.PROFILE)
-    args.console.print(f"Profile [cyan]{args.PROFILE}[/] deleted.")
-    config.save()
+        config.delete(args.PROFILE)
+        args.console.print(f"Profile [cyan]{args.PROFILE}[/] deleted.")
 
 
 def add_parser(main_subparsers, parents):
     auth_help = "Profile management."
     parser = main_subparsers.add_parser(
         "profile",
+        aliases=["profiles"],
         description=auth_help,
         help=auth_help,
         parents=parents,

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/runners.py

@@ -1,10 +1,9 @@
+from ._utils import get_client
 from .parser import FalClientParser
 
 
 def _kill(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.kill_runner(args.id)
 

{fal-1.11.0 → fal-1.11.2}/src/fal/cli/secrets.py

@@ -1,10 +1,9 @@
+from ._utils import get_client
 from .parser import DictAction, FalClientParser
 
 
 def _set(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         for name, value in args.secrets.items():
             connection.set_secret(name, value)
@@ -34,13 +33,11 @@ def _add_set_parser(subparsers, parents):
 def _list(args):
     from rich.table import Table
 
-    from fal.sdk import FalServerlessClient
-
     table = Table()
     table.add_column("Secret Name")
     table.add_column("Created At")
 
-    client = FalServerlessClient(args.host)
+    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))
@@ -60,9 +57,7 @@ def _add_list_parser(subparsers, parents):
 
 
 def _unset(args):
-    from fal.sdk import FalServerlessClient
-
-    client = FalServerlessClient(args.host)
+    client = get_client(args.host, args.team)
     with client.connect() as connection:
         connection.delete_secret(args.secret)
 

fal-1.11.2/src/fal/cli/teams.py

@@ -0,0 +1,89 @@
+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)
+
+
+def _unset(args):
+    from fal.config import Config
+
+    with Config().edit() as config:
+        config.unset("team")
+
+
+def add_parser(main_subparsers, parents):
+    teams_help = "Manage teams."
+    parser = main_subparsers.add_parser(
+        "teams",
+        aliases=["team"],
+        description=teams_help,
+        help=teams_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        dest="cmd",
+        required=True,
+    )
+
+    list_help = "List teams."
+    list_parser = subparsers.add_parser(
+        "list",
+        description=list_help,
+        help=list_help,
+        parents=parents,
+    )
+    list_parser.set_defaults(func=_list)
+
+    set_help = "Set the current team."
+    set_parser = subparsers.add_parser(
+        "set",
+        description=set_help,
+        help=set_help,
+        parents=parents,
+    )
+    set_parser.add_argument("team", help="The team to set.")
+    set_parser.set_defaults(func=_set)
+
+    unset_help = "Unset the current team."
+    unset_parser = subparsers.add_parser(
+        "unset",
+        description=unset_help,
+        help=unset_help,
+        parents=parents,
+    )
+    unset_parser.set_defaults(func=_unset)

{fal-1.11.0 → fal-1.11.2}/src/fal/config.py

@@ -1,7 +1,9 @@
 import os
+from contextlib import contextmanager
 from typing import Dict, List, Optional
 
-SETTINGS_SECTION = "__internal__"
+SETTINGS_SECTION = "__internal__"  # legacy
+DEFAULT_PROFILE = "default"
 
 
 class Config:
@@ -23,9 +25,9 @@ class Config:
         except FileNotFoundError:
             self._config = {}
 
-        profile = os.getenv("FAL_PROFILE")
-        if not profile:
-            profile = self.get_internal("profile")
+        profile = (
+            os.getenv("FAL_PROFILE") or self.get_internal("profile") or DEFAULT_PROFILE
+        )
 
         self.profile = profile
 
@@ -66,6 +68,12 @@ class Config:
 
         self._config[self.profile][key] = value
 
+    def unset(self, key: str) -> None:
+        if not self.profile:
+            raise ValueError("No profile set.")
+
+        del self._config[self.profile][key]
+
     def get_internal(self, key: str) -> Optional[str]:
         if SETTINGS_SECTION not in self._config:
             self._config[SETTINGS_SECTION] = {}
@@ -83,3 +91,8 @@ class Config:
 
     def delete(self, profile: str) -> None:
         del self._config[profile]
+
+    @contextmanager
+    def edit(self):
+        yield self
+        self.save()

{fal-1.11.0 → fal-1.11.2}/src/fal/sdk.py

@@ -129,12 +129,22 @@ class FalServerlessKeyCredentials(Credentials):
 @dataclass
 class AuthenticatedCredentials(Credentials):
     user = USER
+    team_id: str | None = None
 
     def to_grpc(self) -> grpc.ChannelCredentials:
-        return grpc.composite_channel_credentials(
+        creds = [
             self.server_credentials.to_grpc(),
             grpc.access_token_call_credentials(USER.access_token),
-        )
+        ]
+
+        if self.team_id:
+            creds.append(
+                grpc.metadata_call_credentials(
+                    _GRPCMetadata("fal-user-id", self.team_id)
+                )
+            )
+
+        return grpc.composite_channel_credentials(*creds)
 
     def to_headers(self) -> dict[str, str]:
         token = USER.bearer_token
@@ -158,16 +168,23 @@ def get_agent_credentials(original_credentials: Credentials) -> Credentials:
         return original_credentials
 
 
-def get_default_credentials() -> Credentials:
+def get_default_credentials(team: str | None = None) -> Credentials:
+    from fal.config import Config
+
     if flags.AUTH_DISABLED:
         return Credentials()
 
     key_creds = key_credentials()
     if key_creds:
         logger.debug("Using key credentials")
+        if team:
+            raise ValueError("Using explicit team with key credentials is not allowed")
         return FalServerlessKeyCredentials(key_creds[0], key_creds[1])
     else:
-        return AuthenticatedCredentials()
+        config = Config()
+        team = team or config.get("team")
+        team_id = USER.get_team(team)["user_id"] if team else None
+        return AuthenticatedCredentials(team_id=team_id)
 
 
 @dataclass