fal 0.13.0__tar.gz → 0.14.0__tar.gz

{fal-0.13.0 → fal-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 0.13.0
+Version: 0.14.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels
 Author-email: hello@fal.ai

{fal-0.13.0 → fal-0.14.0}/pyproject.toml

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

{fal-0.13.0 → fal-0.14.0}/src/fal/__init__.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-from fal import apps
+from fal import apps  # noqa: F401
 from fal.api import FalServerlessHost, LocalHost, cached
 from fal.api import function
-from fal.api import function as isolated
-from fal.app import App, endpoint, realtime, wrap_app
+from fal.api import function as isolated  # noqa: F401
+from fal.app import App, endpoint, realtime, wrap_app  # noqa: F401
 from fal.sdk import FalServerlessKeyCredentials
 from fal.sync import sync_dir
 
@@ -32,6 +32,6 @@ __all__ = [
 # This will add to the package’s __path__ all subdirectories of directories on sys.path named after the package which effectively combines both modules into a single namespace (dbt.adapters)
 # The matching statement is in plugins/postgres/dbt/adapters/__init__.py
 
-from pkgutil import extend_path
+from pkgutil import extend_path  # noqa: E402
 
 __path__ = extend_path(__path__, __name__)

{fal-0.13.0 → fal-0.14.0}/src/fal/_serialization.py

@@ -163,6 +163,25 @@ def patch_exceptions():
         dill.pickle(exception_cls, save_exception)
 
 
+@mainify
+def _patch_console_thread_locals() -> None:
+    # NOTE: we __sometimes__ might have to serialize these
+    from rich.console import ConsoleThreadLocals
+
+    @dill.register(ConsoleThreadLocals)
+    def save_console_thread_locals(pickler, obj):
+        args = {
+            "theme_stack": obj.theme_stack,
+            "buffer": obj.buffer,
+            "buffer_index": obj.buffer_index,
+        }
+
+        def unpickle(kwargs):
+            return ConsoleThreadLocals(**kwargs)
+
+        pickler.save_reduce(unpickle, (args,), obj=obj)
+
+
 @mainify
 def patch_dill():
     import dill
@@ -172,3 +191,11 @@ def patch_dill():
     patch_exceptions()
     patch_pydantic_class_attributes()
     patch_pydantic_field_serialization()
+    _patch_console_thread_locals()
+
+
+@mainify
+def patch_pickle():
+    from tblib import pickling_support
+
+    pickling_support.install()

{fal-0.13.0 → fal-0.14.0}/src/fal/api.py

@@ -2,11 +2,12 @@ from __future__ import annotations
 
 import inspect
 import sys
+import threading
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field, replace
-from functools import partial, wraps
+from functools import wraps
 from os import PathLike
 from typing import (
     Any,
@@ -26,6 +27,7 @@ import dill
 import dill.detect
 import grpc
 import isolate
+import tblib
 import yaml
 from fastapi import FastAPI
 from isolate.backends.common import active_python
@@ -36,7 +38,7 @@ from packaging.utils import canonicalize_name
 from typing_extensions import Concatenate, ParamSpec
 
 import fal.flags as flags
-from fal._serialization import add_serialization_listeners_for, patch_dill
+from fal._serialization import add_serialization_listeners_for, patch_dill, patch_pickle
 from fal.logging.isolate import IsolateLogPrinter
 from fal.sdk import (
     FAL_SERVERLESS_DEFAULT_KEEP_ALIVE,
@@ -192,10 +194,11 @@ def match_class(obj, cls):
 
 def _prepare_partial_func(
     func: Callable[ArgsT, ReturnT],
+    patch_func: Callable[[], None],
     *args: ArgsT.args,
     **kwargs: ArgsT.kwargs,
 ) -> Callable[ArgsT, ReturnT]:
-    """Prepare the given function for execution on the remote isolate workers."""
+    """Prepare the given function for execution on isolate workers."""
 
     @wraps(func)
     def wrapper(*remote_args: ArgsT.args, **remote_kwargs: ArgsT.kwargs) -> ReturnT:
@@ -211,20 +214,39 @@ def _prepare_partial_func(
             ) from exc.with_traceback(tb)
         finally:
             with suppress(Exception):
-                patch_dill()
+                patch_func()
         return result
 
     return wrapper
 
 
+def _prepare_local_partial_func(
+    func: Callable[ArgsT, ReturnT],
+    *args: ArgsT.args,
+    **kwargs: ArgsT.kwargs,
+) -> Callable[ArgsT, ReturnT]:
+
+    return _prepare_partial_func(func, patch_pickle, *args, **kwargs)
+
+
+def _prepare_remote_partial_func(
+    func: Callable[ArgsT, ReturnT],
+    *args: ArgsT.args,
+    **kwargs: ArgsT.kwargs,
+) -> Callable[ArgsT, ReturnT]:
+
+    return _prepare_partial_func(func, patch_dill, *args, **kwargs)
+
+
 @dataclass
 class LocalHost(Host):
     # The environment which provides the default set of
     # packages for isolate agent to run.
     _AGENT_ENVIRONMENT = isolate.prepare_environment(
         "virtualenv",
-        requirements=[f"dill=={dill.__version__}"],
+        requirements=[f"dill=={dill.__version__}", f"tblib=={tblib.__version__}"],
     )
+    _log_printer = IsolateLogPrinter(debug=flags.DEBUG)
 
     def run(
         self,
@@ -233,7 +255,7 @@ class LocalHost(Host):
         args: tuple[Any, ...],
         kwargs: dict[str, Any],
     ) -> ReturnT:
-        settings = replace(DEFAULT_SETTINGS, serialization_method="dill")
+        settings = replace(DEFAULT_SETTINGS, serialization_method="dill", log_hook=self._log_printer.print)
         environment = isolate.prepare_environment(
             **options.environment,
             context=settings,
@@ -243,7 +265,7 @@ class LocalHost(Host):
             environment.create(),
             extra_inheritance_paths=[self._AGENT_ENVIRONMENT.create()],
         ) as connection:
-            executable = partial(func, *args, **kwargs)
+            executable = _prepare_local_partial_func(func, *args, **kwargs)
             return connection.run(executable)
 
 
@@ -251,9 +273,6 @@ FAL_SERVERLESS_DEFAULT_URL = flags.GRPC_HOST
 FAL_SERVERLESS_DEFAULT_MACHINE_TYPE = "XS"
 
 
-import threading
-
-
 def _handle_grpc_error():
     def decorator(fn):
         @wraps(fn)
@@ -403,7 +422,7 @@ class FalServerlessHost(Host):
             min_concurrency=min_concurrency,
         )
 
-        partial_func = _prepare_partial_func(func)
+        partial_func = _prepare_remote_partial_func(func)
 
         if metadata is None:
             metadata = {}
@@ -473,7 +492,7 @@ class FalServerlessHost(Host):
         return_value = _UNSET
         # Allow isolate provided arguments (such as setup function) to take
         # precedence over the ones provided by the user.
-        partial_func = _prepare_partial_func(func, *args, **kwargs)
+        partial_func = _prepare_remote_partial_func(func, *args, **kwargs)
         for partial_result in self._connection.run(
             partial_func,
             environments,

{fal-0.13.0 → fal-0.14.0}/src/fal/app.py

@@ -39,7 +39,7 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
     try:
         app = cls(_allow_init=True)
         metadata["openapi"] = app.openapi()
-    except Exception as exc:
+    except Exception:
         logger.warning("Failed to build OpenAPI specification for %s", cls.__name__)
         realtime_app = False
     else:

{fal-0.13.0 → fal-0.14.0}/src/fal/auth/__init__.py

@@ -64,7 +64,7 @@ def _fetch_access_token() -> str:
             try:
                 auth0.verify_access_token_expiration(access_token)
                 return access_token
-            except:
+            except Exception:
                 # access_token expired, will refresh
                 pass
 

{fal-0.13.0 → fal-0.14.0}/src/fal/cli.py

@@ -113,7 +113,6 @@ class MainGroup(RichGroup):
 
         if aliases:
             # Add aliases to the help text
-            aliases_str = "Alias: " + ", ".join([name, *aliases])
             cmd.help = (cmd.help or "") + "\n\nAlias: " + ", ".join([name, *aliases])
             cmd.short_help = (
                 (cmd.short_help or "") + "(Alias: " + ", ".join(aliases) + ")"
@@ -603,7 +602,7 @@ def _get_user_id() -> str:
     if user_details_response.status_code != HTTPStatus.OK:
         try:
             content = json.loads(user_details_response.content.decode("utf8"))
-        except:
+        except Exception:
             raise api.FalServerlessError(
                 f"Error fetching user details: {user_details_response}"
             )

{fal-0.13.0 → fal-0.14.0}/src/fal/logging/isolate.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import sys
 from datetime import datetime, timezone
 
-from isolate.logs import Log, LogLevel
+from isolate.logs import Log, LogLevel, LogSource
 from structlog.dev import ConsoleRenderer
 from structlog.typing import EventDict
 
@@ -21,6 +22,12 @@ class IsolateLogPrinter:
     def print(self, log: Log):
         if log.level < LogLevel.INFO and not self.debug:
             return
+
+        if log.source == LogSource.USER:
+            stream = sys.stderr if log.level == LogLevel.STDERR else sys.stdout
+            print(log.message, file=stream)
+            return
+
         level = str(log.level)
 
         if hasattr(log, "timestamp"):
@@ -44,21 +51,3 @@ class IsolateLogPrinter:
         # Use structlog processors to get consistent output with local logs
         message = _renderer.__call__(logger={}, name=level, event_dict=event)
         print(message)
-
-    def print_dict(self, log: dict):
-        level = LogLevel[log["level"]]
-        if level < LogLevel.INFO and not self.debug:
-            return
-        if "timestamp" in log.keys():
-            timestamp = log["timestamp"]
-        else:
-            timestamp = datetime.now(timezone.utc).strftime("%Y-%m-%d %H:%M:%S.%f")
-
-        event: EventDict = {
-            "event": log["message"],
-            "level": log["level"],
-            "timestamp": timestamp[:-3],
-        }
-
-        message = _renderer.__call__(logger={}, name=log["level"], event_dict=event)
-        print(message)

{fal-0.13.0 → fal-0.14.0}/src/fal/logging/user.py

@@ -12,7 +12,7 @@ def add_user_id(
     user_id: str | None = None
     try:
         user_id = USER.info.get("sub")
-    except:
+    except Exception:
         # logs are fail-safe, so any exception is safe to ignore
         # this is expected to happen only when user is logged out
         # or there's no internet connection

{fal-0.13.0 → fal-0.14.0}/src/fal/sdk.py

@@ -14,7 +14,7 @@ from isolate.server.interface import from_grpc, to_serialized_object, to_struct
 
 import isolate_proto
 from fal import flags
-from fal._serialization import patch_dill
+from fal._serialization import patch_dill, patch_pickle
 from fal.auth import USER, key_credentials
 from fal.logging import get_logger
 from fal.logging.trace import TraceContextInterceptor
@@ -32,6 +32,7 @@ FAL_SERVERLESS_DEFAULT_MIN_CONCURRENCY = 0
 logger = get_logger(__name__)
 
 patch_dill()
+patch_pickle()
 
 
 class ServerCredentials:

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/file/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-from .file import *
+from .file import *  # noqa: F403

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/file/file.py

@@ -94,7 +94,7 @@ class File(BaseModel):
         if isinstance(value, str):
             parsed_url = urlparse(value)
             if parsed_url.scheme not in ["http", "https", "data"]:
-                raise ValueError(f"value must be a valid URL")
+                raise ValueError("value must be a valid URL")
             return cls._from_url(parsed_url.geturl())
 
         return value

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/file/providers/fal.py

@@ -12,7 +12,7 @@ from fal.toolkit.exceptions import FileUploadException
 from fal.toolkit.file.types import FileData, FileRepository
 from fal.toolkit.mainify import mainify
 
-_FAL_CDN = "https://fal-cdn.batuhan-941.workers.dev"
+_FAL_CDN = "https://fal.media"
 
 
 @mainify
@@ -27,7 +27,7 @@ class FalFileRepository(FileRepository):
         headers = {
             "Authorization": f"Key {key_id}:{key_secret}",
             "Accept": "application/json",
-            "Content-Type": f"application/json",
+            "Content-Type": "application/json",
         }
 
         grpc_host = os.environ.get("FAL_HOST", "api.alpha.fal.ai")

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/image/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-from .image import *
+from .image import *  # noqa: F403

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/image/image.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import io
 from tempfile import NamedTemporaryFile
-from typing import TYPE_CHECKING, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal, Union, Optional
 
 from pydantic import BaseModel, Field
 

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/optimize.py

@@ -41,7 +41,7 @@ def optimize(
             module,
             optimization_config=optimization_config,
         )
-    except Exception as e:
+    except Exception:
         print(
             "[WARNING] Failed to optimize module, falling back "
             "to default torch execution."

fal-0.14.0/src/fal/toolkit/utils/__init__.py

@@ -0,0 +1,3 @@
+from __future__ import annotations
+
+from fal.toolkit.utils.download_utils import *  # noqa: F403

{fal-0.13.0 → fal-0.14.0}/src/fal/toolkit/utils/download_utils.py

@@ -42,7 +42,7 @@ def _hash_url(url: str) -> str:
 
 
 @mainify
-@lru_cache()
+@lru_cache
 def _get_remote_file_properties(url: str) -> tuple[str, int]:
     """Retrieves the file name and content length of a remote file.
 

{fal-0.13.0 → fal-0.14.0}/src/fal/workflows.py

@@ -471,7 +471,7 @@ def main() -> None:
                 context.vars[node_id] = node.execute(context)
 
         console.print(
-            f"🎉 Execution complete!",
+            "🎉 Execution complete!",
             style="bold green",
         )
         output = context.hydrate(workflow.output)

fal-0.13.0/src/fal/toolkit/utils/__init__.py

@@ -1,3 +0,0 @@
-from __future__ import annotations
-
-from fal.toolkit.utils.download_utils import *