fal 1.39.2__tar.gz → 1.40.1__tar.gz

{fal-1.39.2/fal.egg-info → fal-1.40.1}/PKG-INFO

@@ -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 → fal-1.40.1/fal.egg-info}/PKG-INFO

@@ -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 → fal-1.40.1}/fal.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ src/fal/cli/keys.py
 src/fal/cli/main.py
 src/fal/cli/parser.py
 src/fal/cli/profile.py
+src/fal/cli/queue.py
 src/fal/cli/run.py
 src/fal/cli/runners.py
 src/fal/cli/secrets.py
@@ -128,7 +129,6 @@ src/fal/logging/__init__.py
 src/fal/logging/isolate.py
 src/fal/logging/style.py
 src/fal/logging/trace.py
-src/fal/logging/user.py
 src/fal/toolkit/__init__.py
 src/fal/toolkit/exceptions.py
 src/fal/toolkit/kv.py

{fal-1.39.2 → fal-1.40.1}/src/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-1.39.2 → fal-1.40.1}/src/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-1.39.2 → fal-1.40.1}/src/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-1.39.2 → fal-1.40.1}/src/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-1.40.1/src/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-1.39.2 → fal-1.40.1}/src/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-1.39.2 → fal-1.40.1}/src/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/src/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