fal 1.26.4__tar.gz → 1.26.6__tar.gz

{fal-1.26.4/fal.egg-info → fal-1.26.6}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.26.4
+Version: 1.26.6
 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.19.0,>=0.18.0
-Requires-Dist: isolate-proto<0.11.0,>=0.10.0
+Requires-Dist: isolate-proto<0.11.0,>=0.10.2
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.26.4 → fal-1.26.6/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.26.4
+Version: 1.26.6
 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.19.0,>=0.18.0
-Requires-Dist: isolate-proto<0.11.0,>=0.10.0
+Requires-Dist: isolate-proto<0.11.0,>=0.10.2
 Requires-Dist: grpcio<2,>=1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0

{fal-1.26.4 → fal-1.26.6}/fal.egg-info/SOURCES.txt

@@ -162,6 +162,7 @@ tests/conftest.py
 tests/integration_test.py
 tests/mainify_target.py
 tests/test_apps.py
+tests/test_files.py
 tests/test_kv.py
 tests/test_stability.py
 tests/assets/cat.png

{fal-1.26.4 → fal-1.26.6}/fal.egg-info/requires.txt

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

{fal-1.26.4 → fal-1.26.6}/pyproject.toml

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

{fal-1.26.4 → fal-1.26.6}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.26.4'
-__version_tuple__ = version_tuple = (1, 26, 4)
+__version__ = version = '1.26.6'
+__version_tuple__ = version_tuple = (1, 26, 6)

{fal-1.26.4 → fal-1.26.6}/src/fal/cli/apps.py

@@ -246,7 +246,10 @@ def _add_scale_parser(subparsers, parents):
 def _set_rev(args):
     client = get_client(args.host, args.team)
     with client.connect() as connection:
-        connection.create_alias(args.app_name, args.app_rev, args.auth)
+        alias_info = connection.create_alias(args.app_name, args.app_rev, args.auth)
+        table = _apps_table([alias_info])
+
+    args.console.print(table)
 
 
 def _add_set_rev_parser(subparsers, parents):

{fal-1.26.4 → fal-1.26.6}/src/fal/files.py

@@ -56,6 +56,16 @@ class FalFileSystem(AbstractFileSystem):
             raise FalServerlessException(detail)
         return response
 
+    def _abspath(self, rpath):
+        if rpath.startswith("/"):
+            return rpath
+
+        cwd = "/data"
+        if rpath in [".", ""]:
+            return cwd
+
+        return posixpath.join(cwd, rpath)
+
     def _ls(self, path):
         response = self._request("GET", f"/files/list/{path}")
         files = response.json()
@@ -73,7 +83,7 @@ class FalFileSystem(AbstractFileSystem):
         )
 
     def ls(self, path, detail=True, **kwargs):
-        abs_path = "/" + path.lstrip("/")
+        abs_path = self._abspath(path)
         if abs_path in self.dircache:
             entries = self.dircache[abs_path]
         elif abs_path in ["/", "", "."]:
@@ -95,20 +105,29 @@ class FalFileSystem(AbstractFileSystem):
         return [entry["name"] for entry in entries]
 
     def info(self, path, **kwargs):
-        parent = posixpath.dirname(path)
+        abs_path = self._abspath(path)
+        if abs_path == "/":
+            return {
+                "name": "/",
+                "size": 0,
+                "type": "directory",
+                "mtime": 0,
+            }
+        parent = posixpath.dirname(abs_path)
         entries = self.ls(parent, detail=True)
         for entry in entries:
-            if entry["name"] == path:
+            if entry["name"] == abs_path:
                 return entry
-        raise FileNotFoundError(f"File not found: {path}")
+        raise FileNotFoundError(f"File not found: {abs_path}")
 
     def get_file(self, rpath, lpath, **kwargs):
-        if self.isdir(rpath):
+        abs_rpath = self._abspath(rpath)
+        if self.isdir(abs_rpath):
             os.makedirs(lpath, exist_ok=True)
             return
 
         with open(lpath, "wb") as fobj:
-            response = self._request("GET", f"/files/file/{rpath}")
+            response = self._request("GET", f"/files/file/{abs_rpath}")
             fobj.write(response.content)
 
     def _put_file_part(self, rpath, lpath, upload_id, part_number, chunk_size):
@@ -177,6 +196,8 @@ class FalFileSystem(AbstractFileSystem):
         if os.path.isdir(lpath):
             return
 
+        abs_rpath = self._abspath(rpath)
+
         size = os.path.getsize(lpath)
         with Progress(
             SpinnerColumn(),
@@ -185,29 +206,31 @@ class FalFileSystem(AbstractFileSystem):
             TextColumn("[progress.percentage]{task.percentage:>3.0f}%"),
         ) as progress:
             if size > MULTIPART_THRESHOLD:
-                self._put_file_multipart(lpath, rpath, size, progress)
+                self._put_file_multipart(lpath, abs_rpath, size, progress)
             else:
                 task = progress.add_task(f"{os.path.basename(lpath)}", total=1)
                 with open(lpath, "rb") as fobj:
                     self._request(
                         "POST",
-                        f"/files/file/local/{rpath}",
+                        f"/files/file/local/{abs_rpath}",
                         files={"file_upload": (posixpath.basename(lpath), fobj)},
                     )
                 progress.advance(task)
         self.dircache.clear()
 
     def put_file_from_url(self, url, rpath, mode="overwrite", **kwargs):
+        abs_rpath = self._abspath(rpath)
         self._request(
             "POST",
-            f"/files/file/url/{rpath}",
+            f"/files/file/url/{abs_rpath}",
             json={"url": url},
         )
         self.dircache.clear()
 
     def rm(self, path, **kwargs):
+        abs_path = self._abspath(path)
         self._request(
             "DELETE",
-            f"/files/file/{path}",
+            f"/files/file/{abs_path}",
         )
         self.dircache.clear()

{fal-1.26.4 → fal-1.26.6}/src/fal/sdk.py

@@ -735,7 +735,7 @@ class FalServerlessConnection:
         alias: str,
         revision: str,
         auth_mode: AuthMode,
-    ):
+    ) -> AliasInfo:
         if auth_mode == "public":
             auth = isolate_proto.ApplicationAuthMode.PUBLIC
         elif auth_mode == "shared":
@@ -750,7 +750,8 @@ class FalServerlessConnection:
             revision=revision,
             auth_mode=auth,
         )
-        self.stub.SetAlias(request)
+        res = self.stub.SetAlias(request)
+        return from_grpc(res.alias_info)
 
     def delete_alias(self, alias: str) -> str | None:
         request = isolate_proto.DeleteAliasRequest(alias=alias)

{fal-1.26.4 → fal-1.26.6}/src/fal/toolkit/file/file.py

@@ -73,6 +73,42 @@ def FileField(*args, **kwargs):
     return Field(*args, **kwargs)
 
 
+def _try_with_fallback(
+    func: str,
+    args: list[Any],
+    repository: FileRepository | RepositoryId,
+    fallback_repository: Optional[
+        FileRepository | RepositoryId | list[FileRepository | RepositoryId]
+    ],
+    save_kwargs: dict,
+    fallback_save_kwargs: dict,
+) -> Any:
+    if fallback_repository is None:
+        fallback_repositories = []
+    elif isinstance(fallback_repository, list):
+        fallback_repositories = fallback_repository
+    else:
+        fallback_repositories = [fallback_repository]
+
+    attempts = [
+        (repository, save_kwargs),
+        *((fallback, fallback_save_kwargs) for fallback in fallback_repositories),
+    ]
+    for idx, (repo, kwargs) in enumerate(attempts):
+        repo_obj = get_builtin_repository(repo)
+        try:
+            return getattr(repo_obj, func)(*args, **kwargs)
+        except Exception as exc:
+            if idx >= len(attempts) - 1:
+                raise
+
+            traceback.print_exc()
+            print(
+                f"Failed to {func} to repository {repo}: {exc}, "
+                f"falling back to {attempts[idx + 1][0]}"
+            )
+
+
 class File(BaseModel):
     # public properties
     url: str = Field(
@@ -154,14 +190,12 @@ class File(BaseModel):
         file_name: Optional[str] = None,
         repository: FileRepository | RepositoryId = DEFAULT_REPOSITORY,
         fallback_repository: Optional[
-            FileRepository | RepositoryId
+            FileRepository | RepositoryId | list[FileRepository | RepositoryId]
         ] = FALLBACK_REPOSITORY,
         request: Optional[Request] = None,
         save_kwargs: Optional[dict] = None,
         fallback_save_kwargs: Optional[dict] = None,
     ) -> File:
-        repo = get_builtin_repository(repository)
-
         save_kwargs = save_kwargs or {}
         fallback_save_kwargs = fallback_save_kwargs or {}
 
@@ -177,21 +211,14 @@ class File(BaseModel):
             "object_lifecycle_preference", object_lifecycle_preference
         )
 
-        try:
-            url = repo.save(fdata, **save_kwargs)
-        except Exception as exc:
-            if not fallback_repository:
-                raise
-
-            traceback.print_exc()
-            print(
-                f"Failed to save bytes to repository {repository}: {exc}, "
-                f"falling back to {fallback_repository}"
-            )
-
-            fallback_repo = get_builtin_repository(fallback_repository)
-
-            url = fallback_repo.save(fdata, **fallback_save_kwargs)
+        url = _try_with_fallback(
+            "save",
+            [fdata],
+            repository=repository,
+            fallback_repository=fallback_repository,
+            save_kwargs=save_kwargs,
+            fallback_save_kwargs=fallback_save_kwargs,
+        )
 
         return cls(
             url=url,
@@ -209,7 +236,7 @@ class File(BaseModel):
         repository: FileRepository | RepositoryId = DEFAULT_REPOSITORY,
         multipart: bool | None = None,
         fallback_repository: Optional[
-            FileRepository | RepositoryId
+            FileRepository | RepositoryId | list[FileRepository | RepositoryId]
         ] = FALLBACK_REPOSITORY,
         request: Optional[Request] = None,
         save_kwargs: Optional[dict] = None,
@@ -219,8 +246,6 @@ class File(BaseModel):
         if not file_path.exists():
             raise FileNotFoundError(f"File {file_path} does not exist")
 
-        repo = get_builtin_repository(repository)
-
         save_kwargs = save_kwargs or {}
         fallback_save_kwargs = fallback_save_kwargs or {}
 
@@ -238,29 +263,17 @@ class File(BaseModel):
         save_kwargs.setdefault("multipart", multipart)
         fallback_save_kwargs.setdefault("multipart", multipart)
 
-        try:
-            url, data = repo.save_file(
-                file_path,
-                content_type=content_type,
-                **save_kwargs,
-            )
-        except Exception as exc:
-            if not fallback_repository:
-                raise
-
-            traceback.print_exc()
-            print(
-                f"Failed to save file to repository {repository}: {exc}, "
-                f"falling back to {fallback_repository}"
-            )
-
-            fallback_repo = get_builtin_repository(fallback_repository)
+        save_kwargs.setdefault("content_type", content_type)
+        fallback_save_kwargs.setdefault("content_type", content_type)
 
-            url, data = fallback_repo.save_file(
-                file_path,
-                content_type=content_type,
-                **fallback_save_kwargs,
-            )
+        url, data = _try_with_fallback(
+            "save_file",
+            [file_path],
+            repository=repository,
+            fallback_repository=fallback_repository,
+            save_kwargs=save_kwargs,
+            fallback_save_kwargs=fallback_save_kwargs,
+        )
 
         return cls(
             url=url,

fal-1.26.6/tests/test_files.py

@@ -0,0 +1,59 @@
+import posixpath
+import uuid
+
+from fal.files import FalFileSystem
+
+
+def test_fal_fs(tmp_path):
+    (tmp_path / "myfile").write_text("myfile")
+    (tmp_path / "mydir").mkdir()
+    (tmp_path / "mydir" / "myfile1").write_text("myfile1")
+    (tmp_path / "mydir" / "myfile2").write_text("myfile2")
+
+    (tmp_path / "downloaded").mkdir()
+
+    remote_temp_dir = f"/data/tmp/{uuid.uuid4()}"
+
+    fs = FalFileSystem()
+
+    assert fs.exists("/")
+    assert fs.isdir("/")
+    assert fs.exists("/data")
+    assert fs.isdir("/data")
+    assert fs.exists(".")
+    assert fs.isdir(".")
+
+    fs.put(str(tmp_path / "myfile"), remote_temp_dir + "/myfile")
+    assert fs.exists(remote_temp_dir + "/myfile")
+    assert fs.isdir(remote_temp_dir)
+    assert fs.isfile(remote_temp_dir + "/myfile")
+    assert not fs.isdir(remote_temp_dir + "/myfile")
+    fs.get(remote_temp_dir + "/myfile", str(tmp_path / "downloaded" / "myfile"))
+    assert (tmp_path / "downloaded" / "myfile").read_text() == "myfile"
+
+    fs.put(str(tmp_path / "mydir"), remote_temp_dir + "/mydir", recursive=True)
+    assert fs.exists(remote_temp_dir + "/mydir")
+    assert fs.isdir(remote_temp_dir + "/mydir")
+    assert fs.isfile(remote_temp_dir + "/mydir/myfile1")
+    assert fs.isfile(remote_temp_dir + "/mydir/myfile2")
+    fs.get(
+        remote_temp_dir + "/mydir",
+        str(tmp_path / "downloaded" / "mydir"),
+        recursive=True,
+    )
+    assert (tmp_path / "downloaded" / "mydir" / "myfile1").read_text() == "myfile1"
+    assert (tmp_path / "downloaded" / "mydir" / "myfile2").read_text() == "myfile2"
+
+    assert fs.ls(remote_temp_dir, detail=False) == [
+        remote_temp_dir + "/mydir",
+        remote_temp_dir + "/myfile",
+    ]
+    assert fs.ls(posixpath.relpath(remote_temp_dir, "/data"), detail=False) == [
+        remote_temp_dir + "/mydir",
+        remote_temp_dir + "/myfile",
+    ]
+
+    fs.rm(remote_temp_dir + "/myfile")
+    assert not fs.exists(remote_temp_dir + "/myfile")
+    fs.rm(remote_temp_dir + "/mydir", recursive=True)
+    assert not fs.exists(remote_temp_dir + "/mydir")

{fal-1.26.4 → fal-1.26.6}/tests/test_stability.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import subprocess
+import uuid
 from contextlib import suppress
 
 import pytest
@@ -82,6 +83,44 @@ def test_regular_function_in_a_container(isolated_client):
     assert mult(5, 2) == 10
 
 
+def test_container_no_venv(isolated_client):
+    actual_python = active_python()
+
+    @isolated_client(
+        "container",
+        image=ContainerImage.from_dockerfile_str(
+            f"""
+            FROM python:{actual_python}
+            # {uuid.uuid4()}
+            """
+        ),
+    )
+    def myfunc():
+        return 42
+
+    assert myfunc() == 42
+
+
+def test_container_venv(isolated_client):
+    actual_python = active_python()
+
+    @isolated_client(
+        "container",
+        image=ContainerImage.from_dockerfile_str(
+            f"""
+            FROM python:{actual_python}
+            # {uuid.uuid4()}
+            RUN python -m venv .venv
+            ENV PATH="/root/.venv/bin:$PATH"
+            """
+        ),
+    )
+    def myfunc():
+        return 42
+
+    assert myfunc() == 42
+
+
 def test_regular_function_in_a_container_with_custom_image(isolated_client):
     actual_python = active_python()
 
@@ -584,7 +623,7 @@ def test_worker_env_vars(isolated_client):
     [
         (
             "fal",
-            "https://storage.googleapis.com/isolate-dev-smiling-shark_toolkit_bucket/",
+            "https://storage.googleapis.com/isolate-dev-smiling-shark_toolkit_public_bucket/",
         ),
         ("fal_v2", "https://v2.fal.media/files"),
         ("fal_v3", "https://v3.fal.media/files"),