dulcefigueredo/scripts_zubabot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scripst ajustados para soportar cuenta de servicio

Browse Source
This commit is contained in:
mabejoyb
2026-05-13 14:20:55 -03:00
parent 912c5b74c3
commit d0c1f77ec3
4 changed files with 65 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
clausulas_financiado.py
View File

@@ -26,9 +26,6 @@ for k in list(sys.modules.keys()):
from googleapiclient.discovery import build
from googleapiclient.errors import HttpError
from google.oauth2 import service_account
from google.oauth2.credentials import Credentials
from google_auth_oauthlib.flow import InstalledAppFlow
from google.auth.transport.requests import Request as GRequest
# -----------------------------------------------------------
@@ -42,39 +39,23 @@ def _load_json(path):
return json.load(f)
def get_services(credentials_json_path, token_json_path):
def get_services(credentials_json_path, impersonated_user):
info = _load_json(credentials_json_path)
if not isinstance(info, dict) or info.get("type") != "service_account":
raise RuntimeError("gdoc_sa_json2 debe apuntar a un JSON de cuenta de servicio.")
if isinstance(info, dict) and info.get("type") == "service_account":
creds = service_account.Credentials.from_service_account_file(
credentials_json_path,
scopes=SCOPES,
)
docs = build("docs", "v1", credentials=creds, cache_discovery=False)
drive = build("drive", "v3", credentials=creds, cache_discovery=False)
return docs, drive, "service_account"
creds = None
if os.path.exists(token_json_path):
creds = Credentials.from_authorized_user_file(token_json_path, SCOPES)
if (not creds) or (not creds.valid):
if creds and creds.expired and creds.refresh_token:
creds.refresh(GRequest())
else:
flow = InstalledAppFlow.from_client_secrets_file(credentials_json_path, SCOPES)
try:
creds = flow.run_local_server(port=0)
except Exception:
creds = flow.run_console()
os.makedirs(os.path.dirname(token_json_path), exist_ok=True)
with open(token_json_path, "w", encoding="utf-8") as f:
f.write(creds.to_json())
impersonated_user = (impersonated_user or "").strip()
if not impersonated_user:
raise RuntimeError("Falta la variable gdoc_impersonated_user.")
creds = service_account.Credentials.from_service_account_file(
credentials_json_path,
scopes=SCOPES,
subject=impersonated_user,
)
docs = build("docs", "v1", credentials=creds, cache_discovery=False)
drive = build("drive", "v3", credentials=creds, cache_discovery=False)
return docs, drive, "oauth"
return docs, drive, "service_account_impersonated"
# -----------------------------------------------------------
@@ -691,24 +672,21 @@ try:
_sv("gdoc_original_id", raw_id)
cred_path = _gvs("gdoc_sa_json", "")
cred_path = _gvs("gdoc_sa_json2", "")
if cred_path == "":
raise RuntimeError("Falta la variable gdoc_sa_json.")
raise RuntimeError("Falta la variable gdoc_sa_json2.")
if not os.path.isabs(cred_path):
cred_path = os.path.join(base_dir, cred_path)
if not os.path.exists(cred_path):
raise RuntimeError("No existe credentials.json: " + cred_path)
raise RuntimeError("No existe JSON de cuenta de servicio: " + cred_path)
token_path = _gvs("gdoc_token_json", "")
if token_path == "":
token_path = os.path.join(base_dir, "credentials", "token_gdocs_drive.json")
if not os.path.isabs(token_path):
token_path = os.path.join(base_dir, token_path)
impersonated_user = _gvs("gdoc_impersonated_user", "")
docs_service, drive_service, auth_mode = get_services(cred_path, token_path)
docs_service, drive_service, auth_mode = get_services(cred_path, impersonated_user)
_sv("gdoc_auth_mode", auth_mode)
_sv("gdoc_impersonated_user_used", impersonated_user)
doc_id, meta_file, converted = ensure_docs_api_compatible(drive_service, raw_id)
_sv("gdoc_id", doc_id)