adloop 0.8.1__tar.gz → 0.10.0__tar.gz

{adloop-0.8.1 → adloop-0.10.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.3
 Name: adloop
-Version: 0.8.1
-Summary: Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.
+Version: 0.10.0
+Summary: The AI command center for Google Ads, GA4, and tracking code.
 Keywords: mcp,google-ads,google-analytics,ga4,cursor,marketing
 Author: Daniel Klose
 Author-email: Daniel Klose <info@daniel-klose.com>
@@ -26,7 +26,7 @@ Description-Content-Type: text/markdown
 
 # AdLoop
 
-**Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.**
+**The AI command center for Google Ads, GA4, and tracking code.**
 
 [![PyPI](https://img.shields.io/pypi/v/adloop.svg)](https://pypi.org/project/adloop/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
@@ -196,16 +196,22 @@ AdLoop manages real ad spend, so safety is not optional.
 
 ## Setup
 
-### Quick Start (Recommended)
+> **AdLoop uses your own (free) Google Cloud project for OAuth.** The `adloop init` wizard walks you through it — a one-time setup of about 5 minutes, with no shared user caps and no waiting on anyone's verification review. AdLoop does not ship built-in OAuth credentials.
+>
+> **Prefer zero setup?** [**AdLoop Cloud**](https://getadloop.com) is the hosted version: connect Google in two clicks — no Cloud project, no developer token, EU-hosted.
+>
+> *(Upgrading from ≤0.9 with built-in credentials? Those sign-ins were retired in 0.10 — run `adloop init` once to switch to your own project.)*
 
-**Option A — Install from PyPI:**
+### Install
+
+**From PyPI:**
 
 ```bash
 pip install adloop
 adloop init
 ```
 
-**Option B — Install from source:**
+**From source:**
 
 ```bash
 git clone https://github.com/kLOsk/adloop.git
@@ -214,21 +220,17 @@ uv sync
 uv run adloop init
 ```
 
-The `adloop init` wizard walks you through everything. AdLoop ships with built-in Google OAuth credentials, so you don't need to create a Google Cloud project.
+### What `adloop init` does
 
-> **⚠️ Built-in credentials temporarily unavailable — Google verification pending.**
-> Google limits unverified OAuth apps to 100 users. AdLoop has reached that cap while awaiting Google's app verification. Until verification is complete, the built-in credentials will show a **"This app is blocked"** error for new users.
->
-> **Workaround:** set up your own Google Cloud project using the [Advanced Setup](#advanced-setup-custom-google-cloud-project) instructions below (takes ~5 minutes). Your own project has no user cap and is the recommended setup path in the meantime.
+The wizard walks you through:
 
-The wizard:
-
-1. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
-2. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
-3. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
-4. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
-5. **Safety defaults** — budget cap and dry-run preference
-6. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
+1. **Google Cloud setup** — creates a project, enables the three APIs, generates an OAuth client (see [Custom Google Cloud Project Setup](#custom-google-cloud-project-setup) below for the exact steps the wizard refers you to)
+2. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
+3. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
+4. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
+5. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
+6. **Safety defaults** — budget cap and dry-run preference
+7. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
 
 ### Requirements
 
@@ -238,7 +240,7 @@ The wizard:
 
 ### Google Ads Developer Token
 
-A developer token is **always required** — even when using AdLoop's built-in OAuth credentials. The built-in credentials handle Google sign-in; the developer token is a separate key that grants API access to your Google Ads data.
+A developer token is **always required**. Your OAuth client handles Google sign-in; the developer token is a separate key that grants API access to your Google Ads data.
 
 1. **Create an MCC** (free) at [ads.google.com/home/tools/manager-accounts](https://ads.google.com/home/tools/manager-accounts/) if you don't have one. Link your regular Google Ads account to it.
 2. In the MCC, go to **Tools & Settings → API Center**
@@ -258,12 +260,9 @@ A developer token is **always required** — even when using AdLoop's built-in O
 
 Running on a server without a browser (VMs, Docker, SSH)? The wizard automatically detects this and falls back to a manual flow: it prints an authorization URL you can open on any device, then you paste the redirect URL back into the terminal.
 
-### Advanced Setup (Custom Google Cloud Project)
-
-<details>
-<summary>Click to expand — only needed if you want to use your own GCP project instead of AdLoop's built-in credentials</summary>
+### Custom Google Cloud Project Setup
 
-When you run `adloop init`, choose "No" when asked about built-in credentials. The wizard will guide you through:
+The wizard refers to these steps — do them in your browser before running `adloop init` (or while it waits at the OAuth prompt).
 
 #### Step 1 — Google Cloud Project
 
@@ -335,8 +334,6 @@ If you'd rather manage things by hand instead, copy `.claude/rules/adloop.md` an
 
 **Claude Desktop / claude.ai** has no programmatic rules location. Run `adloop install-rules` and it will print the rules content for you to paste into Project settings → Custom instructions on claude.ai.
 
-</details>
-
 ### Use It
 
 Ask your AI assistant things like:
@@ -358,7 +355,7 @@ All configuration lives in `~/.adloop/config.yaml`. See [`config.yaml.example`](
 | Section | Key | Default | Description |
 |---------|-----|---------|-------------|
 | `google` | `project_id` | *(empty)* | Google Cloud project ID (only needed with custom credentials) |
-| `google` | `credentials_path` | *(empty — uses built-in)* | Path to OAuth client JSON or service account key. Leave empty to use AdLoop's built-in credentials. |
+| `google` | `credentials_path` | *(empty)* | Path to OAuth client JSON or service account key. Empty = `~/.adloop/credentials.json`, else Application Default Credentials. |
 | `google` | `token_path` | `~/.adloop/token.json` | Where to store the OAuth token (auto-created) |
 | `ga4` | `property_id` | — | Your GA4 property ID (auto-discovered by `adloop init`) |
 | `ads` | `developer_token` | — | Your Google Ads API developer token |
@@ -375,7 +372,7 @@ src/adloop/
 ├── __init__.py        # Entry point — routes 'adloop init' to wizard, otherwise starts MCP server
 ├── server.py          # FastMCP server — 43 tool registrations with safety annotations
 ├── config.py          # Config loader (~/.adloop/config.yaml)
-├── auth.py            # OAuth 2.0 flow (bundled + custom credentials, headless fallback) + service accounts
+├── auth.py            # OAuth 2.0 flow (user-supplied credentials, headless fallback) + service accounts
 ├── cli.py             # Interactive 'adloop init' setup wizard
 ├── crossref.py        # Cross-reference tools (GA4 + Ads combined analysis)
 ├── tracking.py        # Tracking validation + code generation tools
@@ -411,7 +408,7 @@ What's been shipped and what's next:
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
 - **Claude Desktop one-click install** — `adloop install claude-desktop` (and/or a `.dxt` extension bundle) that writes the AdLoop MCP entry into `claude_desktop_config.json` automatically, so Claude Desktop + Cowork users don't have to hand-edit JSON
 - ~~PyPI package~~ ✓ — `pip install adloop`
-- ~~Bundled OAuth credentials~~ ✓ — no Google Cloud project required, auto-discovery of GA4/Ads accounts (currently capped at 100 users pending Google verification — use [Advanced Setup](#advanced-setup-custom-google-cloud-project) in the meantime)
+- **[AdLoop Cloud](https://getadloop.com)** — the hosted version: no Google Cloud project, no developer token, connect Google in two clicks (EU-hosted, GDPR-first)
 - ~~Headless server support~~ ✓ — manual URL copy-paste flow for servers without a browser
 - ~~Behavioral eval suites~~ ✓ — 28 prompt-and-expectation tests covering read, write, tracking, and planning workflows
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
@@ -433,7 +430,7 @@ AdLoop runs entirely on your machine. No data is collected, stored, or transmitt
 
 <div align="center">
 
-**If AdLoop saves you from switching between Google Ads, GA4, and your code editor — [give it a star](https://github.com/kLOsk/adloop).**
+**If AdLoop helps you run Google Ads, GA4, and tracking code from one place — [give it a star](https://github.com/kLOsk/adloop).**
 
 Made by [@kLOsk](https://github.com/kLOsk) | [Privacy Policy](PRIVACY.md)
 

{adloop-0.8.1 → adloop-0.10.0}/README.md

@@ -2,7 +2,7 @@
 
 # AdLoop
 
-**Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.**
+**The AI command center for Google Ads, GA4, and tracking code.**
 
 [![PyPI](https://img.shields.io/pypi/v/adloop.svg)](https://pypi.org/project/adloop/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
@@ -172,16 +172,22 @@ AdLoop manages real ad spend, so safety is not optional.
 
 ## Setup
 
-### Quick Start (Recommended)
+> **AdLoop uses your own (free) Google Cloud project for OAuth.** The `adloop init` wizard walks you through it — a one-time setup of about 5 minutes, with no shared user caps and no waiting on anyone's verification review. AdLoop does not ship built-in OAuth credentials.
+>
+> **Prefer zero setup?** [**AdLoop Cloud**](https://getadloop.com) is the hosted version: connect Google in two clicks — no Cloud project, no developer token, EU-hosted.
+>
+> *(Upgrading from ≤0.9 with built-in credentials? Those sign-ins were retired in 0.10 — run `adloop init` once to switch to your own project.)*
 
-**Option A — Install from PyPI:**
+### Install
+
+**From PyPI:**
 
 ```bash
 pip install adloop
 adloop init
 ```
 
-**Option B — Install from source:**
+**From source:**
 
 ```bash
 git clone https://github.com/kLOsk/adloop.git
@@ -190,21 +196,17 @@ uv sync
 uv run adloop init
 ```
 
-The `adloop init` wizard walks you through everything. AdLoop ships with built-in Google OAuth credentials, so you don't need to create a Google Cloud project.
+### What `adloop init` does
 
-> **⚠️ Built-in credentials temporarily unavailable — Google verification pending.**
-> Google limits unverified OAuth apps to 100 users. AdLoop has reached that cap while awaiting Google's app verification. Until verification is complete, the built-in credentials will show a **"This app is blocked"** error for new users.
->
-> **Workaround:** set up your own Google Cloud project using the [Advanced Setup](#advanced-setup-custom-google-cloud-project) instructions below (takes ~5 minutes). Your own project has no user cap and is the recommended setup path in the meantime.
+The wizard walks you through:
 
-The wizard:
-
-1. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
-2. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
-3. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
-4. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
-5. **Safety defaults** — budget cap and dry-run preference
-6. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
+1. **Google Cloud setup** — creates a project, enables the three APIs, generates an OAuth client (see [Custom Google Cloud Project Setup](#custom-google-cloud-project-setup) below for the exact steps the wizard refers you to)
+2. **Developer token** — from your Google Ads MCC ([API Center](https://ads.google.com/aw/apicenter))
+3. **MCC Account ID** — your Manager Account ID (top bar in the MCC UI)
+4. **OAuth sign-in** — opens a browser to sign in with Google (or prints a URL for headless servers)
+5. **Auto-discovers your accounts** — finds your GA4 properties and Ads accounts automatically
+6. **Safety defaults** — budget cap and dry-run preference
+7. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code
 
 ### Requirements
 
@@ -214,7 +216,7 @@ The wizard:
 
 ### Google Ads Developer Token
 
-A developer token is **always required** — even when using AdLoop's built-in OAuth credentials. The built-in credentials handle Google sign-in; the developer token is a separate key that grants API access to your Google Ads data.
+A developer token is **always required**. Your OAuth client handles Google sign-in; the developer token is a separate key that grants API access to your Google Ads data.
 
 1. **Create an MCC** (free) at [ads.google.com/home/tools/manager-accounts](https://ads.google.com/home/tools/manager-accounts/) if you don't have one. Link your regular Google Ads account to it.
 2. In the MCC, go to **Tools & Settings → API Center**
@@ -234,12 +236,9 @@ A developer token is **always required** — even when using AdLoop's built-in O
 
 Running on a server without a browser (VMs, Docker, SSH)? The wizard automatically detects this and falls back to a manual flow: it prints an authorization URL you can open on any device, then you paste the redirect URL back into the terminal.
 
-### Advanced Setup (Custom Google Cloud Project)
-
-<details>
-<summary>Click to expand — only needed if you want to use your own GCP project instead of AdLoop's built-in credentials</summary>
+### Custom Google Cloud Project Setup
 
-When you run `adloop init`, choose "No" when asked about built-in credentials. The wizard will guide you through:
+The wizard refers to these steps — do them in your browser before running `adloop init` (or while it waits at the OAuth prompt).
 
 #### Step 1 — Google Cloud Project
 
@@ -311,8 +310,6 @@ If you'd rather manage things by hand instead, copy `.claude/rules/adloop.md` an
 
 **Claude Desktop / claude.ai** has no programmatic rules location. Run `adloop install-rules` and it will print the rules content for you to paste into Project settings → Custom instructions on claude.ai.
 
-</details>
-
 ### Use It
 
 Ask your AI assistant things like:
@@ -334,7 +331,7 @@ All configuration lives in `~/.adloop/config.yaml`. See [`config.yaml.example`](
 | Section | Key | Default | Description |
 |---------|-----|---------|-------------|
 | `google` | `project_id` | *(empty)* | Google Cloud project ID (only needed with custom credentials) |
-| `google` | `credentials_path` | *(empty — uses built-in)* | Path to OAuth client JSON or service account key. Leave empty to use AdLoop's built-in credentials. |
+| `google` | `credentials_path` | *(empty)* | Path to OAuth client JSON or service account key. Empty = `~/.adloop/credentials.json`, else Application Default Credentials. |
 | `google` | `token_path` | `~/.adloop/token.json` | Where to store the OAuth token (auto-created) |
 | `ga4` | `property_id` | — | Your GA4 property ID (auto-discovered by `adloop init`) |
 | `ads` | `developer_token` | — | Your Google Ads API developer token |
@@ -351,7 +348,7 @@ src/adloop/
 ├── __init__.py        # Entry point — routes 'adloop init' to wizard, otherwise starts MCP server
 ├── server.py          # FastMCP server — 43 tool registrations with safety annotations
 ├── config.py          # Config loader (~/.adloop/config.yaml)
-├── auth.py            # OAuth 2.0 flow (bundled + custom credentials, headless fallback) + service accounts
+├── auth.py            # OAuth 2.0 flow (user-supplied credentials, headless fallback) + service accounts
 ├── cli.py             # Interactive 'adloop init' setup wizard
 ├── crossref.py        # Cross-reference tools (GA4 + Ads combined analysis)
 ├── tracking.py        # Tracking validation + code generation tools
@@ -387,7 +384,7 @@ What's been shipped and what's next:
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
 - **Claude Desktop one-click install** — `adloop install claude-desktop` (and/or a `.dxt` extension bundle) that writes the AdLoop MCP entry into `claude_desktop_config.json` automatically, so Claude Desktop + Cowork users don't have to hand-edit JSON
 - ~~PyPI package~~ ✓ — `pip install adloop`
-- ~~Bundled OAuth credentials~~ ✓ — no Google Cloud project required, auto-discovery of GA4/Ads accounts (currently capped at 100 users pending Google verification — use [Advanced Setup](#advanced-setup-custom-google-cloud-project) in the meantime)
+- **[AdLoop Cloud](https://getadloop.com)** — the hosted version: no Google Cloud project, no developer token, connect Google in two clicks (EU-hosted, GDPR-first)
 - ~~Headless server support~~ ✓ — manual URL copy-paste flow for servers without a browser
 - ~~Behavioral eval suites~~ ✓ — 28 prompt-and-expectation tests covering read, write, tracking, and planning workflows
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
@@ -409,7 +406,7 @@ AdLoop runs entirely on your machine. No data is collected, stored, or transmitt
 
 <div align="center">
 
-**If AdLoop saves you from switching between Google Ads, GA4, and your code editor — [give it a star](https://github.com/kLOsk/adloop).**
+**If AdLoop helps you run Google Ads, GA4, and tracking code from one place — [give it a star](https://github.com/kLOsk/adloop).**
 
 Made by [@kLOsk](https://github.com/kLOsk) | [Privacy Policy](PRIVACY.md)
 

{adloop-0.8.1 → adloop-0.10.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "adloop"
-version = "0.8.1"
-description = "Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped."
+version = "0.10.0"
+description = "The AI command center for Google Ads, GA4, and tracking code."
 readme = "README.md"
 authors = [
     { name = "Daniel Klose", email = "info@daniel-klose.com" }

{adloop-0.8.1 → adloop-0.10.0}/src/adloop/__init__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-__version__ = "0.8.1"
+__version__ = "0.9.0"
 
 
 def main() -> None:
@@ -42,6 +42,15 @@ def main() -> None:
             sys.exit(130)
         return
 
+    # Process-global side effects (signal handlers, heartbeat thread, and
+    # the stdio cancellation-race monkeypatch) are deliberately installed
+    # here — in the stdio entry point — rather than at adloop.server import
+    # time, so embedding the server in an ASGI app stays side-effect-free.
+    from adloop import _mcp_patches, diagnostics
+
+    diagnostics.install()
+    _mcp_patches.install()
+
     from adloop.server import mcp
 
     mcp.run()

{adloop-0.8.1 → adloop-0.10.0}/src/adloop/ads/forecast.py

@@ -98,30 +98,43 @@ def estimate_budget(
     response = kp_service.generate_keyword_forecast_metrics(request=request)
     metrics = response.campaign_forecast_metrics
 
+    # KeywordForecastMetrics fields are ``optional`` in v23, so the SDK
+    # returns ``None`` for unset fields and the actual integer (including
+    # 0) otherwise. Falsy checks like ``int(v) if v else None`` would
+    # silently map a real 0-click or 0-cost forecast to None and the
+    # caller couldn't tell "no data" apart from "data says zero" — same
+    # bug class as discover_keywords (issue Bug 2). Use ``is not None``
+    # throughout and the shared ``_micros_to_currency`` helper for the
+    # micros→currency conversions.
     clicks = getattr(metrics, "clicks", None)
     impressions = getattr(metrics, "impressions", None)
     avg_cpc_micros = getattr(metrics, "average_cpc_micros", None)
     cost_micros = getattr(metrics, "cost_micros", None)
     ctr = getattr(metrics, "click_through_rate", None)
 
-    total_cost = round(cost_micros / 1_000_000, 2) if cost_micros else None
-    avg_cpc = round(avg_cpc_micros / 1_000_000, 2) if avg_cpc_micros else None
+    total_cost = _micros_to_currency(cost_micros)
+    avg_cpc = _micros_to_currency(avg_cpc_micros)
 
     days = max(forecast_days, 1)
     daily = {
-        "clicks": round(clicks / days, 1) if clicks else None,
-        "impressions": round(impressions / days, 1) if impressions else None,
-        "cost": round(total_cost / days, 2) if total_cost else None,
+        "clicks": round(clicks / days, 1) if clicks is not None else None,
+        "impressions": (
+            round(impressions / days, 1) if impressions is not None else None
+        ),
+        "cost": round(total_cost / days, 2) if total_cost is not None else None,
     }
 
     insights = []
+    # Only emit the headline insight when there's actually something to
+    # report (real clicks AND real cost) — a zero-click forecast gets its
+    # own dedicated insight below, and a None forecast shouldn't trigger
+    # either path.
     if total_cost is not None and clicks is not None and clicks > 0:
-        effective_cpa_budget = total_cost / clicks * 10
         insights.append(
             f"Estimated {clicks:.0f} clicks over {forecast_days} days at "
             f"~{avg_cpc} avg CPC. Total estimated cost: {total_cost:.2f}."
         )
-    if daily_budget > 0 and daily["cost"] is not None:
+    if daily_budget > 0 and daily["cost"] is not None and daily["cost"] > 0:
         if daily_budget < daily["cost"]:
             capture_pct = round(daily_budget / daily["cost"] * 100)
             insights.append(
@@ -134,7 +147,12 @@ def estimate_budget(
                 f"most available traffic (estimated daily cost: {daily['cost']:.2f})."
             )
 
-    if impressions is not None and clicks is not None and impressions > 0 and clicks == 0:
+    if (
+        impressions is not None
+        and clicks is not None
+        and impressions > 0
+        and clicks == 0
+    ):
         insights.append(
             "Forecast shows impressions but zero clicks — keywords may be too "
             "generic or CPCs too low for competitive positions."
@@ -149,7 +167,7 @@ def estimate_budget(
         "estimated_impressions": impressions,
         "estimated_cost": total_cost,
         "estimated_avg_cpc": avg_cpc,
-        "estimated_ctr": round(ctr, 4) if ctr else None,
+        "estimated_ctr": round(ctr, 4) if ctr is not None else None,
         "daily_estimates": daily,
         "keywords_used": len([kw for kw in keywords if kw.get("text")]),
         "insights": insights,

{adloop-0.8.1 → adloop-0.10.0}/src/adloop/ads/gaql.py

@@ -89,7 +89,29 @@ _GAQL_ERROR_HINTS = {
 
 
 def _parse_gaql_error(exc: Exception) -> str:
-    """Extract a human-readable message from Google Ads gRPC errors."""
+    """Extract a human-readable message from Google Ads gRPC errors.
+
+    Prefers the structured ``failure.errors[]`` a GoogleAdsException
+    carries — Google's own message names the exact field/clause at
+    fault (e.g. PROHIBITED_FIELD_IN_SELECT_CLAUSE with the field name),
+    which is far more actionable than a generic hint. Known error codes
+    still get the hint appended as a suffix.
+    """
+    failure = getattr(exc, "failure", None)
+    errors = getattr(failure, "errors", None) if failure is not None else None
+    if errors:
+        parts = []
+        for err in errors:
+            code = str(getattr(err, "error_code", "") or "").strip()
+            message = str(getattr(err, "message", "") or "").strip()
+            parts.append(" — ".join(p for p in (code, message) if p))
+        detail = " | ".join(p for p in parts if p)
+        if detail:
+            for known, hint in _GAQL_ERROR_HINTS.items():
+                if known in detail:
+                    return f"{detail} (hint: {hint})"
+            return detail
+
     raw = str(exc)
     for code, hint in _GAQL_ERROR_HINTS.items():
         if code in raw:
@@ -137,6 +159,21 @@ def _to_python(obj: object) -> object:
     # AdTextAsset and similar message types
     if hasattr(obj, "text") and isinstance(getattr(obj, "text", None), str):
         return obj.text
+    # Nested proto-plus messages (targeting settings, criteria, ...) —
+    # serialize to a dict instead of collapsing to their str() repr.
+    try:
+        import proto
+
+        if isinstance(obj, proto.Message):
+            return type(obj).to_dict(
+                obj, preserving_proto_field_name=True, use_integers_for_enums=False
+            )
+    except ImportError:
+        pass
+    if hasattr(obj, "DESCRIPTOR"):
+        from google.protobuf.json_format import MessageToDict
+
+        return MessageToDict(obj, preserving_proto_field_name=True)
     return str(obj)
 
 

{adloop-0.8.1 → adloop-0.10.0}/src/adloop/ads/write.py

@@ -71,6 +71,79 @@ def _normalize_rsa_assets(items: list) -> list[dict]:
 # ---------------------------------------------------------------------------
 
 
+def _ssrf_error(url: str) -> str | None:
+    """Reject URLs that would make the validation fetch reach non-public hosts.
+
+    User-supplied URLs are fetched from the machine running AdLoop; on a
+    hosted multi-tenant server that request originates inside our network,
+    so private/loopback/link-local/metadata targets must be refused. Ads
+    pointing at such addresses could never serve anyway. Returns an error
+    string, or None if the URL looks safe to fetch.
+
+    Note: the fetch re-resolves DNS after this check, so a hostile DNS
+    server could still rebind between check and fetch — acceptable here
+    because the fetch result is only an up/down signal, never returned
+    to the caller.
+    """
+    import ipaddress
+    import socket
+    from urllib.parse import urlparse
+
+    try:
+        parsed = urlparse(url)
+    except ValueError as e:
+        return f"unparseable URL: {e}"
+
+    if parsed.scheme not in ("http", "https"):
+        return f"unsupported URL scheme '{parsed.scheme}' (only http/https)"
+
+    host = parsed.hostname
+    if not host:
+        return "URL has no hostname"
+
+    try:
+        addresses = [ipaddress.ip_address(host)]
+    except ValueError:
+        try:
+            addr_info = socket.getaddrinfo(host, None)
+        except OSError as e:
+            return f"hostname does not resolve: {e}"
+        addresses = [
+            ipaddress.ip_address(info[4][0]) for info in addr_info
+        ]
+
+    for addr in addresses:
+        if (
+            addr.is_private
+            or addr.is_loopback
+            or addr.is_link_local
+            or addr.is_multicast
+            or addr.is_reserved
+            or addr.is_unspecified
+        ):
+            return (
+                f"URL resolves to a non-public address ({addr}) — "
+                "refusing to fetch"
+            )
+
+    return None
+
+
+def _build_public_only_opener():
+    """Return a urllib opener that re-checks every redirect hop for SSRF."""
+    import urllib.error
+    import urllib.request
+
+    class _PublicOnlyRedirectHandler(urllib.request.HTTPRedirectHandler):
+        def redirect_request(self, req, fp, code, msg, headers, newurl):
+            err = _ssrf_error(newurl)
+            if err is not None:
+                raise urllib.error.URLError(f"redirect blocked: {err}")
+            return super().redirect_request(req, fp, code, msg, headers, newurl)
+
+    return urllib.request.build_opener(_PublicOnlyRedirectHandler)
+
+
 def _validate_urls(urls: list[str], timeout: int = 10) -> dict[str, str | None]:
     """Check that each URL returns a 2xx/3xx status.
 
@@ -79,14 +152,20 @@ def _validate_urls(urls: list[str], timeout: int = 10) -> dict[str, str | None]:
     import urllib.request
     import urllib.error
 
+    opener = _build_public_only_opener()
+
     results = {}
     for url in urls:
         if not url:
             continue
+        ssrf = _ssrf_error(url)
+        if ssrf is not None:
+            results[url] = ssrf
+            continue
         try:
             req = urllib.request.Request(url, method="HEAD")
             req.add_header("User-Agent", "AdLoop-URLCheck/1.0")
-            resp = urllib.request.urlopen(req, timeout=timeout)
+            resp = opener.open(req, timeout=timeout)
             if resp.status >= 400:
                 results[url] = f"HTTP {resp.status}"
             else:
@@ -97,7 +176,7 @@ def _validate_urls(urls: list[str], timeout: int = 10) -> dict[str, str | None]:
                 try:
                     req = urllib.request.Request(url, method="GET")
                     req.add_header("User-Agent", "AdLoop-URLCheck/1.0")
-                    resp = urllib.request.urlopen(req, timeout=timeout)
+                    resp = opener.open(req, timeout=timeout)
                     if resp.status >= 400:
                         results[url] = f"HTTP {resp.status}"
                     else:
@@ -1221,9 +1300,19 @@ def draft_image_assets(
     image_paths: list[str] | None = None,
 ) -> dict:
     """Draft campaign image assets from local files."""
+    from adloop.runtime import deployment_mode
     from adloop.safety.guards import SafetyViolation, check_blocked_operation
     from adloop.safety.preview import ChangePlan, store_plan
 
+    if deployment_mode() == "server":
+        return {
+            "error": (
+                "draft_image_assets reads image files from the local "
+                "filesystem and is not available on the hosted server. "
+                "Use the self-hosted AdLoop MCP server for image assets."
+            )
+        }
+
     try:
         check_blocked_operation("create_image_assets", config.safety)
     except SafetyViolation as e:
@@ -3146,11 +3235,14 @@ def _apply_attach_shared_set_to_campaigns(
         css.shared_set = shared_set_resource
         operations.append(op)
 
-    response = css_service.mutate_campaign_shared_sets(
-        customer_id=cid,
-        operations=operations,
-        partial_failure=True,
-    )
+    # CampaignSharedSetService.mutate_campaign_shared_sets does NOT accept a
+    # flattened ``partial_failure`` kwarg (unlike GoogleAdsService.mutate);
+    # it must be set on the request object.
+    request = client.get_type("MutateCampaignSharedSetsRequest")
+    request.customer_id = cid
+    request.operations.extend(operations)
+    request.partial_failure = True
+    response = css_service.mutate_campaign_shared_sets(request=request)
 
     pf_error = getattr(response, "partial_failure_error", None)
     per_op_errors = _parse_partial_failure_per_op(client, pf_error)
@@ -3213,11 +3305,13 @@ def _apply_detach_shared_set_from_campaigns(
         )
         operations.append(op)
 
-    response = css_service.mutate_campaign_shared_sets(
-        customer_id=cid,
-        operations=operations,
-        partial_failure=True,
-    )
+    # partial_failure must be set on the request object — the flattened
+    # kwarg is not supported by CampaignSharedSetService (see attach above).
+    request = client.get_type("MutateCampaignSharedSetsRequest")
+    request.customer_id = cid
+    request.operations.extend(operations)
+    request.partial_failure = True
+    response = css_service.mutate_campaign_shared_sets(request=request)
 
     pf_error = getattr(response, "partial_failure_error", None)
     per_op_errors = _parse_partial_failure_per_op(client, pf_error)