fal 1.5.7__tar.gz → 1.5.9__tar.gz

{fal-1.5.7/fal.egg-info → fal-1.5.9}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.5.7
+Version: 1.5.9
 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[build]<0.15.0,>=0.14.2
+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.7 → fal-1.5.9/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.5.7
+Version: 1.5.9
 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[build]<0.15.0,>=0.14.2
+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.7 → fal-1.5.9}/fal.egg-info/SOURCES.txt

@@ -130,6 +130,7 @@ src/fal/toolkit/file/types.py
 src/fal/toolkit/file/providers/fal.py
 src/fal/toolkit/file/providers/gcp.py
 src/fal/toolkit/file/providers/r2.py
+src/fal/toolkit/file/providers/s3.py
 src/fal/toolkit/image/__init__.py
 src/fal/toolkit/image/image.py
 src/fal/toolkit/image/safety_checker.py

{fal-1.5.7 → fal-1.5.9}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
-isolate[build]<1.14.0,>=0.13.0
-isolate-proto==0.5.4
+isolate[build]<0.15.0,>=0.14.2
+isolate-proto==0.5.5
 grpcio==1.64.0
 dill==0.3.7
 cloudpickle==3.0.0

{fal-1.5.7 → fal-1.5.9}/pyproject.toml

@@ -22,8 +22,8 @@ authors = [{ name = "Features & Labels <support@fal.ai>"}]
 readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
-    "isolate[build]>=0.13.0,<1.14.0",
-    "isolate-proto==0.5.4",
+    "isolate[build]>=0.14.2,<0.15.0",
+    "isolate-proto==0.5.5",
     "grpcio==1.64.0",
     "dill==0.3.7",
     "cloudpickle==3.0.0",

{fal-1.5.7 → fal-1.5.9}/src/fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.5.7'
-__version_tuple__ = version_tuple = (1, 5, 7)
+__version__ = version = '1.5.9'
+__version_tuple__ = version_tuple = (1, 5, 9)

{fal-1.5.7 → fal-1.5.9}/src/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-1.5.7 → fal-1.5.9}/src/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-1.5.7 → fal-1.5.9}/src/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-1.5.7 → fal-1.5.9}/src/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-1.5.7 → fal-1.5.9}/src/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-1.5.9/src/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-1.5.7 → fal-1.5.9}/src/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-1.5.7 → fal-1.5.9}/tests/test_apps.py

@@ -516,6 +516,48 @@ def test_404_response(test_app: str, request: pytest.FixtureRequest):
         apps.run(test_app, path="/other", arguments={"lhs": 1, "rhs": 2})
 
 
+def test_app_deploy_scale(aliased_app: tuple[str, str]):
+    import uuid
+    from dataclasses import replace
+
+    app_alias = str(uuid.uuid4()) + "-alias"
+    app_revision = addition_app.host.register(
+        func=addition_app.func,
+        options=addition_app.options,
+        application_name=app_alias,
+        application_auth_mode="private",
+    )
+
+    host: api.FalServerlessHost = addition_app.host  # type: ignore
+    options = replace(
+        addition_app.options, host={**addition_app.options.host, "max_multiplexing": 30}
+    )
+    kwargs = dict(
+        func=addition_app.func,
+        options=options,
+        application_name=app_alias,
+        application_auth_mode="private",
+    )
+
+    app_revision = addition_app.host.register(**kwargs, scale=False)
+
+    with host._connection as client:
+        res = client.list_aliases()
+        found = next(filter(lambda alias: alias.alias == app_alias, res), None)
+        assert found, f"Could not find app {app_alias} in {res}"
+        assert found.revision == app_revision
+        assert found.max_multiplexing == 1
+
+    app_revision = addition_app.host.register(**kwargs, scale=True)
+
+    with host._connection as client:
+        res = client.list_aliases()
+        found = next(filter(lambda alias: alias.alias == app_alias, res), None)
+        assert found, f"Could not find app {app_alias} in {res}"
+        assert found.revision == app_revision
+        assert found.max_multiplexing == 30
+
+
 def test_app_update_app(aliased_app: tuple[str, str]):
     app_revision, app_alias = aliased_app