fal 1.14.0__tar.gz → 1.15.1__tar.gz

{fal-1.14.0/fal.egg-info → fal-1.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.14.0
+Version: 1.15.1
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -38,6 +38,7 @@ Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
 Requires-Dist: tomli<3,>2
 Requires-Dist: tomli-w<2,>=1
+Requires-Dist: fsspec
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{fal-1.14.0 → fal-1.15.1/fal.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fal
-Version: 1.14.0
+Version: 1.15.1
 Summary: fal is an easy-to-use Serverless Python Framework
 Author: Features & Labels <support@fal.ai>
 Requires-Python: >=3.8
@@ -38,6 +38,7 @@ Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
 Requires-Dist: tomli<3,>2
 Requires-Dist: tomli-w<2,>=1
+Requires-Dist: fsspec
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{fal-1.14.0 → fal-1.15.1}/fal.egg-info/SOURCES.txt

@@ -108,6 +108,7 @@ src/fal/cli/create.py
 src/fal/cli/debug.py
 src/fal/cli/deploy.py
 src/fal/cli/doctor.py
+src/fal/cli/files.py
 src/fal/cli/keys.py
 src/fal/cli/main.py
 src/fal/cli/parser.py

{fal-1.14.0 → fal-1.15.1}/fal.egg-info/requires.txt

@@ -30,6 +30,7 @@ uvicorn<1,>=0.29.0
 cookiecutter
 tomli<3,>2
 tomli-w<2,>=1
+fsspec
 
 [:python_version < "3.10"]
 importlib-metadata>=4.4

{fal-1.14.0 → fal-1.15.1}/pyproject.toml

@@ -58,6 +58,7 @@ dependencies = [
     "cookiecutter",
     "tomli>2,<3",
     "tomli-w>=1,<2",
+    "fsspec",
 ]
 
 [project.optional-dependencies]

{fal-1.14.0 → fal-1.15.1}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.14.0'
-__version_tuple__ = version_tuple = (1, 14, 0)
+__version__ = version = '1.15.1'
+__version_tuple__ = version_tuple = (1, 15, 1)

fal-1.15.1/src/fal/cli/files.py

@@ -0,0 +1,70 @@
+from .parser import FalClientParser
+
+
+def _list(args):
+    import posixpath
+
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+
+    for entry in fs.ls(args.path, detail=True):
+        name = posixpath.basename(entry["name"])
+        color = "blue" if entry["type"] == "directory" else "default"
+        args.console.print(f"[{color}]{name}[/{color}]")
+
+
+def _download(args):
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+    fs.get(args.remote_path, args.local_path, recursive=True)
+
+
+def _upload(args):
+    from fal.files import FalFileSystem
+
+    fs = FalFileSystem()
+    fs.put(args.local_path, args.remote_path, recursive=True)
+
+
+def add_parser(main_subparsers, parents):
+    files_help = "Manage fal files."
+    parser = main_subparsers.add_parser(
+        "files",
+        aliases=["file"],
+        description=files_help,
+        help=files_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        required=True,
+        parser_class=FalClientParser,
+    )
+
+    list_parser = subparsers.add_parser("list", aliases=["ls"], parents=parents)
+    list_parser.add_argument(
+        "path",
+        nargs="?",
+        type=str,
+        help="The path to list",
+        default="/",
+    )
+    list_parser.set_defaults(func=_list)
+
+    download_parser = subparsers.add_parser("download", parents=parents)
+    download_parser.add_argument(
+        "remote_path", type=str, help="Remote path to download"
+    )
+    download_parser.add_argument(
+        "local_path", type=str, help="Local path to download to"
+    )
+    download_parser.set_defaults(func=_download)
+
+    upload_parser = subparsers.add_parser("upload", parents=parents)
+    upload_parser.add_argument("local_path", type=str, help="Local path to upload")
+    upload_parser.add_argument("remote_path", type=str, help="Remote path to upload to")
+    upload_parser.set_defaults(func=_upload)

{fal-1.14.0 → fal-1.15.1}/src/fal/cli/main.py

@@ -13,6 +13,7 @@ from . import (
     create,
     deploy,
     doctor,
+    files,
     keys,
     profile,
     run,
@@ -57,6 +58,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
         create,
         runners,
         teams,
+        files,
     ]:
         cmd.add_parser(subparsers, parents)
 

fal-1.15.1/src/fal/files.py

@@ -0,0 +1,90 @@
+import os
+import posixpath
+from functools import cached_property
+from typing import TYPE_CHECKING
+
+from fsspec import AbstractFileSystem
+
+if TYPE_CHECKING:
+    import httpx
+
+USER_AGENT = "fal-sdk/1.14.0 (python)"
+
+
+class FalFileSystem(AbstractFileSystem):
+    @cached_property
+    def _client(self) -> "httpx.Client":
+        from httpx import Client
+
+        from fal.flags import REST_URL
+        from fal.sdk import get_default_credentials
+
+        creds = get_default_credentials()
+        return Client(
+            base_url=REST_URL,
+            headers={
+                **creds.to_headers(),
+                "User-Agent": USER_AGENT,
+            },
+        )
+
+    def ls(self, path, detail=True, **kwargs):
+        if path in self.dircache:
+            entries = self.dircache[path]
+        else:
+            response = self._client.get(f"/files/list/{path.lstrip('/')}")
+            response.raise_for_status()
+            files = response.json()
+            entries = sorted(
+                (
+                    {
+                        "name": entry["path"].lstrip("/data/"),
+                        "size": entry["size"],
+                        "type": "file" if entry["is_file"] else "directory",
+                        "mtime": entry["updated_time"],
+                    }
+                    for entry in files
+                ),
+                key=lambda x: x["name"],
+            )
+        self.dircache[path] = entries
+
+        if detail:
+            return entries
+
+        return [entry["name"] for entry in entries]
+
+    def info(self, path, **kwargs):
+        parent = posixpath.dirname(path)
+        entries = self.ls(parent, detail=True)
+        for entry in entries:
+            if entry["name"] == path:
+                return entry
+        raise FileNotFoundError(f"File not found: {path}")
+
+    def get_file(self, rpath, lpath, **kwargs):
+        if self.isdir(rpath):
+            os.makedirs(lpath, exist_ok=True)
+            return
+
+        with open(lpath, "wb") as fobj:
+            response = self._client.get(f"/files/file/{rpath.lstrip('/')}")
+            response.raise_for_status()
+            fobj.write(response.content)
+
+    def put_file(self, lpath, rpath, mode="overwrite", **kwargs):
+        if os.path.isdir(lpath):
+            return
+
+        with open(lpath, "rb") as fobj:
+            response = self._client.post(
+                f"/files/file/local/{rpath.lstrip('/')}",
+                files={"file_upload": (posixpath.basename(lpath), fobj, "text/plain")},
+            )
+            response.raise_for_status()
+        self.dircache.clear()
+
+    def rm(self, path, **kwargs):
+        response = self._client.delete(f"/files/file/{path.lstrip('/')}")
+        response.raise_for_status()
+        self.dircache.clear()

{fal-1.14.0 → fal-1.15.1}/src/fal/toolkit/file/providers/fal.py

@@ -5,13 +5,15 @@ import math
 import os
 import threading
 from base64 import b64encode
+from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Generic, TypeVar
+from typing import Generator, Generic, TypeVar
 from urllib.error import HTTPError
 from urllib.parse import urlparse, urlunparse
 from urllib.request import Request, urlopen
+from urllib.response import addinfourl
 
 from fal.auth import key_credentials
 from fal.toolkit.exceptions import FileUploadException
@@ -21,6 +23,17 @@ from fal.toolkit.utils.retry import retry
 _FAL_CDN = "https://fal.media"
 _FAL_CDN_V3 = "https://v3.fal.media"
 
+DEFAULT_REQUEST_TIMEOUT = 10
+PUT_REQUEST_TIMEOUT = 5 * 60
+
+
+@contextmanager
+def _urlopen(
+    request: Request, timeout: int = DEFAULT_REQUEST_TIMEOUT
+) -> Generator[addinfourl, None, None]:
+    with urlopen(request, timeout=timeout) as response:
+        yield response
+
 
 @dataclass
 class FalV2Token:
@@ -79,7 +92,7 @@ class FalV2TokenManager:
             data=b"{}",
             method="POST",
         )
-        with urlopen(req) as response:
+        with _urlopen(req) as response:
             result = json.load(response)
 
         parsed_base_url = urlparse(result["base_url"])
@@ -158,7 +171,7 @@ class FalFileRepositoryBase(FileRepository):
                 headers=headers,
                 method="POST",
             )
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
 
             upload_url = result["upload_url"]
@@ -175,7 +188,7 @@ class FalFileRepositoryBase(FileRepository):
                 headers={"Content-Type": file.content_type},
             )
 
-            with urlopen(req):
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT):
                 pass
 
             return result["file_url"]
@@ -252,7 +265,7 @@ class MultipartUploadGCS:
                 ).encode(),
             )
 
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
                 self._access_url = result["file_url"]
                 self._upload_url = result["upload_url"]
@@ -272,7 +285,7 @@ class MultipartUploadGCS:
         )
 
         try:
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
                 upload_url = result["upload_url"]
         except HTTPError as exc:
@@ -288,7 +301,7 @@ class MultipartUploadGCS:
         )
 
         try:
-            with urlopen(req) as resp:
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "part_number": part_number,
@@ -318,7 +331,7 @@ class MultipartUploadGCS:
                     }
                 ).encode(),
             )
-            with urlopen(req):
+            with _urlopen(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -523,7 +536,7 @@ class MultipartUpload:
                     }
                 ).encode(),
             )
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
                 self._upload_url = result["upload_url"]
                 self._file_url = result["file_url"]
@@ -543,7 +556,7 @@ class MultipartUpload:
         )
 
         try:
-            with urlopen(req) as resp:
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "part_number": part_number,
@@ -568,7 +581,7 @@ class MultipartUpload:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with urlopen(req):
+            with _urlopen(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -721,7 +734,7 @@ class MultipartUploadV3:
                 ).encode(),
             )
 
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
                 self._access_url = result["file_url"]
                 self._upload_url = result["upload_url"]
@@ -747,7 +760,7 @@ class MultipartUploadV3:
         )
 
         try:
-            with urlopen(req) as resp:
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "partNumber": part_number,
@@ -775,7 +788,7 @@ class MultipartUploadV3:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with urlopen(req):
+            with _urlopen(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -915,7 +928,7 @@ class InternalMultipartUploadV3:
                     "X-Fal-File-Name": self.file_name,
                 },
             )
-            with urlopen(req) as response:
+            with _urlopen(req) as response:
                 result = json.load(response)
                 self._access_url = result["access_url"]
                 self._upload_id = result["uploadId"]
@@ -940,7 +953,7 @@ class InternalMultipartUploadV3:
         )
 
         try:
-            with urlopen(req) as resp:
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as resp:
                 self._parts.append(
                     {
                         "partNumber": part_number,
@@ -966,7 +979,7 @@ class InternalMultipartUploadV3:
                 },
                 data=json.dumps({"parts": self._parts}).encode(),
             )
-            with urlopen(req):
+            with _urlopen(req):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -1092,7 +1105,7 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
                 headers=headers,
                 method="PUT",
             )
-            with urlopen(req) as response:
+            with _urlopen(req, timeout=PUT_REQUEST_TIMEOUT) as response:
                 result = json.load(response)
 
             return result["file_url"]
@@ -1186,7 +1199,7 @@ class FalCDNFileRepository(FileRepository):
         url = os.getenv("FAL_CDN_HOST", _FAL_CDN) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)
         try:
-            with urlopen(request) as response:
+            with _urlopen(request) as response:
                 result = json.load(response)
         except HTTPError as e:
             raise FileUploadException(
@@ -1266,7 +1279,7 @@ class FalFileRepositoryV3(FileRepository):
             ).encode(),
         )
         try:
-            with urlopen(request) as response:
+            with _urlopen(request) as response:
                 result = json.load(response)
                 file_url = result["file_url"]
                 upload_url = result["upload_url"]
@@ -1282,7 +1295,7 @@ class FalFileRepositoryV3(FileRepository):
             data=file.data,
         )
         try:
-            with urlopen(request):
+            with _urlopen(request, timeout=PUT_REQUEST_TIMEOUT):
                 pass
         except HTTPError as e:
             raise FileUploadException(
@@ -1380,7 +1393,7 @@ class InternalFalFileRepositoryV3(FileRepository):
         url = os.getenv("FAL_CDN_V3_HOST", _FAL_CDN_V3) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)
         try:
-            with urlopen(request) as response:
+            with _urlopen(request) as response:
                 result = json.load(response)
         except HTTPError as e:
             raise FileUploadException(

{fal-1.14.0 → fal-1.15.1}/tests/cli/test_deploy.py

@@ -5,7 +5,7 @@ import pytest
 
 from fal.cli.deploy import _deploy
 from fal.cli.main import parse_args
-from fal.files import find_project_root
+from fal.project import find_project_root
 
 
 def test_deploy():

{fal-1.14.0 → fal-1.15.1}/tests/cli/test_run.py

@@ -5,7 +5,7 @@ import pytest
 
 from fal.cli.main import parse_args
 from fal.cli.run import _run
-from fal.files import find_project_root
+from fal.project import find_project_root
 
 
 def test_run():

{fal-1.14.0 → fal-1.15.1}/tests/test_apps.py

@@ -504,6 +504,9 @@ def test_app_cancellation(test_app: str, test_cancellable_app: str):
     assert response == {"result": 3}
 
 
+@pytest.mark.xfail(
+    reason="Temporary disabled while investigating backend issue. Ping @efiop"
+)
 @pytest.mark.flaky(max_runs=3)
 def test_app_client_async(test_sleep_app: str):
     handle = apps.submit(test_sleep_app, arguments={"wait_time": 1})

fal-1.14.0/src/fal/files.py

@@ -1,81 +0,0 @@
-from functools import lru_cache
-from pathlib import Path
-from typing import Any, Dict, Optional, Sequence, Tuple, Union
-
-import tomli
-
-
-@lru_cache
-def _load_toml(path: Union[Path, str]) -> Dict[str, Any]:
-    with open(path, "rb") as f:
-        return tomli.load(f)
-
-
-@lru_cache
-def _cached_resolve(path: Path) -> Path:
-    return path.resolve()
-
-
-@lru_cache
-def find_project_root(srcs: Optional[Sequence[str]]) -> Tuple[Path, str]:
-    """Return a directory containing .git, or pyproject.toml.
-
-    That directory will be a common parent of all files and directories
-    passed in `srcs`.
-
-    If no directory in the tree contains a marker that would specify it's the
-    project root, the root of the file system is returned.
-
-    Returns a two-tuple with the first element as the project root path and
-    the second element as a string describing the method by which the
-    project root was discovered.
-    """
-    if not srcs:
-        srcs = [str(_cached_resolve(Path.cwd()))]
-
-    path_srcs = [_cached_resolve(Path(Path.cwd(), src)) for src in srcs]
-
-    # A list of lists of parents for each 'src'. 'src' is included as a
-    # "parent" of itself if it is a directory
-    src_parents = [
-        list(path.parents) + ([path] if path.is_dir() else []) for path in path_srcs
-    ]
-
-    common_base = max(
-        set.intersection(*(set(parents) for parents in src_parents)),
-        key=lambda path: path.parts,
-    )
-
-    for directory in (common_base, *common_base.parents):
-        if (directory / ".git").exists():
-            return directory, ".git directory"
-
-        if (directory / "pyproject.toml").is_file():
-            pyproject_toml = _load_toml(directory / "pyproject.toml")
-            if "fal" in pyproject_toml.get("tool", {}):
-                return directory, "pyproject.toml"
-
-    return directory, "file system root"
-
-
-def find_pyproject_toml(
-    path_search_start: Optional[Tuple[str, ...]] = None,
-) -> Optional[str]:
-    """Find the absolute filepath to a pyproject.toml if it exists"""
-    path_project_root, _ = find_project_root(path_search_start)
-    path_pyproject_toml = path_project_root / "pyproject.toml"
-
-    if path_pyproject_toml.is_file():
-        return str(path_pyproject_toml)
-
-
-def parse_pyproject_toml(path_config: str) -> Dict[str, Any]:
-    """Parse a pyproject toml file, pulling out relevant parts for fal.
-
-    If parsing fails, will raise a tomli.TOMLDecodeError.
-    """
-    pyproject_toml = _load_toml(path_config)
-    config: Dict[str, Any] = pyproject_toml.get("tool", {}).get("fal", {})
-    config = {k.replace("--", "").replace("-", "_"): v for k, v in config.items()}
-
-    return config