fal 0.13.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()
@@ -39,7 +37,7 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
     try:
         app = cls(_allow_init=True)
         metadata["openapi"] = app.openapi()
-    except Exception as exc:
+    except Exception:
         logger.warning("Failed to build OpenAPI specification for %s", cls.__name__)
         realtime_app = False
     else:
@@ -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":
@@ -64,7 +62,7 @@ def _fetch_access_token() -> str:
             try:
                 auth0.verify_access_token_expiration(access_token)
                 return access_token
-            except:
+            except Exception:
                 # access_token expired, will refresh
                 pass
 

fal/cli.py

@@ -113,7 +113,6 @@ class MainGroup(RichGroup):
 
         if aliases:
             # Add aliases to the help text
-            aliases_str = "Alias: " + ", ".join([name, *aliases])
             cmd.help = (cmd.help or "") + "\n\nAlias: " + ", ".join([name, *aliases])
             cmd.short_help = (
                 (cmd.short_help or "") + "(Alias: " + ", ".join(aliases) + ")"
@@ -268,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):
@@ -603,7 +602,7 @@ def _get_user_id() -> str:
     if user_details_response.status_code != HTTPStatus.OK:
         try:
             content = json.loads(user_details_response.content.decode("utf8"))
-        except:
+        except Exception:
             raise api.FalServerlessError(
                 f"Error fetching user details: {user_details_response}"
             )

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/logging/isolate.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import sys
 from datetime import datetime, timezone
 
-from isolate.logs import Log, LogLevel
+from isolate.logs import Log, LogLevel, LogSource
 from structlog.dev import ConsoleRenderer
 from structlog.typing import EventDict
 
@@ -21,6 +22,12 @@ class IsolateLogPrinter:
     def print(self, log: Log):
         if log.level < LogLevel.INFO and not self.debug:
             return
+
+        if log.source == LogSource.USER:
+            stream = sys.stderr if log.level == LogLevel.STDERR else sys.stdout
+            print(log.message, file=stream)
+            return
+
         level = str(log.level)
 
         if hasattr(log, "timestamp"):
@@ -44,21 +51,3 @@ class IsolateLogPrinter:
         # Use structlog processors to get consistent output with local logs
         message = _renderer.__call__(logger={}, name=level, event_dict=event)
         print(message)
-
-    def print_dict(self, log: dict):
-        level = LogLevel[log["level"]]
-        if level < LogLevel.INFO and not self.debug:
-            return
-        if "timestamp" in log.keys():
-            timestamp = log["timestamp"]
-        else:
-            timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S.%f")
-
-        event: EventDict = {
-            "event": log["message"],
-            "level": log["level"],
-            "timestamp": timestamp[:-3],
-        }
-
-        message = _renderer.__call__(logger={}, name=log["level"], event_dict=event)
-        print(message)

fal/logging/user.py

@@ -12,7 +12,7 @@ def add_user_id(
     user_id: str | None = None
     try:
         user_id = USER.info.get("sub")
-    except:
+    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

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
+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,14 @@ 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()
 
 
 class ServerCredentials:

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/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-from .file import *
+from .file import *  # noqa: F403

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,59 +51,47 @@ 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):
         if isinstance(value, str):
             parsed_url = urlparse(value)
             if parsed_url.scheme not in ["http", "https", "data"]:
-                raise ValueError(f"value must be a valid URL")
+                raise ValueError("value must be a valid URL")
             return cls._from_url(parsed_url.geturl())
 
         return value
@@ -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-cdn.batuhan-941.workers.dev"
+_FAL_CDN = "https://fal.media"
 
 
-@mainify
 @dataclass
 class FalFileRepository(FileRepository):
     def save(self, file: FileData) -> str:
@@ -27,7 +25,7 @@ class FalFileRepository(FileRepository):
         headers = {
             "Authorization": f"Key {key_id}:{key_secret}",
             "Accept": "application/json",
-            "Content-Type": f"application/json",
+            "Content-Type": "application/json",
         }
 
         grpc_host = os.environ.get("FAL_HOST", "api.alpha.fal.ai")
@@ -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/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-from .image import *
+from .image import *  # noqa: F403