Unwrap functions when extracting global variable references #2604
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aksh-at
approved these changes
Dec 4, 2024
modal/_utils/function_utils.py
Outdated
| @@ -249,6 +249,12 @@ def get_globals(self) -> dict[str, Any]: | |||
| from .._vendor.cloudpickle import _extract_code_globals | |||
|
|
|||
| func = self.raw_f | |||
| while True: | |||
| # Unwrap functions decorated using functools.wrapped (potentially multiple times) | |||
| try: | |||
There was a problem hiding this comment.
This is a really contrived example and I hope no one will do this:
import functools
def f():
print("hi")
functools.wraps(f)(f)
print(f.__wrapped__ is f) # True
print(f.__wrapped__.__wrapped__ is f) # TrueBut just in case, we could guard against func != func.__wrapped__ so we don't go into an infinite loop?
mwaskom
force-pushed
the
michael/2024-12-03-handle-wrapped-build-functions
branch
from
643839b to
7c12cf4
Compare
mwaskom
force-pushed
the
michael/2024-12-03-handle-wrapped-build-functions
branch
from
7c12cf4 to
9b05fea
Compare
|
@prbot automerge |
|
Some required workflows are pending. Will automerge once they complete successfully. |
|
Cannot automerge PR because workflow 'CI / CD' failed. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes CLI-276
Changelog
functools.wrapsdecorator will now have their global variables included in the cache key. Previously, the cache would use global variables referenced within the wrapper itself. This will force a rebuild for Image layers defined using wrapped functions.