fal 1.5.1__py3-none-any.whl → 1.5.2__py3-none-any.whl

fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.1'
-__version_tuple__ = version_tuple = (1, 5, 1)
+__version__ = version = '1.5.2'
+__version_tuple__ = version_tuple = (1, 5, 2)

fal/app.py

@@ -402,7 +402,10 @@ def _fal_websocket_template(
                 batch.append(next_input)
 
             t0 = loop.time()
-            output = await loop.run_in_executor(None, func, self, *batch)  # type: ignore
+            if inspect.iscoroutinefunction(func):
+                output = await func(self, *batch)
+            else:
+                output = await loop.run_in_executor(None, func, self, *batch)  # type: ignore
             total_time = loop.time() - t0
             if not isinstance(output, dict):
                 # Handle pydantic output modal

fal/toolkit/file/file.py

@@ -8,6 +8,7 @@ from urllib.parse import urlparse
 from zipfile import ZipFile
 
 import pydantic
+from fastapi import Request
 
 # https://github.com/pydantic/pydantic/pull/2573
 if not hasattr(pydantic, "__version__") or pydantic.__version__.startswith("1."):
@@ -24,6 +25,7 @@ from fal.toolkit.file.providers.fal import (
     FalCDNFileRepository,
     FalFileRepository,
     FalFileRepositoryV2,
+    FalFileRepositoryV3,
     InMemoryRepository,
 )
 from fal.toolkit.file.providers.gcp import GoogleStorageRepository
@@ -36,6 +38,7 @@ FileRepositoryFactory = Callable[[], FileRepository]
 BUILT_IN_REPOSITORIES: dict[RepositoryId, FileRepositoryFactory] = {
     "fal": lambda: FalFileRepository(),
     "fal_v2": lambda: FalFileRepositoryV2(),
+    "fal_v3": lambda: FalFileRepositoryV3(),
     "in_memory": lambda: InMemoryRepository(),
     "gcp_storage": lambda: GoogleStorageRepository(),
     "r2": lambda: R2Repository(),
@@ -53,6 +56,7 @@ get_builtin_repository.__module__ = "__main__"
 
 DEFAULT_REPOSITORY: FileRepository | RepositoryId = "fal_v2"
 FALLBACK_REPOSITORY: FileRepository | RepositoryId = "cdn"
+OBJECT_LIFECYCLE_PREFERENCE_KEY = "x-fal-object-lifecycle-preference"
 
 
 class File(BaseModel):
@@ -130,6 +134,7 @@ class File(BaseModel):
         fallback_repository: Optional[
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
+        request: Optional[Request] = None,
     ) -> File:
         repo = (
             repository
@@ -139,8 +144,10 @@ class File(BaseModel):
 
         fdata = FileData(data, content_type, file_name)
 
+        object_lifecycle_preference = _get_lifecycle_preference(request)
+
         try:
-            url = repo.save(fdata)
+            url = repo.save(fdata, object_lifecycle_preference)
         except Exception:
             if not fallback_repository:
                 raise
@@ -151,7 +158,7 @@ class File(BaseModel):
                 else get_builtin_repository(fallback_repository)
             )
 
-            url = fallback_repo.save(fdata)
+            url = fallback_repo.save(fdata, object_lifecycle_preference)
 
         return cls(
             url=url,
@@ -171,6 +178,7 @@ class File(BaseModel):
         fallback_repository: Optional[
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
+        request: Optional[Request] = None,
     ) -> File:
         file_path = Path(path)
         if not file_path.exists():
@@ -183,12 +191,14 @@ class File(BaseModel):
         )
 
         content_type = content_type or "application/octet-stream"
+        object_lifecycle_preference = _get_lifecycle_preference(request)
 
         try:
             url, data = repo.save_file(
                 file_path,
                 content_type=content_type,
                 multipart=multipart,
+                object_lifecycle_preference=object_lifecycle_preference,
             )
         except Exception:
             if not fallback_repository:
@@ -204,6 +214,7 @@ class File(BaseModel):
                 file_path,
                 content_type=content_type,
                 multipart=multipart,
+                object_lifecycle_preference=object_lifecycle_preference,
             )
 
         return cls(
@@ -261,3 +272,23 @@ class CompressedFile(File):
     def __del__(self):
         if self.extract_dir:
             shutil.rmtree(self.extract_dir)
+
+
+def _get_lifecycle_preference(request: Request) -> dict[str, str] | None:
+    import json
+
+    preference_str = (
+        request.headers.get(OBJECT_LIFECYCLE_PREFERENCE_KEY)
+        if request is not None
+        else None
+    )
+    if preference_str is None:
+        return None
+
+    object_lifecycle_preference = {}
+    try:
+        object_lifecycle_preference = json.loads(preference_str)
+        return object_lifecycle_preference
+    except Exception as e:
+        print(f"Failed to parse object lifecycle preference: {e}")
+        return None

fal/toolkit/file/providers/fal.py

@@ -19,6 +19,7 @@ from fal.toolkit.file.types import FileData, FileRepository
 from fal.toolkit.utils.retry import retry
 
 _FAL_CDN = "https://fal.media"
+_FAL_CDN_V3 = "https://v3.fal.media"
 
 
 @dataclass
@@ -91,11 +92,11 @@ fal_v2_token_manager = FalV2TokenManager()
 
 @dataclass
 class ObjectLifecyclePreference:
-    expriation_duration_seconds: int
+    expiration_duration_seconds: int
 
 
 GLOBAL_LIFECYCLE_PREFERENCE = ObjectLifecyclePreference(
-    expriation_duration_seconds=86400
+    expiration_duration_seconds=86400
 )
 
 
@@ -158,7 +159,9 @@ class FalFileRepositoryBase(FileRepository):
 
 @dataclass
 class FalFileRepository(FalFileRepositoryBase):
-    def save(self, file: FileData) -> str:
+    def save(
+        self, file: FileData, object_lifecycle_preference: dict[str, str] | None = None
+    ) -> str:
         return self._save(file, "gcs")
 
 
@@ -275,7 +278,9 @@ class MultipartUpload:
 @dataclass
 class FalFileRepositoryV2(FalFileRepositoryBase):
     @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
-    def save(self, file: FileData) -> str:
+    def save(
+        self, file: FileData, object_lifecycle_preference: dict[str, str] | None = None
+    ) -> str:
         token = fal_v2_token_manager.get_token()
         headers = {
             "Authorization": f"{token.token_type} {token.token}",
@@ -327,6 +332,7 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
         multipart_threshold: int | None = None,
         multipart_chunk_size: int | None = None,
         multipart_max_concurrency: int | None = None,
+        object_lifecycle_preference: dict[str, str] | None = None,
     ) -> tuple[str, FileData | None]:
         if multipart is None:
             threshold = multipart_threshold or MultipartUpload.MULTIPART_THRESHOLD
@@ -347,7 +353,7 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
                     content_type=content_type,
                     file_name=os.path.basename(file_path),
                 )
-            url = self.save(data)
+            url = self.save(data, object_lifecycle_preference)
 
         return url, data
 
@@ -357,6 +363,7 @@ class InMemoryRepository(FileRepository):
     def save(
         self,
         file: FileData,
+        object_lifecycle_preference: dict[str, str] | None = None,
     ) -> str:
         return f'data:{file.content_type};base64,{b64encode(file.data).decode("utf-8")}'
 
@@ -367,6 +374,7 @@ class FalCDNFileRepository(FileRepository):
     def save(
         self,
         file: FileData,
+        object_lifecycle_preference: dict[str, str] | None = None,
     ) -> str:
         headers = {
             **self.auth_headers,
@@ -401,3 +409,50 @@ class FalCDNFileRepository(FileRepository):
             "Authorization": f"Bearer {key_id}:{key_secret}",
             "User-Agent": "fal/0.1.0",
         }
+
+
+@dataclass
+class FalFileRepositoryV3(FileRepository):
+    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
+    def save(
+        self, file: FileData, user_lifecycle_preference: dict[str, str] | None
+    ) -> str:
+        object_lifecycle_preference = dataclasses.asdict(GLOBAL_LIFECYCLE_PREFERENCE)
+
+        if user_lifecycle_preference is not None:
+            object_lifecycle_preference = {
+                key: user_lifecycle_preference[key]
+                if key in user_lifecycle_preference
+                else value
+                for key, value in object_lifecycle_preference.items()
+            }
+
+        headers = {
+            **self.auth_headers,
+            "Accept": "application/json",
+            "Content-Type": file.content_type,
+            "X-Fal-File-Name": file.file_name,
+            "X-Fal-Object-Lifecycle-Preference": json.dumps(
+                object_lifecycle_preference
+            ),
+        }
+        url = os.getenv("FAL_CDN_V3_HOST", _FAL_CDN_V3) + "/files/upload"
+        request = Request(url, headers=headers, method="POST", data=file.data)
+        try:
+            with urlopen(request) as response:
+                result = json.load(response)
+        except HTTPError as e:
+            raise FileUploadException(
+                f"Error initiating upload. Status {e.status}: {e.reason}"
+            )
+
+        access_url = result["access_url"]
+        return access_url
+
+    @property
+    def auth_headers(self) -> dict[str, str]:
+        token = fal_v2_token_manager.get_token()
+        return {
+            "Authorization": f"{token.token_type} {token.token}",
+            "User-Agent": "fal/0.1.0",
+        }

fal/toolkit/file/types.py

@@ -3,7 +3,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 typing import Literal, Optional
 from uuid import uuid4
 
 
@@ -29,12 +29,18 @@ class FileData:
             self.file_name = file_name
 
 
-RepositoryId = Literal["fal", "fal_v2", "in_memory", "gcp_storage", "r2", "cdn"]
+RepositoryId = Literal[
+    "fal", "fal_v2", "fal_v3", "in_memory", "gcp_storage", "r2", "cdn"
+]
 
 
 @dataclass
 class FileRepository:
-    def save(self, data: FileData) -> str:
+    def save(
+        self,
+        data: FileData,
+        object_lifecycle_preference: Optional[dict[str, str]] = None,
+    ) -> str:
         raise NotImplementedError()
 
     def save_file(
@@ -45,6 +51,7 @@ class FileRepository:
         multipart_threshold: int | None = None,
         multipart_chunk_size: int | None = None,
         multipart_max_concurrency: int | None = None,
+        object_lifecycle_preference: Optional[dict[str, str]] = None,
     ) -> tuple[str, FileData | None]:
         if multipart:
             raise NotImplementedError()
@@ -52,4 +59,4 @@ class FileRepository:
         with open(file_path, "rb") as fobj:
             data = FileData(fobj.read(), content_type, Path(file_path).name)
 
-        return self.save(data), data
+        return self.save(data, object_lifecycle_preference), data

fal/toolkit/image/image.py

@@ -4,6 +4,7 @@ import io
 from tempfile import NamedTemporaryFile
 from typing import TYPE_CHECKING, Literal, Optional, Union
 
+from fastapi import Request
 from pydantic import BaseModel, Field
 
 from fal.toolkit.file.file import DEFAULT_REPOSITORY, FALLBACK_REPOSITORY, File
@@ -82,6 +83,7 @@ class Image(File):
         fallback_repository: Optional[
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
+        request: Optional[Request] = None,
     ) -> Image:
         obj = super().from_bytes(
             data,
@@ -89,6 +91,7 @@ class Image(File):
             file_name=file_name,
             repository=repository,
             fallback_repository=fallback_repository,
+            request=request,
         )
         obj.width = size.width if size else None
         obj.height = size.height if size else None
@@ -104,6 +107,7 @@ class Image(File):
         fallback_repository: Optional[
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
+        request: Optional[Request] = None,
     ) -> Image:
         size = ImageSize(width=pil_image.width, height=pil_image.height)
         if format is None:
@@ -133,6 +137,7 @@ class Image(File):
             file_name,
             repository,
             fallback_repository=fallback_repository,
+            request=request,
         )
 
     def to_pil(self, mode: str = "RGB") -> PILImage.Image:

{fal-1.5.1.dist-info → fal-1.5.2.dist-info}/METADATA

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

{fal-1.5.1.dist-info → fal-1.5.2.dist-info}/RECORD

@@ -1,10 +1,10 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=W6YuN1JOd6M-rSt9HDXK91AutRDYXTjJT_LQg3rCsjk,411
+fal/_fal_version.py,sha256=P-JlE1bO3FGbbntvKHqxjgKk7ORvjFhybkK-h8R2s5g,411
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
 fal/api.py,sha256=wmXywHvkdKe0AlsPmXt8_nidPhoC_Ho4BrUi7In4Hek,43278
-fal/app.py,sha256=kzjHA325RDwUl-_9lTaL77L-DD1Lh-KEZFuJLPkOC9U,17899
+fal/app.py,sha256=u25k-MLKU_7eux4PuN24iq1zZf5hSeUeYkO7kUIA6uI,18021
 fal/apps.py,sha256=lge7-HITzI20l1oXdlkAzqxdMVtXRfnACIylKRWgCNQ,7151
 fal/container.py,sha256=V7riyyq8AZGwEX9QaqRQDZyDN_bUKeRKV1OOZArXjL0,622
 fal/files.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
@@ -47,13 +47,13 @@ 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=jGdaIHMoYRCwsui3q3J6RTnngBG1-53UeJa0k_bBO2M,7756
-fal/toolkit/file/types.py,sha256=GymH0CJesJvsZ6wph7GqTGTuNjzvyMgLxQmBBxoKzS0,1627
-fal/toolkit/file/providers/fal.py,sha256=f07ps_P8qyYCeLA9fDnG46c7uIfDZOgbL7MD5LxTUQs,12677
+fal/toolkit/file/file.py,sha256=GuY4zTqYMod2e9pLorZdPJqmGQ2CmmxaYxmtBm4J7vQ,8913
+fal/toolkit/file/types.py,sha256=MjZ6xAhKPv4rowLo2Vcbho0sX7AQ3lm3KFyYDcw0dL4,1845
+fal/toolkit/file/providers/fal.py,sha256=W3XKbAsRuCKPDHwVK1IBen_Tdp23Pi8qhgfiVbsPc4s,14777
 fal/toolkit/file/providers/gcp.py,sha256=cxG1j3yuOpFl_Dl_nCEibFE4677qkdXZhuKgb65PnjQ,2126
 fal/toolkit/file/providers/r2.py,sha256=Y3DjhpmrbESUTDUtVcKtg0NMKamMTevf6cJA7OgvalI,2750
 fal/toolkit/image/__init__.py,sha256=aLcU8HzD7HyOxx-C-Bbx9kYCMHdBhy9tR98FSVJ6gSA,1830
-fal/toolkit/image/image.py,sha256=ZTNiHDSNxJuDd8_I6guZpFLgeMbkSGUchRszVl2k2SM,4861
+fal/toolkit/image/image.py,sha256=ZSkozciP4XxaGnvrR_mP4utqE3_QhoPN0dau9FJ2Xco,5033
 fal/toolkit/image/safety_checker.py,sha256=S7ow-HuoVxC6ixHWWcBrAUm2dIlgq3sTAIull6xIbAg,3105
 fal/toolkit/image/nsfw_filter/__init__.py,sha256=0d9D51EhcnJg8cZLYJjgvQJDZT74CfQu6mpvinRYRpA,216
 fal/toolkit/image/nsfw_filter/env.py,sha256=iAP2Q3vzIl--DD8nr8o3o0goAwhExN2v0feYE0nIQjs,212
@@ -126,8 +126,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.5.1.dist-info/METADATA,sha256=sQTFRl_qxwkO_g6moEVwRL4LRCSyrvkpuD_AHbUhwFI,3787
-fal-1.5.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-fal-1.5.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.5.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.5.1.dist-info/RECORD,,
+fal-1.5.2.dist-info/METADATA,sha256=hOKSZaGlMc6uIwV8Te50B9vaqRBxE2YjCeALzTpveRo,3787
+fal-1.5.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+fal-1.5.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.5.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.5.2.dist-info/RECORD,,