fal 1.6.0__tar.gz → 1.6.2__tar.gz

{fal-1.6.0/fal.egg-info → fal-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fal
-Version: 1.6.0
+Version: 1.6.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8

{fal-1.6.0 → fal-1.6.2/fal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: fal
-Version: 1.6.0
+Version: 1.6.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8

{fal-1.6.0 → fal-1.6.2}/pyproject.toml

@@ -87,5 +87,8 @@ target-version = "py38"
 [tool.ruff.lint]
 select = ["E", "F", "W", "PLC", "PLE", "PLW", "I", "UP"]
 
+[tool.ruff.lint.isort]
+known-first-party = ["fal"]
+
 [tool.ruff.lint.pyupgrade]
 keep-runtime-typing = true

{fal-1.6.0 → fal-1.6.2}/src/fal/_fal_version.py

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

{fal-1.6.0 → fal-1.6.2}/src/fal/app.py

@@ -248,6 +248,14 @@ def _to_fal_app_name(name: str) -> str:
     return "-".join(part.lower() for part in PART_FINDER_RE.findall(name))
 
 
+def _print_python_packages() -> None:
+    from pkg_resources import working_set
+
+    packages = [f"{package.key}=={package.version}" for package in working_set]
+
+    print("[debug] Python packages installed:", ", ".join(packages))
+
+
 class App(fal.api.BaseServable):
     requirements: ClassVar[list[str]] = []
     machine_type: ClassVar[str] = "S"
@@ -305,6 +313,7 @@ class App(fal.api.BaseServable):
 
     @asynccontextmanager
     async def lifespan(self, app: fastapi.FastAPI):
+        _print_python_packages()
         await _call_any_fn(self.setup)
         try:
             yield

{fal-1.6.0 → fal-1.6.2}/src/fal/cli/_utils.py

@@ -35,5 +35,6 @@ def get_app_data_from_toml(app_name):
 
     app_auth = app_data.get("auth", "private")
     app_deployment_strategy = app_data.get("deployment_strategy", "recreate")
+    app_no_scale = app_data.get("no_scale", False)
 
-    return app_ref, app_auth, app_deployment_strategy
+    return app_ref, app_auth, app_deployment_strategy, app_no_scale

{fal-1.6.0 → fal-1.6.2}/src/fal/cli/deploy.py

@@ -68,6 +68,7 @@ def _deploy_from_reference(
     args,
     auth: Optional[Literal["public", "shared", "private"]] = None,
     deployment_strategy: Optional[Literal["recreate", "rolling"]] = None,
+    no_scale: bool = False,
 ):
     from fal.api import FalServerlessError, FalServerlessHost
     from fal.utils import load_function_from
@@ -106,7 +107,7 @@ def _deploy_from_reference(
         application_auth_mode=app_auth,
         metadata=isolated_function.options.host.get("metadata", {}),
         deployment_strategy=deployment_strategy,
-        scale=not args.no_scale,
+        scale=not no_scale,
     )
 
     if app_id:
@@ -139,7 +140,9 @@ def _deploy(args):
             raise ValueError("Cannot use --app-name or --auth with app name reference.")
 
         app_name = args.app_ref[0]
-        app_ref, app_auth, app_deployment_strategy = get_app_data_from_toml(app_name)
+        app_ref, app_auth, app_deployment_strategy, app_no_scale = (
+            get_app_data_from_toml(app_name)
+        )
         file_path, func_name = RefAction.split_ref(app_ref)
 
     # path/to/myfile.py::MyApp
@@ -148,6 +151,7 @@ def _deploy(args):
         app_name = args.app_name
         app_auth = args.auth
         app_deployment_strategy = args.strategy
+        app_no_scale = args.no_scale
 
     _deploy_from_reference(
         (file_path, func_name),
@@ -155,6 +159,7 @@ def _deploy(args):
         args,
         app_auth,
         app_deployment_strategy,
+        app_no_scale,
     )
 
 

{fal-1.6.0 → fal-1.6.2}/src/fal/cli/run.py

@@ -10,7 +10,7 @@ def _run(args):
 
     if is_app_name(args.func_ref):
         app_name = args.func_ref[0]
-        app_ref, _, _ = get_app_data_from_toml(app_name)
+        app_ref, *_ = get_app_data_from_toml(app_name)
         file_path, func_name = RefAction.split_ref(app_ref)
     else:
         file_path, func_name = args.func_ref

{fal-1.6.0 → fal-1.6.2}/src/fal/container.py

@@ -3,7 +3,7 @@ class ContainerImage:
     from a Dockerfile.
     """
 
-    _known_keys = {"dockerfile_str", "build_env", "build_args"}
+    _known_keys = {"dockerfile_str", "build_args", "registries"}
 
     @classmethod
     def from_dockerfile_str(cls, text: str, **kwargs):

{fal-1.6.0 → fal-1.6.2}/tests/cli/test_deploy.py

@@ -2,6 +2,7 @@ from typing import Optional, Tuple
 from unittest.mock import MagicMock, patch
 
 import pytest
+
 from fal.cli.deploy import _deploy
 from fal.cli.main import parse_args
 from fal.files import find_project_root
@@ -34,6 +35,7 @@ def mock_args(
     app_name: Optional[str] = None,
     auth: Optional[str] = None,
     strategy: Optional[str] = None,
+    no_scale: bool = False,
 ):
     args = MagicMock()
 
@@ -42,6 +44,8 @@ def mock_args(
     args.auth = auth
     args.strategy = strategy
 
+    args.no_scale = no_scale
+
     return args
 
 
@@ -67,6 +71,7 @@ def test_deploy_with_toml_success(
         args,
         "shared",
         "rolling",
+        False,
     )
 
 
@@ -92,6 +97,7 @@ def test_deploy_with_toml_no_auth(
         args,
         "private",
         "recreate",
+        False,
     )
 
 
@@ -185,6 +191,7 @@ def test_deploy_with_toml_deployment_strategy(
         args,
         "shared",
         "rolling",
+        False,
     )
 
 
@@ -208,6 +215,7 @@ def test_deploy_with_toml_default_deployment_strategy(
         args,
         "private",
         "recreate",
+        False,
     )
 
 
@@ -229,6 +237,7 @@ def test_deploy_with_cli_auth(
         args,
         "shared",
         None,
+        False,
     )
 
 
@@ -250,4 +259,49 @@ def test_deploy_with_cli_deployment_strategy(
         args,
         None,
         "rolling",
+        False,
+    )
+
+
+@patch("fal.cli._utils.find_pyproject_toml", return_value="pyproject.toml")
+@patch("fal.cli._utils.parse_pyproject_toml")
+@patch("fal.cli.deploy._deploy_from_reference")
+def test_deploy_with_cli_no_scale(
+    mock_deploy_ref, mock_parse_toml, mock_find_toml, mock_parse_pyproject_toml
+):
+    mock_parse_toml.return_value = mock_parse_pyproject_toml
+
+    args = mock_args(app_ref=("src/my_app/inference.py", "MyApp"), no_scale=True)
+
+    _deploy(args)
+
+    mock_deploy_ref.assert_called_once_with(
+        ("src/my_app/inference.py", "MyApp"),
+        None,
+        args,
+        None,
+        None,
+        True,
+    )
+
+
+@patch("fal.cli._utils.find_pyproject_toml", return_value="pyproject.toml")
+@patch("fal.cli._utils.parse_pyproject_toml")
+@patch("fal.cli.deploy._deploy_from_reference")
+def test_deploy_with_cli_scale(
+    mock_deploy_ref, mock_parse_toml, mock_find_toml, mock_parse_pyproject_toml
+):
+    mock_parse_toml.return_value = mock_parse_pyproject_toml
+
+    args = mock_args(app_ref=("src/my_app/inference.py", "MyApp"))
+
+    _deploy(args)
+
+    mock_deploy_ref.assert_called_once_with(
+        ("src/my_app/inference.py", "MyApp"),
+        None,
+        args,
+        None,
+        None,
+        False,
     )

{fal-1.6.0 → fal-1.6.2}/tests/cli/test_run.py

@@ -2,6 +2,7 @@ from typing import Optional, Tuple
 from unittest.mock import MagicMock, patch
 
 import pytest
+
 from fal.cli.main import parse_args
 from fal.cli.run import _run
 from fal.files import find_project_root

{fal-1.6.0 → fal-1.6.2}/tests/conftest.py

@@ -1,9 +1,16 @@
 from __future__ import annotations
 
+import sys
 from functools import partial
 
 import pytest
+
 from fal import function
+from fal.flags import GRPC_HOST
+from fal.sdk import get_default_credentials
+
+print("TARGET:", GRPC_HOST, file=sys.stderr)
+print("AUTH:", get_default_credentials(), file=sys.stderr)
 
 
 @pytest.fixture(scope="function")

{fal-1.6.0 → fal-1.6.2}/tests/integration_test.py

@@ -6,8 +6,11 @@ from pathlib import Path
 from typing import Callable
 from uuid import uuid4
 
-import fal
 import pytest
+from pydantic import BaseModel, Field
+from pydantic import __version__ as pydantic_version
+
+import fal
 from fal import FalServerlessHost, FalServerlessKeyCredentials, local, sync_dir
 from fal.api import FalServerlessError, IsolatedFunction
 from fal.toolkit import (
@@ -21,8 +24,6 @@ from fal.toolkit import (
 )
 from fal.toolkit.file.file import CompressedFile
 from fal.toolkit.utils.download_utils import _get_git_revision_hash, _hash_url
-from pydantic import BaseModel, Field
-from pydantic import __version__ as pydantic_version
 
 EXAMPLE_FILE_URL = "https://raw.githubusercontent.com/fal-ai/fal/main/projects/fal/tests/assets/cat.png"
 

{fal-1.6.0 → fal-1.6.2}/tests/test_apps.py

@@ -7,10 +7,17 @@ from contextlib import contextmanager, suppress
 from datetime import datetime
 from typing import Generator, List, Tuple
 
-import fal
-import fal.api as api
 import httpx
 import pytest
+from fastapi import WebSocket
+from httpx import HTTPStatusError
+from isolate.backends.common import active_python
+from openapi_fal_rest.api.applications import app_metadata
+from pydantic import BaseModel
+from pydantic import __version__ as pydantic_version
+
+import fal
+import fal.api as api
 from fal import apps
 from fal.app import AppClient, AppClientError
 from fal.cli.deploy import _get_user
@@ -19,12 +26,6 @@ from fal.exceptions import AppException, FieldException, RequestCancelledExcepti
 from fal.exceptions._cuda import _CUDA_OOM_MESSAGE, _CUDA_OOM_STATUS_CODE
 from fal.rest_client import REST_CLIENT
 from fal.workflows import Workflow
-from fastapi import WebSocket
-from httpx import HTTPStatusError
-from isolate.backends.common import active_python
-from openapi_fal_rest.api.applications import app_metadata
-from pydantic import BaseModel
-from pydantic import __version__ as pydantic_version
 
 
 class Input(BaseModel):
@@ -90,6 +91,26 @@ def container_addition_app(input: Input) -> Output:
     return Output(result=input.lhs + input.rhs)
 
 
+@fal.function(
+    kind="container",
+    image=ContainerImage.from_dockerfile_str(
+        f"""FROM python:{actual_python}-slim\n# {git_revision_short_hash()}
+ARG OUTPUT="built incorrectly"
+ENV OUTPUT="$OUTPUT"
+""",
+        build_args={"OUTPUT": "built with build args"},
+    ),
+    keep_alive=60,
+    machine_type="S",
+    serve=True,
+    max_concurrency=1,
+)
+def container_build_args_app() -> str:
+    import os
+
+    return os.environ["OUTPUT"]
+
+
 @fal.function(
     keep_alive=300,
     requirements=["fastapi", "uvicorn", "pydantic==1.10.18"],
@@ -321,6 +342,18 @@ def test_container_app():
     yield f"{user.user_id}/{app_revision}"
 
 
+@pytest.fixture(scope="module")
+def test_container_build_args_app():
+    # Create a temporary app, register it, and return the ID of it.
+
+    app_revision = container_build_args_app.host.register(
+        func=container_build_args_app.func,
+        options=container_build_args_app.options,
+    )
+    user = _get_user()
+    yield f"{user.user_id}/{app_revision}"
+
+
 @pytest.fixture(scope="module")
 def test_fastapi_app():
     # Create a temporary app, register it, and return the ID of it.
@@ -843,3 +876,13 @@ def test_kill_runner():
         assert len(runners) == 1
 
         client.kill_runner(runners[0].runner_id)
+
+
+def test_container_app_client(test_container_app: str):
+    response = apps.run(test_container_app, arguments={"lhs": 1, "rhs": 2})
+    assert response["result"] == 3
+
+
+def test_container_build_args_app_client(test_container_build_args_app: str):
+    response = apps.run(test_container_build_args_app, {})
+    assert response == "built with build args"

{fal-1.6.0 → fal-1.6.2}/tests/test_stability.py

@@ -3,13 +3,14 @@ from __future__ import annotations
 import subprocess
 from contextlib import suppress
 
-import fal
 import pytest
+from isolate.backends.common import active_python
+from pydantic import __version__ as pydantic_version
+
+import fal
 from fal.api import FalServerlessError, Options
 from fal.container import ContainerImage
 from fal.toolkit.file import File
-from isolate.backends.common import active_python
-from pydantic import __version__ as pydantic_version
 
 PACKAGE_NAME = "fall"
 
@@ -87,7 +88,11 @@ def test_regular_function_in_a_container_with_custom_image(isolated_client):
     @isolated_client(
         "container",
         image=ContainerImage.from_dockerfile_str(
-            f"FROM python:{actual_python}-slim\n# {git_revision_short_hash()}"
+            f"""
+            FROM python:{actual_python}-slim
+            # {git_revision_short_hash()}
+            RUN env
+            """
         ),
     )
     def regular_function():

{fal-1.6.0 → fal-1.6.2}/tests/toolkit/file_test.py

@@ -4,6 +4,7 @@ import os
 from base64 import b64encode
 
 import pytest
+
 from fal.toolkit.file.file import File, GoogleStorageRepository
 
 

{fal-1.6.0 → fal-1.6.2}/tests/toolkit/image_test.py

@@ -5,11 +5,12 @@ from io import BytesIO
 from typing import Literal, overload
 
 import pytest
-from fal.toolkit import Image
 from PIL import Image as PILImage
 from pydantic import BaseModel, Field
 from pydantic import __version__ as pydantic_version
 
+from fal.toolkit import Image
+
 
 @overload
 def get_image(as_bytes: Literal[False] = False) -> PILImage.Image: ...

{fal-1.6.0 → fal-1.6.2}/tests/toolkit/utils/retry.py

@@ -1,6 +1,7 @@
 from unittest import mock
 
 import pytest
+
 from fal.toolkit.utils.retry import retry