interloper-api 0.13.0__tar.gz → 0.14.0__tar.gz

{interloper_api-0.13.0 → interloper_api-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: interloper-api
-Version: 0.13.0
+Version: 0.14.0
 Summary: Interloper FastAPI routes
 Author: Guillaume Onfroy
 Author-email: Guillaume Onfroy <guillaume@digitlcloud.com>

{interloper_api-0.13.0 → interloper_api-0.14.0}/pyproject.toml

@@ -3,7 +3,7 @@
 # ###############
 [project]
 name = "interloper-api"
-version = "0.13.0"
+version = "0.14.0"
 description = "Interloper FastAPI routes"
 readme = "README.md"
 authors = [{ name = "Guillaume Onfroy", email = "guillaume@digitlcloud.com" }]

{interloper_api-0.13.0 → interloper_api-0.14.0}/src/interloper_api/routes/external/google_cloud.py

@@ -18,8 +18,13 @@ from interloper_api.routes.external import handle_error
 sub_router = APIRouter()
 
 _TOKEN_URL = "https://oauth2.googleapis.com/token"
-_PROJECTS_URL = "https://cloudresourcemanager.googleapis.com/v1/projects"
-_SCOPE = "https://www.googleapis.com/auth/cloud-platform.read-only"
+# BigQuery's own projects.list: returns the projects the credential holds a
+# BigQuery role on -- exactly the candidates for a BigQuery destination --
+# and only requires the BigQuery API, which is necessarily enabled wherever
+# the destination can work (unlike the Cloud Resource Manager API, which is
+# frequently disabled).
+_PROJECTS_URL = "https://bigquery.googleapis.com/bigquery/v2/projects"
+_SCOPE = "https://www.googleapis.com/auth/bigquery.readonly"
 
 
 class GoogleCloudConnectionRequest(BaseModel):
@@ -88,7 +93,7 @@ async def _get_access_token(client: httpx.AsyncClient, key_info: dict[str, Any])
 
 
 async def _list_projects(client: httpx.AsyncClient, access_token: str) -> list[dict[str, str]]:
-    """List the active projects visible to the credential, following pagination.
+    """List the projects the credential has BigQuery access to, following pagination.
 
     Returns:
         Project options with ``project_id`` and a display ``name``.
@@ -96,7 +101,7 @@ async def _list_projects(client: httpx.AsyncClient, access_token: str) -> list[d
     results: list[dict[str, str]] = []
     page_token: str | None = None
     while True:
-        params: dict[str, str] = {"filter": "lifecycleState:ACTIVE"}
+        params: dict[str, str] = {"maxResults": "500"}
         if page_token:
             params["pageToken"] = page_token
         resp = await client.get(
@@ -107,8 +112,8 @@ async def _list_projects(client: httpx.AsyncClient, access_token: str) -> list[d
         resp.raise_for_status()
         data = resp.json()
         for project in data.get("projects", []):
-            project_id = project["projectId"]
-            name = project.get("name") or project_id
+            project_id = project["id"]
+            name = project.get("friendlyName") or project_id
             results.append({"project_id": project_id, "name": f"{name} ({project_id})"})
         page_token = data.get("nextPageToken")
         if not page_token:
@@ -116,6 +121,26 @@ async def _list_projects(client: httpx.AsyncClient, access_token: str) -> list[d
     return sorted(results, key=lambda p: p["name"].lower())
 
 
+def _upstream_detail(exc: httpx.HTTPStatusError) -> str:
+    """Extract the human-readable error message from a Google error response.
+
+    The token endpoint answers ``{"error": ..., "error_description": ...}``;
+    the Cloud Resource Manager answers ``{"error": {"message": ...}}``.
+
+    Returns:
+        Google's error message, or the raw body as a fallback.
+    """
+    try:
+        payload = exc.response.json()
+    except ValueError:
+        return exc.response.text[:200]
+    error = payload.get("error")
+    if isinstance(error, dict):
+        return str(error.get("message") or error)
+    description = payload.get("error_description")
+    return str(description or error or exc.response.text[:200])
+
+
 @sub_router.post("/google-cloud/projects")
 async def google_cloud_projects(
     body: GoogleCloudConnectionRequest,
@@ -127,6 +152,16 @@ async def google_cloud_projects(
         async with httpx.AsyncClient(timeout=30) as client:
             access_token = await _get_access_token(client, key_info)
             return await _list_projects(client, access_token)
+    except httpx.HTTPStatusError as exc:
+        # Surface Google's own message (e.g. "Cloud Resource Manager API has
+        # not been used in project ...", "Invalid JWT Signature.") so the
+        # form error is actionable, instead of the generic handle_error text.
+        status = exc.response.status_code
+        detail = _upstream_detail(exc)
+        raise HTTPException(
+            status_code=status if status in (401, 403, 404) else 502,
+            detail=f"Google Cloud error while fetching projects: {detail}",
+        )
     except Exception as exc:
         handle_error(exc, "fetching Google Cloud projects")
         return []  # unreachable, but satisfies type checker