fal 1.4.0__tar.gz → 1.4.1__tar.gz

{fal-1.4.0 → fal-1.4.1}/PKG-INFO

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

{fal-1.4.0 → fal-1.4.1}/fal.egg-info/PKG-INFO

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

{fal-1.4.0 → fal-1.4.1}/src/fal/_fal_version.py

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

{fal-1.4.0 → fal-1.4.1}/src/fal/cli/_utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from fal.files import find_pyproject_toml, parse_pyproject_toml
+from fal.files import find_project_root, find_pyproject_toml, parse_pyproject_toml
 
 
 def is_app_name(app_ref: tuple[str, str | None]) -> bool:
@@ -29,6 +29,10 @@ def get_app_data_from_toml(app_name):
     except KeyError:
         raise ValueError(f"App {app_name} does not have a ref key in pyproject.toml")
 
+    # Convert the app_ref to a path relative to the project root
+    project_root, _ = find_project_root(None)
+    app_ref = str(project_root / app_ref)
+
     app_auth = app_data.get("auth", "private")
 
     return app_ref, app_auth

{fal-1.4.0 → fal-1.4.1}/src/fal/toolkit/file/providers/fal.py

@@ -10,6 +10,7 @@ from dataclasses import dataclass
 from datetime import datetime, timezone
 from pathlib import Path
 from urllib.error import HTTPError
+from urllib.parse import urlparse, urlunparse
 from urllib.request import Request, urlopen
 
 from fal.auth import key_credentials
@@ -24,7 +25,7 @@ _FAL_CDN = "https://fal.media"
 class FalV2Token:
     token: str
     token_type: str
-    base_url: str
+    base_upload_url: str
     expires_at: datetime
 
     def is_expired(self) -> bool:
@@ -36,7 +37,7 @@ class FalV2TokenManager:
         self._token: FalV2Token = FalV2Token(
             token="",
             token_type="",
-            base_url="",
+            base_upload_url="",
             expires_at=datetime.min.replace(tzinfo=timezone.utc),
         )
         self._lock: threading.Lock = threading.Lock()
@@ -72,10 +73,15 @@ class FalV2TokenManager:
         with urlopen(req) as response:
             result = json.load(response)
 
+        parsed_base_url = urlparse(result["base_url"])
+        base_upload_url = urlunparse(
+            parsed_base_url._replace(netloc="upload." + parsed_base_url.netloc)
+        )
+
         self._token = FalV2Token(
             token=result["token"],
             token_type=result["token_type"],
-            base_url=result["base_url"],
+            base_upload_url=base_upload_url,
             expires_at=datetime.fromisoformat(result["expires_at"]),
         )
 
@@ -179,7 +185,7 @@ class MultipartUpload:
         token = fal_v2_token_manager.get_token()
         try:
             req = Request(
-                f"{token.base_url}/upload/initiate-multipart",
+                f"{token.base_upload_url}/upload/initiate-multipart",
                 method="POST",
                 headers={
                     "Authorization": f"{token.token_type} {token.token}",
@@ -195,7 +201,7 @@ class MultipartUpload:
             )
             with urlopen(req) as response:
                 result = json.load(response)
-                self._upload_id = result["upload_id"]
+                self._upload_url = result["upload_url"]
                 self._file_url = result["file_url"]
         except HTTPError as exc:
             raise FileUploadException(
@@ -235,10 +241,7 @@ class MultipartUpload:
         ) as executor:
             futures = []
             for part_number in range(1, parts + 1):
-                upload_url = (
-                    f"{self._file_url}?upload_id={self._upload_id}"
-                    f"&part_number={part_number}"
-                )
+                upload_url = f"{self._upload_url}&part_number={part_number}"
                 futures.append(
                     executor.submit(self._upload_part, upload_url, part_number)
                 )
@@ -248,7 +251,7 @@ class MultipartUpload:
                 self._parts.append(entry)
 
     def complete(self):
-        url = f"{self._file_url}?upload_id={self._upload_id}"
+        url = self._upload_url
         try:
             req = Request(
                 url,
@@ -281,7 +284,7 @@ class FalFileRepositoryV2(FalFileRepositoryBase):
             "Content-Type": file.content_type,
         }
 
-        storage_url = f"{token.base_url}/upload"
+        storage_url = f"{token.base_upload_url}/upload"
 
         try:
             req = Request(

{fal-1.4.0 → fal-1.4.1}/tests/cli/test_deploy.py

@@ -4,6 +4,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 from fal.cli.deploy import _deploy
 from fal.cli.main import parse_args
+from fal.files import find_project_root
 
 
 def test_deploy():
@@ -53,9 +54,14 @@ def test_deploy_with_toml_success(
 
     _deploy(args)
 
+    project_root, _ = find_project_root(None)
+
     # Ensure the correct app is deployed
     mock_deploy_ref.assert_called_once_with(
-        ("src/my_app/inference.py", "MyApp"), "my-app", "shared", args
+        (f"{project_root / 'src/my_app/inference.py'}", "MyApp"),
+        "my-app",
+        "shared",
+        args,
     )
 
 
@@ -72,9 +78,14 @@ def test_deploy_with_toml_no_auth(
 
     _deploy(args)
 
+    project_root, _ = find_project_root(None)
+
     # Since auth is not provided for "another-app", it should default to "private"
     mock_deploy_ref.assert_called_once_with(
-        ("src/another_app/inference.py", "AnotherApp"), "another-app", "private", args
+        (f"{project_root / 'src/another_app/inference.py'}", "AnotherApp"),
+        "another-app",
+        "private",
+        args,
     )
 
 

{fal-1.4.0 → fal-1.4.1}/tests/cli/test_run.py

@@ -3,6 +3,7 @@ from unittest.mock import MagicMock, patch
 import pytest
 from fal.cli.main import parse_args
 from fal.cli.run import _run
+from fal.files import find_project_root
 
 
 def test_run():
@@ -60,9 +61,11 @@ def test_run_with_toml_success(
 
     _run(args)
 
-    # Ensure the correct app is deployed
+    project_root, _ = find_project_root(None)
+
+    # Ensure the correct app is ran
     mock_load_function_from.assert_called_once_with(
-        host, "src/my_app/inference.py", "MyApp"
+        host, f"{project_root / 'src/my_app/inference.py'}", "MyApp"
     )