fal 0.14.0__py3-none-any.whl → 0.15.0__py3-none-any.whl

fal/app.py

@@ -10,11 +10,9 @@ from typing import Any, Callable, ClassVar, TypeVar
 from fastapi import FastAPI
 
 import fal.api
-from fal._serialization import add_serialization_listeners_for
 from fal.api import RouteSignature
 from fal.logging import get_logger
-from fal.toolkit import mainify
-
+from fal._serialization import include_modules_from
 REALTIME_APP_REQUIREMENTS = ["websockets", "msgpack"]
 
 EndpointT = TypeVar("EndpointT", bound=Callable[..., Any])
@@ -29,7 +27,7 @@ async def _call_any_fn(fn, *args, **kwargs):
 
 
 def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
-    add_serialization_listeners_for(cls)
+    include_modules_from(cls)
 
     def initialize_and_serve():
         app = cls()
@@ -64,7 +62,6 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
     return fn
 
 
-@mainify
 class App(fal.api.BaseServable):
     requirements: ClassVar[list[str]] = []
     machine_type: ClassVar[str] = "S"
@@ -131,7 +128,6 @@ class App(fal.api.BaseServable):
         raise NotImplementedError
 
 
-@mainify
 def endpoint(
     path: str, *, is_websocket: bool = False
 ) -> Callable[[EndpointT], EndpointT]:
@@ -343,7 +339,6 @@ def _fal_websocket_template(
 _SENTINEL = object()
 
 
-@mainify
 def realtime(
     path: str,
     *,

fal/auth/__init__.py

@@ -9,10 +9,8 @@ from fal.auth import auth0, local
 from fal.console import console
 from fal.console.icons import CHECK_ICON
 from fal.exceptions.auth import UnauthenticatedException
-from fal.toolkit.mainify import mainify
 
 
-@mainify
 def key_credentials() -> tuple[str, str] | None:
     # Ignore key credentials when the user forces auth by user.
     if os.environ.get("FAL_FORCE_AUTH_BY_USER") == "1":

fal/cli.py

@@ -267,8 +267,8 @@ def load_function_from(
         raise api.FalServerlessError(f"Function '{function_name}' not found in module")
 
     # The module for the function is set to <run_path> when runpy is used, in which
-    # case we want to manually include the packages it is defined in.
-    _serialization.include_packages_from_path(file_path)
+    # case we want to manually include the package it is defined in.
+    _serialization.include_package_from_path(file_path)
 
     target = module[function_name]
     if isinstance(target, type) and issubclass(target, fal.App):

fal/exceptions/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from ._base import FalServerlessException  # noqa: F401
 from .handlers import (
     BaseExceptionHandler,
-    FalServerlessExceptionHandler,
     GrpcExceptionHandler,
     UserFunctionExceptionHandler,
 )
@@ -20,7 +20,6 @@ class ApplicationExceptionHandler:
 
     _handlers: list[BaseExceptionHandler] = [
         GrpcExceptionHandler(),
-        FalServerlessExceptionHandler(),
         UserFunctionExceptionHandler(),
     ]
 

fal/exceptions/_base.py

@@ -3,15 +3,4 @@ from __future__ import annotations
 
 class FalServerlessException(Exception):
     """Base exception type for fal Serverless related flows and APIs."""
-
-    message: str
-
-    hint: str | None
-
-    def __init__(self, message: str, hint: str | None = None) -> None:
-        self.message = message
-        self.hint = hint
-        super().__init__(message)
-
-    def __str__(self) -> str:
-        return self.message + (f"\nHint: {self.hint}" if self.hint else "")
+    pass

fal/exceptions/auth.py

@@ -4,10 +4,8 @@ from ._base import FalServerlessException
 
 
 class UnauthenticatedException(FalServerlessException):
-    """Exception that indicates that"""
-
     def __init__(self) -> None:
         super().__init__(
-            message="You must be authenticated.",
-            hint="Login via `fal auth login` or make sure to setup fal keys correctly.",
+            "You must be authenticated. "
+            "Login via `fal auth login` or make sure to setup fal keys correctly."
         )

fal/exceptions/handlers.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import TYPE_CHECKING, Generic, TypeVar
 
 from grpc import Call as RpcCall
-from rich.markdown import Markdown
 
 from fal.console import console
 from fal.console.icons import CROSS_ICON
@@ -11,9 +10,8 @@ from fal.console.icons import CROSS_ICON
 if TYPE_CHECKING:
     from fal.api import UserFunctionException
 
-from ._base import FalServerlessException
 
-ExceptionType = TypeVar("ExceptionType")
+ExceptionType = TypeVar("ExceptionType", bound=BaseException)
 
 
 class BaseExceptionHandler(Generic[ExceptionType]):
@@ -23,20 +21,11 @@ class BaseExceptionHandler(Generic[ExceptionType]):
         return True
 
     def handle(self, exception: ExceptionType):
-        console.print(str(exception))
-
-
-class FalServerlessExceptionHandler(BaseExceptionHandler[FalServerlessException]):
-    """Handle fal Serverless exceptions"""
-
-    def should_handle(self, exception: Exception) -> bool:
-        return isinstance(exception, FalServerlessException)
-
-    def handle(self, exception: FalServerlessException):
-        console.print(f"{CROSS_ICON} {exception.message}")
-        if exception.hint is not None:
-            console.print(Markdown(f"**Hint:** {exception.hint}"))
-            console.print()
+        msg = f"{CROSS_ICON} {str(exception)}"
+        cause = exception.__cause__
+        if cause is not None:
+            msg += f": {str(cause)}"
+        console.print(msg)
 
 
 class GrpcExceptionHandler(BaseExceptionHandler[RpcCall]):
@@ -51,9 +40,9 @@ class GrpcExceptionHandler(BaseExceptionHandler[RpcCall]):
 
 class UserFunctionExceptionHandler(BaseExceptionHandler["UserFunctionException"]):
     def should_handle(self, exception: Exception) -> bool:
-        from fal.api import UserFunctionException, match_class
+        from fal.api import UserFunctionException
 
-        return match_class(exception, UserFunctionException)
+        return isinstance(exception, UserFunctionException)
 
     def handle(self, exception: UserFunctionException):
         import rich

fal/sdk.py

@@ -14,7 +14,7 @@ from isolate.server.interface import from_grpc, to_serialized_object, to_struct
 
 import isolate_proto
 from fal import flags
-from fal._serialization import patch_dill, patch_pickle
+from fal._serialization import patch_pickle
 from fal.auth import USER, key_credentials
 from fal.logging import get_logger
 from fal.logging.trace import TraceContextInterceptor
@@ -24,14 +24,13 @@ ResultT = TypeVar("ResultT")
 InputT = TypeVar("InputT")
 UNSET = object()
 
-_DEFAULT_SERIALIZATION_METHOD = "dill"
+_DEFAULT_SERIALIZATION_METHOD = "cloudpickle"
 FAL_SERVERLESS_DEFAULT_KEEP_ALIVE = 10
 FAL_SERVERLESS_DEFAULT_MAX_MULTIPLEXING = 1
 FAL_SERVERLESS_DEFAULT_MIN_CONCURRENCY = 0
 
 logger = get_logger(__name__)
 
-patch_dill()
 patch_pickle()
 
 

fal/toolkit/__init__.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 from fal.toolkit.file import CompressedFile, File
 from fal.toolkit.image.image import Image, ImageSizeInput, get_image_size
-from fal.toolkit.mainify import mainify
 from fal.toolkit.optimize import optimize
 from fal.toolkit.utils import (
     FAL_MODEL_WEIGHTS_DIR,
@@ -19,7 +18,6 @@ __all__ = [
     "Image",
     "ImageSizeInput",
     "get_image_size",
-    "mainify",
     "optimize",
     "FAL_MODEL_WEIGHTS_DIR",
     "FAL_PERSISTENT_DIR",

fal/toolkit/exceptions.py

@@ -1,14 +1,9 @@
-from fal.toolkit.mainify import mainify
-
-
-@mainify
 class FalTookitException(Exception):
     """Base exception for all toolkit exceptions"""
 
     pass
 
 
-@mainify
 class FileUploadException(FalTookitException):
     """Raised when file upload fails"""
 

fal/toolkit/file/file.py

@@ -1,13 +1,23 @@
 from __future__ import annotations
 
+import shutil
 from pathlib import Path
-from tempfile import NamedTemporaryFile, TemporaryDirectory
-from typing import Any, Callable
+from tempfile import NamedTemporaryFile, mkdtemp
+from typing import Callable, Optional, Any
 from urllib.parse import urlparse
 from zipfile import ZipFile
 
-from pydantic import BaseModel, Field, PrivateAttr
-from pydantic.typing import Optional
+import pydantic
+
+# https://github.com/pydantic/pydantic/pull/2573
+if not hasattr(pydantic, "__version__") or pydantic.__version__.startswith("1."):
+    IS_PYDANTIC_V2 = False
+else:
+    from pydantic_core import core_schema, CoreSchema
+    from pydantic import GetCoreSchemaHandler
+    IS_PYDANTIC_V2 = True
+
+from pydantic import BaseModel, Field
 
 from fal.toolkit.file.providers.fal import (
     FalCDNFileRepository,
@@ -17,7 +27,6 @@ from fal.toolkit.file.providers.fal import (
 from fal.toolkit.file.providers.gcp import GoogleStorageRepository
 from fal.toolkit.file.providers.r2 import R2Repository
 from fal.toolkit.file.types import FileData, FileRepository, RepositoryId
-from fal.toolkit.mainify import mainify
 from fal.toolkit.utils.download_utils import download_file
 
 FileRepositoryFactory = Callable[[], FileRepository]
@@ -42,52 +51,40 @@ get_builtin_repository.__module__ = "__main__"
 DEFAULT_REPOSITORY: FileRepository | RepositoryId = "fal"
 
 
-@mainify
 class File(BaseModel):
     # public properties
-    _file_data: FileData = PrivateAttr()
     url: str = Field(
         description="The URL where the file can be downloaded from.",
     )
     content_type: Optional[str] = Field(
-        description="The mime type of the file.",
+        None, description="The mime type of the file.",
         examples=["image/png"],
     )
     file_name: Optional[str] = Field(
-        description="The name of the file. It will be auto-generated if not provided.",
+        None, description="The name of the file. It will be auto-generated if not provided.",
         examples=["z9RV14K95DvU.png"],
     )
     file_size: Optional[int] = Field(
-        description="The size of the file in bytes.", examples=[4404019]
+        None, description="The size of the file in bytes.", examples=[4404019]
+    )
+    file_data: Optional[bytes] = Field(
+        None, description="File data", exclude=True, repr=False,
     )
-
-    def __init__(self, **kwargs):
-        if "file_data" in kwargs:
-            data: FileData = kwargs.pop("file_data")
-            repository = kwargs.pop("repository", None)
-
-            repo = (
-                repository
-                if isinstance(repository, FileRepository)
-                else get_builtin_repository(repository)
-            )
-            self._file_data = data
-
-            kwargs.update(
-                {
-                    "url": repo.save(data),
-                    "content_type": data.content_type,
-                    "file_name": data.file_name,
-                    "file_size": len(data.data),
-                }
-            )
-
-        super().__init__(**kwargs)
 
     # Pydantic custom validator for input type conversion
-    @classmethod
-    def __get_validators__(cls):
-        yield cls.__convert_from_str
+    if IS_PYDANTIC_V2:
+        @classmethod
+        def __get_pydantic_core_schema__(
+            cls, source_type: Any, handler: GetCoreSchemaHandler
+        ) -> CoreSchema:
+            return core_schema.no_info_before_validator_function(
+                cls.__convert_from_str,
+                handler(source_type),
+            )
+    else:
+        @classmethod
+        def __get_validators__(cls):
+            yield cls.__convert_from_str  
 
     @classmethod
     def __convert_from_str(cls, value: Any):
@@ -119,9 +116,20 @@ class File(BaseModel):
         file_name: Optional[str] = None,
         repository: FileRepository | RepositoryId = DEFAULT_REPOSITORY,
     ) -> File:
+        repo = (
+            repository
+            if isinstance(repository, FileRepository)
+            else get_builtin_repository(repository)
+        )
+
+        fdata = FileData(data, content_type, file_name)
+
         return cls(
-            file_data=FileData(data, content_type, file_name),
-            repository=repository,
+            url=repo.save(fdata),
+            content_type=fdata.content_type,
+            file_name=fdata.file_name,
+            file_size=len(data),
+            file_data=data,
         )
 
     @classmethod
@@ -141,10 +149,10 @@ class File(BaseModel):
         )
 
     def as_bytes(self) -> bytes:
-        if getattr(self, "_file_data", None) is None:
+        if self.file_data is None:
             raise ValueError("File has not been downloaded")
 
-        return self._file_data.data
+        return self.file_data
 
     def save(self, path: str | Path, overwrite: bool = False) -> Path:
         file_path = Path(path).resolve()
@@ -158,37 +166,32 @@ class File(BaseModel):
         return file_path
 
 
-@mainify
 class CompressedFile(File):
-    _extract_dir: Optional[TemporaryDirectory] = PrivateAttr(default=None)
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self._extract_dir = None
+    extract_dir: Optional[str] = Field(default=None, exclude=True, repr=False)
 
     def __iter__(self):
-        if not self._extract_dir:
+        if not self.extract_dir:
             self._extract_files()
 
-        files = Path(self._extract_dir.name).iterdir()  # type: ignore
+        files = Path(self.extract_dir).iterdir()  # type: ignore
         return iter(files)
 
     def _extract_files(self):
-        self._extract_dir = TemporaryDirectory()
+        self.extract_dir = mkdtemp()
 
         with NamedTemporaryFile() as temp_file:
             file_path = temp_file.name
             self.save(file_path, overwrite=True)
 
             with ZipFile(file_path) as zip_file:
-                zip_file.extractall(self._extract_dir.name)
+                zip_file.extractall(self.extract_dir)
 
     def glob(self, pattern: str):
-        if not self._extract_dir:
+        if not self.extract_dir:
             self._extract_files()
 
-        return Path(self._extract_dir.name).glob(pattern)  # type: ignore
+        return Path(self.extract_dir).glob(pattern)  # type: ignore
 
     def __del__(self):
-        if self._extract_dir:
-            self._extract_dir.cleanup()
+        if self.extract_dir:
+            shutil.rmtree(self.extract_dir)

fal/toolkit/file/providers/fal.py

@@ -10,12 +10,10 @@ from urllib.request import Request, urlopen
 from fal.auth import key_credentials
 from fal.toolkit.exceptions import FileUploadException
 from fal.toolkit.file.types import FileData, FileRepository
-from fal.toolkit.mainify import mainify
 
 _FAL_CDN = "https://fal.media"
 
 
-@mainify
 @dataclass
 class FalFileRepository(FileRepository):
     def save(self, file: FileData) -> str:
@@ -70,14 +68,12 @@ class FalFileRepository(FileRepository):
             return
 
 
-@mainify
 @dataclass
 class InMemoryRepository(FileRepository):
     def save(self, file: FileData) -> str:
         return f'data:{file.content_type};base64,{b64encode(file.data).decode("utf-8")}'
 
 
-@mainify
 @dataclass
 class FalCDNFileRepository(FileRepository):
     def save(self, file: FileData) -> str:

fal/toolkit/file/providers/gcp.py

@@ -6,12 +6,10 @@ import os
 from dataclasses import dataclass
 
 from fal.toolkit.file.types import FileData, FileRepository
-from fal.toolkit.mainify import mainify
 
 DEFAULT_URL_TIMEOUT = 60 * 15  # 15 minutes
 
 
-@mainify
 @dataclass
 class GoogleStorageRepository(FileRepository):
     bucket_name: str = "fal_file_storage"

fal/toolkit/file/providers/r2.py

@@ -6,12 +6,10 @@ from dataclasses import dataclass
 from io import BytesIO
 
 from fal.toolkit.file.types import FileData, FileRepository
-from fal.toolkit.mainify import mainify
 
 DEFAULT_URL_TIMEOUT = 60 * 15  # 15 minutes
 
 
-@mainify
 @dataclass
 class R2Repository(FileRepository):
     bucket_name: str = "fal_file_storage"

fal/toolkit/file/types.py

@@ -5,10 +5,7 @@ from mimetypes import guess_extension, guess_type
 from typing import Literal
 from uuid import uuid4
 
-from fal.toolkit.mainify import mainify
 
-
-@mainify
 class FileData:
     data: bytes
     content_type: str
@@ -34,7 +31,6 @@ class FileData:
 RepositoryId = Literal["fal", "in_memory", "gcp_storage", "r2", "cdn"]
 
 
-@mainify
 @dataclass
 class FileRepository:
     def save(self, data: FileData) -> str:

fal/toolkit/image/image.py

@@ -7,8 +7,7 @@ from typing import TYPE_CHECKING, Literal, Union, Optional
 from pydantic import BaseModel, Field
 
 from fal.toolkit.file.file import DEFAULT_REPOSITORY, File
-from fal.toolkit.file.types import FileData, FileRepository, RepositoryId
-from fal.toolkit.mainify import mainify
+from fal.toolkit.file.types import FileRepository, RepositoryId
 from fal.toolkit.utils.download_utils import _download_file_python
 
 if TYPE_CHECKING:
@@ -25,7 +24,6 @@ ImageSizePreset = Literal[
 ]
 
 
-@mainify
 class ImageSize(BaseModel):
     width: int = Field(
         default=512, description="The width of the generated image.", gt=0, le=14142
@@ -46,7 +44,6 @@ IMAGE_SIZE_PRESETS: dict[ImageSizePreset, ImageSize] = {
 
 ImageSizeInput = Union[ImageSize, ImageSizePreset]
 
-@mainify
 def get_image_size(source: ImageSizeInput) -> ImageSize:
     if isinstance(source, ImageSize):
         return source
@@ -59,18 +56,17 @@ def get_image_size(source: ImageSizeInput) -> ImageSize:
 ImageFormat = Literal["png", "jpeg", "jpg", "webp", "gif"]
 
 
-@mainify
 class Image(File):
     """
     Represents an image file.
     """
 
     width: Optional[int] = Field(
-        description="The width of the image in pixels.",
+        None, description="The width of the image in pixels.",
         examples=[1024],
     )
     height: Optional[int] = Field(
-        description="The height of the image in pixels.", examples=[1024]
+        None, description="The height of the image in pixels.", examples=[1024]
     )
 
     @classmethod
@@ -82,15 +78,15 @@ class Image(File):
         file_name: str | None = None,
         repository: FileRepository | RepositoryId = DEFAULT_REPOSITORY,
     ) -> Image:
-        file_data = FileData(
-            data=data, content_type=f"image/{format}", file_name=file_name
-        )
-        return cls(
-            file_data=file_data,
+        obj = super().from_bytes(
+            data,
+            content_type=f"image/{format}",
+            file_name=file_name,
             repository=repository,
-            width=size.width if size else None,
-            height=size.height if size else None,
         )
+        obj.width=size.width if size else None
+        obj.height=size.height if size else None
+        return obj
 
     @classmethod
     def from_pil(

fal/toolkit/optimize.py

@@ -4,13 +4,11 @@ import os
 import traceback
 from typing import TYPE_CHECKING, Any
 
-from fal.toolkit.mainify import mainify
 
 if TYPE_CHECKING:
     import torch
 
 
-@mainify
 def optimize(
     module: torch.nn.Module, *, optimization_config: dict[str, Any] | None = None
 ) -> torch.nn.Module:

fal/toolkit/utils/download_utils.py

@@ -10,8 +10,6 @@ from tempfile import TemporaryDirectory
 from urllib.parse import urlparse
 from urllib.request import Request, urlopen
 
-from fal.toolkit.mainify import mainify
-
 FAL_PERSISTENT_DIR = PurePath("/data")
 FAL_REPOSITORY_DIR = FAL_PERSISTENT_DIR / ".fal" / "repos"
 FAL_MODEL_WEIGHTS_DIR = FAL_PERSISTENT_DIR / ".fal" / "model_weights"
@@ -23,12 +21,10 @@ TEMP_HEADERS = {
 }
 
 
-@mainify
 class DownloadError(Exception):
     pass
 
 
-@mainify
 def _hash_url(url: str) -> str:
     """Hashes a URL using SHA-256.
 
@@ -41,7 +37,6 @@ def _hash_url(url: str) -> str:
     return hashlib.sha256(url.encode("utf-8")).hexdigest()
 
 
-@mainify
 @lru_cache
 def _get_remote_file_properties(url: str) -> tuple[str, int]:
     """Retrieves the file name and content length of a remote file.
@@ -83,7 +78,6 @@ def _get_remote_file_properties(url: str) -> tuple[str, int]:
     return file_name, content_length
 
 
-@mainify
 def _file_content_length_matches(url: str, file_path: Path) -> bool:
     """Check if the local file's content length matches the expected remote
     file's content length.
@@ -109,7 +103,6 @@ def _file_content_length_matches(url: str, file_path: Path) -> bool:
     return local_file_content_length == remote_file_content_length
 
 
-@mainify
 def download_file(
     url: str,
     target_dir: str | Path,
@@ -154,7 +147,7 @@ def download_file(
 
     # If target_dir is not an absolute path, use "/data" as the relative directory
     if not target_dir_path.is_absolute():
-        target_dir_path = FAL_PERSISTENT_DIR / target_dir_path  # type: ignore[assignment]
+        target_dir_path = Path(FAL_PERSISTENT_DIR / target_dir_path)  # type: ignore[assignment]
 
     target_path = target_dir_path.resolve() / file_name
 
@@ -185,7 +178,6 @@ def download_file(
     return target_path
 
 
-@mainify
 def _download_file_python(url: str, target_path: Path | str) -> Path:
     """Download a file from a given URL and save it to a specified path using a
     Python interface.
@@ -224,7 +216,6 @@ def _download_file_python(url: str, target_path: Path | str) -> Path:
     return Path(target_path)
 
 
-@mainify
 def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 64):
     """Download data from a URL and stream it to a file.
 
@@ -273,7 +264,6 @@ def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 6
         raise DownloadError("Received less data than expected from the server.")
 
 
-@mainify
 def download_model_weights(url: str, force: bool = False):
     """Downloads model weights from the specified URL and saves them to a
     predefined directory.
@@ -313,7 +303,6 @@ def download_model_weights(url: str, force: bool = False):
     )
 
 
-@mainify
 def clone_repository(
     https_url: str,
     *,
@@ -408,7 +397,6 @@ def clone_repository(
     return local_repo_path
 
 
-@mainify
 def __add_local_path_to_sys_path(local_path: Path | str):
     local_path_str = str(local_path)
 
@@ -416,7 +404,6 @@ def __add_local_path_to_sys_path(local_path: Path | str):
         sys.path.insert(0, local_path_str)
 
 
-@mainify
 def _get_git_revision_hash(repo_path: Path) -> str:
     import subprocess