fal 1.7.7__tar.gz → 1.8.0__tar.gz

{fal-1.7.7/fal.egg-info → fal-1.8.0}/PKG-INFO

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

@@ -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 → fal-1.8.0}/src/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-1.7.7 → fal-1.8.0}/src/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-1.8.0/src/fal/container.py

@@ -0,0 +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.
+    """
+
+    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) -> "ContainerImage":
+        return cls(dockerfile_str=text, **kwargs)
+
+    @classmethod
+    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/src/fal/container.py

@@ -1,19 +0,0 @@
-class ContainerImage:
-    """ContainerImage represents a Docker image that can be built
-    from a Dockerfile.
-    """
-
-    _known_keys = {"dockerfile_str", "build_args", "registries", "builder"}
-
-    @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)