webapi fixes #277
Merged
webapi fixes #277
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
Credential folder only created when needed Maximum attempts in authentication while loops Authentication only called when needed, and checks if already done
tylerflex
requested changes
Mar 29, 2022
tidy3d/web/auth.py
Outdated
| user for login info and saves to file.""" | ||
| user for login info and saves to file. | ||
|
|
||
| If Config["auth" is already set, returns immediately. |
|
So what is the new behavior of this in terms of users? Will it try to log in each web api call? Also, does this print anything to STDOUT each auth call because that could be annoying eg. if Also, can we use log.info instead of print? |
|
when credential is verified, we can also set values back to env. also the current solution requested unnecessary calls for auth. It is fine for right now. def handle_response(func):
def wrapper(*args, **kwargs):
resp = func(*args, **kwargs)
if resp.status_code == 401 and Config.auth_retry < 1:
getEmailPasswdAuthKey()
Config.auth_retry = Config.auth_retry + 1
resp = func(*args, **kwargs)
elif resp.status_code != 200:
print(resp.content)
resp.raise_for_status()
try:
Config.auth_retry = 0
jsn = resp.json()['data']
except Exception as e:
print('Could not json decode response : {0}!'.format(resp.text))
raise
return jsn
return wrapper |
tylerflex
reviewed
Mar 30, 2022
tidy3d/web/auth.py
Outdated
| @@ -3,24 +3,30 @@ | |||
| import getpass | |||
| import hashlib | |||
| import json | |||
| import logging | |||
tidy3d/web/auth.py
Outdated
| if "TIDY3D_USER" in os.environ and ( | ||
| "TIDY3D_PASS" in os.environ or "TIDY3D_PASS_HASH" in os.environ | ||
| ): | ||
| logging.debug("Using Tidy3D credentials from enviornment") |
tidy3d/web/auth.py
Outdated
|
|
||
| # if we find something in the credential path | ||
| if os.path.exists(credential_path): | ||
| print("Using Tidy3D credentials from stored file") | ||
| logging.info("Using Tidy3D credentials from stored file") |
tidy3d/web/auth.py
Outdated
| return | ||
|
|
||
| except Exception: # pylint:disable=broad-except | ||
| print("Error: Failed to log in with environment credentials.") | ||
| logging.info("Error: Failed to log in with environment credentials.") |
tidy3d/web/auth.py
Outdated
| @@ -73,10 +86,13 @@ def get_credentials() -> None: | |||
| return | |||
|
|
|||
| except Exception: # pylint:disable=broad-except | |||
| print("Error: Failed to log in with saved credentials.") | |||
| logging.info("Error: Failed to log in with saved credentials.") | |||
tidy3d/web/auth.py
Outdated
|
|
||
| # keep trying to log in | ||
| while True: | ||
| attempts = 0 |
There was a problem hiding this comment.
could also just do for attempts in range(MAX_ATTEMPTS): I think (or for _ in range(MAX_ATTEMPTS) if attempts is not used.
tidy3d/web/auth.py
Outdated
| return | ||
|
|
||
| except Exception: # pylint:disable=broad-except | ||
| logging.info("Error: Failed to store credentials.") |
tidy3d/web/auth.py
Outdated
| @@ -88,27 +104,46 @@ def get_credentials() -> None: | |||
| break | |||
|
|
|||
| except Exception: # pylint:disable=broad-except | |||
| print("Error: Failed to log in with new username and password.") | |||
| logging.info("Error: Failed to log in with new username and password.") | |||
tidy3d/web/auth.py
Outdated
| return | ||
|
|
||
| except Exception: # pylint:disable=broad-except | ||
| logging.info("Error: Failed to store credentials.") |
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.
Credential folder only created when needed
Maximum attempts in authentication while loops
Authentication only called when needed, and checks if already done