fal 1.26.2__tar.gz → 1.26.4__tar.gz

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

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

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

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

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

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

{fal-1.26.2 → fal-1.26.4}/src/fal/cli/profile.py

@@ -23,14 +23,38 @@ def _list(args):
 
 
 def _set(args):
-    with Config().edit() as config:
-        config.set_internal("profile", args.PROFILE)
-        args.console.print(f"Default profile set to [cyan]{args.PROFILE}[/].")
-        config.profile = args.PROFILE
-        if not config.get("key"):
+    config = Config()
+
+    # Check if the profile exists
+    if args.PROFILE not in config._config:
+        # Profile doesn't exist, offer to create it
+        args.console.print(f"Profile [cyan]{args.PROFILE}[/] does not exist.")
+        create_profile = input("Would you like to create it? (y/N): ").strip().lower()
+
+        if create_profile in ["y", "yes"]:
+            # Create the profile by setting it
+            with config.edit() as config:
+                config.set_internal("profile", args.PROFILE)
+                config._config[args.PROFILE] = {}
+                config._profile = args.PROFILE
             args.console.print(
-                "No key set for profile. Use [bold]fal profile key[/] to set a key."
+                f"Profile [cyan]{args.PROFILE}[/] created and set as default."
             )
+        else:
+            args.console.print("Profile creation cancelled.")
+            return
+    else:
+        # Profile exists, just set it as default
+        with config.edit() as config:
+            config.set_internal("profile", args.PROFILE)
+            config._profile = args.PROFILE
+        args.console.print(f"Default profile set to [cyan]{args.PROFILE}[/].")
+
+    # Check if key is set for the profile
+    if not config.get("key"):
+        args.console.print(
+            "No key set for profile. Use [bold]fal profile key[/] to set a key."
+        )
 
 
 def _unset(args, config: Config | None = None):
@@ -42,6 +66,8 @@ def _unset(args, config: Config | None = None):
 
 
 def _key_set(args):
+    config = Config(validate_profile=True)
+
     while True:
         key = input("Enter the key: ")
         if ":" in key:
@@ -50,7 +76,7 @@ def _key_set(args):
             "[red]Invalid key. The key must be in the format [bold]key:value[/].[/]"
         )
 
-    with Config().edit() as config:
+    with config.edit():
         config.set("key", key)
         args.console.print(f"Key set for profile [cyan]{config.profile}[/].")
 
@@ -61,6 +87,24 @@ def _host_set(args):
         args.console.print(f"Fal host set to [cyan]{args.HOST}[/].")
 
 
+def _create(args):
+    config = Config()
+
+    # Check if the profile already exists
+    if args.PROFILE in config._config:
+        args.console.print(f"Profile [cyan]{args.PROFILE}[/] already exists.")
+        return
+
+    # Create the profile
+    with config.edit() as config:
+        config._config[args.PROFILE] = {}
+
+    args.console.print(f"Profile [cyan]{args.PROFILE}[/] created.")
+    args.console.print(
+        f"Use [bold]fal profile set {args.PROFILE}[/] to set it as default."
+    )
+
+
 def _delete(args):
     with Config().edit() as config:
         if config.profile == args.PROFILE:
@@ -96,7 +140,7 @@ def add_parser(main_subparsers, parents):
     )
     list_parser.set_defaults(func=_list)
 
-    set_help = "Set default profile."
+    set_help = "Set default profile. If the profile doesn't exist, you'll be prompted to create it."  # noqa: E501
     set_parser = subparsers.add_parser(
         "set",
         description=set_help,
@@ -140,6 +184,19 @@ def add_parser(main_subparsers, parents):
     )
     host_set_parser.set_defaults(func=_host_set)
 
+    create_help = "Create a new profile. Use 'fal profile set <name>' to set it as default after creation."  # noqa: E501
+    create_parser = subparsers.add_parser(
+        "create",
+        description=create_help,
+        help=create_help,
+        parents=parents,
+    )
+    create_parser.add_argument(
+        "PROFILE",
+        help="Profile name.",
+    )
+    create_parser.set_defaults(func=_create)
+
     delete_help = "Delete profile."
     delete_parser = subparsers.add_parser(
         "delete",

{fal-1.26.2 → fal-1.26.4}/src/fal/config.py

@@ -4,8 +4,9 @@ import os
 from contextlib import contextmanager
 from typing import Dict, Iterator, List, Optional
 
-SETTINGS_SECTION = "__internal__"  # legacy
-DEFAULT_PROFILE = "default"
+SETTINGS_SECTION = "__internal__"
+
+NO_PROFILE_ERROR = ValueError("No profile set.")
 
 
 class Config:
@@ -15,7 +16,7 @@ class Config:
 
     DEFAULT_CONFIG_PATH = "~/.fal/config.toml"
 
-    def __init__(self):
+    def __init__(self, *, validate_profile: bool = False):
         import tomli
 
         self.config_path = os.path.expanduser(
@@ -28,11 +29,17 @@ class Config:
         except FileNotFoundError:
             self._config = {}
 
-        profile = (
-            os.getenv("FAL_PROFILE") or self.get_internal("profile") or DEFAULT_PROFILE
-        )
+        profile = os.getenv("FAL_PROFILE") or self.get_internal("profile")
+
+        # Try to set the profile, but don't fail if it doesn't exist
+        try:
+            self.profile = profile
+        except ValueError:
+            # Profile doesn't exist, set to None
+            self._profile = None
 
-        self.profile = profile
+        if validate_profile and not self.profile:
+            raise NO_PROFILE_ERROR
 
     @property
     def profile(self) -> Optional[str]:
@@ -41,9 +48,10 @@ class Config:
     @profile.setter
     def profile(self, value: Optional[str]) -> None:
         if value and value not in self._config:
-            # Make sure the section exists
-            self._config[value] = {}
-            self.set_internal("profile", value)
+            # Don't automatically create profiles - they should be created explicitly
+            raise ValueError(
+                f"Profile '{value}' does not exist. Create it first or use the profile set command."  # noqa: E501
+            )
         elif not value:
             self.unset_internal("profile")
 
@@ -53,11 +61,7 @@ class Config:
         keys: List[str] = []
         for key in self._config:
             if key != SETTINGS_SECTION:
-                if key == DEFAULT_PROFILE:
-                    # Add it at the beginning
-                    keys.insert(0, key)
-                else:
-                    keys.append(key)
+                keys.append(key)
 
         return keys
 
@@ -75,13 +79,13 @@ class Config:
 
     def set(self, key: str, value: str) -> None:
         if not self.profile:
-            raise ValueError("No profile set.")
+            raise NO_PROFILE_ERROR
 
         self._config[self.profile][key] = value
 
     def unset(self, key: str) -> None:
         if not self.profile:
-            raise ValueError("No profile set.")
+            raise NO_PROFILE_ERROR
 
         self._config.get(self.profile, {}).pop(key, None)
 

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

@@ -9,7 +9,7 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Generator, Generic, TypeVar
+from typing import Any, Dict, Generator, Generic, TypeVar
 from urllib.error import HTTPError
 from urllib.parse import urlparse, urlunparse
 from urllib.request import Request, urlopen
@@ -45,6 +45,9 @@ def _should_retry(exc: Exception) -> bool:
     if isinstance(exc, HTTPError) and exc.code in RETRY_CODES:
         return True
 
+    if isinstance(exc, TimeoutError):
+        return True
+
     return False
 
 
@@ -66,6 +69,19 @@ def _maybe_retry_request(
         yield response
 
 
+def _object_lifecycle_headers(
+    headers: dict[str, str],
+    object_lifecycle_preference: dict[str, str] | None,
+):
+    if object_lifecycle_preference:
+        # Used by V3 CDN
+        headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
+        # Used by V1 CDN
+        headers["X-Fal-Object-Lifecycle-Preference"] = json.dumps(
+            object_lifecycle_preference
+        )
+
+
 @dataclass
 class FalV2Token:
     token: str
@@ -448,14 +464,6 @@ class MultipartUploadGCS:
 
 @dataclass
 class FalFileRepository(FalFileRepositoryBase):
-    def _object_lifecycle_headers(
-        self,
-        headers: dict[str, str],
-        object_lifecycle_preference: dict[str, str] | None,
-    ):
-        if object_lifecycle_preference:
-            headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
-
     def save(
         self,
         file: FileData,
@@ -476,9 +484,8 @@ class FalFileRepository(FalFileRepositoryBase):
                 max_concurrency=multipart_max_concurrency,
             )
 
-        headers = {}
-        if object_lifecycle_preference:
-            headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
+        headers: Dict[str, str] = {}
+        _object_lifecycle_headers(headers, object_lifecycle_preference)
 
         return self._save(file, "gcs", headers=headers)
 
@@ -1121,6 +1128,8 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
             "Content-Type": file.content_type,
         }
 
+        _object_lifecycle_headers(headers, object_lifecycle_preference)
+
         storage_url = f"{token.base_upload_url}/upload"
 
         try:
@@ -1192,16 +1201,6 @@ class InMemoryRepository(FileRepository):
 
 @dataclass
 class FalCDNFileRepository(FileRepository):
-    def _object_lifecycle_headers(
-        self,
-        headers: dict[str, str],
-        object_lifecycle_preference: dict[str, str] | None,
-    ):
-        if object_lifecycle_preference:
-            headers["X-Fal-Object-Lifecycle-Preference"] = json.dumps(
-                object_lifecycle_preference
-            )
-
     def save(
         self,
         file: FileData,
@@ -1218,7 +1217,7 @@ class FalCDNFileRepository(FileRepository):
             "X-Fal-File-Name": file.file_name,
         }
 
-        self._object_lifecycle_headers(headers, object_lifecycle_preference)
+        _object_lifecycle_headers(headers, object_lifecycle_preference)
 
         url = os.getenv("FAL_CDN_HOST", _FAL_CDN) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)
@@ -1285,6 +1284,7 @@ class FalFileRepositoryV3(FileRepository):
             "Accept": "application/json",
             "Content-Type": "application/json",
         }
+        _object_lifecycle_headers(headers, object_lifecycle_preference)
 
         grpc_host = os.environ.get("FAL_HOST", "api.alpha.fal.ai")
         rest_host = grpc_host.replace("api", "rest", 1)
@@ -1373,14 +1373,6 @@ class InternalFalFileRepositoryV3(FileRepository):
     That way it can avoid the need to refresh the token for every upload.
     """
 
-    def _object_lifecycle_headers(
-        self,
-        headers: dict[str, str],
-        object_lifecycle_preference: dict[str, str] | None,
-    ):
-        if object_lifecycle_preference:
-            headers["X-Fal-Object-Lifecycle"] = json.dumps(object_lifecycle_preference)
-
     def save(
         self,
         file: FileData,
@@ -1410,7 +1402,7 @@ class InternalFalFileRepositoryV3(FileRepository):
             "X-Fal-File-Name": file.file_name,
         }
 
-        self._object_lifecycle_headers(headers, object_lifecycle_preference)
+        _object_lifecycle_headers(headers, object_lifecycle_preference)
 
         url = os.getenv("FAL_CDN_V3_HOST", _FAL_CDN_V3) + "/files/upload"
         request = Request(url, headers=headers, method="POST", data=file.data)

{fal-1.26.2 → fal-1.26.4}/tests/test_apps.py

@@ -235,7 +235,7 @@ class ExceptionApp(fal.App, keep_alive=300, max_concurrency=1):
         raise RuntimeError("cuDNN error: CUDNN_STATUS_INTERNAL_ERROR")
 
 
-class CancellableApp(fal.App, keep_alive=300, max_concurrency=1, request_timeout=2):
+class CancellableApp(fal.App, keep_alive=300, max_concurrency=1, request_timeout=4):
     task = None
     running = 0
 
@@ -514,12 +514,12 @@ def test_stateful_app_client(test_stateful_app: str):
 
 def test_app_cancellation(test_app: str, test_cancellable_app: str):
     request_handle = apps.submit(
-        test_cancellable_app, arguments={"lhs": 1, "rhs": 2, "wait_time": 5}
+        test_cancellable_app, arguments={"lhs": 1, "rhs": 2, "wait_time": 6}
     )
 
     while True:
         status = request_handle.status()
-        time.sleep(0.5)
+        time.sleep(0.05)
         if isinstance(status, apps.InProgress):
             # The app is running
             break
@@ -534,12 +534,12 @@ def test_app_cancellation(test_app: str, test_cancellable_app: str):
 
     # normal app should just ignore the cancellation
     request_handle = apps.submit(
-        test_app, arguments={"lhs": 1, "rhs": 2, "wait_time": 5}
+        test_app, arguments={"lhs": 1, "rhs": 2, "wait_time": 6}
     )
 
     while True:
         status = request_handle.status()
-        time.sleep(0.5)
+        time.sleep(0.05)
         if isinstance(status, apps.InProgress):
             # The app is running
             break