fal 1.15.1__tar.gz → 1.16.1__tar.gz

{fal-1.15.1/fal.egg-info → fal-1.16.1}/PKG-INFO

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

{fal-1.15.1 → fal-1.16.1/fal.egg-info}/PKG-INFO

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

{fal-1.15.1 → fal-1.16.1}/fal.egg-info/SOURCES.txt

@@ -150,6 +150,7 @@ src/fal/toolkit/image/nsfw_filter/model.py
 src/fal/toolkit/image/nsfw_filter/requirements.txt
 src/fal/toolkit/utils/__init__.py
 src/fal/toolkit/utils/download_utils.py
+src/fal/toolkit/utils/endpoint.py
 src/fal/toolkit/utils/retry.py
 tests/__init__.py
 tests/conftest.py

{fal-1.15.1 → fal-1.16.1}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.15.1'
-__version_tuple__ = version_tuple = (1, 15, 1)
+__version__ = version = '1.16.1'
+__version_tuple__ = version_tuple = (1, 16, 1)

{fal-1.15.1 → fal-1.16.1}/src/fal/_serialization.py

@@ -6,7 +6,7 @@ from typing import Any, Callable
 import cloudpickle
 
 
-def _register_pickle_by_value(name) -> None:
+def include_module(name) -> None:
     # cloudpickle.register_pickle_by_value wants an imported module object,
     # but there is really no reason to go through that complication, as
     # it might be prone to errors.
@@ -22,7 +22,7 @@ def include_package_from_path(raw_path: str) -> None:
         parent = parent.parent
 
     if parent != path:
-        _register_pickle_by_value(parent.name)
+        include_module(parent.name)
 
 
 def include_modules_from(obj: Any) -> None:
@@ -33,7 +33,7 @@ def include_modules_from(obj: Any) -> None:
     if "." in module_name:
         # Just include the whole package
         package_name, *_ = module_name.partition(".")
-        _register_pickle_by_value(package_name)
+        include_module(package_name)
         return
 
     if module_name == "__main__":
@@ -44,7 +44,7 @@ def include_modules_from(obj: Any) -> None:
         include_package_from_path(__main__.__file__)
         return
 
-    _register_pickle_by_value(module_name)
+    include_module(module_name)
 
 
 def _register(cls: Any, func: Callable) -> None:
@@ -230,4 +230,4 @@ def patch_pickle() -> None:
     _patch_console_thread_locals()
     _patch_exceptions()
 
-    _register_pickle_by_value("fal")
+    include_module("fal")

fal-1.16.1/src/fal/_version.py

@@ -0,0 +1,89 @@
+import json
+import os
+import tempfile
+from typing import Any, Dict, Optional
+
+try:
+    from ._fal_version import version as __version__  # type: ignore[import]
+    from ._fal_version import version_tuple  # type: ignore[import]
+except ImportError:
+    __version__ = "UNKNOWN"
+    version_tuple = (0, 0, __version__)  # type: ignore[assignment]
+
+
+_PYPI_URL = "https://pypi.org/pypi/fal/json"
+_PYPI_CACHE_TTL = 60 * 60  # 1 hour
+_PYPI_CACHE_PATH = os.path.expanduser("~/.fal/cache/pypi.json")
+_URLOPEN_TIMEOUT = 1
+
+
+def _write_pypi_cache(data: Dict[str, Any]) -> None:
+    cache_dir = os.path.dirname(_PYPI_CACHE_PATH)
+    os.makedirs(cache_dir, exist_ok=True)
+    prefix = os.path.basename(_PYPI_CACHE_PATH) + ".tmp."
+    with tempfile.NamedTemporaryFile(
+        mode="w",
+        dir=cache_dir,
+        prefix=prefix,
+        delete=False,
+    ) as fobj:
+        fobj.write(json.dumps(data))
+        os.rename(fobj.name, _PYPI_CACHE_PATH)
+
+
+def _get_pypi_cache() -> Optional[Dict[str, Any]]:
+    import time
+
+    try:
+        mtime = os.path.getmtime(_PYPI_CACHE_PATH)
+    except FileNotFoundError:
+        return None
+
+    if mtime + _PYPI_CACHE_TTL < time.time():
+        return None
+
+    with open(_PYPI_CACHE_PATH) as fobj:
+        try:
+            return json.load(fobj)
+        except ValueError:
+            return None
+
+
+def _fetch_pypi_data() -> Dict[str, Any]:
+    from urllib.request import urlopen
+
+    response = urlopen(_PYPI_URL, timeout=_URLOPEN_TIMEOUT)
+    if response.status != 200:
+        raise Exception(f"Failed to fetch {_PYPI_URL}")
+
+    data = response.read()
+    return json.loads(data)
+
+
+def get_latest_version() -> str:
+    from fal.logging import get_logger
+
+    logger = get_logger(__name__)
+
+    try:
+        data = _get_pypi_cache()
+    except Exception:
+        logger.warning("Failed to get pypi cache", exc_info=True)
+        data = None
+
+    if data is None:
+        try:
+            data = _fetch_pypi_data()
+        except Exception:
+            logger.warning("Failed to get latest fal version", exc_info=True)
+            data = {}
+
+        try:
+            _write_pypi_cache(data)
+        except Exception:
+            logger.warning("Failed to write pypi cache", exc_info=True)
+
+    try:
+        return data["info"]["version"]
+    except KeyError:
+        return "0.0.0"

{fal-1.15.1 → fal-1.16.1}/src/fal/api.py

@@ -39,7 +39,7 @@ from pydantic import __version__ as pydantic_version
 from typing_extensions import Concatenate, ParamSpec
 
 import fal.flags as flags
-from fal._serialization import include_modules_from, patch_pickle
+from fal._serialization import include_module, include_modules_from, patch_pickle
 from fal.container import ContainerImage
 from fal.exceptions import (
     AppException,
@@ -501,12 +501,7 @@ class FalServerlessHost(Host):
         if isinstance(func, ServeWrapper):
             # Assigning in a separate property leaving a place for the user
             # to add more metadata in the future
-            try:
-                metadata["openapi"] = func.openapi()
-            except Exception as e:
-                print(
-                    f"[warning] Failed to generate OpenAPI metadata for function: {e}"
-                )
+            metadata["openapi"] = func.openapi()
 
         for partial_result in self._connection.register(
             partial_func,
@@ -694,6 +689,7 @@ def function(
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
 ) -> Callable[
     [Callable[Concatenate[ArgsT], ReturnT]], IsolatedFunction[ArgsT, ReturnT]
 ]: ...
@@ -710,6 +706,7 @@ def function(
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
 ) -> Callable[
     [Callable[Concatenate[ArgsT], ReturnT]], ServedIsolatedFunction[ArgsT, ReturnT]
 ]: ...
@@ -727,6 +724,7 @@ def function(
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -756,6 +754,7 @@ def function(
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -792,6 +791,7 @@ def function(
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
 ) -> Callable[
     [Callable[Concatenate[ArgsT], ReturnT]], IsolatedFunction[ArgsT, ReturnT]
 ]: ...
@@ -813,6 +813,7 @@ def function(
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
 ) -> Callable[
     [Callable[Concatenate[ArgsT], ReturnT]], ServedIsolatedFunction[ArgsT, ReturnT]
 ]: ...
@@ -835,6 +836,7 @@ def function(
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -869,6 +871,7 @@ def function(
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -897,6 +900,7 @@ def function(
     serve: Literal[False] = False,
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -925,6 +929,7 @@ def function(
     serve: Literal[True],
     exposed_port: int | None = None,
     max_concurrency: int | None = None,
+    local_python_modules: list[str] | None = None,
     # FalServerlessHost options
     metadata: dict[str, Any] | None = None,
     machine_type: str | list[str] = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
@@ -948,6 +953,7 @@ def function(  # type: ignore
     kind: str = "virtualenv",
     *,
     host: Host | None = None,
+    local_python_modules: list[str] | None = None,
     **config: Any,
 ):
     if host is None:
@@ -956,6 +962,10 @@ def function(  # type: ignore
 
     def wrapper(func: Callable[ArgsT, ReturnT]):
         include_modules_from(func)
+
+        for module_name in local_python_modules or []:
+            include_module(module_name)
+
         proxy = IsolatedFunction(
             host=host,  # type: ignore
             raw_func=func,  # type: ignore
@@ -1154,7 +1164,12 @@ class BaseServable:
         Build the OpenAPI specification for the served function.
         Attach needed metadata for a better integration to fal.
         """
-        return self._build_app().openapi()
+        try:
+            return self._build_app().openapi()
+        except Exception as e:
+            raise FalServerlessException(
+                "Failed to generate OpenAPI metadata for function"
+            ) from e
 
     def serve(self) -> None:
         import asyncio

{fal-1.15.1 → fal-1.16.1}/src/fal/app.py

@@ -105,15 +105,12 @@ def wrap_app(cls: type[App], **kwargs) -> IsolatedFunction:
         app.serve()
 
     metadata = {}
-    try:
-        app = cls(_allow_init=True)
-        metadata["openapi"] = app.openapi()
-    except Exception:
-        logger.warning("Failed to build OpenAPI specification for %s", cls.__name__)
-        realtime_app = False
-    else:
-        routes = app.collect_routes()
-        realtime_app = any(route.is_websocket for route in routes)
+    app = cls(_allow_init=True)
+
+    metadata["openapi"] = app.openapi()
+
+    routes = app.collect_routes()
+    realtime_app = any(route.is_websocket for route in routes)
 
     kind = cls.host_kwargs.pop("kind", "virtualenv")
     if kind == "container":
@@ -122,6 +119,7 @@ def wrap_app(cls: type[App], **kwargs) -> IsolatedFunction:
     wrapper = fal_function(
         kind,
         requirements=cls.requirements,
+        local_python_modules=cls.local_python_modules,
         machine_type=cls.machine_type,
         num_gpus=cls.num_gpus,
         **cls.host_kwargs,
@@ -265,6 +263,7 @@ def _print_python_packages() -> None:
 
 class App(BaseServable):
     requirements: ClassVar[list[str]] = []
+    local_python_modules: ClassVar[list[str]] = []
     machine_type: ClassVar[str] = "S"
     num_gpus: ClassVar[int | None] = None
     host_kwargs: ClassVar[dict[str, Any]] = {

{fal-1.15.1 → fal-1.16.1}/src/fal/auth/__init__.py

@@ -63,8 +63,13 @@ def key_credentials() -> tuple[str, str] | None:
 
     key = os.environ.get("FAL_KEY") or config.get("key") or get_colab_token()
     if key:
-        key_id, key_secret = key.split(":", 1)
-        return (key_id, key_secret)
+        try:
+            key_id, key_secret = key.split(":", 1)
+            return (key_id, key_secret)
+        except ValueError:
+            print(f"Invalid key format: {key}")
+            return None
+
     elif "FAL_KEY_ID" in os.environ and "FAL_KEY_SECRET" in os.environ:
         return (os.environ["FAL_KEY_ID"], os.environ["FAL_KEY_SECRET"])
     else:

{fal-1.15.1 → fal-1.16.1}/src/fal/cli/main.py

@@ -77,11 +77,48 @@ def _print_error(msg):
     console.print(f"{CROSS_ICON} {msg}")
 
 
+def _check_latest_version():
+    from packaging.version import parse
+    from rich.emoji import Emoji
+    from rich.panel import Panel
+    from rich.text import Text
+
+    from fal._version import get_latest_version, version_tuple
+
+    latest_version = get_latest_version()
+    parsed = parse(latest_version)
+    latest_version_tuple = (parsed.major, parsed.minor, parsed.micro)
+    if latest_version_tuple <= version_tuple:
+        return
+
+    if not console.is_terminal:
+        return
+
+    line1 = Text.assemble(
+        (Emoji.replace(":warning-emoji:  "), "bold white"),
+        ("A new version of fal is available: ", "bold white"),
+        (latest_version, "bold green"),
+    )
+    line2 = Text.assemble(("pip install --upgrade fal", "bold cyan"))
+    line2.align("center", width=len(line1))
+
+    panel = Panel(
+        line1 + "\n\n" + line2,
+        border_style="yellow",
+        padding=(1, 2),
+        highlight=True,
+        expand=False,
+    )
+    console.print(panel)
+
+
 def main(argv=None) -> int:
     import grpc
 
     from fal.api import UserFunctionException
 
+    _check_latest_version()
+
     ret = 1
     try:
         args = parse_args(argv)

{fal-1.15.1 → fal-1.16.1}/src/fal/cli/profile.py

@@ -55,12 +55,18 @@ def _key_set(args):
         args.console.print(f"Key set for profile [cyan]{config.profile}[/].")
 
 
+def _host_set(args):
+    with Config().edit() as config:
+        config.set("host", args.HOST)
+        args.console.print(f"Fal host set to [cyan]{args.HOST}[/].")
+
+
 def _delete(args):
     with Config().edit() as config:
         if config.profile == args.PROFILE:
             config.set_internal("profile", None)
 
-        config.delete(args.PROFILE)
+        config.delete_profile(args.PROFILE)
         args.console.print(f"Profile [cyan]{args.PROFILE}[/] deleted.")
 
 
@@ -121,6 +127,19 @@ def add_parser(main_subparsers, parents):
     )
     key_set_parser.set_defaults(func=_key_set)
 
+    host_set_help = "Set fal host."
+    host_set_parser = subparsers.add_parser(
+        "host",
+        description=host_set_help,
+        help=host_set_help,
+        parents=parents,
+    )
+    host_set_parser.add_argument(
+        "HOST",
+        help="Fal host.",
+    )
+    host_set_parser.set_defaults(func=_host_set)
+
     delete_help = "Delete profile."
     delete_parser = subparsers.add_parser(
         "delete",

{fal-1.15.1 → fal-1.16.1}/src/fal/cli/runners.py

@@ -21,17 +21,21 @@ def runners_table(runners: List[RunnerInfo]):
     table.add_column("Revision")
 
     for runner in runners:
+        external_metadata = runner.external_metadata
+        present = external_metadata.get("present_in_group", True)
+
         num_leases_with_request = len(
             [
                 lease
-                for lease in runner.external_metadata.get("leases", [])
+                for lease in external_metadata.get("leases", [])
                 if lease.get("request_id") is not None
             ]
         )
 
         table.add_row(
             runner.alias,
-            runner.runner_id,
+            # Mark lost runners in red
+            runner.runner_id if present else f"[red]{runner.runner_id}[/]",
             str(runner.in_flight_requests),
             str(runner.in_flight_requests - num_leases_with_request),
             (

{fal-1.15.1 → fal-1.16.1}/src/fal/config.py

@@ -99,7 +99,7 @@ class Config:
     def unset_internal(self, key: str) -> None:
         self._config.get(SETTINGS_SECTION, {}).pop(key, None)
 
-    def delete(self, profile: str) -> None:
+    def delete_profile(self, profile: str) -> None:
         del self._config[profile]
 
     @contextmanager

{fal-1.15.1 → fal-1.16.1}/src/fal/flags.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import os
 
+from fal.config import Config
+
 
 def bool_envvar(name: str):
     if name in os.environ:
@@ -14,7 +16,10 @@ DEBUG = bool_envvar("DEBUG")
 TEST_MODE = bool_envvar("ISOLATE_TEST_MODE")
 AUTH_DISABLED = bool_envvar("ISOLATE_AUTH_DISABLED")
 
-GRPC_HOST = os.getenv("FAL_HOST", "api.alpha.fal.ai")
+config = Config()
+config_host = config.get("host")
+
+GRPC_HOST = config_host or os.getenv("FAL_HOST") or "api.alpha.fal.ai"
 if not TEST_MODE:
     assert GRPC_HOST.startswith("api"), "FAL_HOST must start with 'api'"
 

fal-1.16.1/src/fal/toolkit/utils/endpoint.py

@@ -0,0 +1,29 @@
+from contextlib import asynccontextmanager
+
+from anyio import create_task_group
+from fastapi import Request
+
+
+@asynccontextmanager
+async def cancel_on_disconnect(request: Request):
+    """
+    Async context manager for async code that needs to be cancelled if client
+    disconnects prematurely.
+    The client disconnect is monitored through the Request object.
+    """
+    async with create_task_group() as tg:
+
+        async def watch_disconnect():
+            while True:
+                message = await request.receive()
+
+                if message["type"] == "http.disconnect":
+                    tg.cancel_scope.cancel()
+                    break
+
+        tg.start_soon(watch_disconnect)
+
+        try:
+            yield
+        finally:
+            tg.cancel_scope.cancel()

{fal-1.15.1 → fal-1.16.1}/src/fal/utils.py

@@ -21,8 +21,11 @@ def load_function_from(
     file_path: str,
     function_name: str | None = None,
 ) -> LoadedFunction:
+    import os
     import runpy
+    import sys
 
+    sys.path.append(os.getcwd())
     module = runpy.run_path(file_path)
     if function_name is None:
         fal_objects = {