fal 1.1.0__tar.gz → 1.1.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.1.0
+Version: 1.1.1
 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.1.1}/fal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.1.0
+Version: 1.1.1
 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.1.1}/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.1.1'
+__version_tuple__ = version_tuple = (1, 1, 1)

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

@@ -22,6 +22,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 +34,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.1.1}/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,7 @@ 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 +79,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.1.1}/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.1.1}/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"
@@ -556,23 +556,26 @@ 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")