fal 1.27.1__py3-none-any.whl → 1.28.1__py3-none-any.whl

fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.27.1'
-__version_tuple__ = version_tuple = (1, 27, 1)
+__version__ = version = '1.28.1'
+__version_tuple__ = version_tuple = (1, 28, 1)

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/cli/_utils.py

@@ -12,7 +12,7 @@ def get_client(host: str, team: str | None = None):
 
 def is_app_name(app_ref: tuple[str, str | None]) -> bool:
     is_single_file = app_ref[1] is None
-    is_python_file = app_ref[0].endswith(".py")
+    is_python_file = app_ref[0] is None or app_ref[0].endswith(".py")
 
     return is_single_file and not is_python_file
 
@@ -42,9 +42,16 @@ def get_app_data_from_toml(app_name):
 
     app_auth = app_data.pop("auth", "private")
     app_deployment_strategy = app_data.pop("deployment_strategy", "recreate")
-    app_no_scale = app_data.pop("no_scale", False)
+
+    if "no_scale" in app_data:
+        # Deprecated
+        app_no_scale = app_data.pop("no_scale")
+        print("[WARNING] no_scale is deprecated, use app_scale_settings instead")
+        app_reset_scale = not app_no_scale
+    else:
+        app_reset_scale = app_data.pop("app_scale_settings", False)
 
     if len(app_data) > 0:
         raise ValueError(f"Found unexpected keys in pyproject.toml: {app_data}")
 
-    return app_ref, app_auth, app_deployment_strategy, app_no_scale
+    return app_ref, app_auth, app_deployment_strategy, app_reset_scale

fal/cli/deploy.py

@@ -66,9 +66,9 @@ def _deploy_from_reference(
     app_ref: Tuple[Optional[Union[Path, str]], ...],
     app_name: str,
     args,
-    auth: Optional[Literal["public", "shared", "private"]] = None,
-    deployment_strategy: Optional[Literal["recreate", "rolling"]] = None,
-    scale: bool = True,
+    auth: Optional[Literal["public", "shared", "private"]],
+    deployment_strategy: Optional[Literal["recreate", "rolling"]],
+    scale: bool,
 ):
     from fal.api import FalServerlessError, FalServerlessHost
     from fal.utils import load_function_from
@@ -146,7 +146,7 @@ def _deploy(args):
             raise ValueError("Cannot use --app-name or --auth with app name reference.")
 
         app_name = args.app_ref[0]
-        app_ref, app_auth, app_deployment_strategy, app_no_scale = (
+        app_ref, app_auth, app_deployment_strategy, app_scale_settings = (
             get_app_data_from_toml(app_name)
         )
         file_path, func_name = RefAction.split_ref(app_ref)
@@ -157,7 +157,7 @@ def _deploy(args):
         app_name = args.app_name
         app_auth = args.auth
         app_deployment_strategy = args.strategy
-        app_no_scale = args.no_scale
+        app_scale_settings = args.app_scale_settings
 
     _deploy_from_reference(
         (file_path, func_name),
@@ -165,7 +165,7 @@ def _deploy(args):
         args,
         app_auth,
         app_deployment_strategy,
-        scale=not app_no_scale,
+        scale=app_scale_settings,
     )
 
 
@@ -233,12 +233,17 @@ def add_parser(main_subparsers, parents):
     )
     parser.add_argument(
         "--no-scale",
+        action="store_false",
+        dest="app_scale_settings",
+        default=False,
+        help="Use the previous deployment of the application for scale settings. "
+        "This is the default behavior.",
+    )
+    parser.add_argument(
+        "--reset-scale",
         action="store_true",
-        help=(
-            "Use min_concurrency/max_concurrency/concurrency_buffer/max_multiplexing "
-            "from previous deployment of application with this name, if exists. "
-            "Otherwise will use the values from the application code."
-        ),
+        dest="app_scale_settings",
+        help="Use the application code for scale settings.",
     )
 
     parser.set_defaults(func=_deploy)

fal/cli/profile.py

@@ -68,12 +68,17 @@ def _unset(args, config: Config | None = None):
 def _key_set(args):
     config = Config(validate_profile=True)
 
+    args.console.print("Go to https://fal.ai/dashboard/keys to create a key.")
+    args.console.print(
+        "Enter the key in the format [cyan][bold]id:secret[/][/]. You can copy and paste it from the browser."  # noqa: E501
+    )
+
     while True:
         key = input("Enter the key: ")
         if ":" in key:
             break
         args.console.print(
-            "[red]Invalid key. The key must be in the format [bold]key:value[/].[/]"
+            "[yellow]Invalid key. The key must be in the format:[/] [cyan][bold]id:secret[/][/]."  # noqa: E501
         )
 
     with config.edit():
@@ -99,10 +104,10 @@ def _create(args):
     with config.edit() as config:
         config._config[args.PROFILE] = {}
 
-    args.console.print(f"Profile [cyan]{args.PROFILE}[/] created.")
     args.console.print(
-        f"Use [bold]fal profile set {args.PROFILE}[/] to set it as default."
+        f"Profile [cyan]{args.PROFILE}[/] created. Setting it as default profile..."
     )
+    _set(args)
 
 
 def _delete(args):
@@ -184,7 +189,7 @@ def add_parser(main_subparsers, parents):
     )
     host_set_parser.set_defaults(func=_host_set)
 
-    create_help = "Create a new profile. Use 'fal profile set <name>' to set it as default after creation."  # noqa: E501
+    create_help = "Create a new profile."
     create_parser = subparsers.add_parser(
         "create",
         description=create_help,

fal/config.py

@@ -6,7 +6,9 @@ from typing import Dict, Iterator, List, Optional
 
 SETTINGS_SECTION = "__internal__"
 
-NO_PROFILE_ERROR = ValueError("No profile set.")
+NO_PROFILE_ERROR = ValueError(
+    "No profile set. Use command [bold]fal profile set[/] to set a profile."
+)
 
 
 class Config:

fal/exceptions/auth.py

@@ -7,5 +7,5 @@ class UnauthenticatedException(FalServerlessException):
     def __init__(self) -> None:
         super().__init__(
             "You must be authenticated. "
-            "Login via `fal auth login` or make sure to setup fal keys correctly."
+            "Use [bold]fal auth login[/] or [bold]fal profile key[/] to set your fal key."  # noqa: E501
         )

fal/toolkit/file/file.py

@@ -201,9 +201,11 @@ 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:
+            object_lifecycle_preference = LIFECYCLE_PREFERENCE.get()
+
         save_kwargs.setdefault(
             "object_lifecycle_preference", object_lifecycle_preference
         )
@@ -250,9 +252,12 @@ 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:
+            object_lifecycle_preference = LIFECYCLE_PREFERENCE.get()
+
         save_kwargs.setdefault(
             "object_lifecycle_preference", object_lifecycle_preference
         )
@@ -332,12 +337,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.27.1.dist-info → fal-1.28.1.dist-info}/METADATA

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

{fal-1.27.1.dist-info → fal-1.28.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=3iEnYoHxc4pb1GpjK8VvmamtxkSp2aFPQ3We7nMxWMQ,513
+fal/_fal_version.py,sha256=uuctUYGLYKZiRv4u5GjbkTTYV9QJ7oYdTxJCsNX-iN8,513
 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=G3IOTLQuu_VAvzPFdx9v22NpJ9m4gU8qEHic7e7-WwU,3511
+fal/config.py,sha256=1HRaOJFOAjB7fbQoEPCSH85gMvEEMIMPeupVWgrHVgU,3572
 fal/container.py,sha256=FTsa5hOW4ars-yV1lUoc0BNeIIvAZcpw7Ftyt3A4m_w,2000
 fal/files.py,sha256=iWkOqCtdoz7_V-wOvV1iB1zg9x7fdGRcmGGyBkCuFXI,7449
 fal/flags.py,sha256=QonyDM7R2GqfAB1bJr46oriu-fHJCkpUwXuSdanePWg,987
@@ -21,20 +21,20 @@ fal/auth/__init__.py,sha256=2mEKdk6_1GclF3cPC3uWSRKFf0KHNIUNAi0xYRbdJ1A,6278
 fal/auth/auth0.py,sha256=g5OgEKe4rsbkLQp6l7EauOAVL6WsmKjuA1wmzmyvvhc,5354
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
-fal/cli/_utils.py,sha256=anFfy6qouB8QzH0Yho41GulGiJu3q1KKIwgyVQCzgRQ,1593
+fal/cli/_utils.py,sha256=ulYezhr3G29nTIF8MDQ6tsW01Oj1zPo-YSqMoBi05Ic,1871
 fal/cli/api.py,sha256=ZuDE_PIC-czzneTAWMwvC7P7WnwIyluNZSuJqzCFhqI,2640
 fal/cli/apps.py,sha256=q0uxuD4h_5tft77QfyFbDz0kGmM51JT39du_OeFytPA,10565
 fal/cli/auth.py,sha256=Qe-Z3ycXJnOzHimz5PjCQYoni8MF4csmdL19yGN7a1o,5171
 fal/cli/cli_nested_json.py,sha256=veSZU8_bYV3Iu1PAoxt-4BMBraNIqgH5nughbs2UKvE,13539
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=u_urnyFzSlNnrq93zz_GXE9FX4VyVxDoamJJyrZpFI0,1312
-fal/cli/deploy.py,sha256=D47AR_voAy-r-h8xnVHICLsosyFRCW4Bn7Br7xwwjNg,7785
+fal/cli/deploy.py,sha256=TseHLukhcHbtfnUMFqd2gQ1eNlBr58l_-y61ZdRsshw,7886
 fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/files.py,sha256=pSgAnTm2eHdP-IPkMIVfnK_Ii7mkSSOVgvbsiFUVBC0,2936
 fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
 fal/cli/main.py,sha256=LnJCe83Fdr5-i3Fkpvrd9BZPjHtcX_H1EEmy6rVlCz8,3180
 fal/cli/parser.py,sha256=jYsGQ0BLQuKI7KtN1jnLVYKMbLtez7hPjwTNfG3UPSk,2964
-fal/cli/profile.py,sha256=9Iz5Prk2mR2JmxBuNPcKAcQJVHlGGXIlKh_7MXDl7U4,5879
+fal/cli/profile.py,sha256=agyGFQRLHOtzJEdN3Pn9317rg044XaszNCZrf0ELK-8,6016
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
 fal/cli/runners.py,sha256=7efNX9vm6D1aBlg0M5-u5plw3HHC41Sj-N7eRNIHnqw,3689
 fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
@@ -45,7 +45,7 @@ fal/console/ux.py,sha256=KMQs3UHQvVHDxDQQqlot-WskVKoMQXOE3jiVkkfmIMY,356
 fal/exceptions/__init__.py,sha256=m2okJEpax11mnwmoqO_pCGtbt-FvzKiiuMhKo2ok-_8,270
 fal/exceptions/_base.py,sha256=LwzpMaW_eYQEC5s26h2qGXbNA-S4bOqC8s-bMCX6HjE,1491
 fal/exceptions/_cuda.py,sha256=L3qvDNaPTthp95IFSBI6pMt3YbRfn1H0inQkj_7NKF8,1719
-fal/exceptions/auth.py,sha256=gxRago5coI__vSIcdcsqhhq1lRPkvCnwPAueIaXTAdw,329
+fal/exceptions/auth.py,sha256=fHea3SIeguInJVB5M33IuP4I5e_pVEifck1C_XJTYvc,351
 fal/logging/__init__.py,sha256=avgKA2V8GJeUtZuWZJjSYgkkrXKpuDMS-YiIBmLda7w,1599
 fal/logging/isolate.py,sha256=jIryi46ZVlJ1mfan4HLNQQ3jwMi8z-WwfqqLlttQVkc,2449
 fal/logging/style.py,sha256=ckIgHzvF4DShM5kQh8F133X53z_vF46snuDHVmo_h9g,386
@@ -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=0VI8ZgGV3tnbDN6vlM8L8AHt5gul6-emuPLjVBB_vt0,10836
 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.27.1.dist-info/METADATA,sha256=TKeydxAK7aqE2EBQHAruwEtCBS11OjqDTQx_R3PQNW0,4089
-fal-1.27.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.27.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.27.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.27.1.dist-info/RECORD,,
+fal-1.28.1.dist-info/METADATA,sha256=kcAdoePxY_Zy3_-5QOvvaS5P72vGwa-db_3p8WktQCU,4089
+fal-1.28.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.28.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.28.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.28.1.dist-info/RECORD,,