fal 1.28.0__py3-none-any.whl → 1.28.2__py3-none-any.whl

fal/_fal_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '1.28.0'
-__version_tuple__ = version_tuple = (1, 28, 0)
+__version__ = version = '1.28.2'
+__version_tuple__ = version_tuple = (1, 28, 2)
+
+__commit_id__ = commit_id = None

fal/api.py

@@ -953,6 +953,11 @@ def function(  # type: ignore
 ):
     if host is None:
         host = FalServerlessHost()
+
+    # NOTE: assuming kind="container" if image is provided
+    if config.get("image"):
+        kind = "container"
+
     options = host.parse_options(kind=kind, **config)
 
     def wrapper(func: Callable[ArgsT, ReturnT]):

fal/app.py

@@ -411,28 +411,31 @@ class App(BaseServable):
                 )
             return response
 
-        @app.middleware("http")
-        async def set_global_object_preference(request, call_next):
-            try:
-                preference_dict = request_lifecycle_preference(request)
-                if preference_dict is not None:
-                    # This will not work properly for apps with multiplexing enabled
-                    # we may mix up the preferences between requests
-                    LIFECYCLE_PREFERENCE.set(preference_dict)
-            except Exception:
-                from fastapi.logger import logger
-
-                logger.exception(
-                    "Failed set a global lifecycle preference %s",
-                    self.__class__.__name__,
-                )
+        multiplexing = self.host_kwargs.get("max_multiplexing") or 1
+        if multiplexing == 1:
+            # just register the middleware if we are not multiplexing
+            @app.middleware("http")
+            async def set_global_object_preference(request, call_next):
+                try:
+                    preference_dict = request_lifecycle_preference(request)
+                    if preference_dict is not None:
+                        # This will not work properly for apps with multiplexing enabled
+                        # we may mix up the preferences between requests
+                        LIFECYCLE_PREFERENCE.set(preference_dict)
+                except Exception:
+                    from fastapi.logger import logger
+
+                    logger.exception(
+                        "Failed set a global lifecycle preference %s",
+                        self.__class__.__name__,
+                    )
 
-            try:
-                return await call_next(request)
-            finally:
-                # We may miss the global preference if there are operations
-                # being done in the background that go beyond the request
-                LIFECYCLE_PREFERENCE.set(None)
+                try:
+                    return await call_next(request)
+                finally:
+                    # We may miss the global preference if there are operations
+                    # being done in the background that go beyond the request
+                    LIFECYCLE_PREFERENCE.set(None)
 
         @app.middleware("http")
         async def set_request_id(request, call_next):

fal/toolkit/file/file.py

@@ -84,15 +84,15 @@ def _try_with_fallback(
     fallback_save_kwargs: dict,
 ) -> Any:
     if fallback_repository is None:
-        fallback_repositories = []
+        fallback_repository = []
     elif isinstance(fallback_repository, list):
-        fallback_repositories = fallback_repository
+        pass
     else:
-        fallback_repositories = [fallback_repository]
+        fallback_repository = [fallback_repository]
 
-    attempts = [
+    attempts: list[tuple[FileRepository | RepositoryId, dict]] = [
         (repository, save_kwargs),
-        *((fallback, fallback_save_kwargs) for fallback in fallback_repositories),
+        *((fallback, fallback_save_kwargs) for fallback in fallback_repository),
     ]
     for idx, (repo, kwargs) in enumerate(attempts):
         repo_obj = get_builtin_repository(repo)
@@ -201,9 +201,12 @@ class File(BaseModel):
 
         fdata = FileData(data, content_type, file_name)
 
-        object_lifecycle_preference = (
-            request_lifecycle_preference(request) or LIFECYCLE_PREFERENCE.get()
-        )
+        if request:
+            object_lifecycle_preference = request_lifecycle_preference(request)
+        else:
+            print("[WARNING] No request provided, using global lifecycle preference")
+            object_lifecycle_preference = LIFECYCLE_PREFERENCE.get()
+
         save_kwargs.setdefault(
             "object_lifecycle_preference", object_lifecycle_preference
         )
@@ -250,9 +253,13 @@ class File(BaseModel):
         fallback_save_kwargs = fallback_save_kwargs or {}
 
         content_type = content_type or "application/octet-stream"
-        object_lifecycle_preference = (
-            request_lifecycle_preference(request) or LIFECYCLE_PREFERENCE.get()
-        )
+
+        if request:
+            object_lifecycle_preference = request_lifecycle_preference(request)
+        else:
+            print("[WARNING] No request provided, using global lifecycle preference")
+            object_lifecycle_preference = LIFECYCLE_PREFERENCE.get()
+
         save_kwargs.setdefault(
             "object_lifecycle_preference", object_lifecycle_preference
         )
@@ -332,12 +339,9 @@ class CompressedFile(File):
             shutil.rmtree(self.extract_dir)
 
 
-def request_lifecycle_preference(request: Optional[Request]) -> dict[str, str] | None:
+def request_lifecycle_preference(request: Request) -> dict[str, str] | None:
     import json
 
-    if request is None:
-        return None
-
     preference_str = request.headers.get(OBJECT_LIFECYCLE_PREFERENCE_KEY)
     if preference_str is None:
         return None

{fal-1.28.0.dist-info → fal-1.28.2.dist-info}/METADATA

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

{fal-1.28.0.dist-info → fal-1.28.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=KkKtQzahpNn1MOumR-OVlanJVQlIRakwQ5jYMesgfes,513
+fal/_fal_version.py,sha256=nTwdjoxcXTX5Uf2SU_PSi40OB3G-_aJ3rimio5QdbAU,706
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
-fal/api.py,sha256=wIEt21P1C7U-dYQEcyHUxxuuTnvzFyTpWDoHoaxq7tg,47385
-fal/app.py,sha256=3RDFV6JUiUk8b3WJanKQYA-kW74t5bqaNy8OYuUH5-Q,25491
+fal/api.py,sha256=TWUpQICgsRO5aDdRP8A3sFI26P6QM93TobcW9M4E0lQ,47501
+fal/app.py,sha256=LktoVpMj3CXR3WCnptakDUvFwOVWsCfstl8wVofovIA,25740
 fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
 fal/config.py,sha256=1HRaOJFOAjB7fbQoEPCSH85gMvEEMIMPeupVWgrHVgU,3572
 fal/container.py,sha256=FTsa5hOW4ars-yV1lUoc0BNeIIvAZcpw7Ftyt3A4m_w,2000
@@ -59,7 +59,7 @@ fal/toolkit/types.py,sha256=kkbOsDKj1qPGb1UARTBp7yuJ5JUuyy7XQurYUBCdti8,4064
 fal/toolkit/audio/__init__.py,sha256=sqNVfrKbppWlIGLoFTaaNTxLpVXsFHxOSHLA5VG547A,35
 fal/toolkit/audio/audio.py,sha256=gt458h989iQ-EhQSH-mCuJuPBY4RneLJE05f_QWU1E0,572
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
-fal/toolkit/file/file.py,sha256=wDKK91i_1NJD5GGVSJPhFQ8C2FgxG2bJUnUexpHTjt8,10782
+fal/toolkit/file/file.py,sha256=_KCKmtmBkBIKD_gFOZALV10dCtOFZTC9MQw2qmdeevw,11013
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
 fal/toolkit/file/providers/fal.py,sha256=Ph8v3Cm_eFu1b1AXiPKZQ5r8AWUALD3Wk18uw3z8RDQ,46910
 fal/toolkit/file/providers/gcp.py,sha256=DKeZpm1MjwbvEsYvkdXUtuLIJDr_UNbqXj_Mfv3NTeo,2437
@@ -142,8 +142,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.28.0.dist-info/METADATA,sha256=lUYj94o8l7NTWMfpA5tYrsKSK5UwCFzmbEFa2gVSWPE,4089
-fal-1.28.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.28.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.28.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.28.0.dist-info/RECORD,,
+fal-1.28.2.dist-info/METADATA,sha256=PFDPOVKkSNsGasm8URJ9h6YTVSIED9Sko-Rp37h8mdo,4089
+fal-1.28.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.28.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.28.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.28.2.dist-info/RECORD,,