chore(weave): change raise to print for netrc existing with api key #2341
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
|
Preview this PR with FeatureBee: https://beta.wandb.ai/?betaVersion=1344f32c46dad0e96277e35566c7c003cfad1c8c |
weave/legacy/weave/environment.py
Outdated
| raise errors.WeaveConfigurationError( | ||
| "WANDB_API_KEY should not be set in both ~/.netrc and the environment." | ||
| ) | ||
| print("WANDB_API_KEY should not be set in both ~/.netrc and the environment.") |
There was a problem hiding this comment.
- If the contents are identical I think we could be silent.
- I'd change the message to explain a bit better. Maybe something like:
"There are different credentials in the netrc file and the environment. Using the environment value." - Not worth fixing but just noting that NETRC file might not be located at ~/.netrc (Windows, I think we might support the NETRC env var for alternate path, etc.)
There was a problem hiding this comment.
makes sense
_wandb_api_key_via_netrc() -> i believe checks the windows location as well
There was a problem hiding this comment.
Right, just meant that on windows this message would have an incorrect path (~/.netrc vs. ~/_netrc)
tssweeney
reviewed
Sep 10, 2024
weave/legacy/weave/environment.py
Outdated
| if env_api_key and netrc_api_key: | ||
| raise errors.WeaveConfigurationError( | ||
| "WANDB_API_KEY should not be set in both ~/.netrc and the environment." | ||
| if env_api_key and netrc_api_key and env_api_key != netrc_api_key: |
There was a problem hiding this comment.
i would still raise in production
tssweeney
reviewed
Sep 10, 2024
weave/legacy/weave/environment.py
Outdated
| @@ -250,10 +250,14 @@ def _wandb_api_key_via_netrc_file(filepath: str) -> typing.Optional[str]: | |||
| def weave_wandb_api_key() -> typing.Optional[str]: | |||
| env_api_key = _wandb_api_key_via_env() | |||
| netrc_api_key = _wandb_api_key_via_netrc() | |||
| if env_api_key and netrc_api_key: | |||
| if env_api_key and netrc_api_key and wandb_production(): | |||
There was a problem hiding this comment.
nit:
if env_api_key and netrc_api_key:
if wandb_production():
raise errors.WeaveConfigurationError(
"WANDB_API_KEY should not be set in both ~/.netrc and the environment."
)
elif env_api_key != netrc_api_key:
print(
"There are different credentials in the netrc file and the environment. Using the environment value."
)
tssweeney
approved these changes
Sep 10, 2024
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
Changes the reaction to netrc and apikey existing to a print and not a raise when not in prod
Testing
How was this PR tested?