misc(container): add tests for container apps and remove build_env (#375

)

* misc(container): add tests for container apps and remove build_env

We currently do not exercise container apps in our tests, the container
app seems to be an unused fixture. This commit introduces basic tests to
ensure that container apps are built and work as expected. Furthermore,
this commit introduces a check that container args actually work.
Finally, this commit removes the `build_env` keyword from the
`ContainerImage` class. Docker has no concept of specifying environment
variables at build time except by declaring build arguments. Having that
keyword is messy and opens the door to non-hermetic builds, which is
a recipe for leaks and reproducibility problems.

Signed-off-by: squat <[email protected]>

* fix isort

---------

Signed-off-by: squat <[email protected]>

projects/fal/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

projects/fal/src/fal/container.py

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

projects/fal/tests/cli/test_deploy.py

@@ -2,6 +2,7 @@
 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

projects/fal/tests/cli/test_run.py

@@ -2,6 +2,7 @@
 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

projects/fal/tests/conftest.py

@@ -4,6 +4,7 @@
 from functools import partial
 
 import pytest
+
 from fal import function
 from fal.flags import GRPC_HOST
 from fal.sdk import get_default_credentials

projects/fal/tests/integration_test.py

@@ -6,8 +6,11 @@
 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.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"
 

projects/fal/tests/test_apps.py

@@ -7,10 +7,17 @@
 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._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"

projects/fal/tests/test_stability.py

@@ -3,13 +3,14 @@
 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"
 

projects/fal/tests/toolkit/file_test.py

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

projects/fal/tests/toolkit/image_test.py

@@ -5,11 +5,12 @@
 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: ...

projects/fal/tests/toolkit/utils/retry.py

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