fal 1.26.2__py3-none-any.whl → 1.26.4__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.2'
-__version_tuple__ = version_tuple = (1, 26, 2)
+__version__ = version = '1.26.4'
+__version_tuple__ = version_tuple = (1, 26, 4)

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

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

@@ -1,12 +1,12 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=C99N_Z6v_dImhQIs0wSP9hjugs8YW_m4cpJMf6e1I-4,513
+fal/_fal_version.py,sha256=u70IaPMkznhV25wuaImHeCFFqIUwcsB7Z1rqTSGrz9g,513
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
 fal/api.py,sha256=wIEt21P1C7U-dYQEcyHUxxuuTnvzFyTpWDoHoaxq7tg,47385
 fal/app.py,sha256=3RDFV6JUiUk8b3WJanKQYA-kW74t5bqaNy8OYuUH5-Q,25491
 fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
-fal/config.py,sha256=19tR4zWr2yqsBRWNhFV1jKMiXAASRz2Et62k68-1r9Y,3290
+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/flags.py,sha256=QonyDM7R2GqfAB1bJr46oriu-fHJCkpUwXuSdanePWg,987
@@ -34,7 +34,7 @@ fal/cli/files.py,sha256=pSgAnTm2eHdP-IPkMIVfnK_Ii7mkSSOVgvbsiFUVBC0,2936
 fal/cli/keys.py,sha256=7Sf4DT4le89G42eAOt0ltRjbZAtE70AVQ62hmjZhUy0,3059
 fal/cli/main.py,sha256=LnJCe83Fdr5-i3Fkpvrd9BZPjHtcX_H1EEmy6rVlCz8,3180
 fal/cli/parser.py,sha256=jYsGQ0BLQuKI7KtN1jnLVYKMbLtez7hPjwTNfG3UPSk,2964
-fal/cli/profile.py,sha256=9d6a8IEZhxKoJt4CmvRbqw1Js7HBNkJjng7I_3ggfTw,3941
+fal/cli/profile.py,sha256=9Iz5Prk2mR2JmxBuNPcKAcQJVHlGGXIlKh_7MXDl7U4,5879
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
 fal/cli/runners.py,sha256=7efNX9vm6D1aBlg0M5-u5plw3HHC41Sj-N7eRNIHnqw,3689
 fal/cli/secrets.py,sha256=QKSmazu-wiNF6fOpGL9v2TDYxAjX9KTi7ot7vnv6f5E,2474
@@ -61,7 +61,7 @@ fal/toolkit/audio/audio.py,sha256=gt458h989iQ-EhQSH-mCuJuPBY4RneLJE05f_QWU1E0,57
 fal/toolkit/file/__init__.py,sha256=FbNl6wD-P0aSSTUwzHt4HujBXrbC3ABmaigPQA4hRfg,70
 fal/toolkit/file/file.py,sha256=4K28gr--5q0nmsm3P76SFoKQj3bPROVwxXrdoMjIiUE,10197
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
-fal/toolkit/file/providers/fal.py,sha256=vt4Mznbfca6blfk0psF1ix-zB6309kpIA0_5Qh7bmFw,47217
+fal/toolkit/file/providers/fal.py,sha256=Ph8v3Cm_eFu1b1AXiPKZQ5r8AWUALD3Wk18uw3z8RDQ,46910
 fal/toolkit/file/providers/gcp.py,sha256=DKeZpm1MjwbvEsYvkdXUtuLIJDr_UNbqXj_Mfv3NTeo,2437
 fal/toolkit/file/providers/r2.py,sha256=YqnYkkAo_ZKIa-xoSuDnnidUFwJWHdziAR34PE6irdI,3061
 fal/toolkit/file/providers/s3.py,sha256=EI45T54Mox7lHZKROss_O8o0DIn3CHP9k1iaNYVrxvg,2714
@@ -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.2.dist-info/METADATA,sha256=kNAhtk3mo4CnZruMDUZOa47W3uh92DKvD0GdAT7YhOE,4089
-fal-1.26.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.26.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.26.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.26.2.dist-info/RECORD,,
+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,,