[Dependency] Fix the lazy import failure for OCI #3463
Merged
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
Michaelvll
requested review from
cblmemo and
concretevitamin
and removed request for
cblmemo
cblmemo
reviewed
Apr 23, 2024
sky/serve/core.py
Outdated
There was a problem hiding this comment.
This is actually fixed in #3363; see the pic attached.
If we want to separate this into a single PR and merge it first, IIUC change the
if (not controller_exist and
controller_resources_in_config.cloud is None):to
if (not controller_exist and
controller_resources_in_config.cloud is None and requested_clouds):could resolve this problem.
There was a problem hiding this comment.
why the current version does not work, which seems simpler to me
There was a problem hiding this comment.
This should work as well. Just trying to reduce the merge conflict 😂
There was a problem hiding this comment.
Actually, it seems that #3363 covers more cases, and is ready to go. I am going to get rid of the handling of the clouds here, and we can get that PR merged first : )
cblmemo
approved these changes
Apr 23, 2024
sky/serve/core.py
Outdated
There was a problem hiding this comment.
This should work as well. Just trying to reduce the merge conflict 😂
Michaelvll
changed the title
Michaelvll
force-pushed
the
fix-controller-resources
branch
from
ea6cc94 to
7d5926a
Compare
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 #3462The problem is caused by we setting the controller resources with an empty resource field when no cloud is specified.#3462 should be fixed in #3363.
This PR now only fixes the issue where OCI is imported even if the user does not have it enabled. This is introduced by #3394.
This can affect all new users of SkyServe who don't have OCI setup.
Tested (run the relevant ones):
bash format.shsky serve up -n new llm/llama-3/llama3.yamlwith no existing controllerpytest tests/test_smoke.pypytest tests/test_smoke.py::test_fill_in_the_namebash tests/backward_comaptibility_tests.sh