fal 1.0.2__py3-none-any.whl → 1.0.4__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.0.2'
-__version_tuple__ = version_tuple = (1, 0, 2)
+__version__ = version = '1.0.4'
+__version_tuple__ = version_tuple = (1, 0, 4)

fal/api.py

@@ -282,7 +282,6 @@ def _handle_grpc_error():
                         "This is likely due to resource overflow. "
                         "You can try again by setting a bigger `machine_type`"
                     )
-
                 elif e.code() == grpc.StatusCode.INVALID_ARGUMENT and (
                     "The function function could not be deserialized" in e.details()
                 ):

fal/cli/main.py

@@ -45,6 +45,10 @@ def parse_args(argv=None):
     return args
 
 
+def _print_error(msg):
+    console.print(f"{CROSS_ICON} {msg}")
+
+
 def main(argv=None) -> int:
     import grpc
 
@@ -65,18 +69,18 @@ def main(argv=None) -> int:
             exc.__traceback__,
         )
         console.print(tb)
-        console.print("Unhandled user exception")
+        _print_error("Unhandled user exception")
     except KeyboardInterrupt:
-        console.print("Aborted.")
+        _print_error("Aborted.")
     except grpc.RpcError as exc:
-        console.print(exc.details())
+        _print_error(exc.details())
     except FalParserExit as exc:
         ret = exc.status
     except Exception as exc:
-        msg = f"{CROSS_ICON} {str(exc)}"
+        msg = str(exc)
         cause = exc.__cause__
         if cause is not None:
             msg += f": {str(cause)}"
-        console.print(msg)
+        _print_error(msg)
 
     return ret

fal/cli/parser.py

@@ -51,6 +51,22 @@ class DictAction(argparse.Action):
         setattr(args, self.dest, d)
 
 
+def _find_parser(parser, func):
+    defaults = parser._defaults
+    if not func or func == defaults.get("func"):
+        return parser
+
+    actions = parser._actions
+    for action in actions:
+        if not isinstance(action.choices, dict):
+            continue
+        for subparser in action.choices.values():
+            par = _find_parser(subparser, func)
+            if par:
+                return par
+    return None
+
+
 class FalParser(argparse.ArgumentParser):
     def __init__(self, *args, **kwargs):
         kwargs.setdefault("formatter_class", rich_argparse.RawTextRichHelpFormatter)
@@ -61,6 +77,13 @@ class FalParser(argparse.ArgumentParser):
             self._print_message(message, sys.stderr)
         raise FalParserExit(status)
 
+    def parse_args(self, args=None, namespace=None):
+        args, argv = self.parse_known_args(args, namespace)
+        if argv:
+            parser = _find_parser(self, getattr(args, "func", None)) or self
+            parser.error("unrecognized arguments: %s" % " ".join(argv))
+        return args
+
 
 class FalClientParser(FalParser):
     def __init__(self, *args, **kwargs):

fal/toolkit/file/providers/fal.py

@@ -20,7 +20,9 @@ class ObjectLifecyclePreference:
     expriation_duration_seconds: int
 
 
-GLOBAL_LIFECYCLE_PREFERENCE = ObjectLifecyclePreference(expriation_duration_seconds=2)
+GLOBAL_LIFECYCLE_PREFERENCE = ObjectLifecyclePreference(
+    expriation_duration_seconds=86400
+)
 
 
 @dataclass

fal/toolkit/utils/download_utils.py

@@ -4,7 +4,6 @@ import hashlib
 import shutil
 import subprocess
 import sys
-from functools import lru_cache
 from pathlib import Path, PurePath
 from tempfile import TemporaryDirectory
 from urllib.parse import urlparse
@@ -40,8 +39,10 @@ def _hash_url(url: str) -> str:
     return hashlib.sha256(url.encode("utf-8")).hexdigest()
 
 
-@lru_cache
-def _get_remote_file_properties(url: str) -> tuple[str, int]:
+def _get_remote_file_properties(
+    url: str,
+    request_headers: dict[str, str] | None = None,
+) -> tuple[str, int]:
     """Retrieves the file name and content length of a remote file.
 
     This function sends an HTTP request to the remote URL and retrieves the
@@ -60,11 +61,15 @@ def _get_remote_file_properties(url: str) -> tuple[str, int]:
 
     Args:
         url: The URL of the remote file.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request.
 
     Returns:
         A tuple containing the file name and the content length of the remote file.
     """
-    request = Request(url, headers=TEMP_HEADERS)
+    headers = {**TEMP_HEADERS, **(request_headers or {})}
+    request = Request(url, headers=headers)
+
     with urlopen(request) as response:
         file_name = response.headers.get_filename()
         content_length = int(response.headers.get("Content-Length", -1))
@@ -81,7 +86,9 @@ def _get_remote_file_properties(url: str) -> tuple[str, int]:
     return file_name, content_length
 
 
-def _file_content_length_matches(url: str, file_path: Path) -> bool:
+def _file_content_length_matches(
+    url: str, file_path: Path, request_headers: dict[str, str] | None = None
+) -> bool:
     """Check if the local file's content length matches the expected remote
     file's content length.
 
@@ -95,13 +102,15 @@ def _file_content_length_matches(url: str, file_path: Path) -> bool:
     Args:
         url: The URL of the remote file.
         file_path: The local path to the file being compared.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request.
 
     Returns:
         bool: `True` if the local file's content length matches the remote file's
             content length, `False` otherwise.
     """
     local_file_content_length = file_path.stat().st_size
-    remote_file_content_length = _get_remote_file_properties(url)[1]
+    remote_file_content_length = _get_remote_file_properties(url, request_headers)[1]
 
     return local_file_content_length == remote_file_content_length
 
@@ -111,6 +120,7 @@ def download_file(
     target_dir: str | Path,
     *,
     force: bool = False,
+    request_headers: dict[str, str] | None = None,
 ) -> Path:
     """Downloads a file from the specified URL to the target directory.
 
@@ -134,6 +144,9 @@ def download_file(
         force: If `True`, the file is downloaded even if it already exists locally and
             its content length matches the expected content length from the remote file.
             Defaults to `False`.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request. Defaults to `None`.
+
 
     Returns:
         A Path object representing the full path to the downloaded file.
@@ -142,7 +155,11 @@ def download_file(
         ValueError: If the provided `file_name` contains a forward slash ('/').
         DownloadError: If an error occurs during the download process.
     """
-    file_name = _get_remote_file_properties(url)[0]
+    try:
+        file_name = _get_remote_file_properties(url, request_headers)[0]
+    except Exception as e:
+        raise DownloadError(f"Failed to get remote file properties for {url}") from e
+
     if "/" in file_name:
         raise ValueError(f"File name '{file_name}' cannot contain a slash.")
 
@@ -156,7 +173,7 @@ def download_file(
 
     if (
         target_path.exists()
-        and _file_content_length_matches(url, target_path)
+        and _file_content_length_matches(url, target_path, request_headers)
         and not force
     ):
         return target_path
@@ -170,7 +187,9 @@ def download_file(
     target_path.parent.mkdir(parents=True, exist_ok=True)
 
     try:
-        _download_file_python(url=url, target_path=target_path)
+        _download_file_python(
+            url=url, target_path=target_path, request_headers=request_headers
+        )
     except Exception as e:
         msg = f"Failed to download {url} to {target_path}"
 
@@ -181,13 +200,17 @@ def download_file(
     return target_path
 
 
-def _download_file_python(url: str, target_path: Path | str) -> Path:
+def _download_file_python(
+    url: str, target_path: Path | str, request_headers: dict[str, str] | None = None
+) -> Path:
     """Download a file from a given URL and save it to a specified path using a
     Python interface.
 
     Args:
         url: The URL of the file to be downloaded.
         target_path: The path where the downloaded file will be saved.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request. Defaults to `None`.
 
     Returns:
         The path where the downloaded file has been saved.
@@ -199,11 +222,14 @@ def _download_file_python(url: str, target_path: Path | str) -> Path:
         try:
             file_path = temp_file.name
 
-            for (progress, total_size) in _stream_url_data_to_file(url, temp_file.name):
+            for progress, total_size in _stream_url_data_to_file(
+                url, temp_file.name, request_headers=request_headers
+            ):
                 if total_size:
                     progress_msg = f"Downloading {url} ... {progress:.2%}"
                 else:
                     progress_msg = f"Downloading {url} ... {progress:.2f} MB"
+
                 print(progress_msg, end="\r\n")
 
             # Move the file when the file is downloaded completely. Since the
@@ -219,7 +245,12 @@ def _download_file_python(url: str, target_path: Path | str) -> Path:
     return Path(target_path)
 
 
-def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 64):
+def _stream_url_data_to_file(
+    url: str,
+    file_path: str,
+    chunk_size_in_mb: int = 64,
+    request_headers: dict[str, str] | None = None,
+):
     """Download data from a URL and stream it to a file.
 
     Note:
@@ -233,6 +264,8 @@ def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 6
         file_path: The path to the file where the downloaded data will be saved.
         chunk_size_in_mb: The size of each download chunk in megabytes.
             Defaults to 64.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request. Defaults to `None`.
 
     Yields:
         A tuple containing two elements:
@@ -244,7 +277,8 @@ def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 6
     """
     ONE_MB = 1024**2
 
-    request = Request(url, headers=TEMP_HEADERS)
+    headers = {**TEMP_HEADERS, **(request_headers or {})}
+    request = Request(url, headers=headers)
 
     received_size = 0
     total_size = 0
@@ -267,7 +301,9 @@ def _stream_url_data_to_file(url: str, file_path: str, chunk_size_in_mb: int = 6
         raise DownloadError("Received less data than expected from the server.")
 
 
-def download_model_weights(url: str, force: bool = False):
+def download_model_weights(
+    url: str, force: bool = False, request_headers: dict[str, str] | None = None
+) -> Path:
     """Downloads model weights from the specified URL and saves them to a
     predefined directory.
 
@@ -284,6 +320,8 @@ def download_model_weights(url: str, force: bool = False):
         force: If `True`, the model weights are downloaded even if they already exist
             locally and their content length matches the expected content length from
             the remote file. Defaults to `False`.
+        request_headers: A dictionary containing additional headers to be included in
+            the HTTP request. Defaults to `None`.
 
     Returns:
         A Path object representing the full path to the downloaded model weights.
@@ -303,6 +341,7 @@ def download_model_weights(url: str, force: bool = False):
         url,
         target_dir=weights_dir,
         force=force,
+        request_headers=request_headers,
     )
 
 

fal/utils.py

@@ -34,7 +34,6 @@ def load_function_from(
     else:
         app_name = None
 
-    module = runpy.run_path(file_path)
     if function_name not in module:
         raise FalServerlessError(f"Function '{function_name}' not found in module")
 

{fal-1.0.2.dist-info → fal-1.0.4.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.0.2
+Version: 1.0.4
 Summary: fal is an easy-to-use Serverless Python Framework
-Author: Features & Labels <hello@fal.ai>
+Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: isolate[build] <1.0,>=0.12.3
@@ -20,7 +20,7 @@ Requires-Dist: colorama <1,>=0.4.6
 Requires-Dist: portalocker <3,>=2.7.0
 Requires-Dist: rich <14,>=13.3.2
 Requires-Dist: rich-argparse
-Requires-Dist: packaging <22,>=21.3
+Requires-Dist: packaging >=21.3
 Requires-Dist: pathspec <1,>=0.11.1
 Requires-Dist: pydantic !=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3
 Requires-Dist: fastapi <1,>=0.99.1

{fal-1.0.2.dist-info → fal-1.0.4.dist-info}/RECORD

@@ -1,9 +1,9 @@
 fal/__init__.py,sha256=suif79hYcYwlZ8dAaVXCErKhuD2AYf8uU78rty8jow8,721
 fal/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-fal/_fal_version.py,sha256=BGgbj7AHZwtVw29XgDIjcG5woR-f3jQy2X-ArcRT22E,411
+fal/_fal_version.py,sha256=9acUHRb1fq-uv5dr49LlEh189daKw4-SeypW5NxDolA,411
 fal/_serialization.py,sha256=7urrZXw99qmsK-RkjCurk6Va4TMEfDIMajkzKbSW4j4,7655
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=g8ypixM_3AZMdDbGQTUkBE92kphGE3dpLJPsY2cJMIk,36287
+fal/api.py,sha256=PBBLmVYNfIstLXJoRRoCQSfspPxklh9PNSWZEMfi0s8,36286
 fal/app.py,sha256=s9ba4t4D5KJrPFGKeRzL3XsdKH-W1Be6NmDQgYjPnCw,13826
 fal/apps.py,sha256=UhR6mq8jBiTAp-QvUnvbnMNcuJ5wHIKSqdlfyx8aBQ8,6829
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
@@ -11,7 +11,7 @@ fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
 fal/sdk.py,sha256=eHcg5TRouGL5d_9-p44x6lQUCYXVXdul6iEETCUov5Q,19976
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
-fal/utils.py,sha256=PfmRrW3EFJ4Y07XsRRfydS1NT4Fll5t7oChmFvusr3g,1793
+fal/utils.py,sha256=MFDs-eO3rBgc3jqIwBpfBtvvK5tbzAYWMzHV-tTVLic,1754
 fal/workflows.py,sha256=4rjqL4xB6GHLJsqTplJmAvpd6uHZJ28sc8su33BFXEo,14682
 fal/auth/__init__.py,sha256=r8iA2-5ih7-Fik3gEC4HEWNFbGoxpYnXpZu1icPIoS0,3561
 fal/auth/auth0.py,sha256=rSG1mgH-QGyKfzd7XyAaj1AYsWt-ho8Y_LZ-FUVWzh4,5421
@@ -22,8 +22,8 @@ fal/cli/auth.py,sha256=--MhfHGwxmtHbRkGioyn1prKn_U-pBzbz0G_QeZou-U,1352
 fal/cli/debug.py,sha256=1doDNwoaPDfLQginGNBxpC20dZYs5UxIojflDvV1Q04,1342
 fal/cli/deploy.py,sha256=S_HIMLqDpGyzDdbiIxudRizwjGoAaHpN-sXcl2uCaQ4,4329
 fal/cli/keys.py,sha256=-9N6ZY6rW-_IE9tpupgaBPDGjGdKB3HKqU2g9daM3Xc,3109
-fal/cli/main.py,sha256=RSMXLUyzYmZhS0Wcq9phXJcMJM_UpQD3su7F7j8Wr3M,1933
-fal/cli/parser.py,sha256=8W9VhxDBOSru6Vs_HsUm_RA7_YMnzXLTzUrXA0mGVRA,2109
+fal/cli/main.py,sha256=bLwuHlkCiroVDZ21WcL_qAv71k5kNTloWreZHuO0jR4,1977
+fal/cli/parser.py,sha256=r1hd5e8Jq6yzDZw8-S0On1EjJbjRtHMuVuHC6MlvUj4,2835
 fal/cli/run.py,sha256=NXwzkAWCKrRwgoMLsBOgW7RJPJW4IgSTrG85q2iePyk,894
 fal/cli/secrets.py,sha256=mgHp3gBr8d2su7wBApeADKWHPkYu2ueB6gG3eNMETh8,2595
 fal/console/__init__.py,sha256=ernZ4bzvvliQh5SmrEqQ7lA5eVcbw6Ra2jalKtA7dxg,132
@@ -43,13 +43,13 @@ fal/toolkit/optimize.py,sha256=p75sovF0SmRP6zxzpIaaOmqlxvXB_xEz3XPNf59EF7w,1339
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
 fal/toolkit/file/file.py,sha256=r8PzNCgv8Gkj6s1zM0yW-pcMKIouyaiEH06iBue8MwM,6066
 fal/toolkit/file/types.py,sha256=9CqDh8SmNJNzfsrvtj468uo2SprJH9rOk8KMhhfU73c,1050
-fal/toolkit/file/providers/fal.py,sha256=AfNwdnvt_IIFrzvNZPFjGwfVOQ2OzPfG1ySz6-2tnvc,3690
+fal/toolkit/file/providers/fal.py,sha256=AtYYXBM72leb8OmP6pvYiNZCWhEmoi9VfpckJ8FuZto,3700
 fal/toolkit/file/providers/gcp.py,sha256=7Lg7BXoHKkFu0jkGv3_vKh2Ks6eRfDMbw31N3mvDUtk,1913
 fal/toolkit/file/providers/r2.py,sha256=YW5aJBOX41MQxfx1rA_f-IiJhAPMZ5md0cxBcg3y08I,2537
 fal/toolkit/image/__init__.py,sha256=qNLyXsBWysionUjbeWbohLqWlw3G_UpzunamkZd_JLQ,71
 fal/toolkit/image/image.py,sha256=2q1ZCBSSdmDx9q1S4ahoCOniNaRcfSFnCS31f3b8ZZ0,4252
 fal/toolkit/utils/__init__.py,sha256=CrmM9DyCz5-SmcTzRSm5RaLgxy3kf0ZsSEN9uhnX2Xo,97
-fal/toolkit/utils/download_utils.py,sha256=M-xUAV8kX6o1zcojozSTaArGIC_LgQriagCC8AoG0mM,15487
+fal/toolkit/utils/download_utils.py,sha256=fDUITgdGW0wRXLE0NuQg29YJnJS3yr6l0zbRKqX6zMU,17006
 openapi_fal_rest/__init__.py,sha256=ziculmF_i6trw63LzZGFX-6W3Lwq9mCR8_UpkpvpaHI,152
 openapi_fal_rest/client.py,sha256=G6BpJg9j7-JsrAUGddYwkzeWRYickBjPdcVgXoPzxuE,2817
 openapi_fal_rest/errors.py,sha256=8mXSxdfSGzxT82srdhYbR0fHfgenxJXaUtMkaGgb6iU,470
@@ -92,8 +92,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.0.2.dist-info/METADATA,sha256=aCks8skI_xU27Mx6dtEPGPz0_H4USs9l9DtM9MOqV7I,3740
-fal-1.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fal-1.0.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.0.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.0.2.dist-info/RECORD,,
+fal-1.0.4.dist-info/METADATA,sha256=y6kcDVRBEAnrq9SCiVvyL6NdHNHDasO9-DBmNukr1L4,3738
+fal-1.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fal-1.0.4.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.0.4.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.0.4.dist-info/RECORD,,