fal 1.7.3__tar.gz → 1.7.5__tar.gz

{fal-1.7.3/fal.egg-info → fal-1.7.5}/PKG-INFO

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

{fal-1.7.3 → fal-1.7.5/fal.egg-info}/PKG-INFO

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

{fal-1.7.3 → fal-1.7.5}/src/fal/_fal_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.7.3'
-__version_tuple__ = version_tuple = (1, 7, 3)
+__version__ = version = '1.7.5'
+__version_tuple__ = version_tuple = (1, 7, 5)

{fal-1.7.3 → fal-1.7.5}/src/fal/toolkit/utils/download_utils.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import errno
 import hashlib
 import os
 import shutil
@@ -389,7 +390,11 @@ def clone_repository(
         A Path object representing the full path to the cloned Git repository.
     """
     target_dir = target_dir or FAL_REPOSITORY_DIR  # type: ignore[assignment]
-    repo_name = repo_name or Path(https_url).stem
+
+    if repo_name is None:
+        repo_name = Path(https_url).stem
+        if commit_hash:
+            repo_name += f"-{commit_hash[:8]}"
 
     local_repo_path = Path(target_dir) / repo_name  # type: ignore[arg-type]
 
@@ -440,7 +445,15 @@ def clone_repository(
 
             # NOTE: Atomically renaming the repository directory into place when the
             # clone and checkout are done.
-            os.rename(temp_dir, local_repo_path)
+            try:
+                os.rename(temp_dir, local_repo_path)
+            except OSError as error:
+                shutil.rmtree(temp_dir)
+
+                # someone beat us to it, assume it's good
+                if error.errno != errno.ENOTEMPTY:
+                    raise
+                print(f"{local_repo_path} already exists, skipping rename")
 
         except Exception as error:
             print(f"{error}\nFailed to clone repository '{https_url}' .")

{fal-1.7.3 → fal-1.7.5}/tests/integration_test.py

@@ -355,6 +355,12 @@ def test_clone_repository(isolated_client, mock_fal_persistent_dirs):
     EXAMPLE_REPO_FIRST_COMMIT = "64b0a89c8391bd2cb3ca23cdeae01779e11aee05"
     EXAMPLE_REPO_SECOND_COMMIT = "34ecbca8cc7b64719d2a5c40dd3272f8d13bc1d2"
     expected_path = FAL_REPOSITORY_DIR / "isolate"
+    first_expected_path = (
+        FAL_REPOSITORY_DIR / f"isolate-{EXAMPLE_REPO_FIRST_COMMIT[:8]}"
+    )
+    second_expected_path = (
+        FAL_REPOSITORY_DIR / f"isolate-{EXAMPLE_REPO_SECOND_COMMIT[:8]}"
+    )
 
     @isolated_client()
     def clone_without_commit_hash():
@@ -376,7 +382,7 @@ def test_clone_repository(isolated_client, mock_fal_persistent_dirs):
             EXAMPLE_REPO_URL, commit_hash=EXAMPLE_REPO_SECOND_COMMIT
         )
 
-        second_repo_hash = _get_git_revision_hash(repo_path)
+        second_repo_hash = _get_git_revision_hash(second_path)
 
         return first_path, first_repo_hash, second_path, second_repo_hash
 
@@ -387,8 +393,12 @@ def test_clone_repository(isolated_client, mock_fal_persistent_dirs):
         second_repo_hash,
     ) = clone_with_commit_hash()
 
-    assert str(expected_path) == str(first_path), "Path should be the target location"
-    assert str(expected_path) == str(second_path), "Path should be the target location"
+    assert str(first_expected_path) == str(
+        first_path
+    ), "Path should be the target location"
+    assert str(second_expected_path) == str(
+        second_path
+    ), "Path should be the target location"
 
     assert (
         first_repo_hash == EXAMPLE_REPO_FIRST_COMMIT
@@ -432,9 +442,15 @@ def test_clone_repository(isolated_client, mock_fal_persistent_dirs):
         third_repo_stat,
     ) = clone_with_force()
 
-    assert str(expected_path) == str(first_path), "Path should be the target location"
-    assert str(expected_path) == str(second_path), "Path should be the target location"
-    assert str(expected_path) == str(third_path), "Path should be the target location"
+    assert str(first_expected_path) == str(
+        first_path
+    ), "Path should be the target location"
+    assert str(first_expected_path) == str(
+        second_path
+    ), "Path should be the target location"
+    assert str(first_expected_path) == str(
+        third_path
+    ), "Path should be the target location"
 
     assert (
         first_repo_stat.st_mtime == second_repo_stat.st_mtime