fal 1.9.2__tar.gz → 1.9.3__tar.gz

{fal-1.9.2/fal.egg-info → fal-1.9.3}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: fal
-Version: 1.9.2
+Version: 1.9.3
 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.17.0,>=0.16.1
-Requires-Dist: isolate-proto<0.7.0,>=0.6.6
+Requires-Dist: isolate-proto<0.7.0,>=0.6.7
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
@@ -37,7 +37,8 @@ Requires-Dist: pillow<11,>=10.2.0
 Requires-Dist: pyjwt[crypto]<3,>=2.8.0
 Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
-Requires-Dist: tomli
+Requires-Dist: tomli<3,>2
+Requires-Dist: tomli-w<2,>=1
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{fal-1.9.2 → fal-1.9.3/fal.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.2
 Name: fal
-Version: 1.9.2
+Version: 1.9.3
 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.17.0,>=0.16.1
-Requires-Dist: isolate-proto<0.7.0,>=0.6.6
+Requires-Dist: isolate-proto<0.7.0,>=0.6.7
 Requires-Dist: grpcio==1.64.0
 Requires-Dist: dill==0.3.7
 Requires-Dist: cloudpickle==3.0.0
@@ -37,7 +37,8 @@ Requires-Dist: pillow<11,>=10.2.0
 Requires-Dist: pyjwt[crypto]<3,>=2.8.0
 Requires-Dist: uvicorn<1,>=0.29.0
 Requires-Dist: cookiecutter
-Requires-Dist: tomli
+Requires-Dist: tomli<3,>2
+Requires-Dist: tomli-w<2,>=1
 Provides-Extra: docs
 Requires-Dist: sphinx<8.2.0; extra == "docs"
 Requires-Dist: sphinx-rtd-theme; extra == "docs"

{fal-1.9.2 → fal-1.9.3}/fal.egg-info/SOURCES.txt

@@ -108,6 +108,7 @@ src/fal/cli/doctor.py
 src/fal/cli/keys.py
 src/fal/cli/main.py
 src/fal/cli/parser.py
+src/fal/cli/profile.py
 src/fal/cli/run.py
 src/fal/cli/runners.py
 src/fal/cli/secrets.py

{fal-1.9.2 → fal-1.9.3}/fal.egg-info/requires.txt

@@ -1,5 +1,5 @@
 isolate[build]<0.17.0,>=0.16.1
-isolate-proto<0.7.0,>=0.6.6
+isolate-proto<0.7.0,>=0.6.7
 grpcio==1.64.0
 dill==0.3.7
 cloudpickle==3.0.0
@@ -29,7 +29,8 @@ pillow<11,>=10.2.0
 pyjwt[crypto]<3,>=2.8.0
 uvicorn<1,>=0.29.0
 cookiecutter
-tomli
+tomli<3,>2
+tomli-w<2,>=1
 
 [:python_version < "3.10"]
 importlib-metadata>=4.4

{fal-1.9.2 → fal-1.9.3}/pyproject.toml

@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.8"
 dependencies = [
     "isolate[build]>=0.16.1,<0.17.0",
-    "isolate-proto>=0.6.6,<0.7.0",
+    "isolate-proto>=0.6.7,<0.7.0",
     "grpcio==1.64.0",
     "dill==0.3.7",
     "cloudpickle==3.0.0",
@@ -57,7 +57,8 @@ dependencies = [
     "pyjwt[crypto]>=2.8.0,<3",
     "uvicorn>=0.29.0,<1",
     "cookiecutter",
-    "tomli"
+    "tomli>2,<3",
+    "tomli-w>=1,<2",
 ]
 
 [project.optional-dependencies]

{fal-1.9.2 → fal-1.9.3}/src/fal/_fal_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.9.2'
-__version_tuple__ = version_tuple = (1, 9, 2)
+__version__ = version = '1.9.3'
+__version_tuple__ = version_tuple = (1, 9, 3)

{fal-1.9.2 → fal-1.9.3}/src/fal/api.py

@@ -78,6 +78,7 @@ SERVE_REQUIREMENTS = [
     "starlette_exporter",
     "structlog",
     "tomli",
+    "tomli-w",
 ]
 
 

{fal-1.9.2 → fal-1.9.3}/src/fal/app.py

@@ -9,7 +9,7 @@ import re
 import threading
 import time
 import typing
-from contextlib import AsyncExitStack, asynccontextmanager, contextmanager
+from contextlib import asynccontextmanager, contextmanager
 from dataclasses import dataclass
 from typing import Any, Callable, ClassVar, Literal, TypeVar
 
@@ -40,27 +40,26 @@ async def _call_any_fn(fn, *args, **kwargs):
         return fn(*args, **kwargs)
 
 
-async def open_isolate_channel(address: str) -> async_grpc.Channel:
-    _stack = AsyncExitStack()
-    channel = await _stack.enter_async_context(
-        async_grpc.insecure_channel(
-            address,
-            options=[
-                ("grpc.max_send_message_length", -1),
-                ("grpc.max_receive_message_length", -1),
-                ("grpc.min_reconnect_backoff_ms", 0),
-                ("grpc.max_reconnect_backoff_ms", 100),
-                ("grpc.dns_min_time_between_resolutions_ms", 100),
-            ],
-        )
+async def open_isolate_channel(address: str) -> async_grpc.Channel | None:
+    channel = async_grpc.insecure_channel(
+        address,
+        options=[
+            ("grpc.max_send_message_length", -1),
+            ("grpc.max_receive_message_length", -1),
+            ("grpc.min_reconnect_backoff_ms", 0),
+            ("grpc.max_reconnect_backoff_ms", 100),
+            ("grpc.dns_min_time_between_resolutions_ms", 100),
+        ],
     )
 
-    channel_status = channel.channel_ready()
     try:
+        channel_status = channel.channel_ready()
+
         await asyncio.wait_for(channel_status, timeout=1)
     except asyncio.TimeoutError:
-        await _stack.aclose()
-        raise Exception("Timed out trying to connect to local isolate")
+        await channel.close(None)
+        print("[DEBUG] Timed out trying to connect to local isolate")
+        return None
 
     return channel
 
@@ -390,9 +389,11 @@ class App(fal.api.BaseServable):
                     f"localhost:{grpc_port}"
                 )
 
+            if self.isolate_channel is None:
+                return await call_next(request)
+
             request_id = request.headers.get(REQUEST_ID_KEY)
             if request_id is None:
-                # Cut it short
                 return await call_next(request)
 
             await _set_logger_labels(

{fal-1.9.2 → fal-1.9.3}/src/fal/cli/apps.py

@@ -22,7 +22,8 @@ def _apps_table(apps: list[AliasInfo]):
     table.add_column("Request Timeout")
     table.add_column("Startup Timeout")
     table.add_column("Machine Type")
-    table.add_column("Active Workers")
+    table.add_column("Runners")
+    table.add_column("Regions")
 
     for app in apps:
         table.add_row(
@@ -37,6 +38,7 @@ def _apps_table(apps: list[AliasInfo]):
             str(app.startup_timeout),
             " ".join(app.machine_types),
             str(app.active_runners),
+            " ".join(app.valid_regions),
         )
 
     return table
@@ -76,7 +78,8 @@ def _app_rev_table(revs: list[ApplicationInfo]):
     table.add_column("Request Timeout")
     table.add_column("Startup Timeout")
     table.add_column("Machine Type")
-    table.add_column("Active Workers")
+    table.add_column("Runners")
+    table.add_column("Regions")
 
     for rev in revs:
         table.add_row(
@@ -89,6 +92,7 @@ def _app_rev_table(revs: list[ApplicationInfo]):
             str(rev.startup_timeout),
             " ".join(rev.machine_types),
             str(rev.active_runners),
+            " ".join(rev.valid_regions),
         )
 
     return table
@@ -129,6 +133,7 @@ def _scale(args):
             and args.request_timeout is None
             and args.startup_timeout is None
             and args.machine_types is None
+            and args.regions is None
         ):
             args.console.log("No parameters for update were provided, ignoring.")
             return
@@ -142,6 +147,7 @@ def _scale(args):
             request_timeout=args.request_timeout,
             startup_timeout=args.startup_timeout,
             machine_types=args.machine_types,
+            valid_regions=args.regions,
         )
         table = _apps_table([alias_info])
 
@@ -191,11 +197,16 @@ def _add_scale_parser(subparsers, parents):
         help="Startup timeout (seconds).",
     )
     parser.add_argument(
-        "--machine-type",
+        "--machine-types",
         type=str,
-        action="append",
+        nargs="+",
         dest="machine_types",
-        help="Machine type.",
+        help="Machine types (pass several items to set multiple).",
+    )
+    parser.add_argument(
+        "--regions",
+        nargs="+",
+        help="Valid regions (pass several items to set multiple).",
     )
     parser.set_defaults(func=_scale)
 
@@ -262,6 +273,7 @@ def _runners(args):
             f"{runner.uptime} ({runner.uptime.total_seconds()}s)",
         )
 
+    args.console.print(f"Runners: {len(runners)}")
     args.console.print(table)
 
     requests_table = Table()
@@ -280,6 +292,7 @@ def _runners(args):
                 lease.get("caller_user_id") or "",
             )
 
+    args.console.print(f"Requests: {len(requests_table.rows)}")
     args.console.print(requests_table)
 
 

{fal-1.9.2 → fal-1.9.3}/src/fal/cli/main.py

@@ -6,7 +6,7 @@ from fal import __version__
 from fal.console import console
 from fal.console.icons import CROSS_ICON
 
-from . import apps, auth, create, deploy, doctor, keys, run, runners, secrets
+from . import apps, auth, create, deploy, doctor, keys, profile, run, runners, secrets
 from .debug import debugtools, get_debug_parser
 from .parser import FalParser, FalParserExit
 
@@ -31,7 +31,18 @@ def _get_main_parser() -> argparse.ArgumentParser:
         required=True,
     )
 
-    for cmd in [auth, apps, deploy, run, keys, secrets, doctor, create, runners]:
+    for cmd in [
+        auth,
+        apps,
+        deploy,
+        run,
+        keys,
+        profile,
+        secrets,
+        doctor,
+        create,
+        runners,
+    ]:
         cmd.add_parser(subparsers, parents)
 
     return parser

fal-1.9.3/src/fal/cli/profile.py

@@ -0,0 +1,129 @@
+from rich.table import Table
+
+from fal.config import Config
+
+
+def _list(args):
+    config = Config()
+
+    table = Table()
+    table.add_column("Default")
+    table.add_column("Profile")
+    table.add_column("Settings")
+
+    for profile in config.profiles():
+        table.add_row(
+            "*" if profile == config._profile else "",
+            profile,
+            ", ".join(key for key in config._config[profile]),
+        )
+
+    args.console.print(table)
+
+
+def _set(args):
+    config = Config()
+    config.set_internal("profile", args.PROFILE)
+    args.console.print(f"Default profile set to [cyan]{args.PROFILE}[/].")
+    config.profile = args.PROFILE
+    config.save()
+
+
+def _unset(args):
+    config = Config()
+    config.set_internal("profile", None)
+    args.console.print("Default profile unset.")
+    config.profile = None
+    config.save()
+
+
+def _key_set(args):
+    config = Config()
+    key_id, key_secret = args.KEY.split(":", 1)
+    config.set("key", f"{key_id}:{key_secret}")
+    args.console.print(f"Key set for profile [cyan]{config.profile}[/].")
+    config.save()
+
+
+def _delete(args):
+    config = Config()
+    if config.profile == args.PROFILE:
+        config.set_internal("profile", None)
+
+    config.delete(args.PROFILE)
+    args.console.print(f"Profile [cyan]{args.PROFILE}[/] deleted.")
+    config.save()
+
+
+def add_parser(main_subparsers, parents):
+    auth_help = "Profile management."
+    parser = main_subparsers.add_parser(
+        "profile",
+        description=auth_help,
+        help=auth_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        dest="cmd",
+        required=True,
+    )
+
+    list_help = "List all profiles."
+    list_parser = subparsers.add_parser(
+        "list",
+        description=list_help,
+        help=list_help,
+        parents=parents,
+    )
+    list_parser.set_defaults(func=_list)
+
+    set_help = "Set default profile."
+    set_parser = subparsers.add_parser(
+        "set",
+        description=set_help,
+        help=set_help,
+        parents=parents,
+    )
+    set_parser.add_argument(
+        "PROFILE",
+        help="Profile name.",
+    )
+    set_parser.set_defaults(func=_set)
+
+    unset_help = "Unset default profile."
+    unset_parser = subparsers.add_parser(
+        "unset",
+        description=unset_help,
+        help=unset_help,
+        parents=parents,
+    )
+    unset_parser.set_defaults(func=_unset)
+
+    key_set_help = "Set key for profile."
+    key_set_parser = subparsers.add_parser(
+        "key",
+        description=key_set_help,
+        help=key_set_help,
+        parents=parents,
+    )
+    key_set_parser.add_argument(
+        "KEY",
+        help="Key ID and secret separated by a colon.",
+    )
+    key_set_parser.set_defaults(func=_key_set)
+
+    delete_help = "Delete profile."
+    delete_parser = subparsers.add_parser(
+        "delete",
+        description=delete_help,
+        help=delete_help,
+        parents=parents,
+    )
+    delete_parser.add_argument(
+        "PROFILE",
+        help="Profile name.",
+    )
+    delete_parser.set_defaults(func=_delete)

fal-1.9.3/src/fal/config.py

@@ -0,0 +1,85 @@
+import os
+from typing import Dict, List, Optional
+
+SETTINGS_SECTION = "__internal__"
+
+
+class Config:
+    _config: Dict[str, Dict[str, str]]
+    _profile: Optional[str]
+
+    DEFAULT_CONFIG_PATH = "~/.fal/config.toml"
+
+    def __init__(self):
+        import tomli
+
+        self.config_path = os.path.expanduser(
+            os.getenv("FAL_CONFIG_PATH", self.DEFAULT_CONFIG_PATH)
+        )
+
+        try:
+            with open(self.config_path, "rb") as file:
+                self._config = tomli.load(file)
+        except FileNotFoundError:
+            self._config = {}
+
+        profile = os.getenv("FAL_PROFILE")
+        if not profile:
+            profile = self.get_internal("profile")
+
+        self.profile = profile
+
+    @property
+    def profile(self) -> Optional[str]:
+        return self._profile
+
+    @profile.setter
+    def profile(self, value: Optional[str]) -> None:
+        if value and value not in self._config:
+            self._config[value] = {}
+
+        self._profile = value
+
+    def profiles(self) -> List[str]:
+        keys = []
+        for key in self._config:
+            if key != SETTINGS_SECTION:
+                keys.append(key)
+
+        return keys
+
+    def save(self) -> None:
+        import tomli_w
+
+        with open(self.config_path, "wb") as file:
+            tomli_w.dump(self._config, file)
+
+    def get(self, key: str) -> Optional[str]:
+        if not self.profile:
+            return None
+
+        return self._config.get(self.profile, {}).get(key)
+
+    def set(self, key: str, value: str) -> None:
+        if not self.profile:
+            raise ValueError("No profile set.")
+
+        self._config[self.profile][key] = value
+
+    def get_internal(self, key: str) -> Optional[str]:
+        if SETTINGS_SECTION not in self._config:
+            self._config[SETTINGS_SECTION] = {}
+
+        return self._config[SETTINGS_SECTION].get(key)
+
+    def set_internal(self, key: str, value: Optional[str]) -> None:
+        if SETTINGS_SECTION not in self._config:
+            self._config[SETTINGS_SECTION] = {}
+
+        if value is None:
+            del self._config[SETTINGS_SECTION][key]
+        else:
+            self._config[SETTINGS_SECTION][key] = value
+
+    def delete(self, profile: str) -> None:
+        del self._config[profile]

{fal-1.9.2 → fal-1.9.3}/src/fal/sdk.py

@@ -200,6 +200,7 @@ class ApplicationInfo:
     machine_types: list[str]
     request_timeout: int
     startup_timeout: int
+    valid_regions: list[str]
 
 
 @dataclass
@@ -215,6 +216,7 @@ class AliasInfo:
     machine_types: list[str]
     request_timeout: int
     startup_timeout: int
+    valid_regions: list[str]
 
 
 @dataclass
@@ -321,9 +323,10 @@ def _from_grpc_application_info(
         max_multiplexing=message.max_multiplexing,
         active_runners=message.active_runners,
         min_concurrency=message.min_concurrency,
-        machine_types=message.machine_types,
+        machine_types=list(message.machine_types),
         request_timeout=message.request_timeout,
         startup_timeout=message.startup_timeout,
+        valid_regions=list(message.valid_regions),
     )
 
 
@@ -347,9 +350,10 @@ def _from_grpc_alias_info(message: isolate_proto.AliasInfo) -> AliasInfo:
         max_multiplexing=message.max_multiplexing,
         active_runners=message.active_runners,
         min_concurrency=message.min_concurrency,
-        machine_types=message.machine_types,
+        machine_types=list(message.machine_types),
         request_timeout=message.request_timeout,
         startup_timeout=message.startup_timeout,
+        valid_regions=list(message.valid_regions),
     )
 
 
@@ -359,9 +363,11 @@ def _from_grpc_runner_info(message: isolate_proto.RunnerInfo) -> RunnerInfo:
     return RunnerInfo(
         runner_id=message.runner_id,
         in_flight_requests=message.in_flight_requests,
-        expiration_countdown=message.expiration_countdown
-        if message.HasField("expiration_countdown")
-        else None,
+        expiration_countdown=(
+            message.expiration_countdown
+            if message.HasField("expiration_countdown")
+            else None
+        ),
         uptime=timedelta(seconds=message.uptime),
         external_metadata=external_metadata,
     )
@@ -582,9 +588,9 @@ class FalServerlessConnection:
         min_concurrency: int | None = None,
         request_timeout: int | None = None,
         startup_timeout: int | None = None,
+        valid_regions: list[str] | None = None,
         machine_types: list[str] | None = None,
     ) -> AliasInfo:
-        print(machine_types)
         request = isolate_proto.UpdateApplicationRequest(
             application_name=application_name,
             keep_alive=keep_alive,
@@ -593,6 +599,7 @@ class FalServerlessConnection:
             min_concurrency=min_concurrency,
             request_timeout=request_timeout,
             startup_timeout=startup_timeout,
+            valid_regions=valid_regions,
             machine_types=machine_types,
         )
         res: isolate_proto.UpdateApplicationResult = self.stub.UpdateApplication(

fal-1.9.2/src/fal/config.py

@@ -1,23 +0,0 @@
-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)