adloop 0.1.0__tar.gz → 0.2.0__tar.gz

adloop-0.1.0/README.md → adloop-0.2.0/PKG-INFO

@@ -1,9 +1,34 @@
+Metadata-Version: 2.3
+Name: adloop
+Version: 0.2.0
+Summary: MCP server connecting Google Ads + GA4 + codebase into one AI-driven feedback loop
+Keywords: mcp,google-ads,google-analytics,ga4,cursor,marketing
+Author: Daniel Klose
+Author-email: Daniel Klose <info@daniel-klose.com>
+License: MIT
+Requires-Dist: fastmcp>=3.0.0
+Requires-Dist: google-ads>=29.0.0
+Requires-Dist: google-analytics-data>=0.20.0
+Requires-Dist: google-analytics-admin>=0.27.0
+Requires-Dist: google-auth-oauthlib>=1.0.0
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: pytest>=8.0 ; extra == 'dev'
+Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'
+Requires-Python: >=3.11
+Project-URL: Homepage, https://github.com/kLOsk/adloop
+Project-URL: Repository, https://github.com/kLOsk/adloop
+Project-URL: Issues, https://github.com/kLOsk/adloop/issues
+Project-URL: Changelog, https://github.com/kLOsk/adloop/releases
+Provides-Extra: dev
+Description-Content-Type: text/markdown
+
 <div align="center">
 
 # AdLoop
 
-**MCP server that connects Google Ads + Google Analytics (GA4) into one AI-driven feedback loop inside your IDE.**
+**Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.**
 
+[![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)
 [![Python 3.11+](https://img.shields.io/badge/Python-3.11+-3776AB.svg?logo=python&logoColor=white)](https://www.python.org/downloads/)
 [![MCP Compatible](https://img.shields.io/badge/MCP-Compatible-8A2BE2.svg)](https://modelcontextprotocol.io)
@@ -11,25 +36,39 @@
 [![GA4 Data API](https://img.shields.io/badge/GA4-Data%20API-E37400.svg?logo=google-analytics&logoColor=white)](https://developers.google.com/analytics/devguides/reporting/data/v1)
 [![GitHub stars](https://img.shields.io/github/stars/kLOsk/adloop?style=social)](https://github.com/kLOsk/adloop)
 
-*26 tools · Read + Write · Safety-first · GDPR-aware*
+An MCP server that gives your AI assistant read + write access to Google Ads and GA4 — with safety guardrails that prevent accidental spend.
 
-> "You built your product with AI. Now manage your ads the same way."
+`pip install adloop`
 
 </div>
 
 ---
 
-## Why
+## What It Solves
+
+AdLoop exists because managing Google Ads alongside your code is a mess. These are the specific problems it handles:
+
+- **"My conversions dropped and I don't know why."** AdLoop cross-references Ads clicks, GA4 sessions, and conversion events in one query. It detects whether the gap is from GDPR consent rejection, broken tracking, or an actual landing page problem — before you waste hours checking each dashboard separately.
+
+- **"I'm wasting ad spend on irrelevant searches."** Pull your search terms report, identify the junk, and add negative keywords — all from a single conversation in your IDE. No context-switching to the Ads UI.
+
+- **"Is my tracking even working?"** Compare the event names in your actual codebase against what GA4 is receiving. Find the mismatches: events you fire that GA4 never sees, events GA4 records that you didn't know about.
 
-Solo founders and small teams ship products fast with AI-assisted coding — but managing Google Ads still means switching between the Ads UI, GA4 dashboards, and your code editor. Whether you're running a SaaS, an e-commerce store, a local service, or anything else you drive traffic to with Google Ads — the workflow is the same fragmented mess.
+- **"I need to create ads but the Google Ads UI is hostile."** Draft responsive search ads, create campaigns, add keywords — all through natural language. Every change shows a preview first. Nothing goes live without your explicit confirmation. New ads and campaigns start paused.
 
-AdLoop brings the entire **build → ship → market → measure → iterate** cycle into your IDE.
+- **"My landing page gets paid traffic but nobody converts."** AdLoop joins your ad final URLs with GA4 page-level data. See which pages get clicks but no conversions, which have high bounce rates, and which ones are orphaned from any ad campaign.
 
-One MCP server gives your AI assistant access to both Google Analytics and Google Ads (read + write), with a safety layer that prevents accidental spend. Combined with your codebase context, it can do things no dashboard can — like diagnosing why conversions dropped by cross-referencing ad traffic, analytics events, and your actual frontend code.
+- **"I don't know if my EU consent setup is causing data gaps."** In Europe, 30-70% of users reject analytics cookies. AdLoop accounts for this automatically — it won't diagnose a normal GDPR consent gap as broken tracking.
 
-## What's Included — 26 Tools
+## Built From Real Usage
+
+Every tool exists because of an actual problem hit while running real Google Ads campaigns. The cross-reference tools exist because we kept manually asking the AI to "get Ads data, then get GA4 data, then compare them" — so we automated the join. The Broad Match + Manual CPC safety rule exists because the AI once created that exact combination and wasted budget. The GDPR consent awareness exists because the AI kept diagnosing normal EU cookie rejection as broken tracking.
+
+The best features come from real workflows. If you're using AdLoop and find yourself wishing it could do something it can't, **open an issue describing your situation** — not just "add feature X" but "I was trying to do Y and couldn't because Z." The context matters more than the request.
 
-> **Quick start:** `git clone https://github.com/kLOsk/adloop.git && cd adloop && uv sync && uv run adloop init`
+## All 33 Tools
+
+> **Quick start:** `pip install adloop` or `git clone https://github.com/kLOsk/adloop.git && cd adloop && uv sync && uv run adloop init`
 
 ### Diagnostics
 
@@ -87,8 +126,14 @@ All write operations follow a **draft → preview → confirm** workflow. Nothin
 
 | Tool | What It Does |
 |------|-------------|
-| `draft_campaign` | Create a full campaign structure — budget + campaign (PAUSED) + ad group + optional keywords. Validates bidding strategy, enforces budget caps, rejects unsafe BROAD match + Manual CPC combinations. |
+| `draft_campaign` | Create a full campaign structure — budget + campaign (PAUSED) + ad group + optional keywords. Supports Search partners, display expansion, and `max_cpc` for either MANUAL_CPC initial ad-group bids or TARGET_SPEND (Maximize Clicks) CPC caps. |
+| `update_campaign` | Modify existing campaign settings — bidding, budget, geo/language targeting, Search partners, display expansion, and TARGET_SPEND (Maximize Clicks) `max_cpc` caps. |
+| `draft_ad_group` | Create a paused SEARCH_STANDARD ad group inside an existing campaign, with optional MANUAL_CPC `max_cpc`. |
+| `update_ad_group` | Update an ad group name and/or MANUAL_CPC `max_cpc`. Use `pause_entity` / `enable_entity` for ad-group status changes. |
 | `draft_responsive_search_ad` | Create RSA preview (3-15 headlines ≤30 chars, 2-4 descriptions ≤90 chars). Warns if headline/description count is below best practice. |
+| `draft_callouts` | Create campaign callout assets from 1-25 character text snippets. |
+| `draft_structured_snippets` | Create campaign structured snippet assets using official header values and 3-10 snippet values. |
+| `draft_image_assets` | Create campaign image assets from local PNG, JPEG, or GIF files. |
 | `draft_keywords` | Propose keyword additions with match types. Proactively checks bidding strategy — blocks BROAD match on Manual CPC campaigns. |
 | `add_negative_keywords` | Propose negative keywords to reduce wasted spend |
 | `pause_entity` | Pause a campaign, ad group, ad, or keyword |
@@ -143,6 +188,15 @@ AdLoop manages real ad spend, so safety is not optional.
 
 ### Quick Start (Recommended)
 
+**Option A — Install from PyPI:**
+
+```bash
+pip install adloop
+adloop init
+```
+
+**Option B — Install from source:**
+
 ```bash
 git clone https://github.com/kLOsk/adloop.git
 cd adloop
@@ -320,14 +374,6 @@ src/adloop/
     └── audit.py       # Mutation audit logging
 ```
 
-## Built From Real Usage
-
-AdLoop isn't a theoretical tool — it's built from running real Google Ads campaigns and hitting real problems. Every tool exists because of an actual situation: needing to diagnose a conversion drop without leaving the IDE, wanting to bulk-add negative keywords after seeing wasted spend in the search terms report, drafting ad variants that match a landing page the AI just helped rewrite.
-
-The cross-reference tools exist because we kept manually asking the AI to "get Ads data, then get GA4 data, then compare them" — so we automated the join. The Broad Match + Manual CPC safety rule exists because the AI once created that exact combination and wasted budget. The GDPR consent awareness exists because the AI kept diagnosing normal EU cookie rejection as broken tracking.
-
-The best features come from real workflows. If you're using AdLoop and find yourself wishing it could do something it can't, **that's exactly the kind of feedback that shapes what gets built next.** Open an issue describing your situation — not just "add feature X" but "I was trying to do Y and couldn't because Z." The context matters more than the request.
-
 ## Roadmap
 
 What's been shipped and what's next:
@@ -339,7 +385,7 @@ What's been shipped and what's next:
 - ~~Budget estimation via Keyword Planner~~ ✓
 - ~~Setup wizard (`adloop init`)~~ ✓
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
-- **PyPI package** — `pip install adloop`
+- ~~PyPI package~~ ✓ — `pip install adloop`
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
 - **Video walkthrough**
 

adloop-0.1.0/PKG-INFO → adloop-0.2.0/README.md

@@ -1,29 +1,10 @@
-Metadata-Version: 2.3
-Name: adloop
-Version: 0.1.0
-Summary: MCP server connecting Google Ads + GA4 + codebase into one AI-driven feedback loop
-Keywords: mcp,google-ads,google-analytics,ga4,cursor,marketing
-Author: Daniel Klose
-Author-email: Daniel Klose <info@daniel-klose.com>
-License: MIT
-Requires-Dist: fastmcp>=3.0.0
-Requires-Dist: google-ads>=29.0.0
-Requires-Dist: google-analytics-data>=0.20.0
-Requires-Dist: google-analytics-admin>=0.27.0
-Requires-Dist: google-auth-oauthlib>=1.0.0
-Requires-Dist: pyyaml>=6.0
-Requires-Dist: pytest>=8.0 ; extra == 'dev'
-Requires-Dist: pytest-asyncio>=0.23 ; extra == 'dev'
-Requires-Python: >=3.11
-Provides-Extra: dev
-Description-Content-Type: text/markdown
-
 <div align="center">
 
 # AdLoop
 
-**MCP server that connects Google Ads + Google Analytics (GA4) into one AI-driven feedback loop inside your IDE.**
+**Stop switching between Google Ads, GA4, and your code editor to figure out why conversions dropped.**
 
+[![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)
 [![Python 3.11+](https://img.shields.io/badge/Python-3.11+-3776AB.svg?logo=python&logoColor=white)](https://www.python.org/downloads/)
 [![MCP Compatible](https://img.shields.io/badge/MCP-Compatible-8A2BE2.svg)](https://modelcontextprotocol.io)
@@ -31,25 +12,39 @@ Description-Content-Type: text/markdown
 [![GA4 Data API](https://img.shields.io/badge/GA4-Data%20API-E37400.svg?logo=google-analytics&logoColor=white)](https://developers.google.com/analytics/devguides/reporting/data/v1)
 [![GitHub stars](https://img.shields.io/github/stars/kLOsk/adloop?style=social)](https://github.com/kLOsk/adloop)
 
-*26 tools · Read + Write · Safety-first · GDPR-aware*
+An MCP server that gives your AI assistant read + write access to Google Ads and GA4 — with safety guardrails that prevent accidental spend.
 
-> "You built your product with AI. Now manage your ads the same way."
+`pip install adloop`
 
 </div>
 
 ---
 
-## Why
+## What It Solves
+
+AdLoop exists because managing Google Ads alongside your code is a mess. These are the specific problems it handles:
+
+- **"My conversions dropped and I don't know why."** AdLoop cross-references Ads clicks, GA4 sessions, and conversion events in one query. It detects whether the gap is from GDPR consent rejection, broken tracking, or an actual landing page problem — before you waste hours checking each dashboard separately.
+
+- **"I'm wasting ad spend on irrelevant searches."** Pull your search terms report, identify the junk, and add negative keywords — all from a single conversation in your IDE. No context-switching to the Ads UI.
+
+- **"Is my tracking even working?"** Compare the event names in your actual codebase against what GA4 is receiving. Find the mismatches: events you fire that GA4 never sees, events GA4 records that you didn't know about.
 
-Solo founders and small teams ship products fast with AI-assisted coding — but managing Google Ads still means switching between the Ads UI, GA4 dashboards, and your code editor. Whether you're running a SaaS, an e-commerce store, a local service, or anything else you drive traffic to with Google Ads — the workflow is the same fragmented mess.
+- **"I need to create ads but the Google Ads UI is hostile."** Draft responsive search ads, create campaigns, add keywords — all through natural language. Every change shows a preview first. Nothing goes live without your explicit confirmation. New ads and campaigns start paused.
 
-AdLoop brings the entire **build → ship → market → measure → iterate** cycle into your IDE.
+- **"My landing page gets paid traffic but nobody converts."** AdLoop joins your ad final URLs with GA4 page-level data. See which pages get clicks but no conversions, which have high bounce rates, and which ones are orphaned from any ad campaign.
 
-One MCP server gives your AI assistant access to both Google Analytics and Google Ads (read + write), with a safety layer that prevents accidental spend. Combined with your codebase context, it can do things no dashboard can — like diagnosing why conversions dropped by cross-referencing ad traffic, analytics events, and your actual frontend code.
+- **"I don't know if my EU consent setup is causing data gaps."** In Europe, 30-70% of users reject analytics cookies. AdLoop accounts for this automatically — it won't diagnose a normal GDPR consent gap as broken tracking.
 
-## What's Included — 26 Tools
+## Built From Real Usage
+
+Every tool exists because of an actual problem hit while running real Google Ads campaigns. The cross-reference tools exist because we kept manually asking the AI to "get Ads data, then get GA4 data, then compare them" — so we automated the join. The Broad Match + Manual CPC safety rule exists because the AI once created that exact combination and wasted budget. The GDPR consent awareness exists because the AI kept diagnosing normal EU cookie rejection as broken tracking.
+
+The best features come from real workflows. If you're using AdLoop and find yourself wishing it could do something it can't, **open an issue describing your situation** — not just "add feature X" but "I was trying to do Y and couldn't because Z." The context matters more than the request.
 
-> **Quick start:** `git clone https://github.com/kLOsk/adloop.git && cd adloop && uv sync && uv run adloop init`
+## All 33 Tools
+
+> **Quick start:** `pip install adloop` or `git clone https://github.com/kLOsk/adloop.git && cd adloop && uv sync && uv run adloop init`
 
 ### Diagnostics
 
@@ -107,8 +102,14 @@ All write operations follow a **draft → preview → confirm** workflow. Nothin
 
 | Tool | What It Does |
 |------|-------------|
-| `draft_campaign` | Create a full campaign structure — budget + campaign (PAUSED) + ad group + optional keywords. Validates bidding strategy, enforces budget caps, rejects unsafe BROAD match + Manual CPC combinations. |
+| `draft_campaign` | Create a full campaign structure — budget + campaign (PAUSED) + ad group + optional keywords. Supports Search partners, display expansion, and `max_cpc` for either MANUAL_CPC initial ad-group bids or TARGET_SPEND (Maximize Clicks) CPC caps. |
+| `update_campaign` | Modify existing campaign settings — bidding, budget, geo/language targeting, Search partners, display expansion, and TARGET_SPEND (Maximize Clicks) `max_cpc` caps. |
+| `draft_ad_group` | Create a paused SEARCH_STANDARD ad group inside an existing campaign, with optional MANUAL_CPC `max_cpc`. |
+| `update_ad_group` | Update an ad group name and/or MANUAL_CPC `max_cpc`. Use `pause_entity` / `enable_entity` for ad-group status changes. |
 | `draft_responsive_search_ad` | Create RSA preview (3-15 headlines ≤30 chars, 2-4 descriptions ≤90 chars). Warns if headline/description count is below best practice. |
+| `draft_callouts` | Create campaign callout assets from 1-25 character text snippets. |
+| `draft_structured_snippets` | Create campaign structured snippet assets using official header values and 3-10 snippet values. |
+| `draft_image_assets` | Create campaign image assets from local PNG, JPEG, or GIF files. |
 | `draft_keywords` | Propose keyword additions with match types. Proactively checks bidding strategy — blocks BROAD match on Manual CPC campaigns. |
 | `add_negative_keywords` | Propose negative keywords to reduce wasted spend |
 | `pause_entity` | Pause a campaign, ad group, ad, or keyword |
@@ -163,6 +164,15 @@ AdLoop manages real ad spend, so safety is not optional.
 
 ### Quick Start (Recommended)
 
+**Option A — Install from PyPI:**
+
+```bash
+pip install adloop
+adloop init
+```
+
+**Option B — Install from source:**
+
 ```bash
 git clone https://github.com/kLOsk/adloop.git
 cd adloop
@@ -340,14 +350,6 @@ src/adloop/
     └── audit.py       # Mutation audit logging
 ```
 
-## Built From Real Usage
-
-AdLoop isn't a theoretical tool — it's built from running real Google Ads campaigns and hitting real problems. Every tool exists because of an actual situation: needing to diagnose a conversion drop without leaving the IDE, wanting to bulk-add negative keywords after seeing wasted spend in the search terms report, drafting ad variants that match a landing page the AI just helped rewrite.
-
-The cross-reference tools exist because we kept manually asking the AI to "get Ads data, then get GA4 data, then compare them" — so we automated the join. The Broad Match + Manual CPC safety rule exists because the AI once created that exact combination and wasted budget. The GDPR consent awareness exists because the AI kept diagnosing normal EU cookie rejection as broken tracking.
-
-The best features come from real workflows. If you're using AdLoop and find yourself wishing it could do something it can't, **that's exactly the kind of feedback that shapes what gets built next.** Open an issue describing your situation — not just "add feature X" but "I was trying to do Y and couldn't because Z." The context matters more than the request.
-
 ## Roadmap
 
 What's been shipped and what's next:
@@ -359,7 +361,7 @@ What's been shipped and what's next:
 - ~~Budget estimation via Keyword Planner~~ ✓
 - ~~Setup wizard (`adloop init`)~~ ✓
 - ~~Claude Code support~~ ✓ — `CLAUDE.md`, `.mcp.json`, `.claude/rules/`, `.claude/commands/`, CLI wizard snippets
-- **PyPI package** — `pip install adloop`
+- ~~PyPI package~~ ✓ — `pip install adloop`
 - **Community launch** — HN, Indie Hackers, r/cursor, Twitter
 - **Video walkthrough**
 

{adloop-0.1.0 → adloop-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.1.0"
+version = "0.2.0"
 description = "MCP server connecting Google Ads + GA4 + codebase into one AI-driven feedback loop"
 readme = "README.md"
 authors = [
@@ -18,6 +18,12 @@ dependencies = [
     "pyyaml>=6.0",
 ]
 
+[project.urls]
+Homepage = "https://github.com/kLOsk/adloop"
+Repository = "https://github.com/kLOsk/adloop"
+Issues = "https://github.com/kLOsk/adloop/issues"
+Changelog = "https://github.com/kLOsk/adloop/releases"
+
 [project.scripts]
 adloop = "adloop:main"
 

{adloop-0.1.0 → adloop-0.2.0}/src/adloop/__init__.py

@@ -2,7 +2,7 @@
 
 import sys
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
 
 def main() -> None:

adloop-0.2.0/src/adloop/ads/currency.py

@@ -0,0 +1,79 @@
+"""Currency detection and formatting — auto-detect from Google Ads account."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from adloop.config import AdLoopConfig
+
+_CURRENCY_SYMBOLS: dict[str, str] = {
+    "EUR": "\u20ac",
+    "USD": "$",
+    "GBP": "\u00a3",
+    "PLN": "z\u0142",
+    "CHF": "CHF",
+    "CZK": "K\u010d",
+    "SEK": "kr",
+    "NOK": "kr",
+    "DKK": "kr",
+    "HUF": "Ft",
+    "RON": "lei",
+    "BGN": "лв",
+    "HRK": "kn",
+    "TRY": "\u20ba",
+    "JPY": "\u00a5",
+    "CNY": "\u00a5",
+    "KRW": "\u20a9",
+    "INR": "\u20b9",
+    "BRL": "R$",
+    "AUD": "A$",
+    "CAD": "C$",
+    "NZD": "NZ$",
+    "MXN": "MX$",
+    "ARS": "ARS",
+    "ZAR": "R",
+    "RUB": "\u20bd",
+    "UAH": "\u20b4",
+}
+
+# Module-level cache: customer_id -> currency_code (one API call per session)
+_cache: dict[str, str] = {}
+
+
+def get_currency_code(config: AdLoopConfig, customer_id: str) -> str:
+    """Detect the account's currency via ``customer.currency_code``.
+
+    Result is cached per *customer_id* for the lifetime of the server process.
+    Falls back to ``"EUR"`` on any error.
+    """
+    from adloop.ads.client import normalize_customer_id
+
+    cid = normalize_customer_id(customer_id)
+    if cid in _cache:
+        return _cache[cid]
+
+    try:
+        from adloop.ads.gaql import execute_query
+
+        rows = execute_query(
+            config, customer_id, "SELECT customer.currency_code FROM customer LIMIT 1"
+        )
+        code = (rows[0].get("customer.currency_code", "EUR") if rows else "EUR") or "EUR"
+    except Exception:
+        code = "EUR"
+
+    _cache[cid] = code
+    return code
+
+
+def format_currency(amount: float, currency_code: str) -> str:
+    """Format *amount* with the correct currency symbol/code.
+
+    Examples::
+
+        format_currency(42.50, "PLN")  -> "42.50 PLN"
+        format_currency(42.50, "EUR")  -> "42.50 EUR"
+        format_currency(42.50, "USD")  -> "42.50 USD"
+    """
+    return f"{amount:.2f} {currency_code}"

{adloop-0.1.0 → adloop-0.2.0}/src/adloop/ads/gaql.py

@@ -63,6 +63,16 @@ def run_gaql(
 # ---------------------------------------------------------------------------
 
 _GAQL_ERROR_HINTS = {
+    "DEVELOPER_TOKEN_NOT_APPROVED": (
+        "Your Google Ads developer token is only approved for test accounts. "
+        "Apply for Basic or Standard access in the Google Ads API Center, "
+        "or use a test account."
+    ),
+    "DEVELOPER_TOKEN_INVALID": (
+        "Your Google Ads developer token is invalid. Update "
+        "`ads.developer_token` in `~/.adloop/config.yaml` using the token "
+        "from your manager account API Center."
+    ),
     "EXPECTED_REFERENCED_FIELD_IN_SELECT_CLAUSE": (
         "Fields used in ORDER BY or HAVING must also appear in the SELECT clause. "
         "Add the missing field to your SELECT."

{adloop-0.1.0 → adloop-0.2.0}/src/adloop/ads/read.py

@@ -4,6 +4,8 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
+from adloop.ads.currency import get_currency_code
+
 if TYPE_CHECKING:
     from adloop.config import AdLoopConfig
 
@@ -57,7 +59,8 @@ def get_campaign_performance(
     """
 
     rows = execute_query(config, customer_id, query)
-    _enrich_cost_fields(rows)
+    currency_code = get_currency_code(config, customer_id)
+    _enrich_cost_fields(rows, currency_code)
 
     return {"campaigns": rows, "total_campaigns": len(rows)}
 
@@ -75,7 +78,7 @@ def get_ad_performance(
     date_clause = _date_clause(date_range_start, date_range_end)
 
     query = f"""
-        SELECT campaign.name, ad_group.name,
+        SELECT campaign.name, campaign.id, ad_group.name, ad_group.id,
                ad_group_ad.ad.id, ad_group_ad.ad.type,
                ad_group_ad.ad.responsive_search_ad.headlines,
                ad_group_ad.ad.responsive_search_ad.descriptions,
@@ -90,7 +93,8 @@ def get_ad_performance(
     """
 
     rows = execute_query(config, customer_id, query)
-    _enrich_cost_fields(rows)
+    currency_code = get_currency_code(config, customer_id)
+    _enrich_cost_fields(rows, currency_code)
 
     return {"ads": rows, "total_ads": len(rows)}
 
@@ -122,7 +126,8 @@ def get_keyword_performance(
     """
 
     rows = execute_query(config, customer_id, query)
-    _enrich_cost_fields(rows)
+    currency_code = get_currency_code(config, customer_id)
+    _enrich_cost_fields(rows, currency_code)
 
     return {"keywords": rows, "total_keywords": len(rows)}
 
@@ -176,7 +181,8 @@ def get_search_terms(
         """
 
     rows = execute_query(config, customer_id, query)
-    _enrich_cost_fields(rows)
+    currency_code = get_currency_code(config, customer_id)
+    _enrich_cost_fields(rows, currency_code)
 
     return {"search_terms": rows, "total_search_terms": len(rows)}
 
@@ -223,7 +229,7 @@ def _date_clause(start: str, end: str) -> str:
     return "AND segments.date DURING LAST_30_DAYS"
 
 
-def _enrich_cost_fields(rows: list[dict]) -> None:
+def _enrich_cost_fields(rows: list[dict], currency_code: str = "EUR") -> None:
     """Add human-readable cost and CPA fields computed from cost_micros."""
     for row in rows:
         cost_micros = row.get("metrics.cost_micros", 0) or 0
@@ -235,4 +241,6 @@ def _enrich_cost_fields(rows: list[dict]) -> None:
 
         avg_cpc_micros = row.get("metrics.average_cpc", 0) or 0
         if avg_cpc_micros:
-            row["metrics.average_cpc_eur"] = round(avg_cpc_micros / 1_000_000, 2)
+            row["metrics.average_cpc_amount"] = round(avg_cpc_micros / 1_000_000, 2)
+
+        row["metrics.currency"] = currency_code