fal 1.39.2__py3-none-any.whl → 1.40.1__py3-none-any.whl

fal/_fal_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '1.39.2'
-__version_tuple__ = version_tuple = (1, 39, 2)
+__version__ = version = '1.40.1'
+__version_tuple__ = version_tuple = (1, 40, 1)
 
 __commit_id__ = commit_id = None

fal/app.py

@@ -300,7 +300,7 @@ def _print_python_packages() -> None:
 class App(BaseServable):
     requirements: ClassVar[list[str]] = []
     local_python_modules: ClassVar[list[str]] = []
-    machine_type: ClassVar[str] = "S"
+    machine_type: ClassVar[str | list[str]] = "S"
     num_gpus: ClassVar[int | None] = None
     host_kwargs: ClassVar[dict[str, Any]] = {
         "_scheduler": "nomad",

fal/auth/__init__.py

@@ -17,6 +17,15 @@ class GoogleColabState:
         self.lock = Lock()
         self.secret: Optional[str] = None
 
+    def __getstate__(self):
+        state = self.__dict__.copy()
+        state["lock"] = None  # type: ignore
+        return state
+
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+        self.lock = Lock()
+
 
 _colab_state = GoogleColabState()
 

fal/cli/main.py

@@ -16,6 +16,7 @@ from . import (
     files,
     keys,
     profile,
+    queue,
     run,
     runners,
     secrets,
@@ -49,6 +50,7 @@ def _get_main_parser() -> argparse.ArgumentParser:
         api,
         auth,
         apps,
+        queue,
         deploy,
         run,
         keys,

fal/cli/queue.py

@@ -0,0 +1,101 @@
+from __future__ import annotations
+
+import json
+from http import HTTPStatus
+
+import httpx
+
+from fal.rest_client import REST_CLIENT
+
+from .parser import FalClientParser, get_output_parser
+
+
+def _queue_size(args):
+    from .deploy import _get_user
+
+    user = _get_user()
+
+    url = f"{REST_CLIENT.base_url}/applications/{user.username}/{args.app_name}/queue"
+    headers = REST_CLIENT.get_headers()
+
+    with httpx.Client(base_url=REST_CLIENT.base_url, headers=headers, timeout=300) as c:
+        resp = c.get(url)
+
+    if resp.status_code != HTTPStatus.OK:
+        try:
+            detail = resp.json().get("detail", resp.text)
+        except Exception:
+            detail = resp.text
+        raise RuntimeError(f"Failed to get queue size: {detail}")
+
+    data = resp.json()
+    size = data.get("size", 0)
+
+    if args.output == "json":
+        args.console.print(json.dumps({"size": size}))
+    else:
+        args.console.print(f"Queue size: {size}")
+
+
+def _queue_flush(args):
+    from .deploy import _get_user
+
+    user = _get_user()
+
+    url = f"{REST_CLIENT.base_url}/applications/{user.username}/{args.app_name}/queue"
+    headers = REST_CLIENT.get_headers()
+
+    with httpx.Client(base_url=REST_CLIENT.base_url, headers=headers, timeout=300) as c:
+        resp = c.delete(url)
+
+    if resp.status_code != HTTPStatus.OK:
+        try:
+            detail = resp.json().get("detail", resp.text)
+        except Exception:
+            detail = resp.text
+        raise RuntimeError(f"Failed to flush queue: {detail}")
+
+    args.console.print("Queue flushed successfully.")
+
+
+def add_parser(main_subparsers, parents):
+    queue_help = "Manage application queues."
+    parser = main_subparsers.add_parser(
+        "queue",
+        description=queue_help,
+        help=queue_help,
+        parents=parents,
+    )
+
+    subparsers = parser.add_subparsers(
+        title="Commands",
+        metavar="command",
+        required=True,
+        parser_class=FalClientParser,
+    )
+
+    size_help = "Get queue size for an application."
+    size_parser = subparsers.add_parser(
+        "size",
+        description=size_help,
+        help=size_help,
+        parents=[*parents, get_output_parser()],
+    )
+    size_parser.add_argument(
+        "app_name",
+        help="Application name (do not prefix with owner).",
+    )
+    size_parser.set_defaults(func=_queue_size)
+
+    flush_help = "Flush all pending requests in an application queue."
+    flush_parser = subparsers.add_parser(
+        "flush",
+        description=flush_help,
+        help=flush_help,
+        parents=parents,
+    )
+    flush_parser.add_argument(
+        "app_name",
+        help="Application name.",
+    )
+    flush_parser.set_defaults(func=_queue_flush)

fal/logging/__init__.py

@@ -6,7 +6,6 @@ import structlog
 from structlog.typing import EventDict, WrappedLogger
 
 from .style import LEVEL_STYLES
-from .user import AddUserIdProcessor
 
 # Unfortunately structlog console processor does not support
 # more general theming as a public API. Consider a PR on the
@@ -43,7 +42,6 @@ structlog.configure(
         structlog.stdlib.PositionalArgumentsFormatter(),
         structlog.processors.TimeStamper(fmt="%Y-%m-%d %H:%M:%S"),
         structlog.processors.StackInfoRenderer(),
-        AddUserIdProcessor(),
         _console_log_output,
     ],
     wrapper_class=structlog.stdlib.BoundLogger,

fal/toolkit/file/providers/fal.py

@@ -159,6 +159,18 @@ class FalV2TokenManager:
             expires_at=datetime.fromisoformat(result["expires_at"]),
         )
 
+    def __getstate__(self) -> dict[str, Any]:
+        state = self.__dict__.copy()
+        # Remove the lock from the state dictionary
+        del state["_lock"]
+        return state
+
+    def __setstate__(self, state: dict[str, Any]) -> None:
+        # Restore the instance attributes
+        self.__dict__.update(state)
+        # Recreate the lock
+        self._lock = threading.Lock()
+
 
 class FalV3TokenManager(FalV2TokenManager):
     token_cls: type[FalV2Token] = FalV3Token

{fal-1.39.2.dist-info → fal-1.40.1.dist-info}/METADATA

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

{fal-1.39.2.dist-info → fal-1.40.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=J8OISQMYQX6BPD5dSFSbfEKap5J-Az3VgM5Q9FjiDtQ,706
+fal/_fal_version.py,sha256=XulopT_VgT2mWr-TUuH1VMduLqKc7_3J0NxfyFwMu44,706
 fal/_serialization.py,sha256=npXNsFJ5G7jzBeBIyVMH01Ww34mGY4XWhHpRbSrTtnQ,7598
 fal/_version.py,sha256=1BbTFnucNC_6ldKJ_ZoC722_UkW4S9aDBSW9L0fkKAw,2315
 fal/api.py,sha256=U_TBUBhkIvA5wFVOeqQejk-8Yxhy4pgWY4DLoelWxjU,49369
-fal/app.py,sha256=sSWr2pPjaTSJbKuhwp5gCjLEnoumjto08KBNzzGY8og,25978
+fal/app.py,sha256=V4aBmtRpn7ysiuoX2ojSu4FyJ-T6ee14koIJ1VSQ0Dw,25990
 fal/apps.py,sha256=pzCd2mrKl5J_4oVc40_pggvPtFahXBCdrZXWpnaEJVs,12130
 fal/config.py,sha256=1HRaOJFOAjB7fbQoEPCSH85gMvEEMIMPeupVWgrHVgU,3572
 fal/container.py,sha256=FTsa5hOW4ars-yV1lUoc0BNeIIvAZcpw7Ftyt3A4m_w,2000
@@ -17,7 +17,7 @@ fal/sdk.py,sha256=iKpyL4RrWCdaFMK4wiIM3zOuM2H0VsN0wv8wF9OBxHM,28099
 fal/sync.py,sha256=ZuIJA2-hTPNANG9B_NNJZUsO68EIdTH0dc9MzeVE2VU,4340
 fal/utils.py,sha256=iQTBG3-i6JZgHkkwbY_I4210g0xoW-as51yrke608u0,2208
 fal/workflows.py,sha256=Zl4f6Bs085hY40zmqScxDUyCu7zXkukDbW02iYOLTTI,14805
-fal/auth/__init__.py,sha256=2mEKdk6_1GclF3cPC3uWSRKFf0KHNIUNAi0xYRbdJ1A,6278
+fal/auth/__init__.py,sha256=mtyQou8DGHC-COjW9WbtRyyzjyt7fMlhVmsB4U-CBh4,6509
 fal/auth/auth0.py,sha256=g5OgEKe4rsbkLQp6l7EauOAVL6WsmKjuA1wmzmyvvhc,5354
 fal/auth/local.py,sha256=sndkM6vKpeVny6NHTacVlTbiIFqaksOmw0Viqs_RN1U,1790
 fal/cli/__init__.py,sha256=padK4o0BFqq61kxAA1qQ0jYr2SuhA2mf90B3AaRkmJA,37
@@ -32,9 +32,10 @@ fal/cli/deploy.py,sha256=aezafp-g8vvLoARl1i84uGd-zIR1TtlSKi9E0dm-Z7E,8703
 fal/cli/doctor.py,sha256=8SZrYG9Ku0F6LLUHtFdKopdIgZfFkw5E3Mwrxa9KOSk,1613
 fal/cli/files.py,sha256=-j0q4g53A7CWSczGLdfeUCTSd4zXoV3pfZFdman7JOw,3450
 fal/cli/keys.py,sha256=iQVMr3WT8CUqSQT3qeCCiy6rRwoux9F-UEaC4bCwMWo,3754
-fal/cli/main.py,sha256=s_LxEyz9z64dewk3oiGEI33_h3vJ3IVdu8aY3qydkMo,3345
+fal/cli/main.py,sha256=LDy3gze9TRsvGa4uSNc8NMFmWMLpsyoC-msteICNiso,3371
 fal/cli/parser.py,sha256=PZi5MWS4Z-3YSPe6np_F87ay4kF6gaYxlP0avByPr-0,5222
 fal/cli/profile.py,sha256=PAY_ffifCT71VJ8VxfDVaXPT0U1oN8drvWZDFRXwvek,6678
+fal/cli/queue.py,sha256=9Kid3zR6VOFfAdDgnqi2TNN4ocIv5Vs61ASEZnwMa9o,2713
 fal/cli/run.py,sha256=nAC12Qss4Fg1XmV0qOS9RdGNLYcdoHeRgQMvbTN4P9I,1202
 fal/cli/runners.py,sha256=AXUB2pq9Ot0VU2cOeJydSgmgTlUm4i6iNgJOClO7ZZw,6533
 fal/cli/secrets.py,sha256=HfIeO2IZpCEiBC6Cs5Kpi3zckfDnc7GsLwLdgj3NnPU,3085
@@ -46,11 +47,10 @@ fal/exceptions/__init__.py,sha256=m2okJEpax11mnwmoqO_pCGtbt-FvzKiiuMhKo2ok-_8,27
 fal/exceptions/_base.py,sha256=LwzpMaW_eYQEC5s26h2qGXbNA-S4bOqC8s-bMCX6HjE,1491
 fal/exceptions/_cuda.py,sha256=L3qvDNaPTthp95IFSBI6pMt3YbRfn1H0inQkj_7NKF8,1719
 fal/exceptions/auth.py,sha256=fHea3SIeguInJVB5M33IuP4I5e_pVEifck1C_XJTYvc,351
-fal/logging/__init__.py,sha256=avgKA2V8GJeUtZuWZJjSYgkkrXKpuDMS-YiIBmLda7w,1599
+fal/logging/__init__.py,sha256=U7DhMpnNqmVdC2XCT5xZkNmYhpL0Q85iDYPeSo_56LU,1532
 fal/logging/isolate.py,sha256=jIryi46ZVlJ1mfan4HLNQQ3jwMi8z-WwfqqLlttQVkc,2449
 fal/logging/style.py,sha256=ckIgHzvF4DShM5kQh8F133X53z_vF46snuDHVmo_h9g,386
 fal/logging/trace.py,sha256=OhzB6d4rQZimBc18WFLqH_9BGfqFFumKKTAGSsmWRMg,1904
-fal/logging/user.py,sha256=H7Pg-nqhpzsUb5f6uXyZUeLWAsr3oImQEaYSCIIAlqo,818
 fal/toolkit/__init__.py,sha256=GR5KxAsNODlhs-DTarJcb5raujActubn0afR7FPueWs,886
 fal/toolkit/exceptions.py,sha256=8-EMuqDXEofPu-eVoWowc7WEM-ifusithyv6tnsm2MM,301
 fal/toolkit/kv.py,sha256=5kMk-I5PMRORK4TYc0jqqowjqKkbk7zUIgz9rAIztxE,2364
@@ -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=_KCKmtmBkBIKD_gFOZALV10dCtOFZTC9MQw2qmdeevw,11013
 fal/toolkit/file/types.py,sha256=MMAH_AyLOhowQPesOv1V25wB4qgbJ3vYNlnTPbdSv1M,2304
-fal/toolkit/file/providers/fal.py,sha256=z2Htg7DJoBxq_y4Q71KOGM1mHvJzUQCGtz2_m2lqK6c,47155
+fal/toolkit/file/providers/fal.py,sha256=P9hm11uKVe6ilmL7CjFztBHswZEHOm4k-K4B36UZe6M,47543
 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
@@ -143,8 +143,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.39.2.dist-info/METADATA,sha256=hGhmMfVOFiN5eEEtWK4DdaV0pu-SOEJU15omH1M60eM,4132
-fal-1.39.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fal-1.39.2.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.39.2.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.39.2.dist-info/RECORD,,
+fal-1.40.1.dist-info/METADATA,sha256=JyaMRBK_S1vsn84l7jgkGVST0XHgPRdRtMXTu0puPPY,4132
+fal-1.40.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fal-1.40.1.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.40.1.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.40.1.dist-info/RECORD,,

fal/logging/user.py

@@ -1,25 +0,0 @@
-from __future__ import annotations
-
-from structlog.typing import EventDict, WrappedLogger
-
-
-class AddUserIdProcessor:
-    def __init__(self):
-        from fal.auth import UserAccess
-
-        self.user_access = UserAccess()
-
-    def __call__(
-        self, logger: WrappedLogger, method_name: str, event_dict: EventDict
-    ) -> EventDict:
-        """The structlog processor that sends the logged user id on every log"""
-        user_id: str | None = None
-        try:
-            user_id = self.user_access.info.get("sub")
-        except Exception:
-            # logs are fail-safe, so any exception is safe to ignore
-            # this is expected to happen only when user is logged out
-            # or there's no internet connection
-            pass
-        event_dict["usr.id"] = user_id
-        return event_dict