fal 1.13.5__tar.gz → 1.14.0__tar.gz

{fal-1.13.5/fal.egg-info → fal-1.14.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.13.5
+Version: 1.14.0
 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.17.0,>=0.16.2
-Requires-Dist: isolate-proto<0.8.0,>=0.7.2
+Requires-Dist: isolate-proto<0.9.0,>=0.8.1
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.13.5 → fal-1.14.0/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.13.5
+Version: 1.14.0
 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.17.0,>=0.16.2
-Requires-Dist: isolate-proto<0.8.0,>=0.7.2
+Requires-Dist: isolate-proto<0.9.0,>=0.8.1
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.13.5 → fal-1.14.0}/fal.egg-info/SOURCES.txt

@@ -88,6 +88,7 @@ src/fal/config.py
 src/fal/container.py
 src/fal/files.py
 src/fal/flags.py
+src/fal/project.py
 src/fal/py.typed
 src/fal/rest_client.py
 src/fal/sdk.py

{fal-1.13.5 → fal-1.14.0}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
 isolate[build]<0.17.0,>=0.16.2
-isolate-proto<0.8.0,>=0.7.2
+isolate-proto<0.9.0,>=0.8.1
 grpcio==1.64.0
 dill==0.3.7
 cloudpickle==3.0.0

{fal-1.13.5 → fal-1.14.0}/pyproject.toml

@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "isolate[build]>=0.16.2,<0.17.0",
-    "isolate-proto>=0.7.2,<0.8.0",
+    "isolate-proto>=0.8.1,<0.9.0",
     "grpcio==1.64.0",
     "dill==0.3.7",
     "cloudpickle==3.0.0",

{fal-1.13.5 → fal-1.14.0}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.13.5'
-__version_tuple__ = version_tuple = (1, 13, 5)
+__version__ = version = '1.14.0'
+__version_tuple__ = version_tuple = (1, 14, 0)

{fal-1.13.5 → fal-1.14.0}/src/fal/auth/__init__.py

@@ -125,6 +125,26 @@ def _fetch_teams(bearer_token: str) -> list[dict]:
         raise FalServerlessException("Failed to fetch teams") from exc
 
 
+def current_user_info(headers: dict[str, str]) -> 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/current",
+        headers=headers,
+    )
+    try:
+        with urlopen(request) as response:
+            return json.load(response)
+    except HTTPError as exc:
+        raise FalServerlessException("Failed to fetch user info") from exc
+
+
 def login(console):
     token_data = auth0.login(console)
     with local.lock_token():

{fal-1.13.5 → fal-1.14.0}/src/fal/cli/_utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from fal.files import find_project_root, find_pyproject_toml, parse_pyproject_toml
+from fal.project import find_project_root, find_pyproject_toml, parse_pyproject_toml
 
 
 def get_client(host: str, team: str | None = None):

{fal-1.13.5 → fal-1.14.0}/src/fal/cli/apps.py

@@ -123,7 +123,7 @@ def _app_rev_table(revs: list[ApplicationInfo]):
 def _list_rev(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        revs = connection.list_applications()
+        revs = connection.list_applications(args.app_name)
         table = _app_rev_table(revs)
 
     args.console.print(table)
@@ -137,6 +137,11 @@ def _add_list_rev_parser(subparsers, parents):
         help=list_help,
         parents=parents,
     )
+    parser.add_argument(
+        "app_name",
+        nargs="?",
+        help="Application name.",
+    )
     parser.set_defaults(func=_list_rev)
 
 

{fal-1.13.5 → fal-1.14.0}/src/fal/cli/auth.py

@@ -1,6 +1,10 @@
+from fal.auth import current_user_info
+from fal.cli import profile
+from fal.sdk import get_default_credentials
+
+
 def _login(args):
     from fal.auth import login
-    from fal.config import Config
     from fal.console.icons import CHECK_ICON, CROSS_ICON
     from fal.exceptions import FalServerlessException
 
@@ -11,15 +15,12 @@ def _login(args):
         args.console.print(f"{CROSS_ICON} {e}")
         return
 
-    with Config().edit() as config:
-        config.unset("team")
-
+    _unset_account(args)
     _set_account(args)
 
 
 def _logout(args):
     from fal.auth import logout
-    from fal.config import Config
     from fal.console.icons import CHECK_ICON, CROSS_ICON
     from fal.exceptions import FalServerlessException
 
@@ -30,8 +31,7 @@ def _logout(args):
         args.console.print(f"{CROSS_ICON} {e}")
         return
 
-    with Config().edit() as config:
-        config.unset("team")
+    _unset_account(args)
 
 
 def _list_accounts(args):
@@ -43,7 +43,7 @@ def _list_accounts(args):
 
     user_access = UserAccess()
     config = Config()
-    current_account = config.get("team") or user_access.info["nickname"]
+    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("#")
@@ -51,7 +51,7 @@ def _list_accounts(args):
     table.add_column("Type")
 
     for idx, account in enumerate(user_access.accounts):
-        selected = account["nickname"] == current_account
+        selected = account["nickname"] == current_account_name
         color = "bold yellow" if selected else None
 
         table.add_row(
@@ -64,6 +64,13 @@ def _list_accounts(args):
     args.console.print(table)
 
 
+def _unset_account(args):
+    from fal.config import Config
+
+    with Config().edit() as config:
+        config.unset_internal("team")
+
+
 def _set_account(args):
     from rich.prompt import Prompt
 
@@ -105,25 +112,24 @@ def _set_account(args):
         )
 
     with Config().edit() as config:
-        config.set("team", account["nickname"])
-
+        config.set_internal("team", account["nickname"])
 
-def _whoami(args):
-    from fal.auth import UserAccess
-    from fal.config import Config
+        # Unset the profile if set
+        if current_profile := config.get_internal("profile"):
+            args.console.print(
+                f"\n[yellow]Unsetting profile [cyan]{current_profile}[/] "
+                "to make team selection effective.[/]"
+            )
+            profile._unset(args, config=config)
 
-    user_access = UserAccess()
-    config = Config()
 
-    team = config.get("team")
-    if team:
-        account = user_access.get_account(team)
-    else:
-        account = user_access.get_account(user_access.info["nickname"])
+def _whoami(args):
+    creds = get_default_credentials()
+    user_info = current_user_info(creds.to_headers())
 
-    nickname = account["nickname"]
-    full_name = account["full_name"]
-    user_id = account["user_id"]
+    full_name = user_info["full_name"]
+    nickname = user_info["nickname"]
+    user_id = user_info["user_id"]
 
     args.console.print(f"Hello, {full_name}: {nickname!r} - {user_id!r}")
 

{fal-1.13.5 → fal-1.14.0}/src/fal/cli/profile.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from rich.table import Table
 
 from fal.config import Config
@@ -31,11 +33,12 @@ def _set(args):
             )
 
 
-def _unset(args):
-    with Config().edit() as config:
-        config.unset_internal("profile")
-        args.console.print("Default profile unset.")
+def _unset(args, config: Config | None = None):
+    config = config or Config()
+
+    with config.edit() as config:
         config.profile = None
+        args.console.print("Default profile unset.")
 
 
 def _key_set(args):

{fal-1.13.5 → fal-1.14.0}/src/fal/cli/teams.py

@@ -1,11 +1,4 @@
-from fal.cli.auth import _list_accounts, _set_account
-
-
-def _unset(args):
-    from fal.config import Config
-
-    with Config().edit() as config:
-        config.unset("team")
+from fal.cli.auth import _list_accounts, _set_account, _unset_account
 
 
 def add_parser(main_subparsers, parents):
@@ -51,4 +44,4 @@ def add_parser(main_subparsers, parents):
         help=unset_help,
         parents=parents,
     )
-    unset_parser.set_defaults(func=_unset)
+    unset_parser.set_defaults(func=_unset_account)

{fal-1.13.5 → fal-1.14.0}/src/fal/config.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import os
 from contextlib import contextmanager
-from typing import Dict, List, Optional
+from typing import Dict, Iterator, List, Optional
 
 SETTINGS_SECTION = "__internal__"  # legacy
 DEFAULT_PROFILE = "default"
@@ -9,6 +11,7 @@ DEFAULT_PROFILE = "default"
 class Config:
     _config: Dict[str, Dict[str, str]]
     _profile: Optional[str]
+    _editing: bool = False
 
     DEFAULT_CONFIG_PATH = "~/.fal/config.toml"
 
@@ -38,7 +41,11 @@ class Config:
     @profile.setter
     def profile(self, value: Optional[str]) -> None:
         if value and value not in self._config:
+            # Make sure the section exists
             self._config[value] = {}
+            self.set_internal("profile", value)
+        elif not value:
+            self.unset_internal("profile")
 
         self._profile = value
 
@@ -96,6 +103,12 @@ class Config:
         del self._config[profile]
 
     @contextmanager
-    def edit(self):
-        yield self
-        self.save()
+    def edit(self) -> Iterator[Config]:
+        if self._editing:
+            # no-op
+            yield self
+        else:
+            self._editing = True
+            yield self
+            self.save()
+            self._editing = False

{fal-1.13.5 → fal-1.14.0}/src/fal/container.py

@@ -1,9 +1,8 @@
 from dataclasses import dataclass, field
-from typing import Dict, Literal
+from typing import Dict, Literal, Optional
 
 Builder = Literal["depot", "service", "worker"]
 BUILDERS = {"depot", "service", "worker"}
-DEFAULT_BUILDER: Builder = "depot"
 DEFAULT_COMPRESSION: str = "gzip"
 DEFAULT_FORCE_COMPRESSION: bool = False
 
@@ -17,7 +16,7 @@ class ContainerImage:
     dockerfile_str: str
     build_args: Dict[str, str] = field(default_factory=dict)
     registries: Dict[str, Dict[str, str]] = field(default_factory=dict)
-    builder: Builder = field(default=DEFAULT_BUILDER)
+    builder: Optional[Builder] = field(default=None)
     compression: str = DEFAULT_COMPRESSION
     force_compression: bool = DEFAULT_FORCE_COMPRESSION
 
@@ -30,7 +29,7 @@ class ContainerImage:
                         "Username and password are required for each registry"
                     )
 
-        if self.builder not in BUILDERS:
+        if self.builder and self.builder not in BUILDERS:
             raise ValueError(
                 f"Invalid builder: {self.builder}, must be one of {BUILDERS}"
             )

fal-1.14.0/src/fal/project.py

@@ -0,0 +1,81 @@
+from functools import lru_cache
+from pathlib import Path
+from typing import Any, Dict, Optional, Sequence, Tuple, Union
+
+import tomli
+
+
+@lru_cache
+def _load_toml(path: Union[Path, str]) -> Dict[str, Any]:
+    with open(path, "rb") as f:
+        return tomli.load(f)
+
+
+@lru_cache
+def _cached_resolve(path: Path) -> Path:
+    return path.resolve()
+
+
+@lru_cache
+def find_project_root(srcs: Optional[Sequence[str]]) -> Tuple[Path, str]:
+    """Return a directory containing .git, or pyproject.toml.
+
+    That directory will be a common parent of all files and directories
+    passed in `srcs`.
+
+    If no directory in the tree contains a marker that would specify it's the
+    project root, the root of the file system is returned.
+
+    Returns a two-tuple with the first element as the project root path and
+    the second element as a string describing the method by which the
+    project root was discovered.
+    """
+    if not srcs:
+        srcs = [str(_cached_resolve(Path.cwd()))]
+
+    path_srcs = [_cached_resolve(Path(Path.cwd(), src)) for src in srcs]
+
+    # A list of lists of parents for each 'src'. 'src' is included as a
+    # "parent" of itself if it is a directory
+    src_parents = [
+        list(path.parents) + ([path] if path.is_dir() else []) for path in path_srcs
+    ]
+
+    common_base = max(
+        set.intersection(*(set(parents) for parents in src_parents)),
+        key=lambda path: path.parts,
+    )
+
+    for directory in (common_base, *common_base.parents):
+        if (directory / ".git").exists():
+            return directory, ".git directory"
+
+        if (directory / "pyproject.toml").is_file():
+            pyproject_toml = _load_toml(directory / "pyproject.toml")
+            if "fal" in pyproject_toml.get("tool", {}):
+                return directory, "pyproject.toml"
+
+    return directory, "file system root"
+
+
+def find_pyproject_toml(
+    path_search_start: Optional[Tuple[str, ...]] = None,
+) -> Optional[str]:
+    """Find the absolute filepath to a pyproject.toml if it exists"""
+    path_project_root, _ = find_project_root(path_search_start)
+    path_pyproject_toml = path_project_root / "pyproject.toml"
+
+    if path_pyproject_toml.is_file():
+        return str(path_pyproject_toml)
+
+
+def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
+    """Parse a pyproject toml file, pulling out relevant parts for fal.
+
+    If parsing fails, will raise a tomli.TOMLDecodeError.
+    """
+    pyproject_toml = _load_toml(path_config)
+    config: Dict[str, Any] = pyproject_toml.get("tool", {}).get("fal", {})
+    config = {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
+
+    return config

{fal-1.13.5 → fal-1.14.0}/src/fal/sdk.py

@@ -157,7 +157,15 @@ class AuthenticatedCredentials(Credentials):
 
     def to_headers(self) -> dict[str, str]:
         token = self.user.bearer_token
-        return {"Authorization": token}
+        headers = {
+            "Authorization": token,
+        }
+
+        if self.team:
+            team_id = self.user.get_account(self.team)["user_id"]
+            headers["X-Fal-User-Id"] = team_id
+
+        return headers
 
 
 @dataclass
@@ -193,7 +201,7 @@ def get_default_credentials(team: str | None = None) -> Credentials:
         return FalServerlessKeyCredentials(key_creds[0], key_creds[1])
     else:
         config = Config()
-        team = team or config.get("team")
+        team = team or config.get_internal("team")
         return AuthenticatedCredentials(team=team)
 
 
@@ -650,8 +658,12 @@ class FalServerlessConnection:
         )
         return from_grpc(res.alias_info)
 
-    def list_applications(self) -> list[ApplicationInfo]:
-        request = isolate_proto.ListApplicationsRequest()
+    def list_applications(
+        self, application_name: str | None = None
+    ) -> list[ApplicationInfo]:
+        request = isolate_proto.ListApplicationsRequest(
+            application_name=application_name
+        )
         res: isolate_proto.ListApplicationsResult = self.stub.ListApplications(request)
         return [from_grpc(app) for app in res.applications]
 

{fal-1.13.5 → fal-1.14.0}/tests/test_apps.py

@@ -332,55 +332,51 @@ def register_app(host: api.FalServerlessHost, app: fal.App, suffix: str = ""):
 def base_app(host: api.FalServerlessHost):
     # running apps without aliases is no longer supported
     # so we need to create an alias for the app
-    with register_app(host, addition_app) as (app_alias, app_revision):
+    with register_app(host, addition_app, "base") as (app_alias, app_revision):
         yield app_alias, app_revision
 
 
 @pytest.fixture(scope="module")
-def aliased_app(base_app: Tuple[str, str, str]):
-    yield base_app[1], base_app[0]
-
-
-@pytest.fixture(scope="module")
-def test_app(base_app: Tuple[str, str, str], user: User):
-    yield f"{user.username}/{base_app[1]}"
+def test_app(host: api.FalServerlessHost, user: User):
+    with register_app(host, addition_app, "addition") as (app_alias, _):
+        yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_nomad_app(host: api.FalServerlessHost, user: User):
-    with register_app(host, nomad_addition_app) as (app_alias, _app_revision):
+    with register_app(host, nomad_addition_app, "nomad") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_container_app(host: api.FalServerlessHost, user: User):
-    with register_app(host, container_addition_app) as (app_alias, _app_revision):
+    with register_app(host, container_addition_app, "container") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_container_build_args_app(host: api.FalServerlessHost, user: User):
-    with register_app(host, container_build_args_app) as (app_alias, _app_revision):
+    with register_app(host, container_build_args_app, "build-args") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_fastapi_app(host: api.FalServerlessHost, user: User):
-    with register_app(host, calculator_app) as (app_alias, _app_revision):
+    with register_app(host, calculator_app, "fastapi") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_stateful_app(host: api.FalServerlessHost, user: User):
     stateful_app = fal.wrap_app(StatefulAdditionApp)
-    with register_app(host, stateful_app) as (app_alias, _app_revision):
+    with register_app(host, stateful_app, "stateful") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_cancellable_app(host: api.FalServerlessHost, user: User):
     cancellable_app = fal.wrap_app(CancellableApp)
-    with register_app(host, cancellable_app) as (app_alias, _app_revision):
+    with register_app(host, cancellable_app, "cancellable") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
@@ -393,14 +389,14 @@ def test_exception_app():
 @pytest.fixture(scope="module")
 def test_sleep_app(host: api.FalServerlessHost, user: User):
     sleep_app = fal.wrap_app(SleepApp)
-    with register_app(host, sleep_app) as (app_alias, _app_revision):
+    with register_app(host, sleep_app, "sleep") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
 @pytest.fixture(scope="module")
 def test_realtime_app(host: api.FalServerlessHost, user: User):
     realtime_app = fal.wrap_app(RealtimeApp)
-    with register_app(host, realtime_app) as (app_alias, _app_revision):
+    with register_app(host, realtime_app, "realtime") as (app_alias, _):
         yield f"{user.username}/{app_alias}"
 
 
@@ -585,14 +581,14 @@ def test_traceback_logs(test_exception_app: AppClient):
             ), "Logs should contain the traceback message"
 
 
-def test_app_openapi_spec_metadata(test_app: str, request: pytest.FixtureRequest):
-    user_id, _, app_id = test_app.partition("/")
+def test_app_openapi_spec_metadata(base_app: Tuple[str, str], user: User):
+    app_alias, _ = base_app
     res = app_metadata.sync_detailed(
-        app_alias_or_id=app_id, app_user_id=user_id, client=REST_CLIENT
+        app_alias_or_id=app_alias, app_user_id=user.user_id, client=REST_CLIENT
     )
 
-    assert res.status_code == 200, f"Failed to fetch metadata for app {test_app}"
-    assert res.parsed, f"Failed to parse metadata for app {test_app}"
+    assert res.status_code == 200, f"Failed to fetch metadata for app {app_alias}"
+    assert res.parsed, f"Failed to parse metadata for app {app_alias}"
 
     metadata = res.parsed.to_dict()
     assert "openapi" in metadata, f"openapi key missing from metadata {metadata}"
@@ -601,9 +597,7 @@ def test_app_openapi_spec_metadata(test_app: str, request: pytest.FixtureRequest
         assert key in openapi_spec, f"{key} key missing from openapi {openapi_spec}"
 
 
-def test_app_no_serve_spec_metadata(
-    test_fastapi_app: str, request: pytest.FixtureRequest
-):
+def test_app_no_serve_spec_metadata(test_fastapi_app: str):
     # We do not store the openapi spec for apps that do not use serve=True
     user_id, _, app_id = test_fastapi_app.partition("/")
     res = app_metadata.sync_detailed(
@@ -680,8 +674,8 @@ def test_app_deploy_scale(host: api.FalServerlessHost):
 
 # List aliases is taking long
 @pytest.mark.timeout(600)
-def test_app_update_app(aliased_app: Tuple[str, str]):
-    app_revision, app_alias = aliased_app
+def test_app_update_app(base_app: Tuple[str, str]):
+    app_alias, app_revision = base_app
 
     host: api.FalServerlessHost = addition_app.host  # type: ignore
     with host._connection as client:
@@ -732,8 +726,8 @@ def test_app_update_app(aliased_app: Tuple[str, str]):
 
 # List aliases is taking long
 @pytest.mark.timeout(600)
-def test_app_set_delete_alias(aliased_app: Tuple[str, str]):
-    app_revision, app_alias = aliased_app
+def test_app_set_delete_alias(base_app: Tuple[str, str]):
+    app_alias, app_revision = base_app
 
     host: api.FalServerlessHost = addition_app.host  # type: ignore