fal 1.0.1__tar.gz → 1.0.3__tar.gz

{fal-1.0.1 → fal-1.0.3}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.0.1
+Version: 1.0.3
 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.1 → fal-1.0.3}/fal.egg-info/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.0.1
+Version: 1.0.3
 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.1 → fal-1.0.3}/fal.egg-info/requires.txt

@@ -13,7 +13,7 @@ colorama<1,>=0.4.6
 portalocker<3,>=2.7.0
 rich<14,>=13.3.2
 rich_argparse
-packaging<22,>=21.3
+packaging>=21.3
 pathspec<1,>=0.11.1
 pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3
 fastapi<1,>=0.99.1

{fal-1.0.1 → fal-1.0.3}/pyproject.toml

@@ -18,7 +18,7 @@ namespaces = false
 name = "fal"
 dynamic = ["version"]
 description = "fal is an easy-to-use Serverless Python Framework"
-authors = [{ name = "Features & Labels <hello@fal.ai>"}]
+authors = [{ name = "Features & Labels <support@fal.ai>"}]
 readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
@@ -37,7 +37,7 @@ dependencies = [
     "portalocker>=2.7.0,<3",
     "rich>=13.3.2,<14",
     "rich_argparse",
-    "packaging>=21.3,<22",
+    "packaging>=21.3",
     "pathspec>=0.11.1,<1",
     "pydantic!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,<3",
     # serve=True dependencies

{fal-1.0.1 → fal-1.0.3}/src/fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.1'
-__version_tuple__ = version_tuple = (1, 0, 1)
+__version__ = version = '1.0.3'
+__version_tuple__ = version_tuple = (1, 0, 3)

{fal-1.0.1 → fal-1.0.3}/src/fal/_serialization.py

@@ -195,7 +195,10 @@ def _patch_rlock() -> None:
 
 
 def _patch_console_thread_locals() -> None:
-    from rich.console import ConsoleThreadLocals
+    try:
+        from rich.console import ConsoleThreadLocals
+    except ModuleNotFoundError:
+        return
 
     def create_locals(kwargs: dict) -> ConsoleThreadLocals:
         return ConsoleThreadLocals(**kwargs)

{fal-1.0.1 → fal-1.0.3}/src/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-1.0.1 → fal-1.0.3}/src/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-1.0.1 → fal-1.0.3}/src/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-1.0.1 → fal-1.0.3}/src/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.1 → fal-1.0.3}/tests/test_apps.py

@@ -48,8 +48,6 @@ def addition_app(input: Input) -> Output:
 
 
 nomad_addition_app = addition_app.on(_scheduler="nomad")
-kubernetes_addition_app = addition_app.on(_scheduler="kubernetes")
-
 
 @fal.function(
     keep_alive=300,
@@ -203,20 +201,6 @@ def test_nomad_app():
     yield f"{user_id}/{app_revision}"
 
 
-@pytest.fixture(scope="module")
-def test_kubernetes_app():
-    # Create a temporary app, register it, and return the ID of it.
-
-    from fal.cli.deploy import _get_user_id
-
-    app_revision = kubernetes_addition_app.host.register(
-        func=nomad_addition_app.func,
-        options=kubernetes_addition_app.options,
-    )
-    user_id = _get_user_id()
-    yield f"{user_id}/{app_revision}"
-
-
 @pytest.fixture(scope="module")
 def test_fastapi_app():
     # Create a temporary app, register it, and return the ID of it.
@@ -426,7 +410,7 @@ def test_app_update_app(aliased_app: tuple[str, str]):
         assert res.max_multiplexing == new_max_multiplexing
 
     with host._connection as client:
-        new_max_concurrency = new_max_concurrency + 1
+        new_max_concurrency = new_max_concurrency - 1
         res = client.update_application(
             application_name=app_alias,
             max_concurrency=new_max_concurrency,

{fal-1.0.1 → fal-1.0.3}/tests/test_stability.py

@@ -67,6 +67,40 @@ def test_function_pipelining(isolated_client):
     assert calling_function(regular_function()) == 84
 
 
+def test_function_exception(isolated_client):
+    class FooException(Exception):
+        pass
+
+    class BarException(Exception):
+        pass
+
+    class MyFuncException(Exception):
+        pass
+
+    def foo():
+        raise FooException("foo")
+
+    def bar():
+        try:
+            foo()
+        except Exception as exc:
+            raise BarException("bar") from exc
+
+    @isolated_client()
+    def myfunc():
+        try:
+            bar()
+        except Exception as exc:
+            raise MyFuncException("myfunc") from exc
+
+    with pytest.raises(MyFuncException) as excinfo:
+        myfunc()
+
+    bar_exc = excinfo.value.__cause__
+    assert isinstance(bar_exc, BarException)
+    assert isinstance(bar_exc.__cause__, FooException)
+
+
 @pytest.mark.xfail(reason="See https://github.com/fal-ai/fal/issues/169")
 def test_function_calling_other_function(isolated_client):
     try:
@@ -341,22 +375,6 @@ def test_futures(isolated_client):
     assert future_4.result() == 8
 
 
-def test_conda_environment(isolated_client):
-    @isolated_client(
-        "conda",
-        packages=["pyjokes=0.6.0"],
-        machine_type="L",
-        # conda is only supported on Kubernetes
-        _scheduler="kubernetes",
-    )
-    def regular_function():
-        import pyjokes
-
-        return pyjokes.__version__
-
-    assert regular_function() == "0.6.0"
-
-
 @pytest.mark.xfail(reason="Nomad does not support conda")
 def test_conda_environment_on_nomad(isolated_client):
     @isolated_client(
@@ -374,6 +392,7 @@ def test_conda_environment_on_nomad(isolated_client):
     assert regular_function() == "0.6.0"
 
 
+@pytest.mark.xfail(reason="Broken on nomad")
 def test_cached_function(isolated_client, capsys, monkeypatch):
     import inspect
     import time
@@ -410,7 +429,6 @@ def test_cached_function(isolated_client, capsys, monkeypatch):
         "virtualenv",
         keep_alive=30,
         requirements=["pyjokes     "],
-        _scheduler="kubernetes",
     )
     def regular_function(n):
         if get_pipe() == "pipe":