fal 1.45.0__tar.gz → 1.45.2__tar.gz

{fal-1.45.0/fal.egg-info → fal-1.45.2}/PKG-INFO

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

{fal-1.45.0 → fal-1.45.2/fal.egg-info}/PKG-INFO

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

{fal-1.45.0 → fal-1.45.2}/fal.egg-info/SOURCES.txt

@@ -184,4 +184,5 @@ tests/toolkit/image_test.py
 tests/toolkit/test_types.py
 tests/toolkit/file/providers/test_fal_retry.py
 tests/toolkit/utils/retry.py
+tests/unit/test_app.py
 tools/demo_script.py

{fal-1.45.0 → fal-1.45.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.45.0'
-__version_tuple__ = version_tuple = (1, 45, 0)
+__version__ = version = '1.45.2'
+__version_tuple__ = version_tuple = (1, 45, 2)
 
 __commit_id__ = commit_id = None

{fal-1.45.0 → fal-1.45.2}/src/fal/app.py

@@ -27,6 +27,7 @@ from fal.api import (
 from fal.api import (
     function as fal_function,
 )
+from fal.container import ContainerImage
 from fal.exceptions import FalServerlessException, RequestCancelledException
 from fal.logging import get_logger
 from fal.sdk import AuthModeLiteral
@@ -338,6 +339,8 @@ class App(BaseServable):
     concurrency_buffer: ClassVar[Optional[int]] = None
     concurrency_buffer_perc: ClassVar[Optional[int]] = None
     max_multiplexing: ClassVar[Optional[int]] = None
+    kind: ClassVar[Optional[str]] = None
+    image: ClassVar[Optional[ContainerImage]] = None
 
     isolate_channel: async_grpc.Channel | None = None
 
@@ -376,7 +379,13 @@ class App(BaseServable):
         if cls.max_multiplexing is not None:
             cls.host_kwargs["max_multiplexing"] = cls.max_multiplexing
 
-        cls.app_name = getattr(cls, "app_name", app_name)
+        if cls.kind is not None:
+            cls.host_kwargs["kind"] = cls.kind
+
+        if cls.image is not None:
+            cls.host_kwargs["image"] = cls.image
+
+        cls.app_name = getattr(cls, "app_name") or app_name
 
         if cls.__init__ is not App.__init__:
             raise ValueError(

{fal-1.45.0 → fal-1.45.2}/src/fal/file_sync.py

@@ -266,9 +266,6 @@ class FileSync:
         files_context_dir: Optional[str] = None,
     ) -> Tuple[List[FileMetadata], List[AppFileUploadException]]:
         files = self.collect_files(paths, files_context_dir)
-        existing_hashes: List[FileMetadata] = []
-        uploaded_files: List[Tuple[FileMetadata, str]] = []
-        errors: List[AppFileUploadException] = []
 
         # Filter out ignored files
         if files_ignore:
@@ -302,24 +299,23 @@ class FileSync:
                 if rel_path not in seen_relative_paths:
                     seen_relative_paths.add(rel_path)
 
-        files_to_check: List[FileMetadata] = []
-        for metadata in unique_files:
-            files_to_check.append(metadata)
+        if not unique_files:
+            return [], []
 
-        if not files_to_check:
-            return existing_hashes, errors
-
-        hashes_to_check = [metadata.hash for metadata in files_to_check]
-        missing_hashes = self.check_hashes_on_server(hashes_to_check)
+        hashes_to_check = list({metadata.hash for metadata in unique_files})
+        missing_hashes = set(self.check_hashes_on_server(hashes_to_check))
 
         # Categorize based on server response
         files_to_upload: List[FileMetadata] = []
-        for file in files_to_check:
-            if file.hash not in missing_hashes:
-                existing_hashes.append(file)
-            else:
+        for file in unique_files:
+            if file.hash in missing_hashes:
+                # No longer missing as we are uploading it
+                # Removing it avoids duplicate uploads
+                missing_hashes.remove(file.hash)
                 files_to_upload.append(file)
 
+        uploaded_files: List[Tuple[FileMetadata, str]] = []
+        errors: List[AppFileUploadException] = []
         # Upload missing files in parallel with bounded concurrency
         if files_to_upload:
             # Embed it here to be able to pass it to the executor
@@ -348,13 +344,11 @@ class FileSync:
                     else:
                         uploaded_files.append((metadata, future.result()))
 
-        all_files = existing_hashes + [file for file, _ in uploaded_files]
-
         # TODO: hide behind DEBUG flag?
         console.print("File Structure:")
-        print_path_tree([m.relative_path for m in all_files])
+        print_path_tree([m.relative_path for m in unique_files])
 
-        return all_files, errors
+        return unique_files, errors
 
     def close(self):
         """Close HTTP client."""

fal-1.45.2/tests/unit/test_app.py

@@ -0,0 +1,71 @@
+from __future__ import annotations
+
+from fal import App
+from fal.container import ContainerImage
+
+
+def test_app_default_app_name_is_generated_from_class_name():
+    class MyCustomApp(App):
+        pass
+
+    assert MyCustomApp.app_name == "my-custom-app"
+
+
+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
+        concurrency_buffer_perc = 50
+        max_multiplexing = 7
+        kind = "container"
+        image = ContainerImage.from_dockerfile_str(
+            "FROM python:3.10-slim",
+        )
+
+    hk = VarsApp.host_kwargs
+    assert hk["request_timeout"] == 11
+    assert hk["startup_timeout"] == 22
+    assert hk["app_files"] == ["a.py", "b.py"]
+    assert hk["app_files_ignore"] == [r"\\.venv/"]
+    assert hk["app_files_context_dir"] == "."
+    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_kwargs_merge_into_host_kwargs_and_override_defaults():
+    class KwargsApp(App, keep_alive=123, resolver="pip", _scheduler="nomad"):
+        pass
+
+    hk = KwargsApp.host_kwargs
+    assert hk["keep_alive"] == 123
+    assert hk["resolver"] == "pip"
+    assert hk["_scheduler"] == "nomad"
+    # default keys should still exist
+    assert "_scheduler_options" in hk
+
+
+def test_non_host_classvars_do_not_leak_into_host_kwargs():
+    class LeakCheckApp(App):
+        requirements = ["fastapi"]
+        local_python_modules = ["."]
+        machine_type = "M"
+        num_gpus = 1
+        app_auth = "private"
+
+    hk = LeakCheckApp.host_kwargs
+    assert "requirements" not in hk
+    assert "local_python_modules" not in hk
+    assert "machine_type" not in hk
+    assert "num_gpus" not in hk
+    assert "app_auth" not in hk