fal 1.6.2__tar.gz → 1.7.0__tar.gz

{fal-1.6.2/fal.egg-info → fal-1.7.0}/PKG-INFO

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

{fal-1.6.2 → fal-1.7.0/fal.egg-info}/PKG-INFO

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

{fal-1.6.2 → fal-1.7.0}/fal.egg-info/SOURCES.txt

@@ -125,6 +125,7 @@ src/fal/logging/user.py
 src/fal/toolkit/__init__.py
 src/fal/toolkit/exceptions.py
 src/fal/toolkit/optimize.py
+src/fal/toolkit/types.py
 src/fal/toolkit/file/__init__.py
 src/fal/toolkit/file/file.py
 src/fal/toolkit/file/types.py
@@ -162,5 +163,6 @@ tests/mainify_package/impl.py
 tests/mainify_package/utils.py
 tests/toolkit/file_test.py
 tests/toolkit/image_test.py
+tests/toolkit/test_types.py
 tests/toolkit/utils/retry.py
 tools/demo_script.py

{fal-1.6.2 → fal-1.7.0}/src/fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.2'
-__version_tuple__ = version_tuple = (1, 6, 2)
+__version__ = version = '1.7.0'
+__version_tuple__ = version_tuple = (1, 7, 0)

{fal-1.6.2 → fal-1.7.0}/src/fal/app.py

@@ -249,9 +249,9 @@ def _to_fal_app_name(name: str) -> str:
 
 
 def _print_python_packages() -> None:
-    from pkg_resources import working_set
+    from importlib.metadata import distributions
 
-    packages = [f"{package.key}=={package.version}" for package in working_set]
+    packages = [f"{dist.metadata['Name']}=={dist.version}" for dist in distributions()]
 
     print("[debug] Python packages installed:", ", ".join(packages))
 

{fal-1.6.2 → fal-1.7.0}/src/fal/auth/__init__.py

@@ -2,6 +2,8 @@ from __future__ import annotations
 
 import os
 from dataclasses import dataclass, field
+from threading import Lock
+from typing import Optional
 
 import click
 
@@ -11,13 +13,56 @@ from fal.console.icons import CHECK_ICON
 from fal.exceptions.auth import UnauthenticatedException
 
 
+class GoogleColabState:
+    def __init__(self):
+        self.is_checked = False
+        self.lock = Lock()
+        self.secret: Optional[str] = None
+
+
+_colab_state = GoogleColabState()
+
+
+def is_google_colab() -> bool:
+    try:
+        from IPython import get_ipython
+
+        return "google.colab" in str(get_ipython())
+    except ModuleNotFoundError:
+        return False
+    except NameError:
+        return False
+
+
+def get_colab_token() -> Optional[str]:
+    if not is_google_colab():
+        return None
+    with _colab_state.lock:
+        if _colab_state.is_checked:  # request access only once
+            return _colab_state.secret
+
+        try:
+            from google.colab import userdata  # noqa: I001
+        except ImportError:
+            return None
+
+        try:
+            token = userdata.get("FAL_KEY")
+            _colab_state.secret = token.strip()
+        except Exception:
+            _colab_state.secret = None
+
+        _colab_state.is_checked = True
+        return _colab_state.secret
+
+
 def key_credentials() -> tuple[str, str] | None:
     # Ignore key credentials when the user forces auth by user.
     if os.environ.get("FAL_FORCE_AUTH_BY_USER") == "1":
         return None
 
-    if "FAL_KEY" in os.environ:
-        key = os.environ["FAL_KEY"]
+    key = os.environ.get("FAL_KEY") or get_colab_token()
+    if key:
         key_id, key_secret = key.split(":", 1)
         return (key_id, key_secret)
     elif "FAL_KEY_ID" in os.environ and "FAL_KEY_SECRET" in os.environ:

{fal-1.6.2 → fal-1.7.0}/src/fal/container.py

@@ -3,7 +3,7 @@ class ContainerImage:
     from a Dockerfile.
     """
 
-    _known_keys = {"dockerfile_str", "build_args", "registries"}
+    _known_keys = {"dockerfile_str", "build_args", "registries", "builder"}
 
     @classmethod
     def from_dockerfile_str(cls, text: str, **kwargs):

fal-1.7.0/src/fal/toolkit/types.py

@@ -0,0 +1,140 @@
+import re
+import tempfile
+from contextlib import contextmanager
+from pathlib import Path
+from typing import Any, Dict, Generator, Union
+
+import pydantic
+from pydantic.utils import update_not_none
+
+from fal.toolkit.image import read_image_from_url
+from fal.toolkit.utils.download_utils import download_file
+
+# https://github.com/pydantic/pydantic/pull/2573
+if not hasattr(pydantic, "__version__") or pydantic.__version__.startswith("1."):
+    IS_PYDANTIC_V2 = False
+else:
+    IS_PYDANTIC_V2 = True
+
+MAX_DATA_URI_LENGTH = 10 * 1024 * 1024
+MAX_HTTPS_URL_LENGTH = 2048
+
+HTTP_URL_REGEX = (
+    r"^https:\/\/(?:[a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(?::\d{1,5})?(?:\/[^\s]*)?$"
+)
+
+
+class DownloadFileMixin:
+    @contextmanager
+    def as_temp_file(self) -> Generator[Path, None, None]:
+        with tempfile.TemporaryDirectory() as temp_dir:
+            yield download_file(str(self), temp_dir)
+
+
+class DownloadImageMixin:
+    def to_pil(self):
+        return read_image_from_url(str(self))
+
+
+class DataUri(DownloadFileMixin, str):
+    if IS_PYDANTIC_V2:
+
+        @classmethod
+        def __get_pydantic_core_schema__(cls, source_type: Any, handler) -> Any:
+            return {
+                "type": "str",
+                "pattern": "^data:",
+                "max_length": MAX_DATA_URI_LENGTH,
+                "strip_whitespace": True,
+            }
+
+        def __get_pydantic_json_schema__(cls, core_schema, handler) -> Dict[str, Any]:
+            json_schema = handler(core_schema)
+            json_schema.update(format="data-uri")
+            return json_schema
+    else:
+
+        @classmethod
+        def __get_validators__(cls):
+            yield cls.validate
+
+        @classmethod
+        def validate(cls, value: Any) -> "DataUri":
+            from pydantic.validators import str_validator
+
+            value = str_validator(value)
+            value = value.strip()
+
+            if not value.startswith("data:"):
+                raise ValueError("Data URI must start with 'data:'")
+
+            if len(value) > MAX_DATA_URI_LENGTH:
+                raise ValueError(
+                    f"Data URI is too long. Max length is {MAX_DATA_URI_LENGTH} bytes."
+                )
+
+            return cls(value)
+
+        @classmethod
+        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
+            update_not_none(field_schema, format="data-uri")
+
+
+class HttpsUrl(DownloadFileMixin, str):
+    if IS_PYDANTIC_V2:
+
+        @classmethod
+        def __get_pydantic_core_schema__(cls, source_type: Any, handler) -> Any:
+            return {
+                "type": "str",
+                "pattern": HTTP_URL_REGEX,
+                "max_length": MAX_HTTPS_URL_LENGTH,
+                "strip_whitespace": True,
+            }
+
+        def __get_pydantic_json_schema__(cls, core_schema, handler) -> Dict[str, Any]:
+            json_schema = handler(core_schema)
+            json_schema.update(format="https-url")
+            return json_schema
+
+    else:
+
+        @classmethod
+        def __get_validators__(cls):
+            yield cls.validate
+
+        @classmethod
+        def validate(cls, value: Any) -> "HttpsUrl":
+            from pydantic.validators import str_validator
+
+            value = str_validator(value)
+            value = value.strip()
+
+            if not re.match(HTTP_URL_REGEX, value):
+                raise ValueError(
+                    "URL must start with 'https://' and follow the correct format."
+                )
+
+            if len(value) > MAX_HTTPS_URL_LENGTH:
+                raise ValueError(
+                    f"HTTPS URL is too long. Max length is "
+                    f"{MAX_HTTPS_URL_LENGTH} characters."
+                )
+
+            return cls(value)
+
+        @classmethod
+        def __modify_schema__(cls, field_schema: Dict[str, Any]) -> None:
+            update_not_none(field_schema, format="https-url")
+
+
+class ImageHttpsUrl(DownloadImageMixin, HttpsUrl):
+    pass
+
+
+class ImageDataUri(DownloadImageMixin, DataUri):
+    pass
+
+
+FileInput = Union[HttpsUrl, DataUri]
+ImageInput = Union[ImageHttpsUrl, ImageDataUri]

fal-1.7.0/tests/toolkit/test_types.py

@@ -0,0 +1,99 @@
+import pytest
+from pydantic import BaseModel, ValidationError
+
+from fal.toolkit.types import MAX_DATA_URI_LENGTH, MAX_HTTPS_URL_LENGTH, FileInput
+
+
+class DummyModel(BaseModel):
+    url: FileInput
+
+
+class TestFileInput:
+    def test_valid_https_urls(self):
+        # Test basic HTTPS URL
+        model = DummyModel(url="https://example.com")
+        assert model.url == "https://example.com"
+
+        # Test HTTPS URL with path
+        model = DummyModel(url="https://example.com/path/to/resource")
+        assert model.url == "https://example.com/path/to/resource"
+
+        # Test HTTPS URL with query parameters
+        model = DummyModel(url="https://example.com/search?q=test&page=1")
+        assert model.url == "https://example.com/search?q=test&page=1"
+
+        # Test HTTPS URL with subdomain
+        model = DummyModel(url="https://sub.example.com")
+        assert model.url == "https://sub.example.com"
+
+        # Test HTTPS URL with port
+        model = DummyModel(url="https://example.com:8443")
+        assert model.url == "https://example.com:8443"
+
+        # Test HTTPS URL with whitespace
+        model = DummyModel(url="  https://example.com  ")
+        assert model.url == "https://example.com"
+
+        # TODO: should we even allow this?
+        # Test HTTPS URL with port
+        model = DummyModel(url="https://example.com:8443")
+        assert model.url == "https://example.com:8443"
+
+    def test_valid_data_uris(self):
+        # Test basic data URI
+        model = DummyModel(url="data:text/plain;base64,SGVsbG8gV29ybGQ=")
+        assert model.url == "data:text/plain;base64,SGVsbG8gV29ybGQ="
+
+        # Test data URI with image
+        image_uri = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=="  # noqa: E501
+        model = DummyModel(url=image_uri)
+        assert model.url == image_uri
+
+        # Test data URI with whitespace
+        model = DummyModel(url="  data:text/plain,Hello World  ")
+        assert model.url == "data:text/plain,Hello World"
+
+    def test_invalid_inputs(self):
+        # Test HTTP URL (non-HTTPS)
+        with pytest.raises(ValueError):
+            DummyModel(url="http://example.com")
+
+        # Test malformed URL
+        with pytest.raises(ValueError):
+            DummyModel(url="not-a-url")
+
+        # Test invalid data URI
+        with pytest.raises(ValueError):
+            DummyModel(url="invalid-data-uri")
+
+        # Test empty string
+        with pytest.raises(ValueError):
+            DummyModel(url="")
+
+        # Test None value
+        with pytest.raises(ValueError):
+            DummyModel(url=None)
+
+    def test_length_limits(self):
+        # Test HTTPS URL at max length
+        domain = "example.com"
+        path_length = MAX_HTTPS_URL_LENGTH - len(f"https://{domain}/")
+        long_url = f"https://{domain}/{'a' * path_length}"
+        model = DummyModel(url=long_url)
+        assert model.url == long_url
+
+        # Test HTTPS URL exceeding max length
+        too_long_url = f"https://example.com/{'a' * MAX_HTTPS_URL_LENGTH}"
+        with pytest.raises(ValidationError):
+            DummyModel(url=too_long_url)
+
+        # Test data URI at max length
+        uri_prefix = "data:text/plain,"
+        long_uri = f"{uri_prefix}{'a' * (MAX_DATA_URI_LENGTH - len(uri_prefix))}"
+        model = DummyModel(url=long_uri)
+        assert model.url == long_uri
+
+        # Test data URI exceeding max length
+        too_long_uri = f"data:text/plain,{'a' * MAX_DATA_URI_LENGTH}"
+        with pytest.raises(ValueError):
+            DummyModel(url=too_long_uri)