fal 1.0.7__py3-none-any.whl → 1.0.8__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.7'
-__version_tuple__ = version_tuple = (1, 0, 7)
+__version__ = version = '1.0.8'
+__version_tuple__ = version_tuple = (1, 0, 8)

fal/api.py

@@ -5,11 +5,12 @@ import os
 import sys
 import threading
 from collections import defaultdict
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import Future, ThreadPoolExecutor
 from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field, replace
 from functools import wraps
 from os import PathLike
+from queue import Queue
 from typing import (
     Any,
     Callable,
@@ -72,6 +73,8 @@ SERVE_REQUIREMENTS = [
 ]
 
 
+THREAD_POOL = ThreadPoolExecutor()
+
 @dataclass
 class FalServerlessError(FalServerlessException):
     message: str
@@ -87,6 +90,31 @@ class FalMissingDependencyError(FalServerlessError):
     ...
 
 
+@dataclass
+class SpawnInfo:
+    future: Future | None = None
+    logs: Queue = field(default_factory=Queue)
+    _url_ready: threading.Event = field(default_factory=threading.Event)
+    _url: str | None = None
+    stream: Any = None
+
+    @property
+    def return_value(self):
+        if self.future is None:
+            raise ValueError
+        return self.future.result()
+
+    @property
+    def url(self):
+        self._url_ready.wait()
+        return self._url
+
+    @url.setter
+    def url(self, value):
+        self._url_ready.set()
+        self._url = value
+
+
 @dataclass
 class Host(Generic[ArgsT, ReturnT]):
     """The physical environment where the isolated code
@@ -150,6 +178,15 @@ class Host(Generic[ArgsT, ReturnT]):
         """Run the given function in the isolated environment."""
         raise NotImplementedError
 
+    def spawn(
+        self,
+        func: Callable[ArgsT, ReturnT],
+        options: Options,
+        args: tuple[Any, ...],
+        kwargs: dict[str, Any],
+    ) -> SpawnInfo:
+        raise NotImplementedError
+
 
 def cached(func: Callable[ArgsT, ReturnT]) -> Callable[ArgsT, ReturnT]:
     """Cache the result of the given function in-memory."""
@@ -444,12 +481,13 @@ class FalServerlessHost(Host):
         return None
 
     @_handle_grpc_error()
-    def run(
+    def _run(
         self,
         func: Callable[..., ReturnT],
         options: Options,
         args: tuple[Any, ...],
         kwargs: dict[str, Any],
+        result_handler: Callable[..., None],
     ) -> ReturnT:
         environment_options = options.environment.copy()
         environment_options.setdefault("python_version", active_python())
@@ -490,8 +528,7 @@ class FalServerlessHost(Host):
             machine_requirements=machine_requirements,
             setup_function=setup_function,
         ):
-            for log in partial_result.logs:
-                self._log_printer.print(log)
+            result_handler(partial_result)
 
             if partial_result.status.state is not HostedRunState.IN_PROGRESS:
                 state = partial_result.status.state
@@ -512,6 +549,47 @@ class FalServerlessHost(Host):
         return cast(ReturnT, return_value)
 
 
+    def run(
+        self,
+        func: Callable[..., ReturnT],
+        options: Options,
+        args: tuple[Any, ...],
+        kwargs: dict[str, Any],
+    ) -> ReturnT:
+        def result_handler(partial_result):
+            for log in partial_result.logs:
+                self._log_printer.print(log)
+
+        return self._run(func, options, args, kwargs, result_handler=result_handler)
+
+    def spawn(
+        self,
+        func: Callable[..., ReturnT],
+        options: Options,
+        args: tuple[Any, ...],
+        kwargs: dict[str, Any],
+    ) -> SpawnInfo:
+        ret = SpawnInfo()
+
+        def result_handler(partial_result):
+            ret.stream = partial_result.stream
+            for log in partial_result.logs:
+                if "Access your exposed service at" in log.message:
+                    ret.url = log.message.rsplit()[-1]
+                ret.logs.put(log)
+
+        THREAD_POOL.submit(
+            self._run,
+            func,
+            options,
+            args,
+            kwargs,
+            result_handler=result_handler,
+        )
+
+        return ret
+
+
 @dataclass
 class Options:
     host: BasicConfig = field(default_factory=dict)
@@ -1052,6 +1130,14 @@ class IsolatedFunction(Generic[ArgsT, ReturnT]):
         )
         return future
 
+    def spawn(self, *args: ArgsT.args, **kwargs: ArgsT.kwargs):
+        return self.host.spawn(
+            self.func,
+            self.options,
+            args,
+            kwargs,
+        )
+
     def __call__(self, *args: ArgsT.args, **kwargs: ArgsT.kwargs) -> ReturnT:
         try:
             return self.host.run(

fal/app.py

@@ -4,10 +4,12 @@ import inspect
 import json
 import os
 import re
+import time
 import typing
-from contextlib import asynccontextmanager
+from contextlib import asynccontextmanager, contextmanager
 from typing import Any, Callable, ClassVar, TypeVar
 
+import httpx
 from fastapi import FastAPI
 
 import fal.api
@@ -69,6 +71,66 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
     return fn
 
 
+class EndpointClient:
+    def __init__(self, url, endpoint, signature):
+        self.url = url
+        self.endpoint = endpoint
+        self.signature = signature
+
+        annotations = endpoint.__annotations__ or {}
+        self.return_type = annotations.get("return") or None
+
+    def __call__(self, data):
+        with httpx.Client() as client:
+            resp = client.post(self.url + self.signature.path, json=dict(data))
+            resp.raise_for_status()
+            resp_dict = resp.json()
+
+        if not self.return_type:
+            return resp_dict
+
+        return self.return_type(**resp_dict)
+
+
+class AppClient:
+    def __init__(self, cls, url):
+        self.url = url
+        self.cls = cls
+
+        for name, endpoint in inspect.getmembers(cls, inspect.isfunction):
+            signature = getattr(endpoint, "route_signature", None)
+            if signature is None:
+                continue
+
+            setattr(self, name, EndpointClient(self.url, endpoint, signature))
+
+    @classmethod
+    @contextmanager
+    def connect(cls, app_cls):
+        app = wrap_app(app_cls)
+        info = app.spawn()
+        try:
+            with httpx.Client() as client:
+                retries = 100
+                while retries:
+                    resp = client.get(info.url + "/health")
+                    if resp.is_success:
+                        break
+                    elif resp.status_code != 500:
+                        resp.raise_for_status()
+                    time.sleep(0.1)
+                    retries -= 1
+
+            yield cls(app_cls, info.url)
+        finally:
+            info.stream.cancel()
+
+    def health(self):
+        with httpx.Client() as client:
+            resp = client.get(self.url + "/health")
+            resp.raise_for_status()
+            return resp.json()
+
 
 PART_FINDER_RE = re.compile(r"[A-Z][a-z]*")
 

fal/cli/doctor.py

@@ -0,0 +1,37 @@
+import os
+import platform
+
+
+def _doctor(args):
+    import isolate
+    from rich.table import Table
+
+    import fal
+
+    table = Table(show_header=False, show_lines=False, box=None)
+    table.add_column("name", no_wrap=True, style="bold")
+    table.add_column("value", no_wrap=True)
+
+    table.add_row("fal", fal.__version__)
+    table.add_row("isolate", isolate.__version__)
+
+    table.add_row("", "")
+    table.add_row("python", platform.python_version())
+    table.add_row("platform", platform.platform())
+
+    table.add_row("", "")
+    table.add_row("FAL_HOST", fal.flags.GRPC_HOST)
+    table.add_row("FAL_KEY", os.getenv("FAL_KEY", "").split(":")[0])
+
+    args.console.print(table)
+
+
+def add_parser(main_subparsers, parents):
+    doctor_help = "fal version and misc environment information."
+    parser = main_subparsers.add_parser(
+        "doctor",
+        description=doctor_help,
+        help=doctor_help,
+        parents=parents,
+    )
+    parser.set_defaults(func=_doctor)

fal/cli/main.py

@@ -6,7 +6,7 @@ from fal import __version__
 from fal.console import console
 from fal.console.icons import CROSS_ICON
 
-from . import apps, auth, deploy, keys, run, secrets
+from . import apps, auth, deploy, doctor, keys, run, secrets
 from .debug import debugtools, get_debug_parser
 from .parser import FalParser, FalParserExit
 
@@ -31,7 +31,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
         required=True,
     )
 
-    for cmd in [auth, apps, deploy, run, keys, secrets]:
+    for cmd in [auth, apps, deploy, run, keys, secrets, doctor]:
         cmd.add_parser(subparsers, parents)
 
     return parser

fal/sdk.py

@@ -224,6 +224,7 @@ class HostedRunResult(Generic[ResultT]):
     status: HostedRunStatus
     logs: list[Log] = field(default_factory=list)
     result: ResultT | None = None
+    stream: Any = None
 
 
 @dataclass
@@ -569,8 +570,11 @@ class FalServerlessConnection:
             request.setup_func.MergeFrom(
                 to_serialized_object(setup_function, serialization_method)
             )
-        for partial_result in self.stub.Run(request):
-            yield from_grpc(partial_result)
+        stream = self.stub.Run(request)
+        for partial_result in stream:
+            res = from_grpc(partial_result)
+            res.stream = stream
+            yield res
 
     def create_alias(
         self,

fal/toolkit/file/providers/fal.py

@@ -98,6 +98,7 @@ class FalCDNFileRepository(FileRepository):
             **self.auth_headers,
             "Accept": "application/json",
             "Content-Type": file.content_type,
+            "X-Fal-File-Name": file.file_name,
             "X-Fal-Object-Lifecycle-Preference": json.dumps(
                 dataclasses.asdict(GLOBAL_LIFECYCLE_PREFERENCE)
             ),

{fal-1.0.7.dist-info → fal-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.0.7
+Version: 1.0.8
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -43,6 +43,7 @@ Requires-Dist: pytest <8 ; extra == 'test'
 Requires-Dist: pytest-asyncio ; extra == 'test'
 Requires-Dist: pytest-xdist ; extra == 'test'
 Requires-Dist: flaky ; extra == 'test'
+Requires-Dist: boto3 ; extra == 'test'
 
 [![PyPI](https://img.shields.io/pypi/v/fal.svg?logo=PyPI)](https://pypi.org/project/fal)
 [![Tests](https://img.shields.io/github/actions/workflow/status/fal-ai/fal/integration_tests.yaml?label=Tests)](https://github.com/fal-ai/fal/actions)

{fal-1.0.7.dist-info → fal-1.0.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-fal/_fal_version.py,sha256=B_2jTRPLk-a7dhEz8Rto7VRGwxfpXrqO4mYrudjn7bw,411
+fal/_fal_version.py,sha256=vy0P95Si-KzUl6NsixjrWEHfr5xcmkA_oO_S3bQRmvE,411
 fal/_serialization.py,sha256=7urrZXw99qmsK-RkjCurk6Va4TMEfDIMajkzKbSW4j4,7655
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=SX8o5Uc5TAl2sZ3u1RuNKEpj7g_OPZOwVTyKsSxNgjk,38045
-fal/app.py,sha256=Sublwqso-gRlJ7oNX00JY8YK0P0WLTrB2c57GQH8Oxw,13946
+fal/api.py,sha256=Qkp97ozww5EBXHq1oSikuDMGB0m7ZaYb5TCvROAknsA,40174
+fal/app.py,sha256=duOf_YKE8o30hmhNtF9zvkT8wlKYXW7hdQLJtPrXHik,15793
 fal/apps.py,sha256=UhR6mq8jBiTAp-QvUnvbnMNcuJ5wHIKSqdlfyx8aBQ8,6829
 fal/container.py,sha256=V7riyyq8AZGwEX9QaqRQDZyDN_bUKeRKV1OOZArXjL0,622
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
 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/sdk.py,sha256=_1aK9VSzHPoDPbLm3nbhE4213zI66qAsgYs1Y1Wc3J8,20077
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=MFDs-eO3rBgc3jqIwBpfBtvvK5tbzAYWMzHV-tTVLic,1754
 fal/workflows.py,sha256=4rjqL4xB6GHLJsqTplJmAvpd6uHZJ28sc8su33BFXEo,14682
@@ -22,8 +22,9 @@ fal/cli/apps.py,sha256=Dqcx7ewUNY6dh0bYqRlOCHVDzmkdpFxe9CNThEz7HX4,8144
 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/doctor.py,sha256=U4ne9LX5gQwNblsYQ27XdO8AYDgbYjTO39EtxhwexRM,983
 fal/cli/keys.py,sha256=-9N6ZY6rW-_IE9tpupgaBPDGjGdKB3HKqU2g9daM3Xc,3109
-fal/cli/main.py,sha256=bLwuHlkCiroVDZ21WcL_qAv71k5kNTloWreZHuO0jR4,1977
+fal/cli/main.py,sha256=MxETDhqIT37quMbmofSMxBcAFOhnEHjpQ_pYEtOhApM,1993
 fal/cli/parser.py,sha256=r1hd5e8Jq6yzDZw8-S0On1EjJbjRtHMuVuHC6MlvUj4,2835
 fal/cli/run.py,sha256=NXwzkAWCKrRwgoMLsBOgW7RJPJW4IgSTrG85q2iePyk,894
 fal/cli/secrets.py,sha256=mgHp3gBr8d2su7wBApeADKWHPkYu2ueB6gG3eNMETh8,2595
@@ -44,7 +45,7 @@ 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=AtYYXBM72leb8OmP6pvYiNZCWhEmoi9VfpckJ8FuZto,3700
+fal/toolkit/file/providers/fal.py,sha256=ACxkfQ9kmMJ1xP8dNUHzkLkJJLZvoybTpVt8avGb8Nw,3747
 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
@@ -93,8 +94,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.7.dist-info/METADATA,sha256=UCGyga5ckEOE5PUeB0rC68NJou9Ehq7j9d34c79HgyY,3738
-fal-1.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fal-1.0.7.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.0.7.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.0.7.dist-info/RECORD,,
+fal-1.0.8.dist-info/METADATA,sha256=J6Lpic62ohISriecQ7IwHdL2PjZrNhrWVumFV7vhhJE,3777
+fal-1.0.8.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fal-1.0.8.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.0.8.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.0.8.dist-info/RECORD,,