fal 1.28.0__tar.gz → 1.28.2__tar.gz

{fal-1.28.0/fal.egg-info → fal-1.28.2}/PKG-INFO

@@ -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 → fal-1.28.2/fal.egg-info}/PKG-INFO

@@ -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 → fal-1.28.2}/src/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-1.28.0 → fal-1.28.2}/src/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-1.28.0 → fal-1.28.2}/src/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-1.28.0 → fal-1.28.2}/src/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