fal 1.46.0__tar.gz → 1.46.2__tar.gz

{fal-1.46.0/fal.egg-info → fal-1.46.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.46.0
+Version: 1.46.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -53,6 +53,7 @@ Requires-Dist: pytest-xdist; extra == "test"
 Requires-Dist: pytest-timeout; extra == "test"
 Requires-Dist: flaky; extra == "test"
 Requires-Dist: boto3; extra == "test"
+Requires-Dist: numpy; extra == "test"
 Provides-Extra: dev
 Requires-Dist: fal[docs,test]; extra == "dev"
 Requires-Dist: openapi-python-client<1,>=0.14.1; extra == "dev"

{fal-1.46.0 → fal-1.46.2/fal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.46.0
+Version: 1.46.2
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -53,6 +53,7 @@ Requires-Dist: pytest-xdist; extra == "test"
 Requires-Dist: pytest-timeout; extra == "test"
 Requires-Dist: flaky; extra == "test"
 Requires-Dist: boto3; extra == "test"
+Requires-Dist: numpy; extra == "test"
 Provides-Extra: dev
 Requires-Dist: fal[docs,test]; extra == "dev"
 Requires-Dist: openapi-python-client<1,>=0.14.1; extra == "dev"

{fal-1.46.0 → fal-1.46.2}/fal.egg-info/requires.txt

@@ -54,3 +54,4 @@ pytest-xdist
 pytest-timeout
 flaky
 boto3
+numpy

{fal-1.46.0 → fal-1.46.2}/pyproject.toml

@@ -77,6 +77,7 @@ test = [
     "pytest-timeout",
     "flaky",
     "boto3",
+    "numpy",
 ]
 dev = [
     "fal[docs,test]",

{fal-1.46.0 → fal-1.46.2}/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.0'
-__version_tuple__ = version_tuple = (1, 46, 0)
+__version__ = version = '1.46.2'
+__version_tuple__ = version_tuple = (1, 46, 2)
 
 __commit_id__ = commit_id = None

{fal-1.46.0 → fal-1.46.2}/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.0 → fal-1.46.2}/src/fal/distributed/utils.py

@@ -8,7 +8,7 @@ import warnings
 from collections.abc import Callable
 from io import BytesIO
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, Union
 
 if TYPE_CHECKING:
     import torch.multiprocessing as mp
@@ -271,8 +271,8 @@ def wrap_distributed_worker(
     master_port: int,
     timeout: int,
     cwd: Optional[Union[str, Path]],
-    args: tuple[Any],
-    kwargs: dict[str, Any],
+    args: Tuple[Any],
+    kwargs: Dict[str, Any],
 ) -> None:
     """
     Worker function for distributed training or inference.

{fal-1.46.0 → fal-1.46.2}/src/fal/distributed/worker.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import asyncio
 import inspect
 import os
@@ -9,6 +11,7 @@ import traceback
 import warnings
 from collections.abc import AsyncIterator, Callable, Coroutine
 from concurrent.futures import Future
+from functools import partial
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Optional, Union
 
@@ -70,7 +73,7 @@ class DistributedWorker:
     # Public API
 
     @property
-    def device(self) -> "torch.device":
+    def device(self) -> torch.device:
         """
         :return: The device for the current worker.
         """
@@ -162,6 +165,16 @@ class DistributedWorker:
         self.loop.call_soon_threadsafe(self.loop.stop)
         self.thread.join(timeout=timeout)
 
+    async def _run_sync_in_executor(
+        self,
+        func: Callable[..., Any],
+        *args: Any,
+        **kwargs: Any,
+    ) -> Any:
+        """Run a synchronous function in the executor."""
+        loop = asyncio.get_running_loop()
+        return await loop.run_in_executor(None, partial(func, *args, **kwargs))
+
     def run_in_worker(
         self,
         func: Callable[..., Any],
@@ -174,7 +187,9 @@ class DistributedWorker:
         if inspect.iscoroutinefunction(func):
             coro = func(*args, **kwargs)
         else:
-            coro = asyncio.to_thread(func, *args, **kwargs)
+            # Using in place of asyncio.to_thread
+            # since it's not available in Python 3.8
+            coro = self._run_sync_in_executor(func, *args, **kwargs)
 
         return self.submit(coro)
 
@@ -206,8 +221,8 @@ class DistributedRunner:
     A class to launch and manage distributed workers.
     """
 
-    zmq_socket: Optional["Socket[Any]"]
-    context: Optional["mp.ProcessContext"]
+    zmq_socket: Optional[Socket[Any]]
+    context: Optional[mp.ProcessContext]
     keepalive_timer: Optional[KeepAliveTimer]
 
     def __init__(
@@ -296,7 +311,7 @@ class DistributedRunner:
                 f"Distributed processes are not running. Errors: {self.gather_errors()}"
             )
 
-    def get_zmq_socket(self) -> "Socket[Any]":
+    def get_zmq_socket(self) -> Socket[Any]:
         """
         Returns a ZeroMQ socket of the specified type.
         :param socket_type: The type of the ZeroMQ socket.
@@ -750,7 +765,7 @@ class DistributedRunner:
         assert rank == b"0", "Expected response from worker with rank 0"
         return distributed_deserialize(response)
 
-    async def __aenter__(self) -> "DistributedRunner":
+    async def __aenter__(self) -> DistributedRunner:
         """
         Enter the context manager.
         :return: The DistributedRunner instance.

{fal-1.46.0 → fal-1.46.2}/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.0 → fal-1.46.2}/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():