Skip to content

Commit

Permalink
fix(toolkit): use fallback_save_kwargs for object_lifecycle (#423)
Browse files Browse the repository at this point in the history
* fix(toolkit): use fallback_save_kwargs for object_lifecycle

* also multipart
  • Loading branch information
efiop authored Feb 19, 2025
1 parent 72688b8 commit d192b6d
Showing 1 changed file with 13 additions and 9 deletions.
22 changes: 13 additions & 9 deletions projects/fal/src/fal/toolkit/file/file.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ def from_bytes(
save_kwargs.setdefault(
"object_lifecycle_preference", object_lifecycle_preference
)
fallback_save_kwargs.setdefault(
"object_lifecycle_preference", object_lifecycle_preference
)

try:
url = repo.save(fdata, **save_kwargs)
Expand All @@ -165,11 +168,7 @@ def from_bytes(

fallback_repo = get_builtin_repository(fallback_repository)

url = fallback_repo.save(
fdata,
object_lifecycle_preference=object_lifecycle_preference,
**fallback_save_kwargs,
)
url = fallback_repo.save(fdata, **fallback_save_kwargs)

return cls(
url=url,
Expand Down Expand Up @@ -206,13 +205,20 @@ def from_path(
object_lifecycle_preference = (
request_lifecycle_preference(request) or LIFECYCLE_PREFERENCE.get()
)
save_kwargs.setdefault(
"object_lifecycle_preference", object_lifecycle_preference
)
fallback_save_kwargs.setdefault(
"object_lifecycle_preference", object_lifecycle_preference
)

save_kwargs.setdefault("multipart", multipart)
fallback_save_kwargs.setdefault("multipart", multipart)

try:
url, data = repo.save_file(
file_path,
content_type=content_type,
multipart=multipart,
object_lifecycle_preference=object_lifecycle_preference,
**save_kwargs,
)
except Exception:
Expand All @@ -224,8 +230,6 @@ def from_path(
url, data = fallback_repo.save_file(
file_path,
content_type=content_type,
multipart=multipart,
object_lifecycle_preference=object_lifecycle_preference,
**fallback_save_kwargs,
)

Expand Down

0 comments on commit d192b6d

Please sign in to comment.