fal 0.12.6__py3-none-any.whl → 0.12.7__py3-none-any.whl

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/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/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/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/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.dist-info → fal-0.12.7.dist-info}/METADATA

@@ -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.dist-info → fal-0.12.7.dist-info}/RECORD

@@ -42,22 +42,22 @@ openapi_fal_rest/py.typed,sha256=8ZJUsxZiuOy1oJeVhsTWQhTG_6pTVHVXk5hJL79ebTk,25
 openapi_fal_rest/types.py,sha256=GLwJwOotUOdfqryo_r0naw55-dh6Ilm4IvxePekSACk,994
 fal/__init__.py,sha256=6SvCuotCb0tuqSWDZSFDjtySktJ5m1QpVIlefumJpvM,1199
 fal/__main__.py,sha256=8hDtWlaFZK24KhfNq_ZKgtXqYHsDQDetukOCMlsbW0Q,59
-fal/_serialization.py,sha256=l_dZuSX5BT7SogXw1CalYLfT2H3zy3tfq4y6jHuxZqQ,4201
-fal/api.py,sha256=Qack_oYNkvF4qown3P_oKvyvRfTJkhOG7PL1xpa8FUQ,32872
+fal/_serialization.py,sha256=PK8E6Z1-_E3IYnt5pNWWViOas0SMZTvpNE7a2arj_3U,4948
+fal/api.py,sha256=YNiX6QCDYDdfqccHzsOd0YYBDslkzVNhlDUxPubYsb4,34033
 fal/app.py,sha256=KAIgvBBpvzp6oY8BpH5hFOLDUpG4bjtwlV5jPGj2IE0,12487
 fal/apps.py,sha256=UhR6mq8jBiTAp-QvUnvbnMNcuJ5wHIKSqdlfyx8aBQ8,6829
 fal/auth/__init__.py,sha256=ZnR1fxonzDk0UhS3-i33Kq2xOrN-leYXvJ-Ddnj94xc,3594
 fal/auth/auth0.py,sha256=5y4-9udOSX2-N_zvinLCpFwl10MdaPydZX2v9GQMZEE,5406
 fal/auth/local.py,sha256=lZqp4j32l2xFpY8zYvLoIHHyJrNAJDcm5MxgsLpY_pw,1786
-fal/cli.py,sha256=bzoN2_oMgSldNQqJH7TCD_uokmH0-gGrdYCciA-EAVk,18338
+fal/cli.py,sha256=RCjns-r2yyJ6AmDFMkOxhKcZqtK5gY2lruA9ympdcUc,18432
 fal/console/__init__.py,sha256=ernZ4bzvvliQh5SmrEqQ7lA5eVcbw6Ra2jalKtA7dxg,132
 fal/console/icons.py,sha256=De9MfFaSkO2Lqfne13n3PrYfTXJVIzYZVqYn5BWsdrA,108
 fal/console/ux.py,sha256=KMQs3UHQvVHDxDQQqlot-WskVKoMQXOE3jiVkkfmIMY,356
 fal/env.py,sha256=-fA8x62BbOX3MOuO0maupa-_QJ9PNwr8ogfeG11QUyQ,53
-fal/exceptions/__init__.py,sha256=Q4LCSqIrJ8GFQZWH5BvWL5mDPR0HwYQuIhNvsdiOkEU,938
+fal/exceptions/__init__.py,sha256=A8oJQQQlb8WQieusFK6O4CBc4s6CUSiNgj0xVKJKvgg,1012
 fal/exceptions/_base.py,sha256=LeQmx-soL_-s1742WKN18VwTVjUuYP0L0BdQHPJBpM4,460
 fal/exceptions/auth.py,sha256=01Ro7SyGJpwchubdHe14Cl6-Al1jUj16Sy4BvakNWf4,384
-fal/exceptions/handlers.py,sha256=b21a8S13euECArjpgm2N69HsShqLYVqAboIeMoWlWA4,1414
+fal/exceptions/handlers.py,sha256=3z4DGTErw0zW3UW4p3JltlqpsMV10kqMtFOxpniMSBU,2105
 fal/flags.py,sha256=AATQO65M4C87dGp0j7o6cSQWcr62xE-8DnJYsUjFFbw,942
 fal/logging/__init__.py,sha256=snqprf7-sKw6oAATS_Yxklf-a3XhLg0vIHICPwLp6TM,1583
 fal/logging/isolate.py,sha256=yDW_P4aR-t53IRmvD2Iprufv1Wn-xQXoBbMB2Ufr59s,2122
@@ -83,7 +83,7 @@ fal/toolkit/optimize.py,sha256=OIhX0T-efRMgUJDpvL0bujdun5SovZgTdKxNOv01b_Y,1394
 fal/toolkit/utils/__init__.py,sha256=b3zVpm50Upx1saXU7RiV9r9in6-Chs4OU9KRjBv7MYI,83
 fal/toolkit/utils/download_utils.py,sha256=bigcLJjLK1OBAGxpYisJ0-5vcQCh0HAPuCykPrcCNd0,15596
 fal/workflows.py,sha256=hkyDk5KQCDcjyUbo_IhQePGP8t4nxzZ7Uw6rVbLtdq4,14448
-fal-0.12.6.dist-info/entry_points.txt,sha256=nE9GBVV3PdBosudFwbIzZQUe_9lfPR6EH8K_FdDASnM,62
-fal-0.12.6.dist-info/METADATA,sha256=qbt8-SaiKeEfaFR1BqOnIt5Kau6by-Q5NU3kViGwez8,3212
-fal-0.12.6.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-fal-0.12.6.dist-info/RECORD,,
+fal-0.12.7.dist-info/METADATA,sha256=qu608UFLzhem9FS6QaA-qjgs4PVSQcVW4aPajpGs5Gg,3263
+fal-0.12.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+fal-0.12.7.dist-info/entry_points.txt,sha256=nE9GBVV3PdBosudFwbIzZQUe_9lfPR6EH8K_FdDASnM,62
+fal-0.12.7.dist-info/RECORD,,

{fal-0.12.6.dist-info → fal-0.12.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.4.0
+Generator: poetry-core 1.9.0
 Root-Is-Purelib: true
 Tag: py3-none-any