fal 1.7.7__py3-none-any.whl → 1.8.0__py3-none-any.whl

fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.7'
-__version_tuple__ = version_tuple = (1, 7, 7)
+__version__ = version = '1.8.0'
+__version_tuple__ = version_tuple = (1, 8, 0)

fal/api.py

@@ -142,6 +142,8 @@ class Host(Generic[ArgsT, ReturnT]):
             # Conda environment definition should be parsed before sending to serverless
             with open(value) as f:
                 return "env_dict", yaml.safe_load(f)
+        elif key == "image" and isinstance(value, ContainerImage):
+            return "image", value.to_dict()
         else:
             return key, value
 

fal/container.py

@@ -1,19 +1,49 @@
+from dataclasses import dataclass, field
+from typing import Dict, Literal
+
+Builder = Literal["depot", "service", "worker"]
+BUILDERS = {"depot", "service", "worker"}
+DEFAULT_BUILDER: Builder = "depot"
+
+
+@dataclass
 class ContainerImage:
     """ContainerImage represents a Docker image that can be built
     from a Dockerfile.
     """
 
-    _known_keys = {"dockerfile_str", "build_args", "registries", "builder"}
+    dockerfile_str: str
+    build_args: Dict[str, str] = field(default_factory=dict)
+    registries: Dict[str, Dict[str, str]] = field(default_factory=dict)
+    builder: Builder = field(default=DEFAULT_BUILDER)
+
+    def __post_init__(self) -> None:
+        if self.registries:
+            for registry in self.registries.values():
+                keys = registry.keys()
+                if "username" not in keys or "password" not in keys:
+                    raise ValueError(
+                        "Username and password are required for each registry"
+                    )
+
+        if self.builder not in BUILDERS:
+            raise ValueError(
+                f"Invalid builder: {self.builder}, must be one of {BUILDERS}"
+            )
 
     @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},
-        )
+    def from_dockerfile_str(cls, text: str, **kwargs) -> "ContainerImage":
+        return cls(dockerfile_str=text, **kwargs)
 
     @classmethod
-    def from_dockerfile(cls, path: str, **kwargs):
+    def from_dockerfile(cls, path: str, **kwargs) -> "ContainerImage":
         with open(path) as fobj:
             return cls.from_dockerfile_str(fobj.read(), **kwargs)
+
+    def to_dict(self) -> dict:
+        return {
+            "dockerfile_str": self.dockerfile_str,
+            "build_args": self.build_args,
+            "registries": self.registries,
+            "builder": self.builder,
+        }

{fal-1.7.7.dist-info → fal-1.8.0.dist-info}/METADATA

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

{fal-1.7.7.dist-info → fal-1.8.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
 fal/__init__.py,sha256=wXs1G0gSc7ZK60-bHe-B2m0l_sA6TrFk4BxY0tMoLe8,784
 fal/__main__.py,sha256=4JMK66Wj4uLZTKbF-sT3LAxOsr6buig77PmOkJCRRxw,83
-fal/_fal_version.py,sha256=ZBOMWZOUYZwPmwzK5AfGuLs4eexHW3xVZhNkn6LSpEQ,411
+fal/_fal_version.py,sha256=PikY8ZcokXQcck_OODdQtYmXxEq-zKRR9b1ZMOFZlds,411
 fal/_serialization.py,sha256=rD2YiSa8iuzCaZohZwN_MPEB-PpSKbWRDeaIDpTEjyY,7653
 fal/_version.py,sha256=EBGqrknaf1WygENX-H4fBefLvHryvJBBGtVJetaB0NY,266
-fal/api.py,sha256=u9QfJtb1nLDJu9kegKCrdvW-Cp0mfMSGTPm5X1ywoeE,43388
+fal/api.py,sha256=TJNuez-xjzHfIAA7ZLmEMksdB3U5EM7bl16ooRL_1Ak,43499
 fal/app.py,sha256=0cm7wZXdusZXyV9nJmlFJl-7Jgxir6954OaO9Lj2ITk,23178
 fal/apps.py,sha256=RpmElElJnDYjsTRQOdNYiJwd74GEOGYA38L5O5GzNEg,11068
 fal/config.py,sha256=hgI3kW4_2NoFsrYEiPss0mnDTr8_Td2z0pVgm93wi9o,600
-fal/container.py,sha256=EjokKTULJ3fPUjDttjir-jmg0gqcUDe0iVzW2j5njec,634
+fal/container.py,sha256=9XslBET-NCG2V3-Wmof8c7eHrRoxCye88Ym7CskqCk0,1639
 fal/files.py,sha256=QgfYfMKmNobMPufrAP_ga1FKcIAlSbw18Iar1-0qepo,2650
 fal/flags.py,sha256=oWN_eidSUOcE9wdPK_77si3A1fpgOC0UEERPsvNLIMc,842
 fal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -130,8 +130,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.7.7.dist-info/METADATA,sha256=HWsZ9TnJjqWxDoTaa2QqWTHXEX19JTW-FEBg1U-Ri9U,4002
-fal-1.7.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-fal-1.7.7.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
-fal-1.7.7.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
-fal-1.7.7.dist-info/RECORD,,
+fal-1.8.0.dist-info/METADATA,sha256=A3W7K5IWeiAZBhiHVqmbGHI5cRS5mRtBS9i3r0L1ODo,4002
+fal-1.8.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+fal-1.8.0.dist-info/entry_points.txt,sha256=32zwTUC1U1E7nSTIGCoANQOQ3I7-qHG5wI6gsVz5pNU,37
+fal-1.8.0.dist-info/top_level.txt,sha256=r257X1L57oJL8_lM0tRrfGuXFwm66i1huwQygbpLmHw,21
+fal-1.8.0.dist-info/RECORD,,