fal 1.12.1__py3-none-any.whl → 1.13.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.12.1'
-__version_tuple__ = version_tuple = (1, 12, 1)
+__version__ = version = '1.13.0'
+__version_tuple__ = version_tuple = (1, 13, 0)

fal/api.py

@@ -12,6 +12,7 @@ from functools import wraps
 from os import PathLike
 from queue import Queue
 from typing import (
+    TYPE_CHECKING,
     Any,
     Callable,
     ClassVar,
@@ -27,15 +28,11 @@ from typing import (
 
 import cloudpickle
 import grpc
-import isolate
 import tblib
 import uvicorn
 import yaml
 from fastapi import FastAPI
 from fastapi import __version__ as fastapi_version
-from isolate.backends.common import active_python
-from isolate.backends.settings import DEFAULT_SETTINGS
-from isolate.connections import PythonIPC
 from packaging.requirements import Requirement
 from packaging.utils import canonicalize_name
 from pydantic import __version__ as pydantic_version
@@ -66,6 +63,9 @@ from fal.sdk import (
     get_default_credentials,
 )
 
+if TYPE_CHECKING:
+    from isolate.backends import BaseEnvironment
+
 ArgsT = ParamSpec("ArgsT")
 ReturnT = TypeVar("ReturnT", covariant=True)  # noqa: PLC0105
 
@@ -83,9 +83,6 @@ SERVE_REQUIREMENTS = [
 ]
 
 
-THREAD_POOL = ThreadPoolExecutor()
-
-
 @dataclass
 class FalServerlessError(FalServerlessException):
     message: str
@@ -222,9 +219,10 @@ def cached(func: Callable[ArgsT, ReturnT]) -> Callable[ArgsT, ReturnT]:
     ) -> ReturnT:
         from functools import lru_cache
 
-        # HACK: Using the isolate module as a global cache.
         import isolate
 
+        # HACK: Using the isolate module as a global cache.
+
         if not hasattr(isolate, "__cached_functions__"):
             isolate.__cached_functions__ = {}
 
@@ -269,17 +267,23 @@ def _prepare_partial_func(
     return wrapper
 
 
-@dataclass
-class LocalHost(Host):
-    # The environment which provides the default set of
-    # packages for isolate agent to run.
-    _AGENT_ENVIRONMENT = isolate.prepare_environment(
+def _prepare_environment() -> BaseEnvironment:
+    import isolate
+
+    return isolate.prepare_environment(
         "virtualenv",
         requirements=[
             f"cloudpickle=={cloudpickle.__version__}",
             f"tblib=={tblib.__version__}",
         ],
     )
+
+
+@dataclass
+class LocalHost(Host):
+    # The environment which provides the default set of
+    # packages for isolate agent to run.
+    _AGENT_ENVIRONMENT: BaseEnvironment = field(default_factory=_prepare_environment)
     _log_printer = IsolateLogPrinter(debug=flags.DEBUG)
 
     def run(
@@ -289,6 +293,10 @@ class LocalHost(Host):
         args: tuple[Any, ...],
         kwargs: dict[str, Any],
     ) -> ReturnT:
+        import isolate
+        from isolate.backends.settings import DEFAULT_SETTINGS
+        from isolate.connections import PythonIPC
+
         settings = replace(
             DEFAULT_SETTINGS,
             serialization_method="cloudpickle",
@@ -419,8 +427,16 @@ class FalServerlessHost(Host):
 
     _log_printer = IsolateLogPrinter(debug=flags.DEBUG)
 
+    _thread_pool: ThreadPoolExecutor = field(default_factory=ThreadPoolExecutor)
+
+    def __getstate__(self) -> dict[str, Any]:
+        state = self.__dict__.copy()
+        state["_thread_pool"] = None
+        return state
+
     def __setstate__(self, state: dict[str, Any]) -> None:
         self.__dict__.update(state)
+        self._thread_pool = ThreadPoolExecutor()
         self.credentials = get_agent_credentials(self.credentials)
 
     @property
@@ -440,6 +456,8 @@ class FalServerlessHost(Host):
         deployment_strategy: Literal["recreate", "rolling"] = "recreate",
         scale: bool = True,
     ) -> str | None:
+        from isolate.backends.common import active_python
+
         environment_options = options.environment.copy()
         environment_options.setdefault("python_version", active_python())
         environments = [self._connection.define_environment(**environment_options)]
@@ -517,6 +535,8 @@ class FalServerlessHost(Host):
         kwargs: dict[str, Any],
         result_handler: Callable[..., None],
     ) -> ReturnT:
+        from isolate.backends.common import active_python
+
         environment_options = options.environment.copy()
         environment_options.setdefault("python_version", active_python())
         environments = [self._connection.define_environment(**environment_options)]
@@ -611,7 +631,7 @@ class FalServerlessHost(Host):
                     ret.url = log.message.rsplit()[-1]
                 ret.logs.put(log)
 
-        THREAD_POOL.submit(
+        self._thread_pool.submit(
             self._run,
             func,
             options,
@@ -654,7 +674,6 @@ class Options:
             return self.gateway.get("exposed_port")
 
 
-_DEFAULT_HOST = FalServerlessHost()
 _SERVE_PORT = 8080
 
 # Overload @function to help users identify the correct signature.
@@ -704,7 +723,7 @@ def function(
     python_version: str | None = None,
     requirements: list[str] | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -733,7 +752,7 @@ def function(
     python_version: str | None = None,
     requirements: list[str] | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -812,7 +831,7 @@ def function(
     pip: list[str] | None = None,
     channels: list[str] | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -846,7 +865,7 @@ def function(
     pip: list[str] | None = None,
     channels: list[str] | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -874,7 +893,7 @@ def function(
     *,
     image: ContainerImage | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -902,7 +921,7 @@ def function(
     *,
     image: ContainerImage | None = None,
     # Common options
-    host: FalServerlessHost = _DEFAULT_HOST,
+    host: FalServerlessHost | None = None,
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
@@ -928,15 +947,17 @@ def function(
 def function(  # type: ignore
     kind: str = "virtualenv",
     *,
-    host: Host = _DEFAULT_HOST,
+    host: Host | None = None,
     **config: Any,
 ):
+    if host is None:
+        host = FalServerlessHost()
     options = host.parse_options(kind=kind, **config)
 
     def wrapper(func: Callable[ArgsT, ReturnT]):
         include_modules_from(func)
         proxy = IsolatedFunction(
-            host=host,
+            host=host,  # type: ignore
             raw_func=func,  # type: ignore
             options=options,
         )

fal/app.py

@@ -16,11 +16,17 @@ from typing import Any, Callable, ClassVar, Literal, TypeVar
 import fastapi
 import grpc.aio as async_grpc
 import httpx
-from isolate.server import definitions
 
-import fal.api
 from fal._serialization import include_modules_from
-from fal.api import RouteSignature
+from fal.api import (
+    SERVE_REQUIREMENTS,
+    BaseServable,
+    IsolatedFunction,
+    RouteSignature,
+)
+from fal.api import (
+    function as fal_function,
+)
 from fal.exceptions import FalServerlessException, RequestCancelledException
 from fal.logging import get_logger
 from fal.toolkit.file import request_lifecycle_preference
@@ -70,6 +76,8 @@ async def _set_logger_labels(
     try:
         import sys
 
+        from isolate.server import definitions
+
         # Flush any prints that were buffered before setting the logger labels
         sys.stderr.flush()
         sys.stdout.flush()
@@ -89,7 +97,7 @@ async def _set_logger_labels(
         pass
 
 
-def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
+def wrap_app(cls: type[App], **kwargs) -> IsolatedFunction:
     include_modules_from(cls)
 
     def initialize_and_serve():
@@ -111,7 +119,7 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
     if kind == "container":
         cls.host_kwargs.pop("resolver", None)
 
-    wrapper = fal.api.function(
+    wrapper = fal_function(
         kind,
         requirements=cls.requirements,
         machine_type=cls.machine_type,
@@ -123,7 +131,7 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
         serve=False,
     )
     fn = wrapper(initialize_and_serve)
-    fn.options.add_requirements(fal.api.SERVE_REQUIREMENTS)
+    fn.options.add_requirements(SERVE_REQUIREMENTS)
     if realtime_app:
         fn.options.add_requirements(REALTIME_APP_REQUIREMENTS)
 
@@ -255,7 +263,7 @@ def _print_python_packages() -> None:
     print("[debug] Python packages installed:", ", ".join(packages))
 
 
-class App(fal.api.BaseServable):
+class App(BaseServable):
     requirements: ClassVar[list[str]] = []
     machine_type: ClassVar[str] = "S"
     num_gpus: ClassVar[int | None] = None

fal/apps.py

@@ -4,6 +4,7 @@ import json
 import time
 from contextlib import contextmanager
 from dataclasses import dataclass, field
+from functools import lru_cache
 from typing import TYPE_CHECKING, Any, Iterator
 
 import httpx
@@ -14,6 +15,7 @@ from fal.sdk import Credentials, get_default_credentials
 if TYPE_CHECKING:
     from websockets.sync.connection import Connection
 
+_STREAM_URL_FORMAT = f"https://{flags.FAL_RUN_HOST}/{{app_id}}"
 _QUEUE_URL_FORMAT = f"https://queue.{flags.FAL_RUN_HOST}/{{app_id}}"
 _REALTIME_URL_FORMAT = f"wss://{flags.FAL_RUN_HOST}/{{app_id}}"
 _WS_URL_FORMAT = f"wss://ws.{flags.FAL_RUN_HOST}/{{app_id}}"
@@ -55,6 +57,11 @@ class Completed(_Status):
     logs: list[dict[str, Any]] | None = field()
 
 
+@lru_cache(maxsize=1)
+def _get_http_client() -> httpx.Client:
+    return httpx.Client(headers={"User-Agent": "Fal/Python"})
+
+
 @dataclass
 class RequestHandle:
     """A handle to an async inference request."""
@@ -62,6 +69,8 @@ class RequestHandle:
     app_id: str
     request_id: str
 
+    _client: httpx.Client = field(default_factory=_get_http_client)
+
     # Use the credentials that were used to submit the request by default.
     _creds: Credentials = field(default_factory=get_default_credentials, repr=False)
 
@@ -82,7 +91,7 @@ class RequestHandle:
             _QUEUE_URL_FORMAT.format(app_id=self.app_id)
             + f"/requests/{self.request_id}/status/"
         )
-        response = _HTTP_CLIENT.get(
+        response = self._client.get(
             url,
             headers=self._creds.to_headers(),
             params={"logs": int(logs)},
@@ -107,7 +116,7 @@ class RequestHandle:
             _QUEUE_URL_FORMAT.format(app_id=self.app_id)
             + f"/requests/{self.request_id}/cancel"
         )
-        response = _HTTP_CLIENT.put(url, headers=self._creds.to_headers())
+        response = self._client.put(url, headers=self._creds.to_headers())
         response.raise_for_status()
 
     def iter_events(
@@ -134,7 +143,7 @@ class RequestHandle:
             _QUEUE_URL_FORMAT.format(app_id=self.app_id)
             + f"/requests/{self.request_id}/"
         )
-        response = _HTTP_CLIENT.get(url, headers=self._creds.to_headers())
+        response = self._client.get(url, headers=self._creds.to_headers())
         try:
             response.raise_for_status()
         except httpx.HTTPStatusError as e:
@@ -159,7 +168,33 @@ class RequestHandle:
         return self.fetch_result()
 
 
-_HTTP_CLIENT = httpx.Client(headers={"User-Agent": "Fal/Python"})
+def stream(
+    app_id: str, arguments: dict[str, Any], *, path: str = ""
+) -> Iterator[str | bytes]:
+    """Stream an inference task on a Fal app."""
+
+    app_id = _backwards_compatible_app_id(app_id)
+    url = _STREAM_URL_FORMAT.format(app_id=app_id)
+    if path:
+        _path = path[len("/") :] if path.startswith("/") else path
+        url += "/" + _path
+
+    creds = get_default_credentials()
+    client = _get_http_client()
+
+    response = client.post(
+        url,
+        json=arguments,
+        headers=creds.to_headers(),
+    )
+    response.raise_for_status()
+
+    if response.headers["Content-Type"].startswith("text/event-stream"):
+        for line in response.iter_lines():
+            if line:
+                yield line
+    else:
+        yield from response.iter_bytes()
 
 
 def run(app_id: str, arguments: dict[str, Any], *, path: str = "") -> dict[str, Any]:
@@ -181,8 +216,9 @@ def submit(app_id: str, arguments: dict[str, Any], *, path: str = "") -> Request
         url += "/" + _path
 
     creds = get_default_credentials()
+    client = _get_http_client()
 
-    response = _HTTP_CLIENT.post(
+    response = client.post(
         url,
         json=arguments,
         headers=creds.to_headers(),
@@ -194,6 +230,7 @@ def submit(app_id: str, arguments: dict[str, Any], *, path: str = "") -> Request
         app_id=app_id,
         request_id=data["request_id"],
         _creds=creds,
+        _client=client,
     )
 
 

fal/auth/__init__.py

@@ -7,8 +7,6 @@ from typing import Optional
 
 from fal.auth import auth0, local
 from fal.config import Config
-from fal.console import console
-from fal.console.icons import CHECK_ICON
 from fal.exceptions import FalServerlessException
 from fal.exceptions.auth import UnauthenticatedException
 
@@ -73,26 +71,6 @@ def key_credentials() -> tuple[str, str] | None:
         return None
 
 
-def login():
-    token_data = auth0.login()
-    with local.lock_token():
-        local.save_token(token_data["refresh_token"])
-
-    USER.invalidate()
-
-
-def logout():
-    refresh_token, _ = local.load_token()
-    if refresh_token is None:
-        raise FalServerlessException("You're not logged in")
-    auth0.revoke(refresh_token)
-    with local.lock_token():
-        local.delete_token()
-
-    USER.invalidate()
-    console.print(f"{CHECK_ICON} Logged out of [cyan bold]fal[/]. Bye!")
-
-
 def _fetch_access_token() -> str:
     """
     Load the refresh token, request a new access_token (refreshing the refresh token)
@@ -147,6 +125,21 @@ def _fetch_teams(bearer_token: str) -> list[dict]:
         raise FalServerlessException("Failed to fetch teams") from exc
 
 
+def login(console):
+    token_data = auth0.login(console)
+    with local.lock_token():
+        local.save_token(token_data["refresh_token"])
+
+
+def logout(console):
+    refresh_token, _ = local.load_token()
+    if refresh_token is None:
+        raise FalServerlessException("You're not logged in")
+    auth0.revoke(refresh_token, console)
+    with local.lock_token():
+        local.delete_token()
+
+
 @dataclass
 class UserAccess:
     _access_token: str | None = field(repr=False, default=None)
@@ -154,12 +147,6 @@ class UserAccess:
     _exc: Exception | 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._accounts = None
-
     @property
     def info(self) -> dict:
         if self._user_info is None:
@@ -203,6 +190,3 @@ class UserAccess:
             if t["nickname"].lower() == team.lower():
                 return t
         raise ValueError(f"Team {team} not found")
-
-
-USER = UserAccess()

fal/auth/auth0.py

@@ -6,8 +6,6 @@ import warnings
 
 import httpx
 
-from fal.console import console
-from fal.console.icons import CHECK_ICON
 from fal.console.ux import maybe_open_browser_tab
 from fal.exceptions import FalServerlessException
 
@@ -26,7 +24,7 @@ def logout_url(return_url: str):
     return f"https://{AUTH0_DOMAIN}/v2/logout?client_id={AUTH0_CLIENT_ID}&returnTo={return_url}"
 
 
-def _open_browser(url: str, code: str | None) -> None:
+def _open_browser(url: str, code: str | None, console) -> None:
     maybe_open_browser_tab(url)
 
     console.print(
@@ -41,7 +39,7 @@ def _open_browser(url: str, code: str | None) -> None:
         )
 
 
-def login() -> dict:
+def login(console) -> dict:
     """
     Runs the device authorization flow and stores the user object in memory
     """
@@ -63,7 +61,7 @@ def login() -> dict:
 
     url = logout_url(device_confirmation_url)
 
-    _open_browser(url, device_user_code)
+    _open_browser(url, device_user_code, console)
 
     # This is needed to suppress the ResourceWarning emitted
     # when the process is waiting for user confirmation
@@ -84,7 +82,6 @@ def login() -> dict:
             token_data = token_response.json()
             if token_response.status_code == 200:
                 status.update(spinner=None)
-                console.print(f"{CHECK_ICON} Authenticated successfully, welcome!")
 
                 validate_id_token(token_data["id_token"])
 
@@ -118,7 +115,7 @@ def refresh(token: str) -> dict:
         raise FalServerlessException(token_data["error_description"])
 
 
-def revoke(token: str):
+def revoke(token: str, console):
     token_payload = {
         "client_id": AUTH0_CLIENT_ID,
         "token": token,
@@ -132,7 +129,7 @@ def revoke(token: str):
         token_data = token_response.json()
         raise FalServerlessException(token_data["error_description"])
 
-    _open_browser(logout_url(WEBSITE_URL), None)
+    _open_browser(logout_url(WEBSITE_URL), None, console)
 
 
 def get_user_info(bearer_token: str) -> dict:

fal/cli/api.py

@@ -10,19 +10,38 @@ KV_SPLIT_RE = re.compile(r"(=|:=)")
 
 def _api(args):
     """Handle the api command execution."""
-    from rich.console import Group
-    from rich.live import Live
-    from rich.panel import Panel
-    from rich.text import Text
-
     from . import cli_nested_json
 
-    params = [KV_SPLIT_RE.split(param) for param in args.params]
+    params_split = [KV_SPLIT_RE.split(param) for param in args.params]
     params = cli_nested_json.interpret_nested_json(  # type: ignore
-        [(key, value) for key, _, value in params]
+        [(key, value) for key, _, value in params_split]
     )
 
-    handle = fal.apps.submit(args.model_id, params)  # type: ignore
+    if args.model_id.endswith("/stream"):
+        stream_run(args.model_id, params)
+    else:
+        queue_run(args.model_id, params)
+
+
+def stream_run(model_id: str, params: dict):
+    res = fal.apps.stream(model_id, params)  # type: ignore
+    for line in res:
+        if isinstance(line, str):
+            rich.print(line)
+        else:
+            if isinstance(line, memoryview):
+                rich.print(line.tobytes().decode())
+            else:
+                rich.print(line.decode())
+
+
+def queue_run(model_id: str, params: dict):
+    from rich.console import Group
+    from rich.live import Live
+    from rich.panel import Panel
+    from rich.text import Text
+
+    handle = fal.apps.submit(model_id, params)  # type: ignore
     logs = []  # type: ignore
 
     with Live(auto_refresh=False) as live:

fal/cli/auth.py

@@ -1,10 +1,15 @@
-from fal.auth import USER, login, logout
-
-
 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
 
-    login()
+    try:
+        login(args.console)
+        args.console.print(f"{CHECK_ICON} Authenticated successfully, welcome!")
+    except FalServerlessException as e:
+        args.console.print(f"{CROSS_ICON} {e}")
+        return
 
     with Config().edit() as config:
         config.unset("team")
@@ -13,9 +18,18 @@ def _login(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
+
+    try:
+        logout(args.console)
+        args.console.print(f"{CHECK_ICON} Logged out of [cyan bold]fal[/]. Bye!")
+    except FalServerlessException as e:
+        args.console.print(f"{CROSS_ICON} {e}")
+        return
 
-    logout()
     with Config().edit() as config:
         config.unset("team")
 
@@ -24,17 +38,19 @@ def _list_accounts(args):
     from rich.style import Style
     from rich.table import Table
 
+    from fal.auth import UserAccess
     from fal.config import Config
 
+    user_access = UserAccess()
     config = Config()
-    current_account = config.get("team") or USER.info["nickname"]
+    current_account = config.get("team") or user_access.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):
+    for idx, account in enumerate(user_access.accounts):
         selected = account["nickname"] == current_account
         color = "bold yellow" if selected else None
 
@@ -51,18 +67,21 @@ def _list_accounts(args):
 def _set_account(args):
     from rich.prompt import Prompt
 
+    from fal.auth import UserAccess
     from fal.config import Config
 
+    user_access = UserAccess()
+
     if hasattr(args, "account") and args.account:
         if args.account.isdigit():
             acc_index = int(args.account) - 1
-            account = USER.accounts[acc_index]
+            account = user_access.accounts[acc_index]
         else:
-            account = USER.get_account(args.account)
+            account = user_access.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]
+        indices = list(map(str, range(1, len(user_access.accounts) + 1)))
+        team_names = [account["nickname"] for account in user_access.accounts]
         acc_choice = Prompt.ask(
             "Select an account by number",
             choices=indices + team_names,
@@ -70,9 +89,9 @@ def _set_account(args):
         )
         if acc_choice in indices:
             acc_index = int(acc_choice) - 1
-            account = USER.accounts[acc_index]
+            account = user_access.accounts[acc_index]
         else:
-            account = USER.get_account(acc_choice)
+            account = user_access.get_account(acc_choice)
 
     if account["is_personal"]:
         args.console.print(
@@ -90,15 +109,17 @@ def _set_account(args):
 
 
 def _whoami(args):
+    from fal.auth import UserAccess
     from fal.config import Config
 
+    user_access = UserAccess()
     config = Config()
 
     team = config.get("team")
     if team:
-        account = USER.get_account(team)
+        account = user_access.get_account(team)
     else:
-        account = USER.get_account(USER.info["nickname"])
+        account = user_access.get_account(user_access.info["nickname"])
 
     nickname = account["nickname"]
     full_name = account["full_name"]

fal/cli/profile.py

@@ -33,7 +33,7 @@ def _set(args):
 
 def _unset(args):
     with Config().edit() as config:
-        config.set_internal("profile", None)
+        config.unset_internal("profile")
         args.console.print("Default profile unset.")
         config.profile = None
 

fal/config.py

@@ -89,6 +89,9 @@ class Config:
         else:
             self._config[SETTINGS_SECTION][key] = value
 
+    def unset_internal(self, key: str) -> None:
+        self._config.get(SETTINGS_SECTION, {}).pop(key, None)
+
     def delete(self, profile: str) -> None:
         del self._config[profile]
 

fal/logging/__init__.py

@@ -6,7 +6,7 @@ import structlog
 from structlog.typing import EventDict, WrappedLogger
 
 from .style import LEVEL_STYLES
-from .user import add_user_id
+from .user import AddUserIdProcessor
 
 # Unfortunately structlog console processor does not support
 # more general theming as a public API. Consider a PR on the
@@ -43,7 +43,7 @@ structlog.configure(
         structlog.stdlib.PositionalArgumentsFormatter(),
         structlog.processors.TimeStamper(fmt="%Y-%m-%d %H:%M:%S"),
         structlog.processors.StackInfoRenderer(),
-        add_user_id,
+        AddUserIdProcessor(),
         _console_log_output,
     ],
     wrapper_class=structlog.stdlib.BoundLogger,

fal/logging/isolate.py

@@ -2,13 +2,16 @@ from __future__ import annotations
 
 import sys
 from datetime import datetime, timezone
+from typing import TYPE_CHECKING
 
-from isolate.logs import Log, LogLevel, LogSource
 from structlog.dev import ConsoleRenderer
 from structlog.typing import EventDict
 
 from .style import LEVEL_STYLES
 
+if TYPE_CHECKING:
+    from isolate.logs import Log, LogSource
+
 _renderer = ConsoleRenderer(level_styles=LEVEL_STYLES)
 
 
@@ -20,6 +23,8 @@ class IsolateLogPrinter:
         self._current_source: LogSource | None = None
 
     def _maybe_print_header(self, source: LogSource):
+        from isolate.logs import LogSource
+
         from fal.console import console
 
         if source == self._current_source:
@@ -37,6 +42,8 @@ class IsolateLogPrinter:
         self._current_source = source
 
     def print(self, log: Log):
+        from isolate.logs import LogLevel, LogSource
+
         if log.level < LogLevel.INFO and not self.debug:
             return
 

fal/logging/user.py

@@ -2,20 +2,24 @@ from __future__ import annotations
 
 from structlog.typing import EventDict, WrappedLogger
 
-from fal.auth import USER
 
+class AddUserIdProcessor:
+    def __init__(self):
+        from fal.auth import UserAccess
 
-def add_user_id(
-    logger: WrappedLogger, method_name: str, event_dict: EventDict
-) -> EventDict:
-    """The structlog processor that sends the logged user id on every log"""
-    user_id: str | None = None
-    try:
-        user_id = USER.info.get("sub")
-    except Exception:
-        # logs are fail-safe, so any exception is safe to ignore
-        # this is expected to happen only when user is logged out
-        # or there's no internet connection
-        pass
-    event_dict["usr.id"] = user_id
-    return event_dict
+        self.user_access = UserAccess()
+
+    def __call__(
+        self, logger: WrappedLogger, method_name: str, event_dict: EventDict
+    ) -> EventDict:
+        """The structlog processor that sends the logged user id on every log"""
+        user_id: str | None = None
+        try:
+            user_id = self.user_access.info.get("sub")
+        except Exception:
+            # logs are fail-safe, so any exception is safe to ignore
+            # this is expected to happen only when user is logged out
+            # or there's no internet connection
+            pass
+        event_dict["usr.id"] = user_id
+        return event_dict

fal/sdk.py

@@ -5,22 +5,30 @@ from contextlib import ExitStack
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from enum import Enum
-from typing import Any, Callable, Generic, Iterator, Literal, Optional, TypeVar
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    Callable,
+    Generic,
+    Iterator,
+    Literal,
+    Optional,
+    TypeVar,
+)
 
 import grpc
 import isolate_proto
-from isolate.connections.common import is_agent
-from isolate.logs import Log
-from isolate.server import definitions as worker_definitions
 from isolate.server.interface import from_grpc, to_serialized_object, to_struct
-from isolate_proto.configuration import GRPC_OPTIONS
 
 from fal import flags
 from fal._serialization import patch_pickle
-from fal.auth import USER, key_credentials
+from fal.auth import UserAccess, key_credentials
 from fal.logging import get_logger
 from fal.logging.trace import TraceContextInterceptor
 
+if TYPE_CHECKING:
+    from isolate.logs import Log
+
 ResultT = TypeVar("ResultT")
 InputT = TypeVar("InputT")
 UNSET = object()
@@ -45,6 +53,8 @@ class ServerCredentials:
     def base_options(self) -> dict[str, str | int]:
         import json
 
+        from isolate_proto.configuration import GRPC_OPTIONS
+
         grpc_ops: dict[str, str | int] = dict(GRPC_OPTIONS)
         grpc_ops["grpc.enable_retries"] = 1
         grpc_ops["grpc.service_config"] = json.dumps(
@@ -128,26 +138,25 @@ class FalServerlessKeyCredentials(Credentials):
 
 @dataclass
 class AuthenticatedCredentials(Credentials):
-    user = USER
-    team_id: str | None = None
+    user: UserAccess = field(default_factory=UserAccess)
+    team: str | None = None
 
     def to_grpc(self) -> grpc.ChannelCredentials:
         creds = [
             self.server_credentials.to_grpc(),
-            grpc.access_token_call_credentials(USER.access_token),
+            grpc.access_token_call_credentials(self.user.access_token),
         ]
 
-        if self.team_id:
+        if self.team:
+            team_id = self.user.get_account(self.team)["user_id"]
             creds.append(
-                grpc.metadata_call_credentials(
-                    _GRPCMetadata("fal-user-id", self.team_id)
-                )
+                grpc.metadata_call_credentials(_GRPCMetadata("fal-user-id", team_id))
             )
 
         return grpc.composite_channel_credentials(*creds)
 
     def to_headers(self) -> dict[str, str]:
-        token = USER.bearer_token
+        token = self.user.bearer_token
         return {"Authorization": token}
 
 
@@ -161,6 +170,8 @@ def get_agent_credentials(original_credentials: Credentials) -> Credentials:
     """If running inside a fal Serverless box, use the preconfigured credentials
     instead of the user provided ones."""
 
+    from isolate.connections.common import is_agent
+
     key_creds = key_credentials()
     if is_agent() and key_creds:
         return FalServerlessKeyCredentials(key_creds[0], key_creds[1])
@@ -183,8 +194,7 @@ def get_default_credentials(team: str | None = None) -> Credentials:
     else:
         config = Config()
         team = team or config.get("team")
-        team_id = USER.get_account(team)["user_id"] if team else None
-        return AuthenticatedCredentials(team_id=team_id)
+        return AuthenticatedCredentials(team=team)
 
 
 @dataclass
@@ -383,6 +393,8 @@ def _from_grpc_alias_info(message: isolate_proto.AliasInfo) -> AliasInfo:
 
 @from_grpc.register(isolate_proto.RunnerInfo)
 def _from_grpc_runner_info(message: isolate_proto.RunnerInfo) -> RunnerInfo:
+    from isolate.server import definitions as worker_definitions
+
     external_metadata = worker_definitions.struct_to_dict(message.external_metadata)
     return RunnerInfo(
         runner_id=message.runner_id,

{fal-1.12.1.dist-info → fal-1.13.0.dist-info}/METADATA

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

{fal-1.12.1.dist-info → fal-1.13.0.dist-info}/RECORD

@@ -1,29 +1,29 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=cfUE-lwyb3aMjxkw1P4iXfZnHdFd9t86BAuv9RkmgYo,513
+fal/_fal_version.py,sha256=tH8KJgTzCjiwedQXB_0jJIzqyRjqKXz40ci9OEj6wNA,513
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=aoA0-7JsO6dWhudzmDOidbPwxnJmIJaQWhGV1kqLCbw,44814
-fal/app.py,sha256=YZBmQ45QbWCO7OmbNhlzM0AMI6STog3fMjdEtpkAS5g,23309
-fal/apps.py,sha256=RpmElElJnDYjsTRQOdNYiJwd74GEOGYA38L5O5GzNEg,11068
-fal/config.py,sha256=26IrSU5LYOGVSULrolAWe6oa7NE8Vk1DLI0-RwS2NIs,2596
+fal/api.py,sha256=dNl6c_CvoFqG5tGXcA6nH6zhuHUDQY3KKLZfNYAIGGo,45400
+fal/app.py,sha256=kHBe5QT7eeptMZ_X70vjPaeBG7Qv2u0a-mxvcEABHgQ,23402
+fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
+fal/config.py,sha256=mS38EIwjR6h2x5wdrTU5E2hubSZm6D35Qigjteg0RJk,2707
 fal/container.py,sha256=PM7e1RloTCexZ64uAv7sa2RSZxPI-X8KcxkdaZqEfjw,1914
 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=lS-nVp35qwlovQWhmkhWhBmTMCG-ntMekdrIIgzK-2A,25423
+fal/sdk.py,sha256=d50umE2XpmNwfOJ17wGfeFciTzj9IZksskk_IXCD4yg,25515
 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=WSDXxkrshGyOvfN6WomHGKrflbmJvPiDUSQRsp4mqsI,5932
-fal/auth/auth0.py,sha256=_OhfrqF41odNebFTr8SvUm-d9REVG6wfQBHhPIQxsZU,5468
+fal/auth/__init__.py,sha256=PqWNK1OmaRA_bfKP5ySBW-LQL9PqQCoRRgYNNR1xRhU,5593
+fal/auth/auth0.py,sha256=g5OgEKe4rsbkLQp6l7EauOAVL6WsmKjuA1wmzmyvvhc,5354
 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/api.py,sha256=ZuDE_PIC-czzneTAWMwvC7P7WnwIyluNZSuJqzCFhqI,2640
 fal/cli/apps.py,sha256=vKeTUw_uUxz5M9hlP0jcJ23qjR0GTz7ifeS4HBjKECo,10101
-fal/cli/auth.py,sha256=uxcV2jZwxXuFfOdXecK_BTSAm86ftdMOrSJy01PzViQ,3979
+fal/cli/auth.py,sha256=CIxeuDmZGGK1B2zvUMIGCprLEKY4XfjFVDqYSEz3vxA,4920
 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
@@ -32,7 +32,7 @@ fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
 fal/cli/main.py,sha256=4TnIno7fvFJbMPlpb8mnT7meKAR-UAOerxuo5qqPZRQ,2234
 fal/cli/parser.py,sha256=jYsGQ0BLQuKI7KtN1jnLVYKMbLtez7hPjwTNfG3UPSk,2964
-fal/cli/profile.py,sha256=vWngqkX7UizQIUQOpXauFz1UGJwDeh38Si6wXcIj3Eo,3396
+fal/cli/profile.py,sha256=_freBFQ0M7gCpHcmbmQfkcwmVelSnywYeeIX9tL6yCY,3392
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
 fal/cli/runners.py,sha256=z7WkZZC9rCW2mU5enowVQsxd1W18iBtLNOnPjrzhEf0,3491
 fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
@@ -44,11 +44,11 @@ fal/exceptions/__init__.py,sha256=m2okJEpax11mnwmoqO_pCGtbt-FvzKiiuMhKo2ok-_8,27
 fal/exceptions/_base.py,sha256=LwzpMaW_eYQEC5s26h2qGXbNA-S4bOqC8s-bMCX6HjE,1491
 fal/exceptions/_cuda.py,sha256=q5EPFYEb7Iyw03cHrQlRHnH5xOvjwTwQdM6a9N3GB8k,1494
 fal/exceptions/auth.py,sha256=gxRago5coI__vSIcdcsqhhq1lRPkvCnwPAueIaXTAdw,329
-fal/logging/__init__.py,sha256=snqprf7-sKw6oAATS_Yxklf-a3XhLg0vIHICPwLp6TM,1583
-fal/logging/isolate.py,sha256=6Ec0gI-dTuxFcQYyhRselGXKVT9ZrRm2cphWiUu6jx4,2305
+fal/logging/__init__.py,sha256=avgKA2V8GJeUtZuWZJjSYgkkrXKpuDMS-YiIBmLda7w,1599
+fal/logging/isolate.py,sha256=jIryi46ZVlJ1mfan4HLNQQ3jwMi8z-WwfqqLlttQVkc,2449
 fal/logging/style.py,sha256=ckIgHzvF4DShM5kQh8F133X53z_vF46snuDHVmo_h9g,386
 fal/logging/trace.py,sha256=OhzB6d4rQZimBc18WFLqH_9BGfqFFumKKTAGSsmWRMg,1904
-fal/logging/user.py,sha256=0Xvb8n6tSb9l_V51VDzv6SOdYEFNouV_6nF_W9e7uNQ,642
+fal/logging/user.py,sha256=H7Pg-nqhpzsUb5f6uXyZUeLWAsr3oImQEaYSCIIAlqo,818
 fal/toolkit/__init__.py,sha256=sV95wiUzKoiDqF9vDgq4q-BLa2sD6IpuKSqp5kdTQNE,658
 fal/toolkit/exceptions.py,sha256=elHZ7dHCJG5zlHGSBbz-ilkZe9QUvQMomJFi8Pt91LA,198
 fal/toolkit/optimize.py,sha256=p75sovF0SmRP6zxzpIaaOmqlxvXB_xEz3XPNf59EF7w,1339
@@ -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.12.1.dist-info/METADATA,sha256=vzyI4j0xP0i07iKKLustjN3P037QQM6bGxkzVSgRaKI,4062
-fal-1.12.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-fal-1.12.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.12.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.12.1.dist-info/RECORD,,
+fal-1.13.0.dist-info/METADATA,sha256=g-mxfo9dF7Wkc-yfWft2lgN-VD7L1IqnQ6Tr5OwDHdQ,4062
+fal-1.13.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+fal-1.13.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.13.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.13.0.dist-info/RECORD,,