fal 1.0.4__py3-none-any.whl → 1.0.5__py3-none-any.whl

fal/__init__.py

@@ -4,6 +4,7 @@ from fal import apps  # noqa: F401
 from fal.api import FalServerlessHost, LocalHost, cached, function
 from fal.api import function as isolated  # noqa: F401
 from fal.app import App, endpoint, realtime, wrap_app  # noqa: F401
+from fal.container import ContainerImage
 from fal.sdk import FalServerlessKeyCredentials
 from fal.sync import sync_dir
 
@@ -26,4 +27,5 @@ __all__ = [
     "sync_dir",
     "__version__",
     "version_tuple",
+    "ContainerImage",
 ]

fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.4'
-__version_tuple__ = version_tuple = (1, 0, 4)
+__version__ = version = '1.0.5'
+__version_tuple__ = version_tuple = (1, 0, 5)

fal/api.py

@@ -42,6 +42,7 @@ from typing_extensions import Concatenate, ParamSpec
 
 import fal.flags as flags
 from fal._serialization import include_modules_from, patch_pickle
+from fal.container import ContainerImage
 from fal.exceptions import FalServerlessException
 from fal.logging.isolate import IsolateLogPrinter
 from fal.sdk import (
@@ -523,9 +524,12 @@ class Options:
             pip_requirements = self.environment.setdefault("requirements", [])
         elif kind == "conda":
             pip_requirements = self.environment.setdefault("pip", [])
+        elif kind == "container":
+            return None
         else:
             raise FalServerlessError(
-                "Only conda and virtualenv is supported as environment options"
+                "Only {conda, virtualenv, container} "
+                "are supported as environment options."
             )
 
         # Already has these.
@@ -743,8 +747,55 @@ def function(
     _scheduler: str | None = None,
 ) -> Callable[
     [Callable[Concatenate[ArgsT], ReturnT]], ServedIsolatedFunction[ArgsT, ReturnT]
-]:
-    ...
+]: ...
+
+
+@overload
+def function(
+    kind: Literal["container"],
+    *,
+    image: ContainerImage | None = None,
+    # Common options
+    host: FalServerlessHost = _DEFAULT_HOST,
+    serve: Literal[False] = False,
+    exposed_port: int | None = None,
+    max_concurrency: int | None = None,
+    # FalServerlessHost options
+    metadata: dict[str, Any] | None = None,
+    machine_type: str = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
+    keep_alive: int = FAL_SERVERLESS_DEFAULT_KEEP_ALIVE,
+    max_multiplexing: int = FAL_SERVERLESS_DEFAULT_MAX_MULTIPLEXING,
+    min_concurrency: int = FAL_SERVERLESS_DEFAULT_MIN_CONCURRENCY,
+    setup_function: Callable[..., None] | None = None,
+    _base_image: str | None = None,
+    _scheduler: str | None = None,
+) -> Callable[
+    [Callable[Concatenate[ArgsT], ReturnT]], IsolatedFunction[ArgsT, ReturnT]
+]: ...
+
+
+@overload
+def function(
+    kind: Literal["container"],
+    *,
+    image: ContainerImage | None = None,
+    # Common options
+    host: FalServerlessHost = _DEFAULT_HOST,
+    serve: Literal[True],
+    exposed_port: int | None = None,
+    max_concurrency: int | None = None,
+    # FalServerlessHost options
+    metadata: dict[str, Any] | None = None,
+    machine_type: str = FAL_SERVERLESS_DEFAULT_MACHINE_TYPE,
+    keep_alive: int = FAL_SERVERLESS_DEFAULT_KEEP_ALIVE,
+    max_multiplexing: int = FAL_SERVERLESS_DEFAULT_MAX_MULTIPLEXING,
+    min_concurrency: int = FAL_SERVERLESS_DEFAULT_MIN_CONCURRENCY,
+    setup_function: Callable[..., None] | None = None,
+    _base_image: str | None = None,
+    _scheduler: str | None = None,
+) -> Callable[
+    [Callable[Concatenate[ArgsT], ReturnT]], ServedIsolatedFunction[ArgsT, ReturnT]
+]: ...
 
 
 # implementation
@@ -1121,4 +1172,3 @@ class Server(uvicorn.Server):
 
     def install_signal_handlers(self) -> None:
         pass
-

fal/app.py

@@ -47,8 +47,9 @@ def wrap_app(cls: type[App], **kwargs) -> fal.api.IsolatedFunction:
         routes = app.collect_routes()
         realtime_app = any(route.is_websocket for route in routes)
 
+    kind = kwargs.pop("kind", "virtualenv")
     wrapper = fal.api.function(
-        "virtualenv",
+        kind,
         requirements=cls.requirements,
         machine_type=cls.machine_type,
         **cls.host_kwargs,

fal/container.py

@@ -0,0 +1,19 @@
+class ContainerImage:
+    """ContainerImage represents a Docker image that can be built
+    from a Dockerfile.
+    """
+
+    _known_keys = {"dockerfile_str", "build_env", "build_args"}
+
+    @classmethod
+    def from_dockerfile_str(cls, text: str, **kwargs):
+        # Check for unknown keys and return them as a dict.
+        return dict(
+            dockerfile_str=text,
+            **{k: v for k, v in kwargs.items() if k in cls._known_keys},
+        )
+
+    @classmethod
+    def from_dockerfile(cls, path: str, **kwargs):
+        with open(path) as fobj:
+            return cls.from_dockerfile_str(fobj.read(), **kwargs)

{fal-1.0.4.dist-info → fal-1.0.5.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: fal
-Version: 1.0.4
+Version: 1.0.5
 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] <1.0,>=0.12.3
-Requires-Dist: isolate-proto ==0.4.0
-Requires-Dist: grpcio <2,>=1.50.0
+Requires-Dist: isolate[build] <1.14.0,>=0.13.0
+Requires-Dist: isolate-proto ==0.5.1
+Requires-Dist: grpcio ==1.64.0
 Requires-Dist: dill ==0.3.7
 Requires-Dist: cloudpickle ==3.0.0
 Requires-Dist: typing-extensions <5,>=4.7.1

{fal-1.0.4.dist-info → fal-1.0.5.dist-info}/RECORD

@@ -1,11 +1,12 @@
-fal/__init__.py,sha256=suif79hYcYwlZ8dAaVXCErKhuD2AYf8uU78rty8jow8,721
+fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=MSmt_5Xg84uHqzTN38JwgseJK8rsJn_11A8WD99VtEo,61
-fal/_fal_version.py,sha256=9acUHRb1fq-uv5dr49LlEh189daKw4-SeypW5NxDolA,411
+fal/_fal_version.py,sha256=ClFIlbf5O23dVWC6oD6t3m2n6nB22IOt3V9t-YX_mG0,411
 fal/_serialization.py,sha256=7urrZXw99qmsK-RkjCurk6Va4TMEfDIMajkzKbSW4j4,7655
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=PBBLmVYNfIstLXJoRRoCQSfspPxklh9PNSWZEMfi0s8,36286
-fal/app.py,sha256=s9ba4t4D5KJrPFGKeRzL3XsdKH-W1Be6NmDQgYjPnCw,13826
+fal/api.py,sha256=oMf01QjADFjM4b2GInDlLoPd8Brhmmga3Ju1--pWM0M,38088
+fal/app.py,sha256=7A7BdGwxmKVmfe7AqQU4f8zuvIucMeBYcAJ1ZMf8PcE,13862
 fal/apps.py,sha256=UhR6mq8jBiTAp-QvUnvbnMNcuJ5wHIKSqdlfyx8aBQ8,6829
+fal/container.py,sha256=V7riyyq8AZGwEX9QaqRQDZyDN_bUKeRKV1OOZArXjL0,622
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fal/rest_client.py,sha256=kGBGmuyHfX1lR910EoKCYPjsyU8MdXawT_cW2q8Sajc,568
@@ -92,8 +93,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.0.4.dist-info/METADATA,sha256=y6kcDVRBEAnrq9SCiVvyL6NdHNHDasO9-DBmNukr1L4,3738
-fal-1.0.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-fal-1.0.4.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.0.4.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.0.4.dist-info/RECORD,,
+fal-1.0.5.dist-info/METADATA,sha256=Z9-1yww3tt0qccM3SVfeZUPPXqceSvfwD7_FT85Cejc,3738
+fal-1.0.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+fal-1.0.5.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.0.5.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.0.5.dist-info/RECORD,,