fal 0.12.2__tar.gz → 0.12.3__tar.gz

{fal-0.12.2 → fal-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 0.12.2
+Version: 0.12.3
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels
 Author-email: hello@fal.ai
@@ -11,18 +11,15 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Dist: attrs (>=21.3.0)
-Requires-Dist: auth0-python (>=4.1.0,<5.0.0)
-Requires-Dist: boto3 (>=1.33.8,<2.0.0)
 Requires-Dist: click (>=8.1.3,<9.0.0)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: datadog-api-client (==2.12.0)
 Requires-Dist: dill (==0.3.7)
 Requires-Dist: fastapi (==0.99.1)
 Requires-Dist: grpc-interceptor (>=0.15.0,<0.16.0)
 Requires-Dist: grpcio (>=1.50.0,<2.0.0)
-Requires-Dist: httpx (>=0.15.4,<0.25.0)
+Requires-Dist: httpx (>=0.15.4)
 Requires-Dist: importlib-metadata (>=4.4) ; python_version < "3.10"
-Requires-Dist: isolate-proto (>=0.3.1,<0.4.0)
+Requires-Dist: isolate-proto (==0.3.3)
 Requires-Dist: isolate[build] (>=0.12.3,<1.0)
 Requires-Dist: msgpack (>=1.0.7,<2.0.0)
 Requires-Dist: opentelemetry-api (>=1.15.0,<2.0.0)
@@ -32,8 +29,8 @@ Requires-Dist: pathspec (>=0.11.1,<0.12.0)
 Requires-Dist: pillow (>=10.2.0,<11.0.0)
 Requires-Dist: portalocker (>=2.7.0,<3.0.0)
 Requires-Dist: pydantic (<2.0)
+Requires-Dist: pyjwt (>=2.8.0,<3.0.0)
 Requires-Dist: python-dateutil (>=2.8.0,<3.0.0)
-Requires-Dist: requests (>=2.28.1,<3.0.0)
 Requires-Dist: rich (>=13.3.2,<14.0.0)
 Requires-Dist: structlog (>=22.3.0,<23.0.0)
 Requires-Dist: types-python-dateutil (>=2.8.0,<3.0.0)

{fal-0.12.2 → fal-0.12.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fal"
-version = "0.12.2"
+version = "0.12.3"
 description = "fal is an easy-to-use Serverless Python Framework"
 authors = ["Features & Labels <hello@fal.ai>"]
 readme = "README.md"
@@ -12,15 +12,12 @@ packages = [
 [tool.poetry.dependencies]
 python = "^3.8"
 isolate = {version = ">=0.12.3, <1.0", extras = ["build"]}
-isolate-proto = "^0.3.1"
-auth0-python = "^4.1.0"
-requests = "^2.28.1"
+isolate-proto = "0.3.3"
 grpcio = "^1.50.0"
 dill = "0.3.7"
 typing-extensions = "^4.7.1"
 click = "^8.1.3"
 structlog = "^22.3.0"
-datadog-api-client = "2.12.0"
 opentelemetry-api = "^1.15.0"
 opentelemetry-sdk = "^1.15.0"
 grpc-interceptor = "^0.15.0"
@@ -35,17 +32,17 @@ pydantic = "<2.0"
 fastapi = "0.99.1"
 
 # rest-api-client dependencies
-httpx = ">=0.15.4,<0.25.0"
+httpx = ">=0.15.4"
 attrs = ">=21.3.0"
 python-dateutil = "^2.8.0"
 types-python-dateutil = "^2.8.0"
 
 # For 3.9 and earlier, importlib-metadata's newer versions are included in the standard library.
 importlib-metadata = { version = ">=4.4", python = "<3.10" }
-boto3 = "^1.33.8"
 msgpack = "^1.0.7"
 websockets = "^12.0"
 pillow = "^10.2.0"
+pyjwt = "^2.8.0"
 
 [tool.poetry.group.dev.dependencies]
 openapi-python-client = "^0.14.1"

{fal-0.12.2 → fal-0.12.3}/setup.py

@@ -33,17 +33,14 @@ package_data = \
 
 install_requires = \
 ['attrs>=21.3.0',
- 'auth0-python>=4.1.0,<5.0.0',
- 'boto3>=1.33.8,<2.0.0',
  'click>=8.1.3,<9.0.0',
  'colorama>=0.4.6,<0.5.0',
- 'datadog-api-client==2.12.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,<0.25.0',
- 'isolate-proto>=0.3.1,<0.4.0',
+ 'httpx>=0.15.4',
+ 'isolate-proto==0.3.3',
  'isolate[build]>=0.12.3,<1.0',
  'msgpack>=1.0.7,<2.0.0',
  'opentelemetry-api>=1.15.0,<2.0.0',
@@ -53,8 +50,8 @@ install_requires = \
  'pillow>=10.2.0,<11.0.0',
  'portalocker>=2.7.0,<3.0.0',
  'pydantic<2.0',
+ 'pyjwt>=2.8.0,<3.0.0',
  'python-dateutil>=2.8.0,<3.0.0',
- 'requests>=2.28.1,<3.0.0',
  'rich>=13.3.2,<14.0.0',
  'structlog>=22.3.0,<23.0.0',
  'types-python-dateutil>=2.8.0,<3.0.0',
@@ -69,7 +66,7 @@ entry_points = \
 
 setup_kwargs = {
     'name': 'fal',
-    'version': '0.12.2',
+    'version': '0.12.3',
     'description': 'fal is an easy-to-use Serverless Python Framework',
     'long_description': '# 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',

{fal-0.12.2 → fal-0.12.3}/src/fal/__init__.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
 from fal import apps
-
-# TODO: DEPRECATED - use function instead
 from fal.api import FalServerlessHost, LocalHost, cached
 from fal.api import function
 from fal.api import function as isolated
@@ -16,6 +14,17 @@ serverless = FalServerlessHost()
 # DEPRECATED - use serverless instead
 cloud = FalServerlessHost()
 
+__all__ = [
+    "function",
+    "cached",
+    "App",
+    "endpoint",
+    "realtime",
+    # "wrap_app",
+    "FalServerlessKeyCredentials",
+    "sync_dir",
+]
+
 
 # NOTE: This makes `import fal.dbt` import the `dbt-fal` module and `import fal` import the `fal` module
 # NOTE: taken from dbt-core: https://github.com/dbt-labs/dbt-core/blob/ac539fd5cf325cfb5315339077d03399d575f570/core/dbt/adapters/__init__.py#L1-L7

{fal-0.12.2 → fal-0.12.3}/src/fal/api.py

@@ -4,7 +4,7 @@ import inspect
 import sys
 from collections import defaultdict
 from concurrent.futures import ThreadPoolExecutor
-from contextlib import suppress
+from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field, replace
 from functools import partial, wraps
 from os import PathLike
@@ -16,6 +16,7 @@ from typing import (
     Generic,
     Iterator,
     Literal,
+    NamedTuple,
     TypeVar,
     cast,
     overload,
@@ -26,6 +27,7 @@ import dill.detect
 import grpc
 import isolate
 import yaml
+from fastapi import FastAPI
 from isolate.backends.common import active_python
 from isolate.backends.settings import DEFAULT_SETTINGS
 from isolate.connections import PythonIPC
@@ -56,6 +58,8 @@ ReturnT = TypeVar("ReturnT", covariant=True)
 BasicConfig = Dict[str, Any]
 _UNSET = object()
 
+SERVE_REQUIREMENTS = ["fastapi==0.99.1", "uvicorn"]
+
 
 @dataclass
 class FalServerlessError(Exception):
@@ -110,7 +114,7 @@ class Host(Generic[ArgsT, ReturnT]):
                 options.environment[key] = value
 
         if options.gateway.get("serve"):
-            options.add_requirements(["fastapi==0.99.1", "uvicorn"])
+            options.add_requirements(SERVE_REQUIREMENTS)
 
         return options
 
@@ -730,53 +734,17 @@ def function(  # type: ignore
 
 
 @mainify
-class ServeWrapper:
-    _func: Callable
-
-    def __init__(self, func: Callable):
-        self._func = func
-
-    def build_app(self):
-        from fastapi import FastAPI
-        from fastapi.middleware.cors import CORSMiddleware
-
-        _app = FastAPI()
-
-        _app.add_middleware(
-            CORSMiddleware,
-            allow_credentials=True,
-            allow_headers=("*"),
-            allow_methods=("*"),
-            allow_origins=("*"),
-        )
-
-        _app.add_api_route(
-            "/",
-            self._func,  # type: ignore
-            name=self._func.__name__,
-            methods=["POST"],
-        )
-
-        return _app
-
-    def __call__(self, *args, **kwargs) -> None:
-        if len(args) != 0 or len(kwargs) != 0:
-            print(
-                f"[warning] {self._func.__name__} function is served with no arguments."
-            )
-
-        from uvicorn import run
-
-        app = self.build_app()
-        run(app, host="0.0.0.0", port=8080)
+class FalFastAPI(FastAPI):
+    """
+    A subclass of FastAPI that adds some fal-specific functionality.
+    """
 
     def openapi(self) -> dict[str, Any]:
         """
         Build the OpenAPI specification for the served function.
         Attach needed metadata for a better integration to fal.
         """
-        app = self.build_app()
-        spec = app.openapi()
+        spec = super().openapi()
         self._mark_order_openapi(spec)
         return spec
 
@@ -788,7 +756,8 @@ class ServeWrapper:
         """
 
         def mark_order(obj: dict[str, Any], key: str):
-            obj[f"x-fal-order-{key}"] = list(obj[key].keys())
+            if key in obj:
+                obj[f"x-fal-order-{key}"] = list(obj[key].keys())
 
         mark_order(spec, "paths")
 
@@ -797,18 +766,129 @@ class ServeWrapper:
             Mark the order of properties in the schema object.
             They can have 'allOf', 'properties' or '$ref' key.
             """
-            if "allOf" in schema:
-                for sub_schema in schema["allOf"]:
-                    order_schema_object(sub_schema)
-            if "properties" in schema:
-                mark_order(schema, "properties")
+            for sub_schema in schema.get("allOf", []):
+                order_schema_object(sub_schema)
+
+            mark_order(schema, "properties")
 
-        for key in spec.get("components", {}).get("schemas") or {}:
+        for key in spec.get("components", {}).get("schemas", {}):
             order_schema_object(spec["components"]["schemas"][key])
 
         return spec
 
 
+@mainify
+class RouteSignature(NamedTuple):
+    path: str
+    is_websocket: bool = False
+    input_modal: type | None = None
+    buffering: int | None = None
+    session_timeout: float | None = None
+    max_batch_size: int = 1
+    emit_timings: bool = False
+
+
+@mainify
+class BaseServable:
+    def collect_routes(self) -> dict[RouteSignature, Callable[..., Any]]:
+        raise NotImplementedError
+
+    def _add_extra_middlewares(self, app: FastAPI):
+        """
+        For subclasses to add extra middlewares to the app.
+        """
+        pass
+
+    @asynccontextmanager
+    async def lifespan(self, app: FastAPI):
+        yield
+
+    def _build_app(self) -> FastAPI:
+        from fastapi import HTTPException, Request
+        from fastapi.middleware.cors import CORSMiddleware
+        from fastapi.responses import JSONResponse
+
+        _app = FalFastAPI(lifespan=self.lifespan)
+
+        _app.add_middleware(
+            CORSMiddleware,
+            allow_credentials=True,
+            allow_headers=("*"),
+            allow_methods=("*"),
+            allow_origins=("*"),
+        )
+
+        self._add_extra_middlewares(_app)
+
+        @_app.exception_handler(404)
+        async def not_found_exception_handler(request: Request, exc: HTTPException):
+            # Rewrite the message to include the path that was not found.
+            # This is supposed to make it easier to understand to the user
+            # that the error comes from the app and not our platform.
+            if exc.detail == "Not Found":
+                return JSONResponse(
+                    {"detail": f"Path {request.url.path} not found"}, 404
+                )
+            else:
+                # If it's not a generic 404, just return the original message.
+                return JSONResponse({"detail": exc.detail}, 404)
+
+        routes = self.collect_routes()
+        if not routes:
+            raise ValueError("An application must have at least one route!")
+
+        for signature, endpoint in routes.items():
+            if signature.is_websocket:
+                _app.add_api_websocket_route(
+                    signature.path,
+                    endpoint,
+                    name=endpoint.__name__,
+                )
+            else:
+                _app.add_api_route(
+                    signature.path,
+                    endpoint,
+                    name=endpoint.__name__,
+                    methods=["POST"],
+                )
+
+        return _app
+
+    def openapi(self) -> dict[str, Any]:
+        """
+        Build the OpenAPI specification for the served function.
+        Attach needed metadata for a better integration to fal.
+        """
+        return self._build_app().openapi()
+
+    def serve(self) -> None:
+        import uvicorn
+
+        app = self._build_app()
+        uvicorn.run(app, host="0.0.0.0", port=8080)
+
+
+@mainify
+class ServeWrapper(BaseServable):
+    _func: Callable
+
+    def __init__(self, func: Callable):
+        self._func = func
+
+    def collect_routes(self) -> dict[RouteSignature, Callable[..., Any]]:
+        return {
+            RouteSignature("/"): self._func,
+        }
+
+    def __call__(self, *args, **kwargs) -> None:
+        if len(args) != 0 or len(kwargs) != 0:
+            print(
+                f"[warning] {self._func.__name__} function is served with no arguments."
+            )
+
+        self.serve()
+
+
 @dataclass
 class IsolatedFunction(Generic[ArgsT, ReturnT]):
     host: Host[ArgsT, ReturnT]