fal 0.12.6__tar.gz → 0.12.7__tar.gz

{fal-0.12.6 → fal-0.12.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 0.12.6
+Version: 0.12.7
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels
 Author-email: hello@fal.ai
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: attrs (>=21.3.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)

{fal-0.12.6 → fal-0.12.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fal"
-version = "0.12.6"
+version = "0.12.7"
 description = "fal is an easy-to-use Serverless Python Framework"
 authors = ["Features & Labels <hello@fal.ai>"]
 readme = "README.md"

{fal-0.12.6 → fal-0.12.7}/src/fal/_serialization.py

@@ -137,10 +137,38 @@ def patch_pydantic_class_attributes():
     pydantic.utils.DUNDER_ATTRIBUTES.add("__class__")
 
 
+@mainify
+def patch_exceptions():
+    # Adapting tblib.pickling_support.install for dill.
+    from types import TracebackType
+
+    import dill
+    from tblib.pickling_support import (
+        _get_subclasses,
+        pickle_exception,
+        pickle_traceback,
+    )
+
+    @dill.register(TracebackType)
+    def save_traceback(pickler, obj):
+        unpickle, args = pickle_traceback(obj)
+        pickler.save_reduce(unpickle, args, obj=obj)
+
+    @dill.register(BaseException)
+    def save_exception(pickler, obj):
+        unpickle, args = pickle_exception(obj)
+        pickler.save_reduce(unpickle, args, obj=obj)
+
+    for exception_cls in _get_subclasses(BaseException):
+        dill.pickle(exception_cls, save_exception)
+
+
 @mainify
 def patch_dill():
     import dill
 
     dill.settings["recurse"] = True
+
+    patch_exceptions()
     patch_pydantic_class_attributes()
     patch_pydantic_field_serialization()

{fal-0.12.6 → fal-0.12.7}/src/fal/api.py

@@ -175,6 +175,21 @@ def cached(func: Callable[ArgsT, ReturnT]) -> Callable[ArgsT, ReturnT]:
     return wrapper
 
 
+@mainify
+class UserFunctionException(Exception):
+    pass
+
+
+def match_class(obj, cls):
+    # NOTE: Can't use isinstance because we are not using dill's byref setting when
+    # loading/dumping objects in RPC, which means that our exceptions from remote
+    # server are created by value and are actually a separate class that only looks
+    # like original one.
+    #
+    # See https://github.com/fal-ai/fal/issues/142
+    return type(obj).__name__ == cls.__name__
+
+
 def _prepare_partial_func(
     func: Callable[ArgsT, ReturnT],
     *args: ArgsT.args,
@@ -184,9 +199,19 @@ def _prepare_partial_func(
 
     @wraps(func)
     def wrapper(*remote_args: ArgsT.args, **remote_kwargs: ArgsT.kwargs) -> ReturnT:
-        result = func(*remote_args, *args, **remote_kwargs, **kwargs)
-        with suppress(Exception):
-            patch_dill()
+        try:
+            result = func(*remote_args, *args, **remote_kwargs, **kwargs)
+        except Exception as exc:
+            tb = exc.__traceback__
+            if tb is not None and tb.tb_next is not None:
+                # remove our wrapper from user's traceback
+                tb = tb.tb_next
+            raise UserFunctionException(
+                f"Uncaught user function exception: {str(exc)}"
+            ) from exc.with_traceback(tb)
+        finally:
+            with suppress(Exception):
+                patch_dill()
         return result
 
     return wrapper
@@ -895,6 +920,7 @@ class IsolatedFunction(Generic[ArgsT, ReturnT]):
     raw_func: Callable[ArgsT, ReturnT]
     options: Options
     executor: ThreadPoolExecutor = field(default_factory=ThreadPoolExecutor)
+    reraise: bool = True
 
     def __getstate__(self) -> dict[str, Any]:
         # Ensure that the executor is not pickled.
@@ -946,6 +972,12 @@ class IsolatedFunction(Generic[ArgsT, ReturnT]):
                     f"function uses the following modules which weren't present in the environment definition:\n"
                     + "\n".join(lines)
                 ) from None
+        except Exception as exc:
+            cause = exc.__cause__
+            if self.reraise and match_class(exc, UserFunctionException) and cause:
+                # re-raise original exception without our wrappers
+                raise cause
+            raise
 
     @overload
     def on(

{fal-0.12.6 → fal-0.12.7}/src/fal/cli.py

@@ -348,6 +348,8 @@ def register_application(
 @click.pass_obj
 def run(host: api.FalServerlessHost, file_path: str, function_name: str):
     isolated_function = load_function_from(host, file_path, function_name)
+    # let our exc handlers handle UserFunctionException
+    isolated_function.reraise = False
     isolated_function()
 
 

{fal-0.12.6 → fal-0.12.7}/src/fal/exceptions/__init__.py

@@ -4,6 +4,7 @@ from .handlers import (
     BaseExceptionHandler,
     FalServerlessExceptionHandler,
     GrpcExceptionHandler,
+    UserFunctionExceptionHandler,
 )
 
 
@@ -20,6 +21,7 @@ class ApplicationExceptionHandler:
     _handlers: list[BaseExceptionHandler] = [
         GrpcExceptionHandler(),
         FalServerlessExceptionHandler(),
+        UserFunctionExceptionHandler(),
     ]
 
     def handle(self, exception):

{fal-0.12.6 → fal-0.12.7}/src/fal/exceptions/handlers.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Generic, TypeVar
+from typing import TYPE_CHECKING, Generic, TypeVar
 
 from grpc import Call as RpcCall
 from rich.markdown import Markdown
@@ -8,6 +8,9 @@ from rich.markdown import Markdown
 from fal.console import console
 from fal.console.icons import CROSS_ICON
 
+if TYPE_CHECKING:
+    from fal.api import UserFunctionException
+
 from ._base import FalServerlessException
 
 ExceptionType = TypeVar("ExceptionType")
@@ -44,3 +47,23 @@ class GrpcExceptionHandler(BaseExceptionHandler[RpcCall]):
 
     def handle(self, exception: RpcCall):
         console.print(exception.details())
+
+
+class UserFunctionExceptionHandler(BaseExceptionHandler["UserFunctionException"]):
+    def should_handle(self, exception: Exception) -> bool:
+        from fal.api import UserFunctionException, match_class
+
+        return match_class(exception, UserFunctionException)
+
+    def handle(self, exception: UserFunctionException):
+        import rich
+
+        cause = exception.__cause__
+        exc = cause or exception
+        tb = rich.traceback.Traceback.from_exception(
+            type(exc),
+            exc,
+            exc.__traceback__,
+        )
+        console.print(tb)
+        super().handle(exception)

fal-0.12.6/setup.py

@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-from setuptools import setup
-
-package_dir = \
-{'': 'src',
- 'openapi_fal_rest': 'openapi-fal-rest/openapi_fal_rest',
- 'openapi_fal_rest.api': 'openapi-fal-rest/openapi_fal_rest/api',
- 'openapi_fal_rest.api.applications': 'openapi-fal-rest/openapi_fal_rest/api/applications',
- 'openapi_fal_rest.api.billing': 'openapi-fal-rest/openapi_fal_rest/api/billing',
- 'openapi_fal_rest.api.files': 'openapi-fal-rest/openapi_fal_rest/api/files',
- 'openapi_fal_rest.api.workflows': 'openapi-fal-rest/openapi_fal_rest/api/workflows',
- 'openapi_fal_rest.models': 'openapi-fal-rest/openapi_fal_rest/models'}
-
-packages = \
-['fal',
- 'fal.auth',
- 'fal.console',
- 'fal.exceptions',
- 'fal.logging',
- 'fal.toolkit',
- 'fal.toolkit.file',
- 'fal.toolkit.file.providers',
- 'fal.toolkit.image',
- 'fal.toolkit.utils',
- 'openapi_fal_rest',
- 'openapi_fal_rest.api',
- 'openapi_fal_rest.api.applications',
- 'openapi_fal_rest.api.billing',
- 'openapi_fal_rest.api.files',
- 'openapi_fal_rest.api.workflows',
- 'openapi_fal_rest.models']
-
-package_data = \
-{'': ['*']}
-
-install_requires = \
-['attrs>=21.3.0',
- 'click>=8.1.3,<9.0.0',
- 'colorama>=0.4.6,<0.5.0',
- 'dill==0.3.7',
- 'fastapi==0.99.1',
- 'grpc-interceptor>=0.15.0,<0.16.0',
- 'grpcio>=1.50.0,<2.0.0',
- 'httpx>=0.15.4',
- 'isolate-proto>=0.3.4,<0.4.0',
- 'isolate[build]>=0.12.3,<1.0',
- 'msgpack>=1.0.7,<2.0.0',
- 'opentelemetry-api>=1.15.0,<2.0.0',
- 'opentelemetry-sdk>=1.15.0,<2.0.0',
- 'packaging>=21.3',
- 'pathspec>=0.11.1,<0.12.0',
- 'pillow>=10.2.0,<11.0.0',
- 'portalocker>=2.7.0,<3.0.0',
- 'pydantic<2.0',
- 'pyjwt[crypto]>=2.8.0,<3.0.0',
- 'python-dateutil>=2.8.0,<3.0.0',
- 'rich>=13.3.2,<14.0.0',
- 'rich_click',
- 'structlog>=22.3.0,<23.0.0',
- 'types-python-dateutil>=2.8.0,<3.0.0',
- 'typing-extensions>=4.7.1,<5.0.0',
- 'websockets>=12.0,<13.0']
-
-extras_require = \
-{':python_version < "3.10"': ['importlib-metadata>=4.4']}
-
-entry_points = \
-{'console_scripts': ['fal = fal.cli:cli', 'fal-serverless = fal.cli:cli']}
-
-setup_kwargs = {
-    'name': 'fal',
-    'version': '0.12.6',
-    'description': 'fal is an easy-to-use Serverless Python Framework',
-    'long_description': '[![PyPI](https://img.shields.io/pypi/v/fal.svg?logo=PyPI)](https://pypi.org/project/fal)\n[![Tests](https://img.shields.io/github/actions/workflow/status/fal-ai/fal/integration_tests.yaml?label=Tests)](https://github.com/fal-ai/fal/actions)\n\n# fal\n\nfal is a serverless Python runtime that lets you run and scale code in the cloud with no infra management.\n\nWith fal, you can build pipelines, serve ML models and scale them up to many users. You scale down to 0 when you don\'t use any resources.\n\n## Quickstart\n\nFirst, you need to install the `fal` package. You can do so using pip:\n```shell\npip install fal\n```\n\nThen you need to authenticate:\n```shell\nfal auth login\n```\n\nYou can also use fal keys that you can get from [our dashboard](https://fal.ai/dashboard/keys).\n\nNow can use the fal package in your Python scripts as follows:\n\n```py\nimport fal\n\n@fal.function(\n    "virtualenv",\n    requirements=["pyjokes"],\n)\ndef tell_joke() -> str:\n    import pyjokes\n\n    joke = pyjokes.get_joke()\n    return joke\n\nprint("Joke from the clouds: ", tell_joke())\n```\n\nA new virtual environment will be created by fal in the cloud and the set of requirements that we passed will be installed as soon as this function is called. From that point on, our code will be executed as if it were running locally, and the joke prepared by the pyjokes library will be returned.\n\n## Next steps\n\nIf you would like to find out more about the capabilities of fal, check out to the [docs](https://fal.ai/docs). You can learn more about persistent storage, function caches and deploying your functions as API endpoints.\n',
-    'author': 'Features & Labels',
-    'author_email': 'hello@fal.ai',
-    'maintainer': 'None',
-    'maintainer_email': 'None',
-    'url': 'None',
-    'package_dir': package_dir,
-    'packages': packages,
-    'package_data': package_data,
-    'install_requires': install_requires,
-    'extras_require': extras_require,
-    'entry_points': entry_points,
-    'python_requires': '>=3.8,<4.0',
-}
-
-
-setup(**setup_kwargs)