fal 1.1.0__tar.gz → 1.2.0__tar.gz

{fal-1.1.0 → fal-1.2.0}/PKG-INFO

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

{fal-1.1.0 → fal-1.2.0}/fal.egg-info/PKG-INFO

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

{fal-1.1.0 → fal-1.2.0}/src/fal/_fal_version.py

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

{fal-1.1.0 → fal-1.2.0}/src/fal/_serialization.py

@@ -186,8 +186,8 @@ def _patch_rlock() -> None:
 
     def pickle_rlock(obj: RLockType) -> tuple[Callable, tuple]:
         r = obj.__repr__()
-        count = int(r.split('count=')[1].split()[0].rstrip('>'))
-        owner = int(r.split('owner=')[1].split()[0])
+        count = int(r.split("count=")[1].split()[0].rstrip(">"))
+        owner = int(r.split("owner=")[1].split()[0])
 
         return create_rlock, (count, owner)
 
@@ -209,7 +209,7 @@ def _patch_console_thread_locals() -> None:
             "buffer": obj.buffer,
             "buffer_index": obj.buffer_index,
         }
-        return create_locals, (kwargs, )
+        return create_locals, (kwargs,)
 
     _register(ConsoleThreadLocals, pickle_locals)
 
@@ -231,4 +231,3 @@ def patch_pickle() -> None:
     _patch_exceptions()
 
     _register_pickle_by_value("fal")
-

{fal-1.1.0 → fal-1.2.0}/src/fal/apps.py

@@ -24,8 +24,7 @@ def _backwards_compatible_app_id(app_id: str) -> str:
 
 
 @dataclass
-class _Status:
-    ...
+class _Status: ...
 
 
 @dataclass

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/apps.py

@@ -203,7 +203,6 @@ def _runners(args):
 
     from fal.sdk import FalServerlessClient
 
-
     client = FalServerlessClient(args.host)
     with client.connect() as connection:
         runners = connection.list_alias_runners(alias=args.app_name)

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/debug.py

@@ -47,11 +47,7 @@ def debugtools(args):
 def get_debug_parser():
     parser = FalParser(add_help=False)
     group = parser.add_argument_group(title="Debug")
-    group.add_argument(
-        "--debug",
-        action="store_true",
-        help="Show verbose errors."
-    )
+    group.add_argument("--debug", action="store_true", help="Show verbose errors.")
     group.add_argument(
         "--pdb",
         action="store_true",

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/deploy.py

@@ -69,9 +69,7 @@ def _deploy(args):
         # Try to find a python file in the current directory
         options = list(Path(".").glob("*.py"))
         if len(options) == 0:
-            raise FalServerlessError(
-                "No python files found in the current directory"
-            )
+            raise FalServerlessError("No python files found in the current directory")
         elif len(options) > 1:
             raise FalServerlessError(
                 "Multiple python files found in the current directory. "
@@ -107,8 +105,12 @@ def _deploy(args):
             "Registered a new revision for function "
             f"'{app_name}' (revision='{app_id}')."
         )
-        args.console.print(f"Playground: https://fal.ai/models/{user.username}/{app_name}")
-        args.console.print(f"Endpoint: https://{gateway_host}/{user.username}/{app_name}")
+        args.console.print(
+            f"Playground: https://fal.ai/models/{user.username}/{app_name}"
+        )
+        args.console.print(
+            f"Endpoint: https://{gateway_host}/{user.username}/{app_name}"
+        )
 
 
 def add_parser(main_subparsers, parents):
@@ -139,8 +141,7 @@ def add_parser(main_subparsers, parents):
         nargs="?",
         action=RefAction,
         help=(
-            "Application reference. "
-            "For example: `myfile.py::MyApp`, `myfile.py`."
+            "Application reference. " "For example: `myfile.py::MyApp`, `myfile.py`."
         ),
     )
     parser.add_argument(

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/keys.py

@@ -56,7 +56,10 @@ def _list(args):
         keys = connection.list_user_keys()
         for key in keys:
             table.add_row(
-                key.key_id, str(key.created_at), str(key.scope.value), key.alias,
+                key.key_id,
+                str(key.created_at),
+                str(key.scope.value),
+                key.alias,
             )
 
     args.console.print(table)

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/run.py

@@ -14,10 +14,7 @@ def _run(args):
 
 def add_parser(main_subparsers, parents):
     run_help = "Run fal function."
-    epilog = (
-        "Examples:\n"
-        "  fal run path/to/myfile.py::myfunc"
-    )
+    epilog = "Examples:\n" "  fal run path/to/myfile.py::myfunc"
     parser = main_subparsers.add_parser(
         "run",
         description=run_help,

{fal-1.1.0 → fal-1.2.0}/src/fal/cli/secrets.py

@@ -1,9 +1,9 @@
-
 from .parser import DictAction, FalClientParser
 
 
 def _set(args):
     from fal.sdk import FalServerlessClient
+
     client = FalServerlessClient(args.host)
     with client.connect() as connection:
         for name, value in args.secrets.items():
@@ -12,10 +12,7 @@ def _set(args):
 
 def _add_set_parser(subparsers, parents):
     set_help = "Set a secret."
-    epilog = (
-        "Examples:\n"
-        "  fal secrets set HF_TOKEN=hf_***"
-    )
+    epilog = "Examples:\n" "  fal secrets set HF_TOKEN=hf_***"
 
     parser = subparsers.add_parser(
         "set",
@@ -64,6 +61,7 @@ def _add_list_parser(subparsers, parents):
 
 def _unset(args):
     from fal.sdk import FalServerlessClient
+
     client = FalServerlessClient(args.host)
     with client.connect() as connection:
         connection.delete_secret(args.secret)

{fal-1.1.0 → fal-1.2.0}/src/fal/exceptions/_base.py

@@ -3,4 +3,5 @@ from __future__ import annotations
 
 class FalServerlessException(Exception):
     """Base exception type for fal Serverless related flows and APIs."""
+
     pass

{fal-1.1.0 → fal-1.2.0}/src/fal/logging/isolate.py

@@ -13,7 +13,6 @@ _renderer = ConsoleRenderer(level_styles=LEVEL_STYLES)
 
 
 class IsolateLogPrinter:
-
     debug: bool
 
     def __init__(self, debug: bool = False) -> None:

{fal-1.1.0 → fal-1.2.0}/src/fal/sdk.py

@@ -277,7 +277,7 @@ class KeyScope(enum.Enum):
 
 @from_grpc.register(isolate_proto.ApplicationInfo)
 def _from_grpc_application_info(
-    message: isolate_proto.ApplicationInfo
+    message: isolate_proto.ApplicationInfo,
 ) -> ApplicationInfo:
     return ApplicationInfo(
         application_id=message.application_id,

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/file/file.py

@@ -15,6 +15,7 @@ if not hasattr(pydantic, "__version__") or pydantic.__version__.startswith("1.")
 else:
     from pydantic import GetCoreSchemaHandler
     from pydantic_core import CoreSchema, core_schema
+
     IS_PYDANTIC_V2 = True
 
 from pydantic import BaseModel, Field
@@ -22,6 +23,7 @@ from pydantic import BaseModel, Field
 from fal.toolkit.file.providers.fal import (
     FalCDNFileRepository,
     FalFileRepository,
+    FalFileRepositoryV2,
     InMemoryRepository,
 )
 from fal.toolkit.file.providers.gcp import GoogleStorageRepository
@@ -33,6 +35,7 @@ FileRepositoryFactory = Callable[[], FileRepository]
 
 BUILT_IN_REPOSITORIES: dict[RepositoryId, FileRepositoryFactory] = {
     "fal": lambda: FalFileRepository(),
+    "fal_v2": lambda: FalFileRepositoryV2(),
     "in_memory": lambda: InMemoryRepository(),
     "gcp_storage": lambda: GoogleStorageRepository(),
     "r2": lambda: R2Repository(),

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/file/providers/fal.py

@@ -26,8 +26,8 @@ GLOBAL_LIFECYCLE_PREFERENCE = ObjectLifecyclePreference(
 
 
 @dataclass
-class FalFileRepository(FileRepository):
-    def save(self, file: FileData) -> str:
+class FalFileRepositoryBase(FileRepository):
+    def _save(self, file: FileData, storage_type: str) -> str:
         key_creds = key_credentials()
         if not key_creds:
             raise FileUploadException("FAL_KEY must be set")
@@ -41,7 +41,9 @@ class FalFileRepository(FileRepository):
 
         grpc_host = os.environ.get("FAL_HOST", "api.alpha.fal.ai")
         rest_host = grpc_host.replace("api", "rest", 1)
-        storage_url = f"https://{rest_host}/storage/upload/initiate"
+        storage_url = (
+            f"https://{rest_host}/storage/upload/initiate?storage_type={storage_type}"
+        )
 
         try:
             req = Request(
@@ -79,6 +81,18 @@ class FalFileRepository(FileRepository):
             return
 
 
+@dataclass
+class FalFileRepository(FalFileRepositoryBase):
+    def save(self, file: FileData) -> str:
+        return self._save(file, "gcs")
+
+
+@dataclass
+class FalFileRepositoryV2(FalFileRepositoryBase):
+    def save(self, file: FileData) -> str:
+        return self._save(file, "fal-cdn")
+
+
 @dataclass
 class InMemoryRepository(FileRepository):
     def save(

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/file/providers/gcp.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import datetime
 import json
 import os
+import posixpath
+import uuid
 from dataclasses import dataclass
 
 from fal.toolkit.file.types import FileData, FileRepository
@@ -49,7 +51,10 @@ class GoogleStorageRepository(FileRepository):
         return self._bucket
 
     def save(self, data: FileData) -> str:
-        destination_path = os.path.join(self.folder, data.file_name)
+        destination_path = posixpath.join(
+            self.folder,
+            f"{uuid.uuid4().hex}_{data.file_name}",
+        )
 
         gcp_blob = self.bucket.blob(destination_path)
         gcp_blob.upload_from_string(data.data, content_type=data.content_type)

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/file/providers/r2.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import json
 import os
+import posixpath
+import uuid
 from dataclasses import dataclass
 from io import BytesIO
 
@@ -66,7 +68,10 @@ class R2Repository(FileRepository):
         return self._bucket
 
     def save(self, data: FileData) -> str:
-        destination_path = os.path.join(self.key, data.file_name)
+        destination_path = posixpath.join(
+            self.key,
+            f"{uuid.uuid4().hex}_{data.file_name}",
+        )
 
         s3_object = self.bucket.Object(destination_path)
         s3_object.upload_fileobj(

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/file/types.py

@@ -28,7 +28,7 @@ class FileData:
             self.file_name = file_name
 
 
-RepositoryId = Literal["fal", "in_memory", "gcp_storage", "r2", "cdn"]
+RepositoryId = Literal["fal", "fal_v2", "in_memory", "gcp_storage", "r2", "cdn"]
 
 
 @dataclass

{fal-1.1.0 → fal-1.2.0}/src/fal/toolkit/image/image.py

@@ -44,6 +44,7 @@ IMAGE_SIZE_PRESETS: dict[ImageSizePreset, ImageSize] = {
 
 ImageSizeInput = Union[ImageSize, ImageSizePreset]
 
+
 def get_image_size(source: ImageSizeInput) -> ImageSize:
     if isinstance(source, ImageSize):
         return source
@@ -62,7 +63,8 @@ class Image(File):
     """
 
     width: Optional[int] = Field(
-        None, description="The width of the image in pixels.",
+        None,
+        description="The width of the image in pixels.",
         examples=[1024],
     )
     height: Optional[int] = Field(
@@ -84,8 +86,8 @@ class Image(File):
             file_name=file_name,
             repository=repository,
         )
-        obj.width=size.width if size else None
-        obj.height=size.height if size else None
+        obj.width = size.width if size else None
+        obj.height = size.height if size else None
         return obj
 
     @classmethod
@@ -120,9 +122,7 @@ class Image(File):
             from PIL import Image as PILImage
             from PIL import ImageOps
         except ImportError:
-            raise ImportError(
-                "The PIL package is required to use Image.to_pil()."
-            )
+            raise ImportError("The PIL package is required to use Image.to_pil().")
 
         # Stream the image data from url to a temp file and convert it to a PIL image
         with NamedTemporaryFile() as temp_file:
@@ -134,4 +134,3 @@ class Image(File):
             img = ImageOps.exif_transpose(img)
 
             return img
-

{fal-1.1.0 → fal-1.2.0}/src/fal/utils.py

@@ -51,4 +51,3 @@ def load_function_from(
             f"Function '{function_name}' is not a fal.function or a fal.App"
         )
     return target, app_name
-

{fal-1.1.0 → fal-1.2.0}/tests/cli/test_apps.py

@@ -31,11 +31,17 @@ def test_set_rev():
 def test_scale():
     args = parse_args(
         [
-            "apps", "scale", "myapp",
-            "--keep-alive", "123",
-            "--max-multiplexing", "321",
-            "--min-concurrency", "7",
-            "--max-concurrency", "10",
+            "apps",
+            "scale",
+            "myapp",
+            "--keep-alive",
+            "123",
+            "--max-multiplexing",
+            "321",
+            "--min-concurrency",
+            "7",
+            "--max-concurrency",
+            "10",
         ]
     )
     assert args.func == _scale
@@ -61,4 +67,3 @@ def test_delete_rev():
     args = parse_args(["apps", "delete-rev", "myrev"])
     assert args.func == _delete_rev
     assert args.app_rev == "myrev"
-

{fal-1.1.0 → fal-1.2.0}/tests/cli/test_keys.py

@@ -7,8 +7,10 @@ def test_create():
         [
             "keys",
             "create",
-            "--scope", "API",
-            "--desc", "My test key",
+            "--scope",
+            "API",
+            "--desc",
+            "My test key",
         ]
     )
     assert args.func == _create

{fal-1.1.0 → fal-1.2.0}/tests/integration_test.py

@@ -556,7 +556,6 @@ def test_fal_compressed_file(isolated_client):
 
 
 def test_fal_cdn(isolated_client):
-
     @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
     def upload_to_fal_cdn() -> FalImage:
         return FalImage.from_bytes(b"0", "jpeg", repository="cdn")

{fal-1.1.0 → fal-1.2.0}/tests/test_stability.py

@@ -6,7 +6,7 @@ import fal
 import pytest
 from fal.api import FalServerlessError, Options
 from fal.container import ContainerImage
-from fal.toolkit.file.file import File
+from fal.toolkit.file import File
 from pydantic import __version__ as pydantic_version
 
 PACKAGE_NAME = "fall"
@@ -56,7 +56,10 @@ def test_regular_function_on_nomad(isolated_client):
 
     assert mult(5, 2) == 10
 
-@pytest.mark.xfail(reason="The support needs to be deployed. See https://github.com/fal-ai/isolate-cloud/pull/1809")
+
+@pytest.mark.xfail(
+    reason="The support needs to be deployed. See https://github.com/fal-ai/isolate-cloud/pull/1809"
+)
 def test_regular_function_in_a_container(isolated_client):
     @isolated_client("container")
     def regular_function():
@@ -70,7 +73,10 @@ def test_regular_function_in_a_container(isolated_client):
 
     assert mult(5, 2) == 10
 
-@pytest.mark.xfail(reason="The support needs to be deployed. See https://github.com/fal-ai/isolate-cloud/pull/1809")
+
+@pytest.mark.xfail(
+    reason="The support needs to be deployed. See https://github.com/fal-ai/isolate-cloud/pull/1809"
+)
 def test_regular_function_in_a_container_with_custom_image(isolated_client):
     @isolated_client(
         "container",
@@ -556,23 +562,29 @@ def test_worker_env_vars(isolated_client):
     assert fal_key_secret, "FAL_KEY_SECRET is not set"
 
 
-def test_fal_storage(isolated_client):
-    file = File.from_bytes(b"Hello fal storage from local", repository="fal")
-    assert file.url.startswith(
-        "https://storage.googleapis.com/isolate-dev-smiling-shark_toolkit_bucket/"
-    )
+@pytest.mark.parametrize(
+    "repo_type, url_prefix",
+    [
+        (
+            "fal",
+            "https://storage.googleapis.com/isolate-dev-smiling-shark_toolkit_bucket/",
+        ),
+        ("fal_v2", "https://v2.fal.media/files"),
+    ],
+)
+def test_fal_storage(isolated_client, repo_type, url_prefix):
+    file = File.from_bytes(b"Hello fal storage from local", repository=repo_type)
+    assert file.url.startswith(url_prefix)
     assert file.as_bytes().decode().endswith("local")
 
     @isolated_client(serve=True, requirements=[f"pydantic=={pydantic_version}"])
     def hello_file():
         # Run in the isolated environment
-        return File.from_bytes(b"Hello fal storage from isolated", repository="fal")
+        return File.from_bytes(b"Hello fal storage from isolated", repository=repo_type)
 
     local_fn = hello_file.on(serve=False)
     file = local_fn()
-    assert file.url.startswith(
-        "https://storage.googleapis.com/isolate-dev-smiling-shark_toolkit_bucket/"
-    )
+    assert file.url.startswith(url_prefix)
     assert file.as_bytes().decode().endswith("isolated")
 
 

{fal-1.1.0 → fal-1.2.0}/tests/toolkit/file_test.py

@@ -4,8 +4,7 @@ import os
 from base64 import b64encode
 
 import pytest
-from fal.toolkit.file.file import BUILT_IN_REPOSITORIES, File, GoogleStorageRepository
-from fal.toolkit.file.types import FileRepository, RepositoryId
+from fal.toolkit.file.file import File, GoogleStorageRepository
 
 
 def test_binary_content_matches():
@@ -65,40 +64,3 @@ def test_gcp_storage_if_available():
     assert file.url.startswith(
         "https://storage.googleapis.com/fal_registry_image_results/"
     )
-
-
-@pytest.mark.xfail(reason="fal cdn is temporarily broken")
-@pytest.mark.parametrize(
-    "repo",
-    BUILT_IN_REPOSITORIES.keys(),
-)
-def test_uniqueness_of_file_name(repo: RepositoryId | FileRepository):
-    if repo == "in_memory":
-        return
-
-    if repo == "gcp_storage":
-        gcp_sa_json = os.environ.get("GCLOUD_SA_JSON")
-        if gcp_sa_json is None:
-            pytest.skip(reason="GCLOUD_SA_JSON environment variable is not set")
-        repo = GoogleStorageRepository(bucket_name="fal_registry_image_results")
-
-    if repo == "r2":
-        r2_account_json = os.environ.get("R2_CREDS_JSON")
-        if r2_account_json is None:
-            pytest.skip(reason="R2_CREDS_JSON environment variable is not set")
-
-    if repo == "fal":
-        fal_key = os.environ.get("FAL_KEY")
-        if fal_key is None:
-            pytest.skip(reason="FAL_KEY environment variable is not set")
-
-    file = File.from_bytes(b"print('Hello!')", repository=repo, file_name="hello.py")
-
-    host_and_path = file.url.split("?")[0]
-    last_path = host_and_path.split("/")[-1]
-    assert (
-        last_path.endswith(".py")
-    ), f"The file name {last_path} should end with the same extension"
-    assert (
-        len(last_path) > 10
-    ), f"There should be a long enough random string in the file name {last_path}"

{fal-1.1.0 → fal-1.2.0}/tests/cli/test_auth.py

@@ -6,6 +6,7 @@ def test_login():
     args = parse_args(["auth", "login"])
     assert args.func == _login
 
+
 def test_logout():
     args = parse_args(["auth", "logout"])
     assert args.func == _logout
@@ -14,4 +15,3 @@ def test_logout():
 def test_whoami():
     args = parse_args(["auth", "whoami"])
     assert args.func == _whoami
-