mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-14 04:02:26 +00:00
fix(google-workspace): cleanup for --check-live salvage
Small follow-ups on top of #19643: - check_auth() takes quiet kwarg to suppress its AUTHENTICATED print when called from check_auth_live(), so the final status line reflects the live-call outcome only. - Drop redundant _ensure_deps() call in check_auth_live() (check_auth() already calls it). - Add AUTHOR_MAP entry for ygd58 so release attribution script works.
This commit is contained in:
parent
617ac0535b
commit
83c23e8861
2 changed files with 9 additions and 5 deletions
|
|
@ -47,6 +47,7 @@ AUTHOR_MAP = {
|
||||||
"qiyin.zuo@pcitc.com": "qiyin-code",
|
"qiyin.zuo@pcitc.com": "qiyin-code",
|
||||||
"oleksii.lisikh@gmail.com": "olisikh",
|
"oleksii.lisikh@gmail.com": "olisikh",
|
||||||
"leone.parise@gmail.com": "leoneparise",
|
"leone.parise@gmail.com": "leoneparise",
|
||||||
|
"buraysandro9@gmail.com": "ygd58",
|
||||||
"teknium@nousresearch.com": "teknium1",
|
"teknium@nousresearch.com": "teknium1",
|
||||||
"piyushvp1@gmail.com": "thelumiereguy",
|
"piyushvp1@gmail.com": "thelumiereguy",
|
||||||
"harish.kukreja@gmail.com": "counterposition",
|
"harish.kukreja@gmail.com": "counterposition",
|
||||||
|
|
|
||||||
|
|
@ -132,9 +132,10 @@ def _ensure_deps():
|
||||||
|
|
||||||
def check_auth_live():
|
def check_auth_live():
|
||||||
"""Check auth with a real API call to detect disabled_client/account issues."""
|
"""Check auth with a real API call to detect disabled_client/account issues."""
|
||||||
if not check_auth():
|
# quiet=True suppresses the "AUTHENTICATED" print from check_auth so the
|
||||||
|
# final status line reflects the live-call outcome (OK or FAILED).
|
||||||
|
if not check_auth(quiet=True):
|
||||||
return False
|
return False
|
||||||
_ensure_deps()
|
|
||||||
try:
|
try:
|
||||||
from googleapiclient.discovery import build
|
from googleapiclient.discovery import build
|
||||||
from google.oauth2.credentials import Credentials
|
from google.oauth2.credentials import Credentials
|
||||||
|
|
@ -155,7 +156,7 @@ def check_auth_live():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def check_auth():
|
def check_auth(quiet: bool = False):
|
||||||
"""Check if stored credentials are valid. Prints status, exits 0 or 1."""
|
"""Check if stored credentials are valid. Prints status, exits 0 or 1."""
|
||||||
if not TOKEN_PATH.exists():
|
if not TOKEN_PATH.exists():
|
||||||
print(f"NOT_AUTHENTICATED: No token at {TOKEN_PATH}")
|
print(f"NOT_AUTHENTICATED: No token at {TOKEN_PATH}")
|
||||||
|
|
@ -182,7 +183,8 @@ def check_auth():
|
||||||
print(f"AUTHENTICATED (partial): Token valid but missing {len(missing_scopes)} scopes:")
|
print(f"AUTHENTICATED (partial): Token valid but missing {len(missing_scopes)} scopes:")
|
||||||
for s in missing_scopes:
|
for s in missing_scopes:
|
||||||
print(f" - {s}")
|
print(f" - {s}")
|
||||||
print(f"AUTHENTICATED: Token valid at {TOKEN_PATH}")
|
if not quiet:
|
||||||
|
print(f"AUTHENTICATED: Token valid at {TOKEN_PATH}")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
if creds.expired and creds.refresh_token:
|
if creds.expired and creds.refresh_token:
|
||||||
|
|
@ -199,7 +201,8 @@ def check_auth():
|
||||||
print(f"AUTHENTICATED (partial): Token refreshed but missing {len(missing_scopes)} scopes:")
|
print(f"AUTHENTICATED (partial): Token refreshed but missing {len(missing_scopes)} scopes:")
|
||||||
for s in missing_scopes:
|
for s in missing_scopes:
|
||||||
print(f" - {s}")
|
print(f" - {s}")
|
||||||
print(f"AUTHENTICATED: Token refreshed at {TOKEN_PATH}")
|
if not quiet:
|
||||||
|
print(f"AUTHENTICATED: Token refreshed at {TOKEN_PATH}")
|
||||||
return True
|
return True
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
err_str = str(e).lower()
|
err_str = str(e).lower()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue