fal 1.3.0__py3-none-any.whl → 1.3.2__py3-none-any.whl

fal/__main__.py

@@ -1,4 +1,6 @@
+import sys
+
 from .cli import main
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())

fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.3.0'
-__version_tuple__ = version_tuple = (1, 3, 0)
+__version__ = version = '1.3.2'
+__version_tuple__ = version_tuple = (1, 3, 2)

fal/api.py

@@ -425,6 +425,7 @@ class FalServerlessHost(Host):
         application_name: str | None = None,
         application_auth_mode: Literal["public", "shared", "private"] | None = None,
         metadata: dict[str, Any] | None = None,
+        deployment_strategy: Literal["recreate", "rolling"] = "recreate",
     ) -> str | None:
         environment_options = options.environment.copy()
         environment_options.setdefault("python_version", active_python())
@@ -477,6 +478,7 @@ class FalServerlessHost(Host):
             application_auth_mode=application_auth_mode,
             machine_requirements=machine_requirements,
             metadata=metadata,
+            deployment_strategy=deployment_strategy,
         ):
             for log in partial_result.logs:
                 self._log_printer.print(log)

fal/app.py

@@ -17,6 +17,7 @@ from fastapi import FastAPI
 import fal.api
 from fal._serialization import include_modules_from
 from fal.api import RouteSignature
+from fal.exceptions import RequestCancelledException
 from fal.logging import get_logger
 from fal.toolkit.file.providers import fal as fal_provider_module
 
@@ -143,7 +144,7 @@ class AppClient:
             with httpx.Client() as client:
                 retries = 100
                 for _ in range(retries):
-                    resp = client.get(info.url + "/health")
+                    resp = client.get(info.url + "/health", timeout=60)
 
                     if resp.is_success:
                         break
@@ -205,6 +206,14 @@ class App(fal.api.BaseServable):
                 "Running apps through SDK is not implemented yet."
             )
 
+    @classmethod
+    def get_endpoints(cls) -> list[str]:
+        return [
+            signature.path
+            for _, endpoint in inspect.getmembers(cls, inspect.isfunction)
+            if (signature := getattr(endpoint, "route_signature", None))
+        ]
+
     def collect_routes(self) -> dict[RouteSignature, Callable[..., Any]]:
         return {
             signature: endpoint
@@ -264,6 +273,17 @@ class App(fal.api.BaseServable):
                 )
             return response
 
+        @app.exception_handler(RequestCancelledException)
+        async def value_error_exception_handler(
+            request, exc: RequestCancelledException
+        ):
+            from fastapi.responses import JSONResponse
+
+            # A 499 status code is not an officially recognized HTTP status code,
+            # but it is sometimes used by servers to indicate that a client has closed
+            # the connection without receiving a response
+            return JSONResponse({"detail": str(exc)}, 499)
+
     def _add_extra_routes(self, app: FastAPI):
         @app.get("/health")
         def health():

fal/apps.py

@@ -97,6 +97,15 @@ class RequestHandle:
         else:
             raise ValueError(f"Unknown status: {data['status']}")
 
+    def cancel(self) -> None:
+        """Cancel an async inference request."""
+        url = (
+            _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.raise_for_status()
+
     def iter_events(
         self,
         *,

fal/cli/_utils.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+from fal.files import find_pyproject_toml, parse_pyproject_toml
+
+
+def is_app_name(app_ref: tuple[str, str | None]) -> bool:
+    is_single_file = app_ref[1] is None
+    is_python_file = app_ref[0].endswith(".py")
+
+    return is_single_file and not is_python_file
+
+
+def get_app_data_from_toml(app_name):
+    toml_path = find_pyproject_toml()
+
+    if toml_path is None:
+        raise ValueError("No pyproject.toml file found.")
+
+    fal_data = parse_pyproject_toml(toml_path)
+    apps = fal_data.get("apps", {})
+
+    try:
+        app_data = apps[app_name]
+    except KeyError:
+        raise ValueError(f"App {app_name} not found in pyproject.toml")
+
+    try:
+        app_ref = app_data["ref"]
+    except KeyError:
+        raise ValueError(f"App {app_name} does not have a ref key in pyproject.toml")
+
+    app_auth = app_data.get("auth", "private")
+
+    return app_ref, app_auth

fal/cli/deploy.py

@@ -1,7 +1,9 @@
 import argparse
 from collections import namedtuple
 from pathlib import Path
+from typing import Optional, Union
 
+from ._utils import get_app_data_from_toml, is_app_name
 from .parser import FalClientParser, RefAction
 
 User = namedtuple("User", ["user_id", "username"])
@@ -60,11 +62,13 @@ def _get_user() -> User:
         raise FalServerlessError(f"Could not parse the user data: {e}")
 
 
-def _deploy(args):
+def _deploy_from_reference(
+    app_ref: tuple[Optional[Union[Path, str]], ...], app_name: str, auth: str, args
+):
     from fal.api import FalServerlessError, FalServerlessHost
     from fal.utils import load_function_from
 
-    file_path, func_name = args.app_ref
+    file_path, func_name = app_ref
     if file_path is None:
         # Try to find a python file in the current directory
         options = list(Path(".").glob("*.py"))
@@ -77,23 +81,27 @@ def _deploy(args):
             )
 
         [file_path] = options
-        file_path = str(file_path)
+        file_path = str(file_path)  # type: ignore
 
     user = _get_user()
     host = FalServerlessHost(args.host)
-    isolated_function, app_name, app_auth = load_function_from(
+    loaded = load_function_from(
         host,
-        file_path,
-        func_name,
+        file_path,  # type: ignore
+        func_name,  # type: ignore
     )
-    app_name = args.app_name or app_name
-    app_auth = args.auth or app_auth or "private"
+    isolated_function = loaded.function
+    app_name = app_name or loaded.app_name  # type: ignore
+    app_auth = auth or loaded.app_auth or "private"
+    deployment_strategy = args.strategy or "default"
+
     app_id = host.register(
         func=isolated_function.func,
         options=isolated_function.options,
         application_name=app_name,
         application_auth_mode=app_auth,
         metadata=isolated_function.options.host.get("metadata", {}),
+        deployment_strategy=deployment_strategy,
     )
 
     if app_id:
@@ -106,12 +114,36 @@ def _deploy(args):
             "Registered a new revision for function "
             f"'{app_name}' (revision='{app_id}')."
         )
-        args.console.print(
-            f"Playground: https://fal.ai/models/{user.username}/{app_name}"
-        )
-        args.console.print(
-            f"Endpoint: https://{gateway_host}/{user.username}/{app_name}"
-        )
+        args.console.print("Playground:")
+        for endpoint in loaded.endpoints:
+            args.console.print(
+                f"\thttps://fal.ai/models/{user.username}/{app_name}{endpoint}"
+            )
+        args.console.print("Endpoints:")
+        for endpoint in loaded.endpoints:
+            args.console.print(
+                f"\thttps://{gateway_host}/{user.username}/{app_name}{endpoint}"
+            )
+
+
+def _deploy(args):
+    # my-app
+    if is_app_name(args.app_ref):
+        # we do not allow --app-name and --auth to be used with app name
+        if args.app_name or args.auth:
+            raise ValueError("Cannot use --app-name or --auth with app name reference.")
+
+        app_name = args.app_ref[0]
+        app_ref, app_auth = get_app_data_from_toml(app_name)
+        file_path, func_name = RefAction.split_ref(app_ref)
+
+    # path/to/myfile.py::MyApp
+    else:
+        file_path, func_name = args.app_ref
+        app_name = args.app_name
+        app_auth = args.auth
+
+    _deploy_from_reference((file_path, func_name), app_name, app_auth, args)
 
 
 def add_parser(main_subparsers, parents):
@@ -122,14 +154,22 @@ def add_parser(main_subparsers, parents):
             raise argparse.ArgumentTypeError(f"{option} is not a auth option")
         return option
 
-    deploy_help = "Deploy a fal application."
+    deploy_help = (
+        "Deploy a fal application. "
+        "If no app reference is provided, the command will look for a "
+        "pyproject.toml file with a [tool.fal.apps] section and deploy the "
+        "application specified with the provided app name."
+    )
+
     epilog = (
         "Examples:\n"
         "  fal deploy\n"
         "  fal deploy path/to/myfile.py\n"
         "  fal deploy path/to/myfile.py::MyApp\n"
         "  fal deploy path/to/myfile.py::MyApp --app-name myapp --auth public\n"
+        "  fal deploy my-app\n"
     )
+
     parser = main_subparsers.add_parser(
         "deploy",
         parents=[*parents, FalClientParser(add_help=False)],
@@ -137,21 +177,36 @@ def add_parser(main_subparsers, parents):
         help=deploy_help,
         epilog=epilog,
     )
+
     parser.add_argument(
         "app_ref",
         nargs="?",
         action=RefAction,
         help=(
-            "Application reference. " "For example: `myfile.py::MyApp`, `myfile.py`."
+            "Application reference. Either a file path or a file path and a "
+            "function name separated by '::'. If no reference is provided, the "
+            "command will look for a pyproject.toml file with a [tool.fal.apps] "
+            "section and deploy the application specified with the provided app name.\n"
+            "File path example: path/to/myfile.py::MyApp\n"
+            "App name example: my-app\n"
         ),
     )
+
     parser.add_argument(
         "--app-name",
         help="Application name to deploy with.",
     )
+
     parser.add_argument(
         "--auth",
         type=valid_auth_option,
         help="Application authentication mode (private, public).",
     )
+    parser.add_argument(
+        "--strategy",
+        choices=["default", "rolling"],
+        help="Deployment strategy.",
+        default="default",
+    )
+
     parser.set_defaults(func=_deploy)

fal/cli/parser.py

@@ -14,14 +14,18 @@ class RefAction(argparse.Action):
         kwargs.setdefault("default", (None, None))
         super().__init__(*args, **kwargs)
 
-    def __call__(self, parser, args, values, option_string=None):  # noqa: ARG002
-        if isinstance(values, tuple):
-            file_path, obj_path = values
-        elif values.find("::") > 1:
-            file_path, obj_path = values.split("::", 1)
-        else:
-            file_path, obj_path = values, None
+    @classmethod
+    def split_ref(cls, value):
+        if isinstance(value, tuple):
+            return value
+
+        if value.find("::") > 1:
+            return value.split("::", 1)
 
+        return value, None
+
+    def __call__(self, parser, args, values, option_string=None):  # noqa: ARG002
+        file_path, obj_path = self.split_ref(values)
         setattr(args, self.dest, (file_path, obj_path))
 
 

fal/cli/run.py

@@ -1,3 +1,4 @@
+from ._utils import get_app_data_from_toml, is_app_name
 from .parser import FalClientParser, RefAction
 
 
@@ -6,7 +7,17 @@ def _run(args):
     from fal.utils import load_function_from
 
     host = FalServerlessHost(args.host)
-    isolated_function, _, _ = load_function_from(host, *args.func_ref)
+
+    if is_app_name(args.func_ref):
+        app_name = args.func_ref[0]
+        app_ref, _ = get_app_data_from_toml(app_name)
+        file_path, func_name = RefAction.split_ref(app_ref)
+    else:
+        file_path, func_name = args.func_ref
+
+    loaded = load_function_from(host, file_path, func_name)
+
+    isolated_function = loaded.function
     # let our exc handlers handle UserFunctionException
     isolated_function.reraise = False
     isolated_function()

fal/exceptions/__init__.py

@@ -1,4 +1,9 @@
 from __future__ import annotations
 
-from ._base import AppException, FalServerlessException, FieldException  # noqa: F401
+from ._base import (
+    AppException,  # noqa: F401
+    FalServerlessException,  # noqa: F401
+    FieldException,  # noqa: F401
+    RequestCancelledException,  # noqa: F401
+)
 from ._cuda import CUDAOutOfMemoryException  # noqa: F401

fal/exceptions/_base.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Sequence
 
 
 class FalServerlessException(Exception):
@@ -40,11 +39,20 @@ class FieldException(FalServerlessException):
     status_code: int = 422
     type: str = "value_error"
 
-    def to_pydantic_format(self) -> Sequence[dict]:
-        return [
-            {
-                "loc": ["body", self.field],
-                "msg": self.message,
-                "type": self.type,
-            }
-        ]
+    def to_pydantic_format(self) -> dict[str, list[dict]]:
+        return dict(
+            detail=[
+                {
+                    "loc": ["body", self.field],
+                    "msg": self.message,
+                    "type": self.type,
+                }
+            ]
+        )
+
+
+@dataclass
+class RequestCancelledException(FalServerlessException):
+    """Exception raised when the request is cancelled by the client."""
+
+    message: str = "Request cancelled by the client."

fal/files.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/sdk.py

@@ -275,6 +275,33 @@ class KeyScope(enum.Enum):
             raise ValueError(f"Unknown KeyScope: {proto}")
 
 
+class DeploymentStrategy(enum.Enum):
+    RECREATE = "recreate"
+    ROLLING = "rolling"
+
+    @staticmethod
+    def from_proto(
+        proto: isolate_proto.DeploymentStrategy.ValueType | None,
+    ) -> DeploymentStrategy:
+        if proto is None:
+            return DeploymentStrategy.RECREATE
+
+        if proto is isolate_proto.DeploymentStrategy.RECREATE:
+            return DeploymentStrategy.RECREATE
+        elif proto is isolate_proto.DeploymentStrategy.ROLLING:
+            return DeploymentStrategy.ROLLING
+        else:
+            raise ValueError(f"Unknown DeploymentStrategy: {proto}")
+
+    def to_proto(self) -> isolate_proto.DeploymentStrategy.ValueType:
+        if self is DeploymentStrategy.RECREATE:
+            return isolate_proto.DeploymentStrategy.RECREATE
+        elif self is DeploymentStrategy.ROLLING:
+            return isolate_proto.DeploymentStrategy.ROLLING
+        else:
+            raise ValueError(f"Unknown DeploymentStrategy: {self}")
+
+
 @from_grpc.register(isolate_proto.ApplicationInfo)
 def _from_grpc_application_info(
     message: isolate_proto.ApplicationInfo,
@@ -457,6 +484,7 @@ class FalServerlessConnection:
         serialization_method: str = _DEFAULT_SERIALIZATION_METHOD,
         machine_requirements: MachineRequirements | None = None,
         metadata: dict[str, Any] | None = None,
+        deployment_strategy: Literal["recreate", "rolling"] = "recreate",
     ) -> Iterator[isolate_proto.RegisterApplicationResult]:
         wrapped_function = to_serialized_object(function, serialization_method)
         if machine_requirements:
@@ -488,6 +516,10 @@ class FalServerlessConnection:
             struct_metadata = isolate_proto.Struct()
             struct_metadata.update(metadata)
 
+        deployment_strategy_proto = DeploymentStrategy[
+            deployment_strategy.upper()
+        ].to_proto()
+
         request = isolate_proto.RegisterApplicationRequest(
             function=wrapped_function,
             environments=environments,
@@ -495,6 +527,7 @@ class FalServerlessConnection:
             application_name=application_name,
             auth_mode=auth_mode,
             metadata=struct_metadata,
+            deployment_strategy=deployment_strategy_proto,
         )
         for partial_result in self.stub.RegisterApplication(request):
             yield from_grpc(partial_result)

fal/toolkit/file/file.py

@@ -149,14 +149,31 @@ class File(BaseModel):
         path: str | Path,
         content_type: Optional[str] = None,
         repository: FileRepository | RepositoryId = DEFAULT_REPOSITORY,
+        multipart: bool | None = None,
     ) -> File:
         file_path = Path(path)
         if not file_path.exists():
             raise FileNotFoundError(f"File {file_path} does not exist")
-        with open(file_path, "rb") as f:
-            data = f.read()
-        return File.from_bytes(
-            data, content_type, file_name=file_path.name, repository=repository
+
+        repo = (
+            repository
+            if isinstance(repository, FileRepository)
+            else get_builtin_repository(repository)
+        )
+
+        content_type = content_type or "application/octet-stream"
+
+        url, data = repo.save_file(
+            file_path,
+            content_type=content_type,
+            multipart=multipart,
+        )
+        return cls(
+            url=url,
+            file_data=data.data if data else None,
+            content_type=content_type,
+            file_name=file_path.name,
+            file_size=file_path.stat().st_size,
         )
 
     def as_bytes(self) -> bytes:

fal/toolkit/file/providers/fal.py

@@ -2,9 +2,11 @@ from __future__ import annotations
 
 import dataclasses
 import json
+import math
 import os
 from base64 import b64encode
 from dataclasses import dataclass
+from pathlib import Path
 from urllib.error import HTTPError
 from urllib.request import Request, urlopen
 
@@ -87,11 +89,185 @@ class FalFileRepository(FalFileRepositoryBase):
         return self._save(file, "gcs")
 
 
+class MultipartUpload:
+    MULTIPART_THRESHOLD = 100 * 1024 * 1024
+    MULTIPART_CHUNK_SIZE = 100 * 1024 * 1024
+    MULTIPART_MAX_CONCURRENCY = 10
+
+    def __init__(
+        self,
+        file_path: str | Path,
+        chunk_size: int | None = None,
+        content_type: str | None = None,
+        max_concurrency: int | None = None,
+    ) -> None:
+        self.file_path = file_path
+        self.chunk_size = chunk_size or self.MULTIPART_CHUNK_SIZE
+        self.content_type = content_type or "application/octet-stream"
+        self.max_concurrency = max_concurrency or self.MULTIPART_MAX_CONCURRENCY
+
+        self._parts: list[dict] = []
+
+        key_creds = key_credentials()
+        if not key_creds:
+            raise FileUploadException("FAL_KEY must be set")
+
+        key_id, key_secret = key_creds
+
+        self._auth_headers = {
+            "Authorization": f"Key {key_id}:{key_secret}",
+        }
+        grpc_host = os.environ.get("FAL_HOST", "api.alpha.fal.ai")
+        rest_host = grpc_host.replace("api", "rest", 1)
+        self._storage_upload_url = f"https://{rest_host}/storage/upload"
+
+    def create(self):
+        try:
+            req = Request(
+                f"{self._storage_upload_url}/initiate-multipart",
+                method="POST",
+                headers={
+                    **self._auth_headers,
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                },
+                data=json.dumps(
+                    {
+                        "file_name": os.path.basename(self.file_path),
+                        "content_type": self.content_type,
+                    }
+                ).encode(),
+            )
+            with urlopen(req) as response:
+                result = json.load(response)
+                self._upload_id = result["upload_id"]
+                self._file_url = result["file_url"]
+        except HTTPError as exc:
+            raise FileUploadException(
+                f"Error initiating upload. Status {exc.status}: {exc.reason}"
+            )
+
+    def _upload_part(self, url: str, part_number: int) -> dict:
+        with open(self.file_path, "rb") as f:
+            start = (part_number - 1) * self.chunk_size
+            f.seek(start)
+            data = f.read(self.chunk_size)
+            req = Request(
+                url,
+                method="PUT",
+                headers={"Content-Type": self.content_type},
+                data=data,
+            )
+
+            try:
+                with urlopen(req) as resp:
+                    return {
+                        "part_number": part_number,
+                        "etag": resp.headers["ETag"],
+                    }
+            except HTTPError as exc:
+                raise FileUploadException(
+                    f"Error uploading part {part_number} to {url}. "
+                    f"Status {exc.status}: {exc.reason}"
+                )
+
+    def upload(self) -> None:
+        import concurrent.futures
+
+        parts = math.ceil(os.path.getsize(self.file_path) / self.chunk_size)
+        with concurrent.futures.ThreadPoolExecutor(
+            max_workers=self.max_concurrency
+        ) as executor:
+            futures = []
+            for part_number in range(1, parts + 1):
+                upload_url = (
+                    f"{self._file_url}?upload_id={self._upload_id}"
+                    f"&part_number={part_number}"
+                )
+                futures.append(
+                    executor.submit(self._upload_part, upload_url, part_number)
+                )
+
+            for future in concurrent.futures.as_completed(futures):
+                entry = future.result()
+                self._parts.append(entry)
+
+    def complete(self):
+        url = f"{self._file_url}?upload_id={self._upload_id}"
+        try:
+            req = Request(
+                url,
+                method="POST",
+                headers={
+                    "Accept": "application/json",
+                    "Content-Type": "application/json",
+                },
+                data=json.dumps({"parts": self._parts}).encode(),
+            )
+            with urlopen(req):
+                pass
+        except HTTPError as e:
+            raise FileUploadException(
+                f"Error completing upload {url}. Status {e.status}: {e.reason}"
+            )
+
+        return self._file_url
+
+
 @dataclass
 class FalFileRepositoryV2(FalFileRepositoryBase):
     def save(self, file: FileData) -> str:
         return self._save(file, "fal-cdn")
 
+    def _save_multipart(
+        self,
+        file_path: str | Path,
+        chunk_size: int | None = None,
+        content_type: str | None = None,
+        max_concurrency: int | None = None,
+    ) -> str:
+        multipart = MultipartUpload(
+            file_path,
+            chunk_size=chunk_size,
+            content_type=content_type,
+            max_concurrency=max_concurrency,
+        )
+        multipart.create()
+        multipart.upload()
+        return multipart.complete()
+
+    def save_file(
+        self,
+        file_path: str | Path,
+        content_type: str,
+        multipart: bool | None = None,
+        multipart_threshold: int | None = None,
+        multipart_chunk_size: int | None = None,
+        multipart_max_concurrency: int | None = None,
+    ) -> tuple[str, FileData | None]:
+        if multipart is None:
+            threshold = multipart_threshold or MultipartUpload.MULTIPART_THRESHOLD
+            multipart = os.path.getsize(file_path) > threshold
+
+        if multipart:
+            url = self._save_multipart(
+                file_path,
+                chunk_size=multipart_chunk_size,
+                content_type=content_type,
+                max_concurrency=multipart_max_concurrency,
+            )
+            data = None
+        else:
+            with open(file_path, "rb") as f:
+                data = FileData(
+                    f.read(),
+                    content_type=content_type,
+                    file_name=os.path.basename(file_path),
+                )
+            url = self.save(data)
+
+        return url, data
+
 
 @dataclass
 class InMemoryRepository(FileRepository):

fal/toolkit/file/types.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 from mimetypes import guess_extension, guess_type
+from pathlib import Path
 from typing import Literal
 from uuid import uuid4
 
@@ -35,3 +36,20 @@ RepositoryId = Literal["fal", "fal_v2", "in_memory", "gcp_storage", "r2", "cdn"]
 class FileRepository:
     def save(self, data: FileData) -> str:
         raise NotImplementedError()
+
+    def save_file(
+        self,
+        file_path: str | Path,
+        content_type: str,
+        multipart: bool | None = None,
+        multipart_threshold: int | None = None,
+        multipart_chunk_size: int | None = None,
+        multipart_max_concurrency: int | None = None,
+    ) -> tuple[str, FileData | None]:
+        if multipart:
+            raise NotImplementedError()
+
+        with open(file_path, "rb") as fobj:
+            data = FileData(fobj.read(), content_type, Path(file_path).name)
+
+        return self.save(data), data

fal/utils.py

@@ -1,16 +1,26 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 import fal._serialization
 from fal import App, wrap_app
 
 from .api import FalServerlessError, FalServerlessHost, IsolatedFunction
 
 
+@dataclass
+class LoadedFunction:
+    function: IsolatedFunction
+    endpoints: list[str]
+    app_name: str | None
+    app_auth: str | None
+
+
 def load_function_from(
     host: FalServerlessHost,
     file_path: str,
     function_name: str | None = None,
-) -> tuple[IsolatedFunction, str | None, str | None]:
+) -> LoadedFunction:
     import runpy
 
     module = runpy.run_path(file_path)
@@ -45,13 +55,15 @@ def load_function_from(
     fal._serialization.include_package_from_path(file_path)
 
     target = module[function_name]
+    endpoints = ["/"]
     if isinstance(target, type) and issubclass(target, App):
         app_name = target.app_name
         app_auth = target.app_auth
+        endpoints = target.get_endpoints() or ["/"]
         target = wrap_app(target, host=host)
 
     if not isinstance(target, IsolatedFunction):
         raise FalServerlessError(
             f"Function '{function_name}' is not a fal.function or a fal.App"
         )
-    return target, app_name, app_auth
+    return LoadedFunction(target, endpoints, app_name=app_name, app_auth=app_auth)

{fal-1.3.0.dist-info → fal-1.3.2.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.3.0
+Version: 1.3.2
 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]<1.14.0,>=0.13.0
-Requires-Dist: isolate-proto==0.5.1
+Requires-Dist: isolate-proto==0.5.3
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
@@ -35,6 +35,7 @@ Requires-Dist: pillow<11,>=10.2.0
 Requires-Dist: pyjwt[crypto]<3,>=2.8.0
 Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
+Requires-Dist: tomli
 Requires-Dist: importlib-metadata>=4.4; python_version < "3.10"
 Provides-Extra: dev
 Requires-Dist: fal[test]; extra == "dev"

{fal-1.3.0.dist-info → fal-1.3.2.dist-info}/RECORD

@@ -1,39 +1,41 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
-fal/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-fal/_fal_version.py,sha256=HGwtpza1HCPtlyqElUvIyH97K44TO13CYiYVZNezQ1M,411
+fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
+fal/_fal_version.py,sha256=ik9WUFYTvRcmzFEUSqkI2H_62uw0XFdUT3mTLq8-_RY,411
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=bOCxmOQSbdcR6h6VLPEuvsD4i0j_Mod6E2UNP07cAQo,41893
-fal/app.py,sha256=PGx-6Zr4evqe4Fzs4g4-MxKnaOp_7hW5G7vU1PpPvkI,16800
-fal/apps.py,sha256=FrKmaAUo8U9vE_fcva0GQvk4sCrzaTEr62lGtu3Ld5M,6825
+fal/api.py,sha256=xOPRO8-Y-7tgab_yKkQ2Lh_n4l8av5zd7srs9PCgJ5U,42020
+fal/app.py,sha256=mBBwTi6IldCEN-IEeznpEwyjUydqB4HkVCu49J3Vsfw,17639
+fal/apps.py,sha256=lge7-HITzI20l1oXdlkAzqxdMVtXRfnACIylKRWgCNQ,7151
 fal/container.py,sha256=V7riyyq8AZGwEX9QaqRQDZyDN_bUKeRKV1OOZArXjL0,622
+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=wA58DYnSK1vdsBi8Or9Z8kvMMEyBNfeZYk_xulSfTWE,20078
+fal/sdk.py,sha256=Vp5S3FNMNzSLN3p7I_bv5TPzJHflr1JE3QgDm5-BeI0,21300
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
-fal/utils.py,sha256=4-V6iGSRd3kG_-UP6OdZp_-EhAkl3zectFlFKkCsS0Q,1884
+fal/utils.py,sha256=9q_QrQBlQN3nZYA1kEGRfhJWi4RjnO4H1uQswfaei9w,2146
 fal/workflows.py,sha256=jx3tGy2R7cN6lLvOzT6lhhlcjmiq64iZls2smVrmQj0,14657
 fal/auth/__init__.py,sha256=r8iA2-5ih7-Fik3gEC4HEWNFbGoxpYnXpZu1icPIoS0,3561
 fal/auth/auth0.py,sha256=rSG1mgH-QGyKfzd7XyAaj1AYsWt-ho8Y_LZ-FUVWzh4,5421
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
+fal/cli/_utils.py,sha256=DSfHZ6qna4jLffs-N4F3XbV-9ydF_OSlP2-GRounWsY,911
 fal/cli/apps.py,sha256=-DDp-Gvxz5kHho5YjAhbri8vOny_9cftAI_wP2KR5nU,8175
 fal/cli/auth.py,sha256=--MhfHGwxmtHbRkGioyn1prKn_U-pBzbz0G_QeZou-U,1352
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=u_urnyFzSlNnrq93zz_GXE9FX4VyVxDoamJJyrZpFI0,1312
-fal/cli/deploy.py,sha256=1e4OERVGtfwgM0VEFjlCLpNyuOl1BiLI-dx8u-71PVs,4817
+fal/cli/deploy.py,sha256=JCTQRNzbPt7Bn7lR8byJ38Ff-vQ2BQoSdzmdp9OlF3A,6790
 fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/keys.py,sha256=trDpA3LJu9S27qE_K8Hr6fKLK4vwVzbxUHq8TFrV4pw,3157
 fal/cli/main.py,sha256=_Wh_DQc02qwh-ZN7v41lZm0lDR1WseViXVOcqUlyWLg,2009
-fal/cli/parser.py,sha256=r1hd5e8Jq6yzDZw8-S0On1EjJbjRtHMuVuHC6MlvUj4,2835
-fal/cli/run.py,sha256=8wHNDruIr8i21JwbfFzS389C-y0jktM5zN5iDnJHsvA,873
+fal/cli/parser.py,sha256=edCqFWYAQSOhrxeEK9BtFRlTEUAlG2JUDjS_vhZ_nHE,2868
+fal/cli/run.py,sha256=uscbLBfTe8-UAbqh8h1iWuGD_G9UNNrj3k8bF5rtzy4,1201
 fal/cli/secrets.py,sha256=740msFm7d41HruudlcfqUXlFl53N-WmChsQP9B9M9Po,2572
 fal/console/__init__.py,sha256=ernZ4bzvvliQh5SmrEqQ7lA5eVcbw6Ra2jalKtA7dxg,132
 fal/console/icons.py,sha256=De9MfFaSkO2Lqfne13n3PrYfTXJVIzYZVqYn5BWsdrA,108
 fal/console/ux.py,sha256=KMQs3UHQvVHDxDQQqlot-WskVKoMQXOE3jiVkkfmIMY,356
-fal/exceptions/__init__.py,sha256=5b2rFnvLf2Q4fPGedcYN_JVLv-j6iOy5DNG7jB6FNUk,180
-fal/exceptions/_base.py,sha256=zFiiRceThgdnR8DEYtzpkq-IDO_D0EHGLd0oZjX5Gqk,1256
+fal/exceptions/__init__.py,sha256=m2okJEpax11mnwmoqO_pCGtbt-FvzKiiuMhKo2ok-_8,270
+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
@@ -45,9 +47,9 @@ fal/toolkit/__init__.py,sha256=sV95wiUzKoiDqF9vDgq4q-BLa2sD6IpuKSqp5kdTQNE,658
 fal/toolkit/exceptions.py,sha256=elHZ7dHCJG5zlHGSBbz-ilkZe9QUvQMomJFi8Pt91LA,198
 fal/toolkit/optimize.py,sha256=p75sovF0SmRP6zxzpIaaOmqlxvXB_xEz3XPNf59EF7w,1339
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
-fal/toolkit/file/file.py,sha256=_OCtg0Po3wlDT41dMThJJ1Z9XLtnajyjYaupO9DhfeQ,6137
-fal/toolkit/file/types.py,sha256=bJCeV5NPcpJYJoglailiRgFsuNAfcextYA8Et5-XUag,1060
-fal/toolkit/file/providers/fal.py,sha256=65-BkK9jhGBwYI_OjhHJsL2DthyKxBBRrqXPI_ZN4-k,4115
+fal/toolkit/file/file.py,sha256=qk_hj7U3cfvuWO-qF_eC_R8lzzVhudfnt1erWEa8eDQ,6578
+fal/toolkit/file/types.py,sha256=GymH0CJesJvsZ6wph7GqTGTuNjzvyMgLxQmBBxoKzS0,1627
+fal/toolkit/file/providers/fal.py,sha256=ClCWM4GI11hOjEIVv2IJZj2SdzBNO8iS1r1WaXFcF6I,10090
 fal/toolkit/file/providers/gcp.py,sha256=pUVH2qNcnO_VrDQQU8MmfYOQZMGaKQIqE4yGnYdQhAc,2003
 fal/toolkit/file/providers/r2.py,sha256=WxmOHF5WxHt6tKMcFjWj7ZWO8a1EXysO9lfYv_tB3MI,2627
 fal/toolkit/image/__init__.py,sha256=aLcU8HzD7HyOxx-C-Bbx9kYCMHdBhy9tR98FSVJ6gSA,1830
@@ -123,8 +125,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.3.0.dist-info/METADATA,sha256=sP1Mdzh8ciPGfXFrY_GzmRm8IH0Ew6gv9IUjBsHWCe4,3766
-fal-1.3.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-fal-1.3.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.3.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.3.0.dist-info/RECORD,,
+fal-1.3.2.dist-info/METADATA,sha256=i6GfuQ5bUpOFzv9yBJDJ2UI14NFYrBwt96HtyXq-g5Q,3787
+fal-1.3.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+fal-1.3.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.3.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.3.2.dist-info/RECORD,,

{fal-1.3.0.dist-info → fal-1.3.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.1.0)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any