fal 1.5.6__py3-none-any.whl → 1.5.8__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.6'
-__version_tuple__ = version_tuple = (1, 5, 6)
+__version__ = version = '1.5.8'
+__version_tuple__ = version_tuple = (1, 5, 8)

fal/api.py

@@ -171,6 +171,7 @@ class Host(Generic[ArgsT, ReturnT]):
         application_name: str | None = None,
         application_auth_mode: Literal["public", "shared", "private"] | None = None,
         metadata: dict[str, Any] | None = None,
+        scale: bool = True,
     ) -> str | None:
         """Register the given function on the host for API call execution."""
         raise NotImplementedError
@@ -430,6 +431,7 @@ class FalServerlessHost(Host):
         application_auth_mode: Literal["public", "shared", "private"] | None = None,
         metadata: dict[str, Any] | None = None,
         deployment_strategy: Literal["recreate", "rolling"] = "recreate",
+        scale: bool = True,
     ) -> str | None:
         environment_options = options.environment.copy()
         environment_options.setdefault("python_version", active_python())
@@ -439,15 +441,14 @@ class FalServerlessHost(Host):
             "machine_type", FAL_SERVERLESS_DEFAULT_MACHINE_TYPE
         )
         keep_alive = options.host.get("keep_alive", FAL_SERVERLESS_DEFAULT_KEEP_ALIVE)
-        max_concurrency = options.host.get("max_concurrency")
-        min_concurrency = options.host.get("min_concurrency")
-        max_multiplexing = options.host.get("max_multiplexing")
         base_image = options.host.get("_base_image", None)
         scheduler = options.host.get("_scheduler", None)
         scheduler_options = options.host.get("_scheduler_options", None)
+        max_concurrency = options.host.get("max_concurrency")
+        min_concurrency = options.host.get("min_concurrency")
+        max_multiplexing = options.host.get("max_multiplexing")
         exposed_port = options.get_exposed_port()
         request_timeout = options.host.get("request_timeout")
-
         machine_requirements = MachineRequirements(
             machine_types=machine_type,  # type: ignore
             num_gpus=options.host.get("num_gpus"),
@@ -486,6 +487,7 @@ class FalServerlessHost(Host):
             machine_requirements=machine_requirements,
             metadata=metadata,
             deployment_strategy=deployment_strategy,
+            scale=scale,
         ):
             for log in partial_result.logs:
                 self._log_printer.print(log)

fal/cli/apps.py

@@ -221,7 +221,7 @@ def _runners(args):
             str(runner.in_flight_requests),
             (
                 "N/A (active)"
-                if not runner.expiration_countdown
+                if runner.expiration_countdown is None
                 else f"{runner.expiration_countdown}s"
             ),
             f"{runner.uptime} ({runner.uptime.total_seconds()}s)",

fal/cli/deploy.py

@@ -106,6 +106,7 @@ def _deploy_from_reference(
         application_auth_mode=app_auth,
         metadata=isolated_function.options.host.get("metadata", {}),
         deployment_strategy=deployment_strategy,
+        scale=not args.no_scale,
     )
 
     if app_id:
@@ -219,5 +220,14 @@ def add_parser(main_subparsers, parents):
         help="Deployment strategy.",
         default="recreate",
     )
+    parser.add_argument(
+        "--no-scale",
+        action="store_true",
+        help=(
+            "Use min_concurrency/max_concurrency/max_multiplexing from previous "
+            "deployment of application with this name, if exists. Otherwise will "
+            "use the values from the application code."
+        ),
+    )
 
     parser.set_defaults(func=_deploy)

fal/sdk.py

@@ -5,7 +5,7 @@ from contextlib import ExitStack
 from dataclasses import dataclass, field
 from datetime import datetime, timedelta
 from enum import Enum
-from typing import Any, Callable, Generic, Iterator, Literal, TypeVar
+from typing import Any, Callable, Generic, Iterator, Literal, Optional, TypeVar
 
 import grpc
 import isolate_proto
@@ -214,7 +214,7 @@ class AliasInfo:
 class RunnerInfo:
     runner_id: str
     in_flight_requests: int
-    expiration_countdown: int
+    expiration_countdown: Optional[int]
     uptime: timedelta
 
 
@@ -344,7 +344,9 @@ def _from_grpc_runner_info(message: isolate_proto.RunnerInfo) -> RunnerInfo:
     return RunnerInfo(
         runner_id=message.runner_id,
         in_flight_requests=message.in_flight_requests,
-        expiration_countdown=message.expiration_countdown,
+        expiration_countdown=message.expiration_countdown
+        if message.HasField("expiration_countdown")
+        else None,
         uptime=timedelta(seconds=message.uptime),
     )
 
@@ -497,6 +499,7 @@ class FalServerlessConnection:
         machine_requirements: MachineRequirements | None = None,
         metadata: dict[str, Any] | None = None,
         deployment_strategy: Literal["recreate", "rolling"] = "recreate",
+        scale: bool = True,
     ) -> Iterator[isolate_proto.RegisterApplicationResult]:
         wrapped_function = to_serialized_object(function, serialization_method)
         if machine_requirements:
@@ -544,6 +547,7 @@ class FalServerlessConnection:
             auth_mode=auth_mode,
             metadata=struct_metadata,
             deployment_strategy=deployment_strategy_proto,
+            scale=scale,
         )
         for partial_result in self.stub.RegisterApplication(request):
             yield from_grpc(partial_result)

fal/toolkit/file/file.py

@@ -135,6 +135,8 @@ class File(BaseModel):
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
         request: Optional[Request] = None,
+        save_kwargs: Optional[dict] = None,
+        fallback_save_kwargs: Optional[dict] = None,
     ) -> File:
         repo = (
             repository
@@ -142,12 +144,15 @@ class File(BaseModel):
             else get_builtin_repository(repository)
         )
 
+        save_kwargs = save_kwargs or {}
+        fallback_save_kwargs = fallback_save_kwargs or {}
+
         fdata = FileData(data, content_type, file_name)
 
         object_lifecycle_preference = get_lifecycle_preference(request)
 
         try:
-            url = repo.save(fdata, object_lifecycle_preference)
+            url = repo.save(fdata, object_lifecycle_preference, **save_kwargs)
         except Exception:
             if not fallback_repository:
                 raise
@@ -158,7 +163,9 @@ class File(BaseModel):
                 else get_builtin_repository(fallback_repository)
             )
 
-            url = fallback_repo.save(fdata, object_lifecycle_preference)
+            url = fallback_repo.save(
+                fdata, object_lifecycle_preference, **fallback_save_kwargs
+            )
 
         return cls(
             url=url,
@@ -179,6 +186,8 @@ class File(BaseModel):
             FileRepository | RepositoryId
         ] = FALLBACK_REPOSITORY,
         request: Optional[Request] = None,
+        save_kwargs: Optional[dict] = None,
+        fallback_save_kwargs: Optional[dict] = None,
     ) -> File:
         file_path = Path(path)
         if not file_path.exists():
@@ -190,6 +199,9 @@ class File(BaseModel):
             else get_builtin_repository(repository)
         )
 
+        save_kwargs = save_kwargs or {}
+        fallback_save_kwargs = fallback_save_kwargs or {}
+
         content_type = content_type or "application/octet-stream"
         object_lifecycle_preference = get_lifecycle_preference(request)
 
@@ -199,6 +211,7 @@ class File(BaseModel):
                 content_type=content_type,
                 multipart=multipart,
                 object_lifecycle_preference=object_lifecycle_preference,
+                **save_kwargs,
             )
         except Exception:
             if not fallback_repository:
@@ -215,6 +228,7 @@ class File(BaseModel):
                 content_type=content_type,
                 multipart=multipart,
                 object_lifecycle_preference=object_lifecycle_preference,
+                **fallback_save_kwargs,
             )
 
         return cls(

fal/toolkit/file/providers/s3.py

@@ -0,0 +1,80 @@
+from __future__ import annotations
+
+import os
+import posixpath
+import uuid
+from dataclasses import dataclass
+from io import BytesIO
+from typing import Optional
+
+from fal.toolkit.file.types import FileData, FileRepository
+from fal.toolkit.utils.retry import retry
+
+DEFAULT_URL_TIMEOUT = 60 * 15  # 15 minutes
+
+
+@dataclass
+class S3Repository(FileRepository):
+    bucket_name: str = "fal_file_storage"
+    url_expiration: int = DEFAULT_URL_TIMEOUT
+    aws_access_key_id: str | None = None
+    aws_secret_access_key: str | None = None
+
+    _s3_client = None
+
+    def __post_init__(self):
+        try:
+            import boto3
+            from botocore.client import Config
+        except ImportError:
+            raise Exception("boto3 is not installed")
+
+        if self.aws_access_key_id is None:
+            self.aws_access_key_id = os.environ.get("AWS_ACCESS_KEY_ID")
+            if self.aws_access_key_id is None:
+                raise Exception("AWS_ACCESS_KEY_ID environment variable is not set")
+
+        if self.aws_secret_access_key is None:
+            self.aws_secret_access_key = os.environ.get("AWS_SECRET_ACCESS_KEY")
+            if self.aws_secret_access_key is None:
+                raise Exception("AWS_SECRET_ACCESS_KEY environment variable is not set")
+
+        self._s3_client = boto3.client(
+            "s3",
+            aws_access_key_id=self.aws_access_key_id,
+            aws_secret_access_key=self.aws_secret_access_key,
+            config=Config(signature_version="s3v4"),
+        )
+
+    @property
+    def storage_client(self):
+        if self._s3_client is None:
+            raise Exception("S3 client is not initialized")
+
+        return self._s3_client
+
+    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
+    def save(
+        self,
+        data: FileData,
+        object_lifecycle_preference: Optional[dict[str, str]] = None,
+        key: Optional[str] = None,
+    ) -> str:
+        destination_path = posixpath.join(
+            key or "",
+            f"{uuid.uuid4().hex}_{data.file_name}",
+        )
+
+        self.storage_client.upload_fileobj(
+            BytesIO(data.data),
+            self.bucket_name,
+            destination_path,
+            ExtraArgs={"ContentType": data.content_type},
+        )
+
+        public_url = self.storage_client.generate_presigned_url(
+            ClientMethod="get_object",
+            Params={"Bucket": self.bucket_name, "Key": destination_path},
+            ExpiresIn=self.url_expiration,
+        )
+        return public_url

fal/toolkit/image/__init__.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+import urllib.request
 from functools import lru_cache
 from typing import TYPE_CHECKING
-from urllib.request import Request, urlopen
 
 from .image import *  # noqa: F403
 
@@ -62,8 +62,8 @@ def read_image_from_url(
     }
 
     try:
-        request = Request(url, headers=TEMP_HEADERS)
-        response = urlopen(request)
+        request = urllib.request.Request(url, headers=TEMP_HEADERS)
+        response = urllib.request.urlopen(request)
         image_pil = Image.open(response)
     except Exception:
         import traceback

fal/toolkit/utils/download_utils.py

@@ -84,6 +84,9 @@ def _get_remote_file_properties(
             url_path = parsed_url.path
             file_name = Path(url_path).name or _hash_url(url)
 
+    # file name can still contain a forward slash if the server returns a relative path
+    file_name = Path(file_name).name
+
     return file_name, content_length
 
 
@@ -159,6 +162,7 @@ def download_file(
     try:
         file_name = _get_remote_file_properties(url, request_headers)[0]
     except Exception as e:
+        print(f"GOt error: {e}")
         raise DownloadError(f"Failed to get remote file properties for {url}") from e
 
     if "/" in file_name:

{fal-1.5.6.dist-info → fal-1.5.8.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.5.6
+Version: 1.5.8
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: isolate[build]<1.14.0,>=0.13.0
-Requires-Dist: isolate-proto==0.5.4
+Requires-Dist: isolate-proto==0.5.5
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.5.6.dist-info → fal-1.5.8.dist-info}/RECORD

@@ -1,9 +1,9 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=k4Tk-oOp5Zst-Tqem-_IuwoAZtyDq4hHYWlF7LJTgBo,411
+fal/_fal_version.py,sha256=bpyG2JPTJKDi28Mtx907aomd5KtqHfk_t3lAAZFZAGk,411
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=oiPONakWiK8KQHaUr41yBIG64FlC9UryFNXFiITVtXk,43295
+fal/api.py,sha256=xTtPvDqaEHsq2lFsMwRZiHb4hzjVY3y6lV-xbzkSetI,43375
 fal/app.py,sha256=pkOTw-69nY6U9PaFtvz4sFjMyyZXIziM9mepzkx-NBo,21298
 fal/apps.py,sha256=lge7-HITzI20l1oXdlkAzqxdMVtXRfnACIylKRWgCNQ,7151
 fal/container.py,sha256=V7riyyq8AZGwEX9QaqRQDZyDN_bUKeRKV1OOZArXjL0,622
@@ -11,7 +11,7 @@ fal/files.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
-fal/sdk.py,sha256=-I-vjO-PuvtnZedFLKys8FpQVsRwEzTPD6heRYPQCE4,22260
+fal/sdk.py,sha256=HAkOv0q53h4LPBdvjJHu_FST0Iq-SYzNKhx1qeKJZfs,22403
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=9q_QrQBlQN3nZYA1kEGRfhJWi4RjnO4H1uQswfaei9w,2146
 fal/workflows.py,sha256=jx3tGy2R7cN6lLvOzT6lhhlcjmiq64iZls2smVrmQj0,14657
@@ -20,11 +20,11 @@ fal/auth/auth0.py,sha256=rSG1mgH-QGyKfzd7XyAaj1AYsWt-ho8Y_LZ-FUVWzh4,5421
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
 fal/cli/_utils.py,sha256=u__PSeNxSC_4Psi3ZwLjefgNQVkYRpVH--vmwK7ppro,1187
-fal/cli/apps.py,sha256=-DDp-Gvxz5kHho5YjAhbri8vOny_9cftAI_wP2KR5nU,8175
+fal/cli/apps.py,sha256=Fo4iUpd6FGTUcIp22WcssE1CaEn_BLKzK_E4JPsXhVI,8179
 fal/cli/auth.py,sha256=--MhfHGwxmtHbRkGioyn1prKn_U-pBzbz0G_QeZou-U,1352
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=u_urnyFzSlNnrq93zz_GXE9FX4VyVxDoamJJyrZpFI0,1312
-fal/cli/deploy.py,sha256=uAMBMXpv3kYNJ3zeIWBL6xf83NpxvvPKOjeE95dOG5o,7099
+fal/cli/deploy.py,sha256=ZBM4pLDDj9ZntlSoFvK_-ZGO-lAOHoZFkYXS-OAxXT0,7461
 fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/keys.py,sha256=trDpA3LJu9S27qE_K8Hr6fKLK4vwVzbxUHq8TFrV4pw,3157
 fal/cli/main.py,sha256=_Wh_DQc02qwh-ZN7v41lZm0lDR1WseViXVOcqUlyWLg,2009
@@ -47,12 +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=4kOPfNVCpJJtDcvScgPzoSrMvkt8AMANNPa8S3Ofs-4,8910
+fal/toolkit/file/file.py,sha256=tq-zMoNLJ1NJc9g8_RTnoIZABnRhtTtQchyMULimMTY,9442
 fal/toolkit/file/types.py,sha256=MjZ6xAhKPv4rowLo2Vcbho0sX7AQ3lm3KFyYDcw0dL4,1845
 fal/toolkit/file/providers/fal.py,sha256=V93vQbbFevPPpPSGfgkWuaBCYZnSxjtK50Lhk-zQYi8,21016
 fal/toolkit/file/providers/gcp.py,sha256=iQtkoYUqbmKKpC5srVOYtrruZ3reGRm5lz4kM8bshgk,2247
 fal/toolkit/file/providers/r2.py,sha256=G2OHcCH2yWrVtXT4hWHEXUeEjFhbKO0koqHcd7hkczk,2871
-fal/toolkit/image/__init__.py,sha256=aLcU8HzD7HyOxx-C-Bbx9kYCMHdBhy9tR98FSVJ6gSA,1830
+fal/toolkit/file/providers/s3.py,sha256=CfiA6rTBFfP-empp0cB9OW2c9F5iy0Z-kGwCs5HBICU,2524
+fal/toolkit/image/__init__.py,sha256=m3OatPbBhcEOYyaTu_dgToxunUKoJu4bJVCWUoN7HX4,1838
 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
@@ -61,7 +62,7 @@ fal/toolkit/image/nsfw_filter/inference.py,sha256=BhIPF_zxRLetThQYxDDF0sdx9VRwvu
 fal/toolkit/image/nsfw_filter/model.py,sha256=63mu8D15z_IosoRUagRLGHy6VbLqFmrG-yZqnu2vVm4,457
 fal/toolkit/image/nsfw_filter/requirements.txt,sha256=3Pmrd0Ny6QAeBqUNHCgffRyfaCARAPJcfSCX5cRYpbM,37
 fal/toolkit/utils/__init__.py,sha256=CrmM9DyCz5-SmcTzRSm5RaLgxy3kf0ZsSEN9uhnX2Xo,97
-fal/toolkit/utils/download_utils.py,sha256=9WMpn0mFIhkFelQpPj5KG-pC7RMyyOzGHbNRDSyz07o,17664
+fal/toolkit/utils/download_utils.py,sha256=fFrKoSJPBSurrD636ncNHhJv-cS3zReIv6ltiU3tMZU,17823
 fal/toolkit/utils/retry.py,sha256=qyIf86LMNf9L-Xgqbjl6vf-CZmhmeDQ6Y9I4LWkU6lk,1289
 openapi_fal_rest/__init__.py,sha256=ziculmF_i6trw63LzZGFX-6W3Lwq9mCR8_UpkpvpaHI,152
 openapi_fal_rest/client.py,sha256=G6BpJg9j7-JsrAUGddYwkzeWRYickBjPdcVgXoPzxuE,2817
@@ -126,8 +127,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.6.dist-info/METADATA,sha256=NFDQ6lqj1Fnq-g1AmKCf5PX47qwnNso0hjdaG-EUD3w,3989
-fal-1.5.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-fal-1.5.6.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.5.6.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.5.6.dist-info/RECORD,,
+fal-1.5.8.dist-info/METADATA,sha256=gq5HYuUN_Jf7OxSshH7gNBr9OhdBp4kZwtRsWj1cy78,3989
+fal-1.5.8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+fal-1.5.8.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.5.8.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.5.8.dist-info/RECORD,,