fal 1.26.0__tar.gz → 1.26.2__tar.gz

{fal-1.26.0/fal.egg-info → fal-1.26.2}/PKG-INFO

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

{fal-1.26.0 → fal-1.26.2/fal.egg-info}/PKG-INFO

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

{fal-1.26.0 → fal-1.26.2}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.26.0'
-__version_tuple__ = version_tuple = (1, 26, 0)
+__version__ = version = '1.26.2'
+__version_tuple__ = version_tuple = (1, 26, 2)

{fal-1.26.0 → fal-1.26.2}/src/fal/api.py

@@ -500,7 +500,7 @@ class FalServerlessHost(Host):
             partial_func,
             environments,
             application_name=application_name,
-            application_auth_mode=application_auth_mode,
+            auth_mode=application_auth_mode,
             machine_requirements=machine_requirements,
             metadata=metadata,
             deployment_strategy=deployment_strategy,

{fal-1.26.0 → fal-1.26.2}/src/fal/app.py

@@ -197,7 +197,14 @@ class AppClient:
 
     @classmethod
     @contextmanager
-    def connect(cls, app_cls):
+    def connect(
+        cls,
+        app_cls,
+        *,
+        health_request_timeout: int = 30,
+        startup_timeout: int = 60,
+        health_check_interval: float = 0.5,
+    ):
         app = wrap_app(app_cls)
         info = app.spawn()
         _shutdown_event = threading.Event()
@@ -214,20 +221,50 @@ class AppClient:
         _log_printer.start()
 
         try:
+            if info.url is None:
+                raise AppClientError(
+                    "App spawn failed: no URL returned",
+                    status_code=500,
+                )
+
+            start_time = time.perf_counter()
+            url = info.url + "/health"
+            last_error = None
+            attempt = 0
+
             with httpx.Client() as client:
-                retries = 100
-                for _ in range(retries):
-                    url = info.url + "/health"
-                    resp = client.get(url, timeout=60)
-
-                    if resp.is_success:
-                        break
-                    elif resp.status_code not in (500, 404):
-                        raise AppClientError(
-                            f"Failed to GET {url}: {resp.status_code} {resp.text}",
-                            status_code=resp.status_code,
+                while time.perf_counter() - start_time < startup_timeout:
+                    attempt += 1
+
+                    try:
+                        resp = client.get(url, timeout=health_request_timeout)
+                    except httpx.TimeoutException:
+                        last_error = (
+                            f"Request timed out after {health_request_timeout} seconds"
                         )
-                    time.sleep(0.1)
+                    except httpx.TransportError as e:
+                        last_error = f"Network error: {e}"
+                    else:
+                        if resp.is_success:
+                            break
+
+                        if resp.status_code in (500, 404):
+                            last_error = f"Server not ready (HTTP {resp.status_code})"
+                        else:
+                            raise AppClientError(
+                                "Health check failed with non-retryable error: "
+                                f"{resp.status_code} {resp.text}",
+                                status_code=resp.status_code,
+                            )
+
+                    time.sleep(health_check_interval)
+                else:
+                    # retry loop completed without success
+                    raise AppClientError(
+                        f"Health check failed after {startup_timeout}s "
+                        f"({attempt} attempts). Last error: {last_error}",
+                        status_code=500,
+                    )
 
             client = cls(app_cls, info.url)
             yield client

{fal-1.26.0 → fal-1.26.2}/src/fal/cli/apps.py

@@ -270,7 +270,7 @@ def _add_set_rev_parser(subparsers, parents):
     parser.add_argument(
         "--auth",
         choices=ALIAS_AUTH_MODES,
-        default="private",
+        default=None,
         help="Application authentication mode.",
     )
     parser.set_defaults(func=_set_rev)

{fal-1.26.0 → fal-1.26.2}/src/fal/files.py

@@ -1,5 +1,8 @@
+import concurrent.futures
+import math
 import os
 import posixpath
+from concurrent.futures import ThreadPoolExecutor
 from functools import cached_property
 from typing import TYPE_CHECKING
 
@@ -9,6 +12,19 @@ if TYPE_CHECKING:
     import httpx
 
 USER_AGENT = "fal-sdk/1.14.0 (python)"
+MULTIPART_THRESHOLD = 10 * 1024 * 1024  # 10MB
+MULTIPART_CHUNK_SIZE = 10 * 1024 * 1024  # 10MB
+MULTIPART_WORKERS = 2  # only 2 because our REST is currently struggling with more
+
+
+def _compute_md5(lpath, chunk_size=8192):
+    import hashlib
+
+    hasher = hashlib.md5()
+    with open(lpath, "rb") as fobj:
+        for chunk in iter(lambda: fobj.read(chunk_size), b""):
+            hasher.update(chunk)
+    return hasher.hexdigest()
 
 
 class FalFileSystem(AbstractFileSystem):
@@ -95,16 +111,90 @@ class FalFileSystem(AbstractFileSystem):
             response = self._request("GET", f"/files/file/{rpath}")
             fobj.write(response.content)
 
+    def _put_file_part(self, rpath, lpath, upload_id, part_number, chunk_size):
+        offset = (part_number - 1) * chunk_size
+        with open(lpath, "rb") as fobj:
+            fobj.seek(offset)
+            chunk = fobj.read(chunk_size)
+            response = self._request(
+                "PUT",
+                f"/files/file/multipart/{rpath}/{upload_id}/{part_number}",
+                files={"file_upload": (posixpath.basename(lpath), chunk)},
+            )
+            data = response.json()
+            return {
+                "part_number": data["part_number"],
+                "etag": data["etag"],
+            }
+
+    def _put_file_multipart(self, lpath, rpath, size, progress):
+        response = self._request(
+            "POST",
+            f"/files/file/multipart/{rpath}/initiate",
+        )
+        upload_id = response.json()["upload_id"]
+
+        parts = []
+        num_parts = math.ceil(size / MULTIPART_CHUNK_SIZE)
+        md5 = _compute_md5(lpath)
+
+        task = progress.add_task(f"{os.path.basename(lpath)}", total=num_parts)
+
+        with ThreadPoolExecutor(max_workers=MULTIPART_WORKERS) as executor:
+            futures = []
+
+            for part_number in range(1, num_parts + 1):
+                futures.append(
+                    executor.submit(
+                        self._put_file_part,
+                        rpath,
+                        lpath,
+                        upload_id,
+                        part_number,
+                        MULTIPART_CHUNK_SIZE,
+                    )
+                )
+
+            for future in concurrent.futures.as_completed(futures):
+                parts.append(future.result())
+                progress.advance(task)
+
+        response = self._request(
+            "POST",
+            f"/files/file/multipart/{rpath}/{upload_id}/complete",
+            json={"parts": parts},
+        )
+        data = response.json()
+        if data["etag"] != md5:
+            raise RuntimeError(
+                f"MD5 mismatch on {rpath}: {data['etag']} != {md5}, "
+                "please contact support"
+            )
+
     def put_file(self, lpath, rpath, mode="overwrite", **kwargs):
+        from rich.progress import BarColumn, Progress, SpinnerColumn, TextColumn
+
         if os.path.isdir(lpath):
             return
 
-        with open(lpath, "rb") as fobj:
-            self._request(
-                "POST",
-                f"/files/file/local/{rpath}",
-                files={"file_upload": (posixpath.basename(lpath), fobj, "text/plain")},
-            )
+        size = os.path.getsize(lpath)
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            BarColumn(),
+            TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
+        ) as progress:
+            if size > MULTIPART_THRESHOLD:
+                self._put_file_multipart(lpath, rpath, size, progress)
+            else:
+                task = progress.add_task(f"{os.path.basename(lpath)}", total=1)
+                with open(lpath, "rb") as fobj:
+                    self._request(
+                        "POST",
+                        f"/files/file/local/{rpath}",
+                        files={"file_upload": (posixpath.basename(lpath), fobj)},
+                    )
+                progress.advance(task)
         self.dircache.clear()
 
     def put_file_from_url(self, url, rpath, mode="overwrite", **kwargs):

{fal-1.26.0 → fal-1.26.2}/src/fal/sdk.py

@@ -45,6 +45,9 @@ logger = get_logger(__name__)
 patch_pickle()
 
 
+AuthMode = Optional[Literal["public", "private", "shared"]]
+
+
 class ServerCredentials:
     def to_grpc(self) -> grpc.ChannelCredentials:
         raise NotImplementedError
@@ -565,7 +568,7 @@ class FalServerlessConnection:
         function: Callable[..., ResultT],
         environments: list[isolate_proto.EnvironmentDefinition],
         application_name: str | None = None,
-        application_auth_mode: Literal["public", "private", "shared"] | None = None,
+        auth_mode: AuthMode = None,
         *,
         serialization_method: str = _DEFAULT_SERIALIZATION_METHOD,
         machine_requirements: MachineRequirements | None = None,
@@ -598,13 +601,14 @@ class FalServerlessConnection:
         else:
             wrapped_requirements = None
 
-        auth_mode = None
-        if application_auth_mode == "public":
-            auth_mode = isolate_proto.ApplicationAuthMode.PUBLIC
-        elif application_auth_mode == "shared":
-            auth_mode = isolate_proto.ApplicationAuthMode.SHARED
-        elif application_auth_mode == "private":
-            auth_mode = isolate_proto.ApplicationAuthMode.PRIVATE
+        if auth_mode == "public":
+            auth = isolate_proto.ApplicationAuthMode.PUBLIC
+        elif auth_mode == "shared":
+            auth = isolate_proto.ApplicationAuthMode.SHARED
+        elif auth_mode == "private":
+            auth = isolate_proto.ApplicationAuthMode.PRIVATE
+        else:
+            auth = None
 
         struct_metadata = None
         if metadata:
@@ -620,7 +624,7 @@ class FalServerlessConnection:
             environments=environments,
             machine_requirements=wrapped_requirements,
             application_name=application_name,
-            auth_mode=auth_mode,
+            auth_mode=auth,
             metadata=struct_metadata,
             deployment_strategy=deployment_strategy_proto,
             scale=scale,
@@ -730,14 +734,16 @@ class FalServerlessConnection:
         self,
         alias: str,
         revision: str,
-        auth_mode: Literal["public", "private", "shared"],
+        auth_mode: AuthMode,
     ):
         if auth_mode == "public":
             auth = isolate_proto.ApplicationAuthMode.PUBLIC
         elif auth_mode == "shared":
             auth = isolate_proto.ApplicationAuthMode.SHARED
-        else:
+        elif auth_mode == "private":
             auth = isolate_proto.ApplicationAuthMode.PRIVATE
+        else:
+            auth = None
 
         request = isolate_proto.SetAliasRequest(
             alias=alias,

{fal-1.26.0 → fal-1.26.2}/src/fal/toolkit/file/file.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import shutil
+import traceback
 from functools import wraps
 from pathlib import Path
 from tempfile import NamedTemporaryFile, mkdtemp
@@ -178,10 +179,16 @@ class File(BaseModel):
 
         try:
             url = repo.save(fdata, **save_kwargs)
-        except Exception:
+        except Exception as exc:
             if not fallback_repository:
                 raise
 
+            traceback.print_exc()
+            print(
+                f"Failed to save bytes to repository {repository}: {exc}, "
+                f"falling back to {fallback_repository}"
+            )
+
             fallback_repo = get_builtin_repository(fallback_repository)
 
             url = fallback_repo.save(fdata, **fallback_save_kwargs)
@@ -237,10 +244,16 @@ class File(BaseModel):
                 content_type=content_type,
                 **save_kwargs,
             )
-        except Exception:
+        except Exception as exc:
             if not fallback_repository:
                 raise
 
+            traceback.print_exc()
+            print(
+                f"Failed to save file to repository {repository}: {exc}, "
+                f"falling back to {fallback_repository}"
+            )
+
             fallback_repo = get_builtin_repository(fallback_repository)
 
             url, data = fallback_repo.save_file(

{fal-1.26.0 → fal-1.26.2}/tests/test_apps.py

@@ -235,7 +235,7 @@ class ExceptionApp(fal.App, keep_alive=300, max_concurrency=1):
         raise RuntimeError("cuDNN error: CUDNN_STATUS_INTERNAL_ERROR")
 
 
-class CancellableApp(fal.App, keep_alive=300, max_concurrency=1, request_timeout=10):
+class CancellableApp(fal.App, keep_alive=300, max_concurrency=1, request_timeout=2):
     task = None
     running = 0
 
@@ -555,7 +555,7 @@ def test_app_disconnect_behavior(test_app: str, test_cancellable_app: str):
     with pytest.raises(HTTPStatusError) as e:
         apps.run(
             test_cancellable_app,
-            arguments={"lhs": 1, "rhs": 2, "wait_time": 20},
+            arguments={"lhs": 1, "rhs": 2, "wait_time": 6},
             path="/well-handled",
         )
     assert (
@@ -575,7 +575,7 @@ def test_app_disconnect_behavior(test_app: str, test_cancellable_app: str):
     with pytest.raises(HTTPStatusError) as e:
         apps.run(
             test_cancellable_app,
-            arguments={"lhs": 1, "rhs": 2, "wait_time": 20},
+            arguments={"lhs": 1, "rhs": 2, "wait_time": 6},
         )
     assert (
         e.value.response.status_code == 504