← Commit history

v0.8.23: install Python requests on stock containers; clear error instead of traceback

John Lauer ·414b00ea01 ·28d ago ·parent a284e8c
3 files changed +18−5
bin/adom-google+14−2
@@ -23,12 +23,24 @@ See `adom-google help`. """ import sys, os, json, base64, argparse, urllib.parse, ssl, socket, hashlib, secrets, struct, time -ADOM_GOOGLE_VERSION = "0.8.22"+ADOM_GOOGLE_VERSION = "0.8.23" if sys.argv[1:2] == ["--version"]:     print(f"adom-google {ADOM_GOOGLE_VERSION}")     sys.exit(0) -import requests+try:+    import requests+except ModuleNotFoundError:+    # Stock Adom containers (Ubuntu 24.04) do not ship `requests`, and without it+    # the CLI used to die with a traceback before printing any consent URL, which+    # an AI summarised as "bad OAuth". This is a missing module, not an auth+    # problem, so say exactly that and give the one-line fix. install.sh now+    # installs it; this guard covers copies installed before 0.8.23.+    sys.exit("ERROR: adom-google needs the Python 'requests' module, and this container does not have it.\n"+             "  This is a missing dependency, NOT an OAuth problem. Fix (either one):\n"+             "    python3 -m pip install --user --break-system-packages requests\n"+             "    sudo apt-get install -y python3-requests\n"+             "  or reinstall, which now does it for you:  adom-wiki pkg install adom/adom-google-adom")  # --- ACCOUNTS ---------------------------------------------------------------------------------- # adom-google supports multiple Google accounts on one container, fully isolated from each
install.sh

  
page.json+4−3
@@ -94,7 +94,7 @@   "skills": [],   "hero_path": "screenshots/hero-google-v5.png",   "hero_type": "image",-  "description": "Drive your whole Google Workspace from the terminal: Gmail, Contacts, Drive, Sheets, Docs, Slides, Calendar, Tasks, Google Chat, plus a generic `api` passthrough to hit ANY Google API. Connect a personal @gmail (or another org's Google account) with ZERO setup via Adom's hosted Connector (`adom-google connect-personal`), or bring your own token-broker gateway (`provider set`): Adom staff use the private adom-google-adom provider. One-click OAuth, no client secret on your machine.",+  "description": "Drive your whole Google Workspace from the terminal: Gmail, Contacts, Drive, Sheets, Docs, Slides, Calendar, Tasks, Google Chat, plus a generic `api` passthrough to hit ANY Google API. Open source, ships with NO OAuth provider baked in: point it at your own token-broker gateway (`provider set`), buy a managed one, or: Adom staff: install the private adom-google-adom provider. One-click OAuth, no client secret on your machine. First run asks safe mode (no delete) vs full mode (incl. delete).",   "keywords": [     "adom-google",     "google-workspace",@@ -118,6 +118,8 @@     "uninstall": "./uninstall.sh"   },   "files": [+    "bin/adom-google",+    "bin/adom-gmail",     "SKILL.md",     "skills/adom-google-onboarding/SKILL.md",     "README.md",@@ -126,8 +128,7 @@     "provider.example.json",     "install.sh",     "uninstall.sh",-    "package.json",-    "VERSION"+    "package.json"   ],   "org": "adom" }\ No newline at end of file