fal 1.19.2__py3-none-any.whl → 1.20.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.19.2'
-__version_tuple__ = version_tuple = (1, 19, 2)
+__version__ = version = '1.20.1'
+__version_tuple__ = version_tuple = (1, 20, 1)

fal/api.py

@@ -1183,6 +1183,9 @@ class BaseServable:
         app_info.labels(version=self.version).set(1)
 
         app = self._build_app()
+
+        # We use the default workers=1 config because setup function can be heavy
+        # and it runs once per worker.
         server = Server(
             config=Config(app, host="0.0.0.0", port=8080, timeout_keep_alive=300)
         )

fal/cli/files.py

@@ -48,11 +48,19 @@ def add_parser(main_subparsers, parents):
     subparsers = parser.add_subparsers(
         title="Commands",
         metavar="command",
+        dest="cmd",
         required=True,
         parser_class=FalClientParser,
     )
 
-    list_parser = subparsers.add_parser("list", aliases=["ls"], parents=parents)
+    list_help = "List files."
+    list_parser = subparsers.add_parser(
+        "list",
+        aliases=["ls"],
+        description=list_help,
+        help=list_help,
+        parents=parents,
+    )
     list_parser.add_argument(
         "path",
         nargs="?",
@@ -62,7 +70,13 @@ def add_parser(main_subparsers, parents):
     )
     list_parser.set_defaults(func=_list)
 
-    download_parser = subparsers.add_parser("download", parents=parents)
+    download_help = "Download files."
+    download_parser = subparsers.add_parser(
+        "download",
+        description=download_help,
+        help=download_help,
+        parents=parents,
+    )
     download_parser.add_argument(
         "remote_path", type=str, help="Remote path to download"
     )
@@ -71,12 +85,24 @@ def add_parser(main_subparsers, parents):
     )
     download_parser.set_defaults(func=_download)
 
-    upload_parser = subparsers.add_parser("upload", parents=parents)
+    upload_help = "Upload files."
+    upload_parser = subparsers.add_parser(
+        "upload",
+        description=upload_help,
+        help=upload_help,
+        parents=parents,
+    )
     upload_parser.add_argument("local_path", type=str, help="Local path to upload")
     upload_parser.add_argument("remote_path", type=str, help="Remote path to upload to")
     upload_parser.set_defaults(func=_upload)
 
-    upload_url_parser = subparsers.add_parser("upload-url", parents=parents)
+    upload_url_help = "Upload file from URL."
+    upload_url_parser = subparsers.add_parser(
+        "upload-url",
+        description=upload_url_help,
+        help=upload_url_help,
+        parents=parents,
+    )
     upload_url_parser.add_argument("url", type=str, help="URL to upload")
     upload_url_parser.add_argument(
         "remote_path", type=str, help="Remote path to upload to"

fal/toolkit/file/providers/fal.py

@@ -9,7 +9,7 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Generator, Generic, TypeVar
+from typing import Any, Generator, Generic, TypeVar
 from urllib.error import HTTPError
 from urllib.parse import urlparse, urlunparse
 from urllib.request import Request, urlopen
@@ -26,15 +26,46 @@ _FAL_CDN_V3 = "https://v3.fal.media"
 DEFAULT_REQUEST_TIMEOUT = 10
 PUT_REQUEST_TIMEOUT = 5 * 60
 
+MAX_ATTEMPTS = 5
+BASE_DELAY = 0.1
+MAX_DELAY = 30
+RETRY_CODES = [408, 409, 429, 500, 502, 503, 504]
+
 
 @contextmanager
 def _urlopen(
-    request: Request, timeout: int = DEFAULT_REQUEST_TIMEOUT
+    request: Request,
+    timeout: int = DEFAULT_REQUEST_TIMEOUT,
 ) -> Generator[addinfourl, None, None]:
     with urlopen(request, timeout=timeout) as response:
         yield response
 
 
+def _should_retry(exc: Exception) -> bool:
+    if isinstance(exc, HTTPError) and exc.code in RETRY_CODES:
+        return True
+
+    return False
+
+
+@contextmanager
+def _maybe_retry_request(
+    request: Request,
+    **kwargs: Any,
+) -> Generator[addinfourl, None, None]:
+    _urlopen_with_retry = retry(
+        max_retries=MAX_ATTEMPTS,
+        base_delay=BASE_DELAY,
+        max_delay=MAX_DELAY,
+        backoff_type="exponential",
+        jitter=True,
+        should_retry=_should_retry,
+    )(_urlopen)
+
+    with _urlopen_with_retry(request, **kwargs) as response:
+        yield response
+
+
 @dataclass
 class FalV2Token:
     token: str
@@ -92,7 +123,7 @@ class FalV2TokenManager:
             data=b"{}",
             method="POST",
         )
-        with _urlopen(req) as response:
+        with _maybe_retry_request(req) as response:
             result = json.load(response)
 
         parsed_base_url = urlparse(result["base_url"])
@@ -137,7 +168,6 @@ LIFECYCLE_PREFERENCE: VariableReference[dict[str, str] | None] = VariableReferen
 
 @dataclass
 class FalFileRepositoryBase(FileRepository):
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def _save(
         self, file: FileData, storage_type: str, headers: dict[str, str] | None = None
     ) -> str:
@@ -171,7 +201,7 @@ class FalFileRepositoryBase(FileRepository):
                 headers=headers,
                 method="POST",
             )
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
 
             upload_url = result["upload_url"]
@@ -188,7 +218,7 @@ class FalFileRepositoryBase(FileRepository):
                 headers={"Content-Type": file.content_type},
             )
 
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT):
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT):
                 pass
 
             return result["file_url"]
@@ -265,7 +295,7 @@ class MultipartUploadGCS:
                 ).encode(),
             )
 
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
                 self._access_url = result["file_url"]
                 self._upload_url = result["upload_url"]
@@ -275,7 +305,6 @@ class MultipartUploadGCS:
                 f"Error initiating upload. Status {exc.status}: {exc.reason}"
             )
 
-    @retry(max_retries=5, base_delay=1, backoff_type="exponential", jitter=True)
     def upload_part(self, part_number: int, data: bytes) -> None:
         initiate_upload_url = self.upload_url + f"/{part_number}"
         req = Request(
@@ -285,7 +314,7 @@ class MultipartUploadGCS:
         )
 
         try:
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
                 upload_url = result["upload_url"]
         except HTTPError as exc:
@@ -301,7 +330,7 @@ class MultipartUploadGCS:
         )
 
         try:
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "part_number": part_number,
@@ -331,7 +360,7 @@ class MultipartUploadGCS:
                     }
                 ).encode(),
             )
-            with _urlopen(req):
+            with _maybe_retry_request(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -427,7 +456,6 @@ class FalFileRepository(FalFileRepositoryBase):
         if object_lifecycle_preference:
             headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
 
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def save(
         self,
         file: FileData,
@@ -536,7 +564,7 @@ class MultipartUpload:
                     }
                 ).encode(),
             )
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
                 self._upload_url = result["upload_url"]
                 self._file_url = result["file_url"]
@@ -556,7 +584,7 @@ class MultipartUpload:
         )
 
         try:
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "part_number": part_number,
@@ -581,7 +609,7 @@ class MultipartUpload:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with _urlopen(req):
+            with _maybe_retry_request(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -734,7 +762,7 @@ class MultipartUploadV3:
                 ).encode(),
             )
 
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
                 self._access_url = result["file_url"]
                 self._upload_url = result["upload_url"]
@@ -744,7 +772,6 @@ class MultipartUploadV3:
                 f"Error initiating upload. Status {exc.status}: {exc.reason}"
             )
 
-    @retry(max_retries=5, base_delay=1, backoff_type="exponential", jitter=True)
     def upload_part(self, part_number: int, data: bytes) -> None:
         parsed = urlparse(self.upload_url)
         part_path = parsed.path + f"/{part_number}"
@@ -760,7 +787,7 @@ class MultipartUploadV3:
         )
 
         try:
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "partNumber": part_number,
@@ -788,7 +815,7 @@ class MultipartUploadV3:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with _urlopen(req):
+            with _maybe_retry_request(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -928,7 +955,7 @@ class InternalMultipartUploadV3:
                     "X-Fal-File-Name": self.file_name,
                 },
             )
-            with _urlopen(req) as response:
+            with _maybe_retry_request(req) as response:
                 result = json.load(response)
                 self._access_url = result["access_url"]
                 self._upload_id = result["uploadId"]
@@ -938,7 +965,6 @@ class InternalMultipartUploadV3:
                 f"Error initiating upload. Status {exc.status}: {exc.reason}"
             )
 
-    @retry(max_retries=5, base_delay=1, backoff_type="exponential", jitter=True)
     def upload_part(self, part_number: int, data: bytes) -> None:
         url = f"{self.access_url}/multipart/{self.upload_id}/{part_number}"
 
@@ -953,7 +979,7 @@ class InternalMultipartUploadV3:
         )
 
         try:
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "partNumber": part_number,
@@ -979,7 +1005,7 @@ class InternalMultipartUploadV3:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with _urlopen(req):
+            with _maybe_retry_request(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -1067,7 +1093,6 @@ class InternalMultipartUploadV3:
 
 @dataclass
 class FalFileRepositoryV2(FalFileRepositoryBase):
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def save(
         self,
         file: FileData,
@@ -1105,7 +1130,7 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
                 headers=headers,
                 method="PUT",
             )
-            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as response:
+            with _maybe_retry_request(req, timeout=PUT_REQUEST_TIMEOUT) as response:
                 result = json.load(response)
 
             return result["file_url"]
@@ -1177,7 +1202,6 @@ class FalCDNFileRepository(FileRepository):
                 object_lifecycle_preference
             )
 
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def save(
         self,
         file: FileData,
@@ -1199,7 +1223,7 @@ class FalCDNFileRepository(FileRepository):
         url = os.getenv("FAL_CDN_HOST", _FAL_CDN) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)
         try:
-            with _urlopen(request) as response:
+            with _maybe_retry_request(request) as response:
                 result = json.load(response)
         except HTTPError as e:
             raise FileUploadException(
@@ -1236,7 +1260,6 @@ class FalFileRepositoryV3(FileRepository):
             "User-Agent": "fal/0.1.0",
         }
 
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def save(
         self,
         file: FileData,
@@ -1279,7 +1302,7 @@ class FalFileRepositoryV3(FileRepository):
             ).encode(),
         )
         try:
-            with _urlopen(request) as response:
+            with _maybe_retry_request(request) as response:
                 result = json.load(response)
                 file_url = result["file_url"]
                 upload_url = result["upload_url"]
@@ -1295,7 +1318,7 @@ class FalFileRepositoryV3(FileRepository):
             data=file.data,
         )
         try:
-            with _urlopen(request, timeout=PUT_REQUEST_TIMEOUT):
+            with _maybe_retry_request(request, timeout=PUT_REQUEST_TIMEOUT):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -1358,7 +1381,6 @@ class InternalFalFileRepositoryV3(FileRepository):
         if object_lifecycle_preference:
             headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
 
-    @retry(max_retries=3, base_delay=1, backoff_type="exponential", jitter=True)
     def save(
         self,
         file: FileData,
@@ -1393,7 +1415,7 @@ class InternalFalFileRepositoryV3(FileRepository):
         url = os.getenv("FAL_CDN_V3_HOST", _FAL_CDN_V3) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)
         try:
-            with _urlopen(request) as response:
+            with _maybe_retry_request(request) as response:
                 result = json.load(response)
         except HTTPError as e:
             raise FileUploadException(

fal/toolkit/utils/retry.py

@@ -2,7 +2,7 @@ import functools
 import random
 import time
 import traceback
-from typing import Any, Callable, Literal
+from typing import Any, Callable, Literal, Optional
 
 BackoffType = Literal["exponential", "fixed"]
 
@@ -13,6 +13,7 @@ def retry(
     max_delay: float = 60.0,
     backoff_type: BackoffType = "exponential",
     jitter: bool = False,
+    should_retry: Optional[Callable[[Exception], bool]] = None,
 ) -> Callable:
     def decorator(func: Callable) -> Callable:
         @functools.wraps(func)
@@ -22,6 +23,9 @@ def retry(
                 try:
                     return func(*args, **kwargs)
                 except Exception as e:
+                    if should_retry is not None and not should_retry(e):
+                        raise
+
                     retries += 1
                     print(f"Retrying {retries} of {max_retries}...")
                     if retries == max_retries:

{fal-1.19.2.dist-info → fal-1.20.1.dist-info}/METADATA

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

{fal-1.19.2.dist-info → fal-1.20.1.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=lOkMpxEMF6MuTuk4IHw6fbD9GVcMBZ3mwFzM45QwTSY,513
+fal/_fal_version.py,sha256=TOsa2f3CpFu7MvtteZ8unn1Fm7CcduyKVyG9QWXEcj8,513
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
-fal/api.py,sha256=moDNT8wt20uzsI-NTEsbVTpjFXFkSuuRXJx7Apux3SI,46329
+fal/api.py,sha256=_TaUcdTUNz5GnjGd3On1FeDSJ0zVJwZQZqAMn3_Yddw,46451
 fal/app.py,sha256=S5VHxDaj5J9YVC8ECenHCZJlTHalapHyOyHbCBNsDfs,24153
 fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
 fal/config.py,sha256=BEMH10B2bfWJ9yNawnLG6v3kBLnLmkhMe201EAODzs4,3124
@@ -30,7 +30,7 @@ fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
 fal/cli/debug.py,sha256=u_urnyFzSlNnrq93zz_GXE9FX4VyVxDoamJJyrZpFI0,1312
 fal/cli/deploy.py,sha256=CWf0Y56w-hNCrht-qrfgiOi9nuvve1Kl5NFZJpt_oRA,7770
 fal/cli/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
-fal/cli/files.py,sha256=DnCVWUFmdxVU-ADIAOjG8mFcnc7xjOTuliFJHNYJZzo,2424
+fal/cli/files.py,sha256=pSgAnTm2eHdP-IPkMIVfnK_Ii7mkSSOVgvbsiFUVBC0,2936
 fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
 fal/cli/main.py,sha256=ao8EEV_Fkd7AdN5En6k_dZWp158Et5DrqNRutl98MHY,3273
 fal/cli/parser.py,sha256=jYsGQ0BLQuKI7KtN1jnLVYKMbLtez7hPjwTNfG3UPSk,2964
@@ -60,7 +60,7 @@ fal/toolkit/audio/audio.py,sha256=_o5zCqBOppmX6_N_vtDkiW6e35XklOMvW71ELo6gfEE,34
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
 fal/toolkit/file/file.py,sha256=QITEtOyevDVOjv9iwUEWId7edQ6EBx6Uz6CgqWWJJ-U,9568
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
-fal/toolkit/file/providers/fal.py,sha256=cbND8tjEJvKklrmYgrjr6RtAcVLJIQ9VwhBhNCqgKc8,46992
+fal/toolkit/file/providers/fal.py,sha256=vt4Mznbfca6blfk0psF1ix-zB6309kpIA0_5Qh7bmFw,47217
 fal/toolkit/file/providers/gcp.py,sha256=DKeZpm1MjwbvEsYvkdXUtuLIJDr_UNbqXj_Mfv3NTeo,2437
 fal/toolkit/file/providers/r2.py,sha256=YqnYkkAo_ZKIa-xoSuDnnidUFwJWHdziAR34PE6irdI,3061
 fal/toolkit/file/providers/s3.py,sha256=EI45T54Mox7lHZKROss_O8o0DIn3CHP9k1iaNYVrxvg,2714
@@ -75,7 +75,7 @@ fal/toolkit/image/nsfw_filter/requirements.txt,sha256=3Pmrd0Ny6QAeBqUNHCgffRyfaC
 fal/toolkit/utils/__init__.py,sha256=CrmM9DyCz5-SmcTzRSm5RaLgxy3kf0ZsSEN9uhnX2Xo,97
 fal/toolkit/utils/download_utils.py,sha256=IIb8eLsoFg4Gy-2N0M4trnxFUF75f1pWtjOX_50vRNM,19983
 fal/toolkit/utils/endpoint.py,sha256=5EXoshA2PD_brjEfhNWAWasjqLOCRrjBnfhj6QGuMt8,782
-fal/toolkit/utils/retry.py,sha256=mHcQvvNIpu-Hi29P1HXSZuyvolRd48dMaJToqzlG0NY,1353
+fal/toolkit/utils/retry.py,sha256=0pnKqs1Y2dADMAk2944FZr68ZL3wQC_5hqApfgyMf_8,1531
 fal/toolkit/video/__init__.py,sha256=YV0jWpuvoA_CDFQXhd3zOvilFLKH7DYARrbzR7hWhpE,35
 fal/toolkit/video/video.py,sha256=U2hIIaIKCB_ZStYgQjpMTNrVONklq6fcqj-IT9jA7nE,344
 openapi_fal_rest/__init__.py,sha256=ziculmF_i6trw63LzZGFX-6W3Lwq9mCR8_UpkpvpaHI,152
@@ -141,8 +141,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.19.2.dist-info/METADATA,sha256=dlSJr_jIsRzpHdOPNuwn7vW9VesVA8Jx-d437ZSv22k,4085
-fal-1.19.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.19.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.19.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.19.2.dist-info/RECORD,,
+fal-1.20.1.dist-info/METADATA,sha256=wIvviHSTRAlZps2vuoaqrOMhMc9fu0LxQg6izAEAcrM,4085
+fal-1.20.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.20.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.20.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.20.1.dist-info/RECORD,,