fal 1.13.5__tar.gz → 1.15.0__tar.gz

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.13.5
+Version: 1.15.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
@@ -38,6 +38,7 @@ Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
 Requires-Dist: tomli<3,>2
 Requires-Dist: tomli-w<2,>=1
+Requires-Dist: fsspec
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.13.5
+Version: 1.15.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
@@ -38,6 +38,7 @@ Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
 Requires-Dist: tomli<3,>2
 Requires-Dist: tomli-w<2,>=1
+Requires-Dist: fsspec
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{fal-1.13.5 → fal-1.15.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
@@ -107,6 +108,7 @@ src/fal/cli/create.py
 src/fal/cli/debug.py
 src/fal/cli/deploy.py
 src/fal/cli/doctor.py
+src/fal/cli/files.py
 src/fal/cli/keys.py
 src/fal/cli/main.py
 src/fal/cli/parser.py

{fal-1.13.5 → fal-1.15.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
@@ -30,6 +30,7 @@ uvicorn<1,>=0.29.0
 cookiecutter
 tomli<3,>2
 tomli-w<2,>=1
+fsspec
 
 [:python_version < "3.10"]
 importlib-metadata>=4.4

{fal-1.13.5 → fal-1.15.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",
@@ -58,6 +58,7 @@ dependencies = [
     "cookiecutter",
     "tomli>2,<3",
     "tomli-w>=1,<2",
+    "fsspec",
 ]
 
 [project.optional-dependencies]

{fal-1.13.5 → fal-1.15.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.15.0'
+__version_tuple__ = version_tuple = (1, 15, 0)

{fal-1.13.5 → fal-1.15.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.15.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.15.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.15.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.15.0/src/fal/cli/files.py

@@ -0,0 +1,70 @@
+from .parser import FalClientParser
+
+
+def _list(args):
+    import posixpath
+
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+
+    for entry in fs.ls(args.path, detail=True):
+        name = posixpath.basename(entry["name"])
+        color = "blue" if entry["type"] == "directory" else "default"
+        args.console.print(f"[{color}]{name}[/{color}]")
+
+
+def _download(args):
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+    fs.get(args.remote_path, args.local_path)
+
+
+def _upload(args):
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+    fs.put(args.local_path, args.remote_path)
+
+
+def add_parser(main_subparsers, parents):
+    files_help = "Manage fal files."
+    parser = main_subparsers.add_parser(
+        "files",
+        aliases=["file"],
+        description=files_help,
+        help=files_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        required=True,
+        parser_class=FalClientParser,
+    )
+
+    list_parser = subparsers.add_parser("list", aliases=["ls"], parents=parents)
+    list_parser.add_argument(
+        "path",
+        nargs="?",
+        type=str,
+        help="The path to list",
+        default="/",
+    )
+    list_parser.set_defaults(func=_list)
+
+    download_parser = subparsers.add_parser("download", parents=parents)
+    download_parser.add_argument(
+        "remote_path", type=str, help="Remote path to download"
+    )
+    download_parser.add_argument(
+        "local_path", type=str, help="Local path to download to"
+    )
+    download_parser.set_defaults(func=_download)
+
+    upload_parser = subparsers.add_parser("upload", parents=parents)
+    upload_parser.add_argument("local_path", type=str, help="Local path to upload")
+    upload_parser.add_argument("remote_path", type=str, help="Remote path to upload to")
+    upload_parser.set_defaults(func=_upload)

{fal-1.13.5 → fal-1.15.0}/src/fal/cli/main.py

@@ -13,6 +13,7 @@ from . import (
     create,
     deploy,
     doctor,
+    files,
     keys,
     profile,
     run,
@@ -57,6 +58,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
         create,
         runners,
         teams,
+        files,
     ]:
         cmd.add_parser(subparsers, parents)
 

{fal-1.13.5 → fal-1.15.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.15.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.15.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.15.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.15.0/src/fal/files.py

@@ -0,0 +1,74 @@
+import posixpath
+from functools import cached_property
+from typing import TYPE_CHECKING
+
+from fsspec import AbstractFileSystem
+
+if TYPE_CHECKING:
+    import httpx
+
+USER_AGENT = "fal-sdk/1.14.0 (python)"
+
+
+class FalFileSystem(AbstractFileSystem):
+    @cached_property
+    def _client(self) -> "httpx.Client":
+        from httpx import Client
+
+        from fal.flags import REST_URL
+        from fal.sdk import get_default_credentials
+
+        creds = get_default_credentials()
+        return Client(
+            base_url=REST_URL,
+            headers={
+                **creds.to_headers(),
+                "User-Agent": USER_AGENT,
+            },
+        )
+
+    def ls(self, path, detail=True, **kwargs):
+        response = self._client.get(f"/files/list/{path.lstrip('/')}")
+        response.raise_for_status()
+        files = response.json()
+        if detail:
+            return sorted(
+                (
+                    {
+                        "name": entry["path"],
+                        "size": entry["size"],
+                        "type": "file" if entry["is_file"] else "directory",
+                        "mtime": entry["updated_time"],
+                    }
+                    for entry in files
+                ),
+                key=lambda x: x["name"],
+            )
+        else:
+            return sorted(entry["path"] for entry in files)
+
+    def info(self, path, **kwargs):
+        parent = posixpath.dirname(path)
+        entries = self.ls(parent, detail=True)
+        for entry in entries:
+            if entry["name"] == path:
+                return entry
+        raise FileNotFoundError(f"File not found: {path}")
+
+    def get_file(self, rpath, lpath, **kwargs):
+        with open(lpath, "wb") as fobj:
+            response = self._client.get(f"/files/file/{rpath.lstrip('/')}")
+            response.raise_for_status()
+            fobj.write(response.content)
+
+    def put_file(self, lpath, rpath, mode="overwrite", **kwargs):
+        with open(lpath, "rb") as fobj:
+            response = self._client.post(
+                f"/files/file/local/{rpath.lstrip('/')}",
+                files={"file_upload": (posixpath.basename(lpath), fobj, "text/plain")},
+            )
+            response.raise_for_status()
+
+    def rm(self, path, **kwargs):
+        response = self._client.delete(f"/files/file/{path.lstrip('/')}")
+        response.raise_for_status()

{fal-1.13.5 → fal-1.15.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]