fal 1.26.4__py3-none-any.whl → 1.26.6__py3-none-any.whl

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/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/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/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/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.4.dist-info → fal-1.26.6.dist-info}/METADATA

@@ -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.dist-info → fal-1.26.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=u70IaPMkznhV25wuaImHeCFFqIUwcsB7Z1rqTSGrz9g,513
+fal/_fal_version.py,sha256=ki20SEr4F9ZxFRNziosQqt1wqRI1HwXbMEH1XL5Oq2M,513
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
 fal/api.py,sha256=wIEt21P1C7U-dYQEcyHUxxuuTnvzFyTpWDoHoaxq7tg,47385
@@ -8,12 +8,12 @@ fal/app.py,sha256=3RDFV6JUiUk8b3WJanKQYA-kW74t5bqaNy8OYuUH5-Q,25491
 fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
 fal/config.py,sha256=G3IOTLQuu_VAvzPFdx9v22NpJ9m4gU8qEHic7e7-WwU,3511
 fal/container.py,sha256=FTsa5hOW4ars-yV1lUoc0BNeIIvAZcpw7Ftyt3A4m_w,2000
-fal/files.py,sha256=iwR9jXWmAruP5tSS5-NkY-mZG53Pb80C40SqB0pYRrk,6819
+fal/files.py,sha256=iWkOqCtdoz7_V-wOvV1iB1zg9x7fdGRcmGGyBkCuFXI,7449
 fal/flags.py,sha256=QonyDM7R2GqfAB1bJr46oriu-fHJCkpUwXuSdanePWg,987
 fal/project.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
-fal/sdk.py,sha256=eX_OJVmD6AY5NsLS7VR-LemXTWNEMfsOEfZBgAqytoo,26158
+fal/sdk.py,sha256=tUrwEohQz2B3LN-troH5FcON4VwRnV0zFjB0FRctDBA,26218
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=iQTBG3-i6JZgHkkwbY_I4210g0xoW-as51yrke608u0,2208
 fal/workflows.py,sha256=Zl4f6Bs085hY40zmqScxDUyCu7zXkukDbW02iYOLTTI,14805
@@ -23,7 +23,7 @@ fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
 fal/cli/_utils.py,sha256=anFfy6qouB8QzH0Yho41GulGiJu3q1KKIwgyVQCzgRQ,1593
 fal/cli/api.py,sha256=ZuDE_PIC-czzneTAWMwvC7P7WnwIyluNZSuJqzCFhqI,2640
-fal/cli/apps.py,sha256=0ex4OWbxcopjEq_BGkwkxCBSTLqUIHmFDz1MWOv06zk,10479
+fal/cli/apps.py,sha256=q0uxuD4h_5tft77QfyFbDz0kGmM51JT39du_OeFytPA,10565
 fal/cli/auth.py,sha256=Qe-Z3ycXJnOzHimz5PjCQYoni8MF4csmdL19yGN7a1o,5171
 fal/cli/cli_nested_json.py,sha256=veSZU8_bYV3Iu1PAoxt-4BMBraNIqgH5nughbs2UKvE,13539
 fal/cli/create.py,sha256=a8WDq-nJLFTeoIXqpb5cr7GR7YR9ZZrQCawNm34KXXE,627
@@ -59,7 +59,7 @@ fal/toolkit/types.py,sha256=kkbOsDKj1qPGb1UARTBp7yuJ5JUuyy7XQurYUBCdti8,4064
 fal/toolkit/audio/__init__.py,sha256=sqNVfrKbppWlIGLoFTaaNTxLpVXsFHxOSHLA5VG547A,35
 fal/toolkit/audio/audio.py,sha256=gt458h989iQ-EhQSH-mCuJuPBY4RneLJE05f_QWU1E0,572
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
-fal/toolkit/file/file.py,sha256=4K28gr--5q0nmsm3P76SFoKQj3bPROVwxXrdoMjIiUE,10197
+fal/toolkit/file/file.py,sha256=goiz5o3Wb7hcyFiolL4a4dANOmv3NJnet4Da50Pm6sI,10767
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
 fal/toolkit/file/providers/fal.py,sha256=Ph8v3Cm_eFu1b1AXiPKZQ5r8AWUALD3Wk18uw3z8RDQ,46910
 fal/toolkit/file/providers/gcp.py,sha256=DKeZpm1MjwbvEsYvkdXUtuLIJDr_UNbqXj_Mfv3NTeo,2437
@@ -142,8 +142,8 @@ openapi_fal_rest/models/workflow_node_type.py,sha256=-FzyeY2bxcNmizKbJI8joG7byRi
 openapi_fal_rest/models/workflow_schema.py,sha256=4K5gsv9u9pxx2ItkffoyHeNjBBYf6ur5bN4m_zePZNY,2019
 openapi_fal_rest/models/workflow_schema_input.py,sha256=2OkOXWHTNsCXHWS6EGDFzcJKkW5FIap-2gfO233EvZQ,1191
 openapi_fal_rest/models/workflow_schema_output.py,sha256=EblwSPAGfWfYVWw_WSSaBzQVju296is9o28rMBAd0mc,1196
-fal-1.26.4.dist-info/METADATA,sha256=L40fhRUeSIvdiabKo8bge8--xUCldpk2heasbcQFUOg,4089
-fal-1.26.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.26.4.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.26.4.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.26.4.dist-info/RECORD,,
+fal-1.26.6.dist-info/METADATA,sha256=g4I367Dy6AaujQfb-0jcU_YK-Vg1iTY-Jx0kMICfih4,4089
+fal-1.26.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.26.6.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.26.6.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.26.6.dist-info/RECORD,,