fal 1.7.0__tar.gz → 1.7.2__tar.gz

{fal-1.7.0/fal.egg-info → fal-1.7.2}/PKG-INFO

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

{fal-1.7.0 → fal-1.7.2/fal.egg-info}/PKG-INFO

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

{fal-1.7.0 → fal-1.7.2}/fal.egg-info/SOURCES.txt

@@ -84,6 +84,7 @@ src/fal/_version.py
 src/fal/api.py
 src/fal/app.py
 src/fal/apps.py
+src/fal/config.py
 src/fal/container.py
 src/fal/files.py
 src/fal/flags.py

{fal-1.7.0 → fal-1.7.2}/src/fal/_fal_version.py

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

{fal-1.7.0 → fal-1.7.2}/src/fal/api.py

@@ -77,6 +77,7 @@ SERVE_REQUIREMENTS = [
     "uvicorn",
     "starlette_exporter",
     "structlog",
+    "tomli",
 ]
 
 

{fal-1.7.0 → fal-1.7.2}/src/fal/auth/__init__.py

@@ -8,6 +8,7 @@ from typing import Optional
 import click
 
 from fal.auth import auth0, local
+from fal.config import Config
 from fal.console import console
 from fal.console.icons import CHECK_ICON
 from fal.exceptions.auth import UnauthenticatedException
@@ -61,7 +62,9 @@ def key_credentials() -> tuple[str, str] | None:
     if os.environ.get("FAL_FORCE_AUTH_BY_USER") == "1":
         return None
 
-    key = os.environ.get("FAL_KEY") or get_colab_token()
+    config = Config()
+
+    key = os.environ.get("FAL_KEY") or config.get("key") or get_colab_token()
     if key:
         key_id, key_secret = key.split(":", 1)
         return (key_id, key_secret)

fal-1.7.2/src/fal/config.py

@@ -0,0 +1,23 @@
+import os
+
+import tomli
+
+
+class Config:
+    DEFAULT_CONFIG_PATH = "~/.fal/config.toml"
+    DEFAULT_PROFILE = "default"
+
+    def __init__(self):
+        self.config_path = os.path.expanduser(
+            os.getenv("FAL_CONFIG_PATH", self.DEFAULT_CONFIG_PATH)
+        )
+        self.profile = os.getenv("FAL_PROFILE", self.DEFAULT_PROFILE)
+
+        try:
+            with open(self.config_path, "rb") as file:
+                self.config = tomli.load(file)
+        except FileNotFoundError:
+            self.config = {}
+
+    def get(self, key):
+        return self.config.get(self.profile, {}).get(key)

{fal-1.7.0 → fal-1.7.2}/src/fal/toolkit/file/file.py

@@ -47,7 +47,10 @@ BUILT_IN_REPOSITORIES: dict[RepositoryId, FileRepositoryFactory] = {
 }
 
 
-def get_builtin_repository(id: RepositoryId) -> FileRepository:
+def get_builtin_repository(id: RepositoryId | FileRepository) -> FileRepository:
+    if isinstance(id, FileRepository):
+        return id
+
     if id not in BUILT_IN_REPOSITORIES.keys():
         raise ValueError(f'"{id}" is not a valid built-in file repository')
     return BUILT_IN_REPOSITORIES[id]()
@@ -122,7 +125,8 @@ class File(BaseModel):
             url=url,
             content_type=None,
             file_name=None,
-            repository=DEFAULT_REPOSITORY,
+            file_size=None,
+            file_data=None,
         )
 
     @classmethod
@@ -139,11 +143,7 @@ class File(BaseModel):
         save_kwargs: Optional[dict] = None,
         fallback_save_kwargs: Optional[dict] = None,
     ) -> File:
-        repo = (
-            repository
-            if isinstance(repository, FileRepository)
-            else get_builtin_repository(repository)
-        )
+        repo = get_builtin_repository(repository)
 
         save_kwargs = save_kwargs or {}
         fallback_save_kwargs = fallback_save_kwargs or {}
@@ -160,11 +160,7 @@ class File(BaseModel):
             if not fallback_repository:
                 raise
 
-            fallback_repo = (
-                fallback_repository
-                if isinstance(fallback_repository, FileRepository)
-                else get_builtin_repository(fallback_repository)
-            )
+            fallback_repo = get_builtin_repository(fallback_repository)
 
             url = fallback_repo.save(
                 fdata, object_lifecycle_preference, **fallback_save_kwargs
@@ -196,11 +192,7 @@ class File(BaseModel):
         if not file_path.exists():
             raise FileNotFoundError(f"File {file_path} does not exist")
 
-        repo = (
-            repository
-            if isinstance(repository, FileRepository)
-            else get_builtin_repository(repository)
-        )
+        repo = get_builtin_repository(repository)
 
         save_kwargs = save_kwargs or {}
         fallback_save_kwargs = fallback_save_kwargs or {}
@@ -222,11 +214,7 @@ class File(BaseModel):
             if not fallback_repository:
                 raise
 
-            fallback_repo = (
-                fallback_repository
-                if isinstance(fallback_repository, FileRepository)
-                else get_builtin_repository(fallback_repository)
-            )
+            fallback_repo = get_builtin_repository(fallback_repository)
 
             url, data = fallback_repo.save_file(
                 file_path,

{fal-1.7.0 → fal-1.7.2}/src/fal/toolkit/file/providers/fal.py

@@ -159,24 +159,27 @@ class FalFileRepositoryBase(FileRepository):
                 result = json.load(response)
 
             upload_url = result["upload_url"]
-            self._upload_file(upload_url, file)
-
-            return result["file_url"]
         except HTTPError as e:
             raise FileUploadException(
                 f"Error initiating upload. Status {e.status}: {e.reason}"
             )
 
-    def _upload_file(self, upload_url: str, file: FileData):
-        req = Request(
-            upload_url,
-            method="PUT",
-            data=file.data,
-            headers={"Content-Type": file.content_type},
-        )
+        try:
+            req = Request(
+                upload_url,
+                method="PUT",
+                data=file.data,
+                headers={"Content-Type": file.content_type},
+            )
+
+            with urlopen(req):
+                pass
 
-        with urlopen(req):
-            return
+            return result["file_url"]
+        except HTTPError as e:
+            raise FileUploadException(
+                f"Error uploading file. Status {e.status}: {e.reason}"
+            )
 
 
 @dataclass

{fal-1.7.0 → fal-1.7.2}/src/fal/toolkit/utils/retry.py

@@ -1,6 +1,7 @@
 import functools
 import random
 import time
+import traceback
 from typing import Any, Callable, Literal
 
 BackoffType = Literal["exponential", "fixed"]
@@ -25,6 +26,8 @@ def retry(
                     print(f"Retrying {retries} of {max_retries}...")
                     if retries == max_retries:
                         print(f"Max retries reached. Raising exception: {e}")
+                        traceback.print_exc()
+
                         raise e
 
                     if backoff_type == "exponential":

{fal-1.7.0 → fal-1.7.2}/tests/integration_test.py

@@ -458,7 +458,7 @@ def fal_file_content_matches(file: File, content: str):
 
 
 def test_fal_file_from_path(isolated_client):
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def fal_file_from_temp(content: str):
         with tempfile.NamedTemporaryFile() as temp_file:
             file_path = temp_file.name
@@ -475,7 +475,7 @@ def test_fal_file_from_path(isolated_client):
 
 
 def test_fal_file_from_bytes(isolated_client):
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def fal_file_from_bytes(content: str):
         return File.from_bytes(content.encode(), repository="in_memory")
 
@@ -486,7 +486,7 @@ def test_fal_file_from_bytes(isolated_client):
 
 
 def test_fal_file_save(isolated_client):
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def fal_file_to_local_file(content: str):
         file = File.from_bytes(content.encode(), repository="in_memory")
 
@@ -521,7 +521,7 @@ def test_fal_file_input(isolated_client, file_url: str, expected_content: str):
     class TestInput(BaseModel):
         file: File = Field()
 
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def init_file_on_fal(input: TestInput) -> File:
         return input.file
 
@@ -542,7 +542,7 @@ def test_fal_compressed_file(isolated_client):
     class TestInput(BaseModel):
         files: CompressedFile
 
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def init_compressed_file_on_fal(input: TestInput) -> int:
         extracted_file_paths = [file for file in input.files]
         return extracted_file_paths
@@ -557,7 +557,7 @@ def test_fal_compressed_file(isolated_client):
 
 
 def test_fal_cdn(isolated_client):
-    @isolated_client(requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=[f"pydantic=={pydantic_version}", "tomli"])
     def upload_to_fal_cdn() -> FalImage:
         return FalImage.from_bytes(b"0", "jpeg", repository="cdn")
 

{fal-1.7.0 → fal-1.7.2}/tests/test_stability.py

@@ -595,7 +595,9 @@ def test_fal_storage(isolated_client, repo_type, url_prefix):
     assert file.url.startswith(url_prefix)
     assert file.as_bytes().decode().endswith("local")
 
-    @isolated_client(serve=True, requirements=[f"pydantic=={pydantic_version}"])
+    @isolated_client(
+        serve=True, requirements=[f"pydantic=={pydantic_version}", "tomli"]
+    )
     def hello_file():
         # Run in the isolated environment
         return File.from_bytes(

{fal-1.7.0 → fal-1.7.2}/tests/toolkit/image_test.py

@@ -77,7 +77,7 @@ def assert_fal_images_equals(fal_image_1: Image, fal_image_2: Image):
 
 
 def test_fal_image_from_pil(isolated_client):
-    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}", "tomli"])
     def fal_image_from_bytes_remote():
         pil_image = get_image()
         return Image.from_pil(pil_image, repository="in_memory")
@@ -87,7 +87,7 @@ def test_fal_image_from_pil(isolated_client):
 
 
 def test_fal_image_from_bytes(isolated_client):
-    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}", "tomli"])
     def fal_image_from_bytes_remote():
         image_bytes = get_image(as_bytes=True)
         return Image.from_bytes(image_bytes, repository="in_memory", format="png")
@@ -107,7 +107,7 @@ def test_fal_image_input(isolated_client, image_url):
     class TestInput(BaseModel):
         image: Image = Field()
 
-    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}", "tomli"])
     def init_image_on_fal(input: TestInput) -> Image:
         return TestInput(image=input.image).image
 
@@ -127,7 +127,7 @@ def test_fal_image_input_to_pil(isolated_client):
     class TestInput(BaseModel):
         image: Image = Field()
 
-    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}"])
+    @isolated_client(requirements=["pillow", f"pydantic=={pydantic_version}", "tomli"])
     def init_image_on_fal(input: TestInput) -> bytes:
         input_image = TestInput(image=input.image).image
         pil_image = input_image.to_pil()