fal 1.2.0__tar.gz → 1.2.2__tar.gz

{fal-1.2.0 → fal-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.2.0
+Version: 1.2.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -35,6 +35,7 @@ Requires-Dist: websockets<13,>=12.0
 Requires-Dist: pillow<11,>=10.2.0
 Requires-Dist: pyjwt[crypto]<3,>=2.8.0
 Requires-Dist: uvicorn<1,>=0.29.0
+Requires-Dist: cookiecutter
 Provides-Extra: test
 Requires-Dist: pytest<8; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"

{fal-1.2.0 → fal-1.2.2}/fal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.2.0
+Version: 1.2.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -35,6 +35,7 @@ Requires-Dist: websockets<13,>=12.0
 Requires-Dist: pillow<11,>=10.2.0
 Requires-Dist: pyjwt[crypto]<3,>=2.8.0
 Requires-Dist: uvicorn<1,>=0.29.0
+Requires-Dist: cookiecutter
 Provides-Extra: test
 Requires-Dist: pytest<8; extra == "test"
 Requires-Dist: pytest-asyncio; extra == "test"

{fal-1.2.0 → fal-1.2.2}/fal.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ src/fal/auth/local.py
 src/fal/cli/__init__.py
 src/fal/cli/apps.py
 src/fal/cli/auth.py
+src/fal/cli/create.py
 src/fal/cli/debug.py
 src/fal/cli/deploy.py
 src/fal/cli/doctor.py

{fal-1.2.0 → fal-1.2.2}/fal.egg-info/requires.txt

@@ -27,6 +27,7 @@ websockets<13,>=12.0
 pillow<11,>=10.2.0
 pyjwt[crypto]<3,>=2.8.0
 uvicorn<1,>=0.29.0
+cookiecutter
 
 [:python_version < "3.10"]
 importlib-metadata>=4.4

{fal-1.2.0 → fal-1.2.2}/pyproject.toml

@@ -55,6 +55,7 @@ dependencies = [
     "pillow>=10.2.0,<11",
     "pyjwt[crypto]>=2.8.0,<3",
     "uvicorn>=0.29.0,<1",
+    "cookiecutter",
 ]
 
 [project.optional-dependencies]

{fal-1.2.0 → fal-1.2.2}/src/fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.2.0'
-__version_tuple__ = version_tuple = (1, 2, 0)
+__version__ = version = '1.2.2'
+__version_tuple__ = version_tuple = (1, 2, 2)

{fal-1.2.0 → fal-1.2.2}/src/fal/api.py

@@ -1048,7 +1048,9 @@ class BaseServable:
         from uvicorn import Config
 
         app = self._build_app()
-        server = Server(config=Config(app, host="0.0.0.0", port=8080))
+        server = Server(
+            config=Config(app, host="0.0.0.0", port=8080, timeout_keep_alive=300)
+        )
         metrics_app = FastAPI()
         metrics_app.add_route("/metrics", handle_metrics)
         metrics_server = Server(config=Config(metrics_app, host="0.0.0.0", port=9090))

{fal-1.2.0 → fal-1.2.2}/src/fal/app.py

@@ -7,7 +7,7 @@ import re
 import time
 import typing
 from contextlib import asynccontextmanager, contextmanager
-from typing import Any, Callable, ClassVar, TypeVar
+from typing import Any, Callable, ClassVar, Literal, TypeVar
 
 import httpx
 from fastapi import FastAPI
@@ -152,6 +152,7 @@ class App(fal.api.BaseServable):
         "keep_alive": 60,
     }
     app_name: ClassVar[str]
+    app_auth: ClassVar[Literal["private", "public", "shared"]] = "private"
 
     def __init_subclass__(cls, **kwargs):
         app_name = kwargs.pop("name", None) or _to_fal_app_name(cls.__name__)

{fal-1.2.0 → fal-1.2.2}/src/fal/cli/apps.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 from .parser import FalClientParser
@@ -6,7 +8,7 @@ if TYPE_CHECKING:
     from fal.sdk import AliasInfo, ApplicationInfo
 
 
-def _apps_table(apps: list["AliasInfo"]):
+def _apps_table(apps: list[AliasInfo]):
     from rich.table import Table
 
     table = Table()
@@ -56,7 +58,7 @@ def _add_list_parser(subparsers, parents):
     parser.set_defaults(func=_list)
 
 
-def _app_rev_table(revs: list["ApplicationInfo"]):
+def _app_rev_table(revs: list[ApplicationInfo]):
     from rich.table import Table
 
     table = Table()

fal-1.2.2/src/fal/cli/create.py

@@ -0,0 +1,26 @@
+PROJECT_TYPES = ["app"]
+
+
+def _create_project(project_type: str):
+    from cookiecutter.main import cookiecutter
+
+    cookiecutter("https://github.com/fal-ai/cookiecutter-fal.git")
+
+
+def add_parser(main_subparsers, parents):
+    apps_help = "Create fal applications."
+    parser = main_subparsers.add_parser(
+        "create",
+        description=apps_help,
+        help=apps_help,
+        parents=parents,
+    )
+
+    parser.add_argument(
+        metavar="project_type",
+        choices=PROJECT_TYPES,
+        help="Type of project to create.",
+        dest="project_type",
+    )
+
+    parser.set_defaults(func=_create_project)

{fal-1.2.0 → fal-1.2.2}/src/fal/cli/deploy.py

@@ -81,17 +81,18 @@ def _deploy(args):
 
     user = _get_user()
     host = FalServerlessHost(args.host)
-    isolated_function, app_name = load_function_from(
+    isolated_function, app_name, app_auth = load_function_from(
         host,
         file_path,
         func_name,
     )
     app_name = args.app_name or app_name
+    app_auth = args.auth or app_auth or "private"
     app_id = host.register(
         func=isolated_function.func,
         options=isolated_function.options,
         application_name=app_name,
-        application_auth_mode=args.auth,
+        application_auth_mode=app_auth,
         metadata=isolated_function.options.host.get("metadata", {}),
     )
 
@@ -151,7 +152,6 @@ def add_parser(main_subparsers, parents):
     parser.add_argument(
         "--auth",
         type=valid_auth_option,
-        default="private",
         help="Application authentication mode (private, public).",
     )
     parser.set_defaults(func=_deploy)

{fal-1.2.0 → fal-1.2.2}/src/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, doctor, keys, run, secrets
+from . import apps, auth, create, 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, doctor]:
+    for cmd in [auth, apps, deploy, run, keys, secrets, doctor, create]:
         cmd.add_parser(subparsers, parents)
 
     return parser

{fal-1.2.0 → fal-1.2.2}/src/fal/cli/run.py

@@ -6,7 +6,7 @@ def _run(args):
     from fal.utils import load_function_from
 
     host = FalServerlessHost(args.host)
-    isolated_function, _ = load_function_from(host, *args.func_ref)
+    isolated_function, _, _ = load_function_from(host, *args.func_ref)
     # let our exc handlers handle UserFunctionException
     isolated_function.reraise = False
     isolated_function()

{fal-1.2.0 → fal-1.2.2}/src/fal/logging/isolate.py

@@ -17,11 +17,31 @@ class IsolateLogPrinter:
 
     def __init__(self, debug: bool = False) -> None:
         self.debug = debug
+        self._current_source: LogSource | None = None
+
+    def _maybe_print_header(self, source: LogSource):
+        from fal.console import console
+
+        if source == self._current_source:
+            return
+
+        msg = {
+            LogSource.BUILDER: "Building the environment",
+            LogSource.BRIDGE: "Unpacking user code",
+            LogSource.USER: "Running",
+        }.get(source)
+
+        if msg:
+            console.print(f"==> {msg}", style="bold green")
+
+        self._current_source = source
 
     def print(self, log: Log):
         if log.level < LogLevel.INFO and not self.debug:
             return
 
+        self._maybe_print_header(log.source)
+
         if log.source == LogSource.USER:
             stream = sys.stderr if log.level == LogLevel.STDERR else sys.stdout
             print(log.message, file=stream)

{fal-1.2.0 → fal-1.2.2}/src/fal/toolkit/utils/download_utils.py

@@ -1,11 +1,12 @@
 from __future__ import annotations
 
 import hashlib
+import os
 import shutil
 import subprocess
 import sys
 from pathlib import Path, PurePath
-from tempfile import TemporaryDirectory
+from tempfile import NamedTemporaryFile, TemporaryDirectory
 from urllib.parse import urlparse
 from urllib.request import Request, urlopen
 
@@ -215,10 +216,14 @@ def _download_file_python(
     Returns:
         The path where the downloaded file has been saved.
     """
-    import shutil
-    import tempfile
-
-    with tempfile.NamedTemporaryFile(delete=False) as temp_file:
+    basename = os.path.basename(target_path)
+    # NOTE: using the same directory to avoid potential copies across temp fs and target
+    # fs, and also to be able to atomically rename a downloaded file into place.
+    with NamedTemporaryFile(
+        delete=False,
+        dir=os.path.dirname(target_path),
+        prefix=f"{basename}.tmp",
+    ) as temp_file:
         try:
             file_path = temp_file.name
 
@@ -232,13 +237,14 @@ def _download_file_python(
 
                 print(progress_msg, end="\r\n")
 
-            # Move the file when the file is downloaded completely. Since the
-            # file used is temporary, in a case of an interruption, the downloaded
-            # content will be lost. So, it is safe to redownload the file in such cases.
-            shutil.move(file_path, target_path)
+            # NOTE: Atomically renaming the file into place when the file is downloaded
+            # completely.
+            #
+            # Since the file used is temporary, in a case of an interruption, the
+            # downloaded content will be lost. So, it is safe to redownload the file in
+            # such cases.
+            os.rename(file_path, target_path)
 
-        except Exception as error:
-            raise error
         finally:
             Path(temp_file.name).unlink(missing_ok=True)
 
@@ -403,35 +409,38 @@ def clone_repository(
             print(f"Removing the existing repository: {local_repo_path} ")
             shutil.rmtree(local_repo_path)
 
-    # Temporary directory to download the repo into.
-    temp_dir = TemporaryDirectory()
-    temp_dir_path = temp_dir.name
-
-    try:
-        print(f"Cloning the repository '{https_url}' .")
-
-        # Clone with disabling the logs and advices for detached HEAD state.
-        clone_command = [
-            "git",
-            "clone",
-            "--recursive",
-            https_url,
-            temp_dir_path,
-        ]
-        subprocess.check_call(clone_command)
-
-        if commit_hash:
-            checkout_command = ["git", "checkout", commit_hash]
-            subprocess.check_call(checkout_command, cwd=temp_dir_path)
-
-        # Move the repository when the clone and checkout is finished.
-        shutil.move(temp_dir_path, local_repo_path)
-
-    except Exception as error:
-        print(f"{error}\nFailed to clone repository '{https_url}' .")
-        temp_dir.cleanup()
+    # NOTE: using the target_dir to be able to avoid potential copies across temp fs
+    # and target fs, and also to be able to atomically rename repo_name dir into place
+    # when we are done setting it up.
+    os.makedirs(target_dir, exist_ok=True)  # type: ignore[arg-type]
+    with TemporaryDirectory(
+        dir=target_dir,
+        suffix=f"{local_repo_path.name}.tmp",
+    ) as temp_dir:
+        try:
+            print(f"Cloning the repository '{https_url}' .")
+
+            # Clone with disabling the logs and advices for detached HEAD state.
+            clone_command = [
+                "git",
+                "clone",
+                "--recursive",
+                https_url,
+                temp_dir,
+            ]
+            subprocess.check_call(clone_command)
+
+            if commit_hash:
+                checkout_command = ["git", "checkout", commit_hash]
+                subprocess.check_call(checkout_command, cwd=temp_dir)
+
+            # NOTE: Atomically renaming the repository directory into place when the
+            # clone and checkout are done.
+            os.rename(temp_dir, local_repo_path)
 
-        raise error
+        except Exception as error:
+            print(f"{error}\nFailed to clone repository '{https_url}' .")
+            raise error
 
     if include_to_path:
         __add_local_path_to_sys_path(local_repo_path)

{fal-1.2.0 → fal-1.2.2}/src/fal/utils.py

@@ -10,13 +10,13 @@ def load_function_from(
     host: FalServerlessHost,
     file_path: str,
     function_name: str | None = None,
-) -> tuple[IsolatedFunction, str | None]:
+) -> tuple[IsolatedFunction, str | None, str | None]:
     import runpy
 
     module = runpy.run_path(file_path)
     if function_name is None:
         fal_objects = {
-            obj.app_name: obj_name
+            obj_name: obj
             for obj_name, obj in module.items()
             if isinstance(obj, type)
             and issubclass(obj, fal.App)
@@ -30,9 +30,12 @@ def load_function_from(
                 "Please specify the name of the app."
             )
 
-        [(app_name, function_name)] = fal_objects.items()
+        [(function_name, obj)] = fal_objects.items()
+        app_name = obj.app_name
+        app_auth = obj.app_auth
     else:
         app_name = None
+        app_auth = None
 
     if function_name not in module:
         raise FalServerlessError(f"Function '{function_name}' not found in module")
@@ -44,10 +47,11 @@ def load_function_from(
     target = module[function_name]
     if isinstance(target, type) and issubclass(target, App):
         app_name = target.app_name
+        app_auth = target.app_auth
         target = wrap_app(target, host=host)
 
     if not isinstance(target, IsolatedFunction):
         raise FalServerlessError(
             f"Function '{function_name}' is not a fal.function or a fal.App"
         )
-    return target, app_name
+    return target, app_name, app_auth

{fal-1.2.0 → fal-1.2.2}/tests/test_apps.py

@@ -192,7 +192,7 @@ def aliased_app() -> Generator[tuple[str, str], None, None]:
 
     import uuid
 
-    app_alias = str(uuid.uuid4()).replace("-", "")[:10]
+    app_alias = str(uuid.uuid4()) + "-alias"
     app_revision = addition_app.host.register(
         func=addition_app.func,
         options=addition_app.options,
@@ -482,15 +482,14 @@ def test_app_set_delete_alias(aliased_app: tuple[str, str]):
         assert found.revision == app_revision
         assert found.auth_mode == "private"
 
-    new_app_alias = f"{app_alias}-new"
     with host._connection as client:
         # Get the registered values
-        res = client.create_alias(new_app_alias, app_revision, "public")
+        res = client.create_alias(app_alias, app_revision, "public")
 
     with host._connection as client:
         # Get the registered values
         res = client.list_aliases()
-        found = next(filter(lambda alias: alias.alias == new_app_alias, res), None)
+        found = next(filter(lambda alias: alias.alias == app_alias, res), None)
         assert found, f"Could not find app {app_alias} in {res}"
         assert found.revision == app_revision
         assert found.auth_mode == "public"
@@ -506,6 +505,7 @@ def test_app_set_delete_alias(aliased_app: tuple[str, str]):
         assert not found, f"Found app {app_alias} in {res} after deletion"
 
 
+@pytest.mark.flaky(max_runs=3)
 def test_realtime_connection(test_realtime_app):
     response = apps.run(test_realtime_app, arguments={"prompt": "a cat"})
     assert response["text"] == "a cat"