fal 1.46.1__tar.gz → 1.47.0__tar.gz

{fal-1.46.1/fal.egg-info → fal-1.47.0}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.46.1
+Version: 1.47.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: isolate[build]<0.21.0,>=0.18.0
-Requires-Dist: isolate-proto<0.19.0,>=0.18.0
+Requires-Dist: isolate-proto<0.20.0,>=0.19.0
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.46.1 → fal-1.47.0/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.46.1
+Version: 1.47.0
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: isolate[build]<0.21.0,>=0.18.0
-Requires-Dist: isolate-proto<0.19.0,>=0.18.0
+Requires-Dist: isolate-proto<0.20.0,>=0.19.0
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.46.1 → fal-1.47.0}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
 isolate[build]<0.21.0,>=0.18.0
-isolate-proto<0.19.0,>=0.18.0
+isolate-proto<0.20.0,>=0.19.0
 grpcio<2,>=1.64.0
 dill==0.3.7
 cloudpickle==3.0.0

{fal-1.46.1 → fal-1.47.0}/pyproject.toml

@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "isolate[build]>=0.18.0,<0.21.0",
-    "isolate-proto>=0.18.0,<0.19.0",
+    "isolate-proto>=0.19.0,<0.20.0",
     "grpcio>=1.64.0,<2",
     "dill==0.3.7",
     "cloudpickle==3.0.0",

{fal-1.46.1 → fal-1.47.0}/src/fal/_fal_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.46.1'
-__version_tuple__ = version_tuple = (1, 46, 1)
+__version__ = version = '1.47.0'
+__version_tuple__ = version_tuple = (1, 47, 0)
 
 __commit_id__ = commit_id = None

{fal-1.46.1 → fal-1.47.0}/src/fal/api/api.py

@@ -514,6 +514,7 @@ class FalServerlessHost(Host):
         *,
         application_name: Optional[str] = None,
         application_auth_mode: Optional[AuthModeLiteral] = None,
+        source_code: Optional[str] = None,
         metadata: Optional[dict[str, Any]] = None,
         deployment_strategy: DeploymentStrategyLiteral,
         scale: bool = True,
@@ -574,6 +575,7 @@ class FalServerlessHost(Host):
             environments,
             application_name=application_name,
             auth_mode=application_auth_mode,
+            source_code=source_code,
             machine_requirements=machine_requirements,
             metadata=metadata,
             deployment_strategy=deployment_strategy,

{fal-1.46.1 → fal-1.47.0}/src/fal/api/deploy.py

@@ -122,6 +122,7 @@ def _deploy_from_reference(
         options=isolated_function.options,
         application_name=app_name,
         application_auth_mode=app_auth,  # type: ignore
+        source_code=loaded.source_code,
         metadata=isolated_function.options.host.get("metadata", {}),
         deployment_strategy=strategy,
         scale=scale,

{fal-1.46.1 → fal-1.47.0}/src/fal/app.py

@@ -6,11 +6,13 @@ import json
 import os
 import queue
 import re
+import sys
 import threading
 import time
 import typing
 from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass
+from pathlib import Path
 from typing import Any, Callable, ClassVar, Optional, TypeVar
 
 import fastapi
@@ -109,6 +111,10 @@ async def _set_logger_labels(
 def wrap_app(cls: type[App], **kwargs) -> IsolatedFunction:
     include_modules_from(cls)
 
+    host = kwargs.get("host", None)
+    if host:
+        cls.local_file_path = host.local_file_path
+
     def initialize_and_serve():
         app = cls()
         app.serve()
@@ -306,12 +312,61 @@ def _print_python_packages() -> None:
     print("[debug] Python packages installed:", ", ".join(packages))
 
 
-def _include_app_files_path():
-    import sys  # noqa: PLC0415
+def _include_app_files_path(
+    local_file_path: str | None, app_files_context_dir: str | None
+):
+    base_cloud_dir = Path("/app")
+    if local_file_path is None:
+        return
+
+    # In case of container apps, the /app directory is not created by default
+    # so we need to check if it exists before proceeding
+    if not base_cloud_dir.exists():
+        return
+
+    base_path = Path(local_file_path).resolve()
+    if base_path.is_dir():
+        original_script_dir = base_path
+    else:
+        original_script_dir = base_path.parent
+
+    if app_files_context_dir:
+        context_path = Path(app_files_context_dir)
+        if context_path.is_absolute():
+            final_script_dir = context_path.resolve()
+        else:
+            final_script_dir = (original_script_dir / context_path).resolve()
+
+        # relative path between the original script dir
+        # and where the app_files_context_dir is targetting
+        relative_path = os.path.relpath(original_script_dir, final_script_dir)
+        # cloud final_path based on the `/app` base dir,
+        final_path = base_cloud_dir / Path(relative_path)
+    else:
+        # if no app_files_context_dir is provided, the base directory is the root
+        final_path = base_cloud_dir
+
+    # Create the final path if it doesn't exist
+    # This is for cases when fal app is not in root
+    # and its parent directory is not in app_files
+    # Which means that the relative path to app won't be created by default
+    final_path.mkdir(parents=True, exist_ok=True)
 
     # Add local files deployment path to sys.path so imports
     # work correctly in the isolate agent
-    sys.path.append("/app_files")
+    # Append the final path to sys.path first so that the
+    # relative directory is resolved first in case of conflicts
+    sys.path.append(str(final_path))
+
+    # Add the base cloud dir path to sys.path so that
+    # the app can access the files in the top level directory
+    # This is for cases when fal app is not in root,
+    # and user wants to access the files without using relative imports
+    sys.path.append(str(base_cloud_dir))
+
+    # Change the current working directory to the path of the app
+    # so that the app can access the files in the current directory
+    os.chdir(str(final_path))
 
 
 class App(BaseServable):
@@ -341,6 +396,7 @@ class App(BaseServable):
     max_multiplexing: ClassVar[Optional[int]] = None
     kind: ClassVar[Optional[str]] = None
     image: ClassVar[Optional[ContainerImage]] = None
+    local_file_path: ClassVar[Optional[str]] = None
 
     isolate_channel: async_grpc.Channel | None = None
 
@@ -363,6 +419,10 @@ class App(BaseServable):
 
         if cls.app_files_context_dir is not None:
             cls.host_kwargs["app_files_context_dir"] = cls.app_files_context_dir
+            if not cls.app_files:
+                raise ValueError(
+                    "app_files_context_dir is only supported when app_files is provided"
+                )
 
         if cls.min_concurrency is not None:
             cls.host_kwargs["min_concurrency"] = cls.min_concurrency
@@ -381,12 +441,17 @@ class App(BaseServable):
 
         if cls.kind is not None:
             cls.host_kwargs["kind"] = cls.kind
+            if cls.kind == "container" and cls.app_files:
+                raise ValueError("app_files is not supported for container apps.")
 
         if cls.image is not None:
             cls.host_kwargs["image"] = cls.image
 
         cls.app_name = getattr(cls, "app_name") or app_name
 
+        if kwargs.get("kind") and cls.app_files:
+            raise ValueError("app_files is not supported for container apps.")
+
         if cls.__init__ is not App.__init__:
             raise ValueError(
                 "App classes should not override __init__ directly. "
@@ -418,7 +483,12 @@ class App(BaseServable):
 
     @asynccontextmanager
     async def lifespan(self, app: fastapi.FastAPI):
-        _include_app_files_path()
+        # We want to not do any directory changes for container apps,
+        # since we don't have explicit checks to see the kind of app
+        # We check for app_files here and check kind and app_files earlier
+        # to ensure that container apps don't have app_files
+        if self.app_files:
+            _include_app_files_path(self.local_file_path, self.app_files_context_dir)
         _print_python_packages()
         await _call_any_fn(self.setup)
         try:

{fal-1.46.1 → fal-1.47.0}/src/fal/file_sync.py

@@ -10,6 +10,7 @@ from typing import Dict, List, Optional, Tuple
 import httpx
 from rich.tree import Tree
 
+import fal.flags as flags
 from fal._version import version_tuple
 from fal.console import console
 from fal.console.icons import CROSS_ICON
@@ -25,7 +26,7 @@ DEFAULT_CONCURRENCY_UPLOADS = 10
 
 
 def print_path_tree(file_paths):
-    tree = Tree("/app_files")
+    tree = Tree("/app")
 
     nodes = {"": tree}
 
@@ -272,8 +273,8 @@ class FileSync:
             filtered_files: List[FileMetadata] = []
             for metadata in files:
                 if self._matches_patterns(metadata.relative_path, files_ignore):
-                    # TODO: hide behind DEBUG flag?
-                    console.print(f"Ignoring file: {metadata.relative_path}")
+                    if flags.DEBUG:
+                        console.print(f"Ignoring file: {metadata.relative_path}")
                 else:
                     filtered_files.append(metadata)
 
@@ -344,9 +345,9 @@ class FileSync:
                     else:
                         uploaded_files.append((metadata, future.result()))
 
-        # TODO: hide behind DEBUG flag?
-        console.print("File Structure:")
-        print_path_tree([m.relative_path for m in unique_files])
+        if flags.DEBUG:
+            console.print("File Structure:")
+            print_path_tree([m.relative_path for m in unique_files])
 
         return unique_files, errors
 

{fal-1.46.1 → fal-1.47.0}/src/fal/sdk.py

@@ -632,6 +632,7 @@ class FalServerlessConnection:
         application_name: str | None = None,
         auth_mode: Optional[AuthModeLiteral] = None,
         *,
+        source_code: str | None = None,
         serialization_method: str = _DEFAULT_SERIALIZATION_METHOD,
         machine_requirements: MachineRequirements | None = None,
         metadata: dict[str, Any] | None = None,
@@ -700,6 +701,7 @@ class FalServerlessConnection:
             scale=scale,
             private_logs=private_logs,
             files=files,
+            source_code=source_code,
         )
         for partial_result in self.stub.RegisterApplication(request):
             yield from_grpc(partial_result)

{fal-1.46.1 → fal-1.47.0}/src/fal/utils.py

@@ -14,6 +14,7 @@ class LoadedFunction:
     endpoints: list[str]
     app_name: str | None
     app_auth: str | None
+    source_code: str | None
 
 
 def load_function_from(
@@ -57,6 +58,9 @@ def load_function_from(
 
     target = module[function_name]
 
+    with open(file_path) as f:
+        source_code = f.read()
+
     endpoints = ["/"]
     if isinstance(target, type) and issubclass(target, App):
         app_name = target.app_name
@@ -68,4 +72,6 @@ def load_function_from(
         raise FalServerlessError(
             f"Function '{function_name}' is not a fal.function or a fal.App"
         )
-    return LoadedFunction(target, endpoints, app_name=app_name, app_auth=app_auth)
+    return LoadedFunction(
+        target, endpoints, app_name=app_name, app_auth=app_auth, source_code=source_code
+    )

{fal-1.46.1 → fal-1.47.0}/tests/unit/test_app.py

@@ -15,9 +15,6 @@ def test_app_classvars_propagate_to_host_kwargs():
     class VarsApp(App):
         request_timeout = 11
         startup_timeout = 22
-        app_files = ["a.py", "b.py"]
-        app_files_ignore = [r"\\.venv/"]
-        app_files_context_dir = "."
         min_concurrency = 2
         max_concurrency = 3
         concurrency_buffer = 4
@@ -28,6 +25,31 @@ def test_app_classvars_propagate_to_host_kwargs():
             "FROM python:3.10-slim",
         )
 
+    hk = VarsApp.host_kwargs
+    assert hk["request_timeout"] == 11
+    assert hk["startup_timeout"] == 22
+    assert hk["min_concurrency"] == 2
+    assert hk["max_concurrency"] == 3
+    assert hk["concurrency_buffer"] == 4
+    assert hk["concurrency_buffer_perc"] == 50
+    assert hk["max_multiplexing"] == 7
+    assert hk["kind"] == "container"
+    assert isinstance(hk["image"], ContainerImage)
+
+
+def test_app_files_classvars_propagate_to_host_kwargs():
+    class VarsApp(App):
+        request_timeout = 11
+        startup_timeout = 22
+        app_files = ["a.py", "b.py"]
+        app_files_ignore = [r"\\.venv/"]
+        app_files_context_dir = "."
+        min_concurrency = 2
+        max_concurrency = 3
+        concurrency_buffer = 4
+        concurrency_buffer_perc = 50
+        max_multiplexing = 7
+
     hk = VarsApp.host_kwargs
     assert hk["request_timeout"] == 11
     assert hk["startup_timeout"] == 22
@@ -39,8 +61,6 @@ def test_app_classvars_propagate_to_host_kwargs():
     assert hk["concurrency_buffer"] == 4
     assert hk["concurrency_buffer_perc"] == 50
     assert hk["max_multiplexing"] == 7
-    assert hk["kind"] == "container"
-    assert isinstance(hk["image"], ContainerImage)
 
 
 def test_app_kwargs_merge_into_host_kwargs_and_override_defaults():