adloop 0.27.0__tar.gz → 0.27.2__tar.gz

{adloop-0.27.0 → adloop-0.27.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: adloop
-Version: 0.27.0
+Version: 0.27.2
 Summary: The AI command center for Google Ads, Reddit Ads, GA4, and tracking code.
 Keywords: mcp,google-ads,reddit-ads,google-analytics,ga4,cursor,marketing
 Author: Daniel Klose
@@ -404,7 +404,7 @@ uv run adloop init
 
 ### What `adloop init` does
 
-The wizard walks you through:
+The wizard first asks whether to set up Google. Answer no to run AdLoop on Reddit Ads alone: it skips steps 1 to 6 and goes straight to the Reddit step. Otherwise it walks you through:
 
 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. **Google Ads API access** — applied for on your Cloud project's [Google Ads API Overview page](https://console.cloud.google.com/google/ads-apis/overview); the legacy developer-token prompt can be left empty
@@ -412,9 +412,10 @@ The wizard walks you through:
 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. **Optional services** — pin a GTM container, a Search Console property (both auto-discovered too), and a PageSpeed API key; skip any of them with Enter
-7. **Safety defaults** — budget cap and dry-run preference
-8. **Toolsets** — optionally expose only part of the tool catalog to your AI client (see [Toolsets](#toolsets--trim-the-context-footprint))
-9. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code, including your toolset selection
+7. **Reddit Ads** — optional next to Google, required without it: your own Reddit developer app, sign-in, and the default ad account
+8. **Safety defaults** — budget cap and dry-run preference
+9. **Toolsets** — optionally expose only part of the tool catalog to your AI client (see [Toolsets](#toolsets--trim-the-context-footprint))
+10. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code, including your toolset selection
 
 ### Requirements
 

{adloop-0.27.0 → adloop-0.27.2}/README.md

@@ -376,7 +376,7 @@ uv run adloop init
 
 ### What `adloop init` does
 
-The wizard walks you through:
+The wizard first asks whether to set up Google. Answer no to run AdLoop on Reddit Ads alone: it skips steps 1 to 6 and goes straight to the Reddit step. Otherwise it walks you through:
 
 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. **Google Ads API access** — applied for on your Cloud project's [Google Ads API Overview page](https://console.cloud.google.com/google/ads-apis/overview); the legacy developer-token prompt can be left empty
@@ -384,9 +384,10 @@ The wizard walks you through:
 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. **Optional services** — pin a GTM container, a Search Console property (both auto-discovered too), and a PageSpeed API key; skip any of them with Enter
-7. **Safety defaults** — budget cap and dry-run preference
-8. **Toolsets** — optionally expose only part of the tool catalog to your AI client (see [Toolsets](#toolsets--trim-the-context-footprint))
-9. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code, including your toolset selection
+7. **Reddit Ads** — optional next to Google, required without it: your own Reddit developer app, sign-in, and the default ad account
+8. **Safety defaults** — budget cap and dry-run preference
+9. **Toolsets** — optionally expose only part of the tool catalog to your AI client (see [Toolsets](#toolsets--trim-the-context-footprint))
+10. **Editor config snippets** — prints MCP configuration for both Cursor and Claude Code, including your toolset selection
 
 ### Requirements
 

{adloop-0.27.0 → adloop-0.27.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.27.0"
+version = "0.27.2"
 description = "The AI command center for Google Ads, Reddit Ads, GA4, and tracking code."
 readme = "README.md"
 requires-python = ">=3.11"

{adloop-0.27.0 → adloop-0.27.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "adloop"
-version = "0.27.0"
+version = "0.27.2"
 description = "The AI command center for Google Ads, Reddit Ads, GA4, and tracking code."
 readme = "README.md"
 authors = [

{adloop-0.27.0 → adloop-0.27.2}/src/adloop/ads/write.py

@@ -7,6 +7,7 @@ Every write tool returns a preview/plan. Nothing executes until
 from __future__ import annotations
 
 import hashlib
+import re
 import struct
 from pathlib import Path, PurePath, PurePosixPath
 from typing import TYPE_CHECKING
@@ -40,6 +41,31 @@ _VALID_IMAGE_MIME_TYPES = {
 _VALID_HEADLINE_PINS = {"HEADLINE_1", "HEADLINE_2", "HEADLINE_3"}
 _VALID_DESCRIPTION_PINS = {"DESCRIPTION_1", "DESCRIPTION_2"}
 
+# Insertion tags Google expands at serve time. Only the default text after
+# the colon counts toward the 30/90 character caps, e.g.
+# "{KeyWord:Clogged Drain Service}" is 21 characters, not 31. Written with
+# spaces ("{ KeyWord : x }") it is not a tag and counts as plain text.
+_INSERTION_TAG_RE = re.compile(r"\{(keyword|location\([a-z]+\)):([^{}]*)\}", re.IGNORECASE)
+_BARE_INSERTION_TAG_RE = re.compile(r"\{(keyword|location\([a-z]+\))\}", re.IGNORECASE)
+
+
+def _counted_length(text: str) -> int:
+    """Length Google checks against the cap: insertion tags count as their default text."""
+    return len(_INSERTION_TAG_RE.sub(lambda m: m.group(2), text))
+
+
+def _insertion_tag_errors(label: str, text: str) -> list[str]:
+    """RSA keyword/location insertion needs default text, e.g. {KeyWord:Drain Cleaning}."""
+    missing = _BARE_INSERTION_TAG_RE.search(text) or any(
+        not m.group(2).strip() for m in _INSERTION_TAG_RE.finditer(text)
+    )
+    if missing:
+        return [
+            f"{label} uses an insertion tag without default text: '{text}'. "
+            "Default text after a colon is required, e.g. {KeyWord:Drain Cleaning}"
+        ]
+    return []
+
 
 def _normalize_rsa_assets(items: list) -> list[dict]:
     """Accept str or {text, pinned_field?} dict entries; return list of dicts.
@@ -3435,9 +3461,10 @@ def _validate_rsa_assets(
     for i, h in enumerate(headlines):
         text = h["text"]
         pin = h["pinned_field"]
-        if len(text) > 30:
+        errors.extend(_insertion_tag_errors(f"Headline {i + 1}", text))
+        if _counted_length(text) > 30:
             errors.append(
-                f"Headline {i + 1} exceeds 30 chars ({len(text)}): '{text}'"
+                f"Headline {i + 1} exceeds 30 chars ({_counted_length(text)}): '{text}'"
             )
         if pin is not None:
             if pin not in _VALID_HEADLINE_PINS:
@@ -3455,9 +3482,10 @@ def _validate_rsa_assets(
     for i, d in enumerate(descriptions):
         text = d["text"]
         pin = d["pinned_field"]
-        if len(text) > 90:
+        errors.extend(_insertion_tag_errors(f"Description {i + 1}", text))
+        if _counted_length(text) > 90:
             errors.append(
-                f"Description {i + 1} exceeds 90 chars ({len(text)}): '{text}'"
+                f"Description {i + 1} exceeds 90 chars ({_counted_length(text)}): '{text}'"
             )
         if pin is not None:
             if pin not in _VALID_DESCRIPTION_PINS:

{adloop-0.27.0 → adloop-0.27.2}/src/adloop/cli.py

@@ -414,7 +414,7 @@ def _wizard_gsc_step(oauth_ok: bool, _existing) -> str:
     )
 
 
-def _wizard_reddit_step(_existing) -> dict[str, str]:
+def _wizard_reddit_step(_existing, required: bool = False) -> dict[str, str]:
     """Optionally connect Reddit Ads: own developer app, own OAuth, own token file.
 
     Returns the ``reddit:`` values for the config. Reddit's redirect URI
@@ -430,7 +430,8 @@ def _wizard_reddit_step(_existing) -> dict[str, str]:
         "ad_account_id": _existing("reddit", "ad_account_id"),
         "username": _existing("reddit", "username"),
     }
-    if not _prompt_bool("Connect Reddit Ads? (optional)", default=bool(existing_id)):
+    # Without Google, Reddit is the platform being set up: no opt-out.
+    if not required and not _prompt_bool("Connect Reddit Ads? (optional)", default=bool(existing_id)):
         return values
 
     _print()
@@ -589,6 +590,70 @@ def run_init_wizard() -> None:
             return str(existing_config[section].get(key, fallback))
         return fallback
 
+    # Both platforms are optional; a workspace can run on Reddit alone.
+    _print("  AdLoop connects Google (Ads, Analytics, Tag Manager, Search Console)")
+    _print("  and Reddit Ads. Set up one or both.")
+    _print()
+    use_google = _prompt_bool(
+        "Set up Google?", default=_existing("google", "credentials_path") != "" or existing_config is None
+    )
+    credentials_path = project_id = developer_token = login_customer_id = ""
+    step_num = 0
+    if use_google:
+        step_num = _wizard_google_steps(_existing)
+        credentials_path, project_id, developer_token, login_customer_id = _WIZARD_GOOGLE
+
+    # OAuth + auto-discovery
+    step_num += 1
+    _step_header(step_num, "Authorization & Account Discovery" if use_google else "Writing a first config")
+
+    # Write a temporary config for OAuth + discovery.  If the wizard is
+    # interrupted after this point, _cleanup_on_cancel restores the original.
+    _ADLOOP_DIR.mkdir(parents=True, exist_ok=True)
+    temp_config_yaml = _generate_config_yaml(
+        project_id=project_id,
+        credentials_path=credentials_path,
+        property_id="",
+        developer_token=developer_token,
+        customer_id="",
+        login_customer_id=login_customer_id,
+        max_daily_budget=50.0,
+        require_dry_run=True,
+    )
+    _CONFIG_PATH.write_text(temp_config_yaml)
+
+    # Everything below uses the temp config for OAuth and discovery.
+    # If the wizard is interrupted, restore the original config (or remove
+    # the temp) so we never leave a half-baked config on disk.
+    try:
+        _run_wizard_post_config(
+            credentials_path=credentials_path,
+            project_id=project_id,
+            developer_token=developer_token,
+            login_customer_id=login_customer_id,
+            step_num=step_num,
+            _existing=_existing,
+            use_google=use_google,
+        )
+    except KeyboardInterrupt:
+        if _original_config_backup is not None:
+            _CONFIG_PATH.write_text(_original_config_backup)
+        elif _CONFIG_PATH.exists():
+            _CONFIG_PATH.unlink()
+        raise
+
+
+_WIZARD_GOOGLE: tuple[str, str, str, str] = ("", "", "", "")
+
+
+def _wizard_google_steps(_existing) -> int:
+    """The Google project, credentials and API access steps; returns the last step number.
+
+    The collected values land in ``_WIZARD_GOOGLE`` (credentials path,
+    project id, developer token, login customer id).
+    """
+    global _WIZARD_GOOGLE
+
     # Step 1: Google Cloud project
     #
     # AdLoop no longer ships OAuth credentials. Every install brings its
@@ -641,44 +706,8 @@ def run_init_wizard() -> None:
         default=_existing("ads", "login_customer_id"),
         required=False,
     )
-
-    # OAuth + auto-discovery
-    step_num += 1
-    _step_header(step_num, "Authorization & Account Discovery")
-
-    # Write a temporary config for OAuth + discovery.  If the wizard is
-    # interrupted after this point, _cleanup_on_cancel restores the original.
-    _ADLOOP_DIR.mkdir(parents=True, exist_ok=True)
-    temp_config_yaml = _generate_config_yaml(
-        project_id=project_id,
-        credentials_path=credentials_path,
-        property_id="",
-        developer_token=developer_token,
-        customer_id="",
-        login_customer_id=login_customer_id,
-        max_daily_budget=50.0,
-        require_dry_run=True,
-    )
-    _CONFIG_PATH.write_text(temp_config_yaml)
-
-    # Everything below uses the temp config for OAuth and discovery.
-    # If the wizard is interrupted, restore the original config (or remove
-    # the temp) so we never leave a half-baked config on disk.
-    try:
-        _run_wizard_post_config(
-            credentials_path=credentials_path,
-            project_id=project_id,
-            developer_token=developer_token,
-            login_customer_id=login_customer_id,
-            step_num=step_num,
-            _existing=_existing,
-        )
-    except KeyboardInterrupt:
-        if _original_config_backup is not None:
-            _CONFIG_PATH.write_text(_original_config_backup)
-        elif _CONFIG_PATH.exists():
-            _CONFIG_PATH.unlink()
-        raise
+    _WIZARD_GOOGLE = (credentials_path, project_id, developer_token, login_customer_id)
+    return step_num
 
 
 def _run_wizard_post_config(
@@ -689,10 +718,9 @@ def _run_wizard_post_config(
     login_customer_id: str,
     step_num: int,
     _existing: object,
+    use_google: bool = True,
 ) -> None:
     """Run the wizard steps after the temp config has been written."""
-    from adloop.config import load_config
-
     # Optional: copy custom credentials to ~/.adloop/
     if credentials_path:
         creds_expanded = Path(credentials_path).expanduser()
@@ -706,6 +734,54 @@ def _run_wizard_post_config(
                 shutil.copy2(creds_expanded, adloop_creds)
                 _print(f"  ✓ Credentials copied to {adloop_creds}")
 
+    oauth_ok = False
+    property_id = ""
+    customer_id = ""
+    gtm_account_id = gtm_container_id = gsc_site_url = ""
+    if use_google:
+        oauth_ok, property_id, customer_id, step_num = _wizard_google_discovery(step_num, _existing)
+
+    # Optional service pins: GTM / Search Console / PageSpeed. All three
+    # work without config (explicit args or discovery per call) — a pin
+    # just saves the model a lookup and locks tools to the right property.
+    step_num += 1
+    if use_google:
+        _step_header(step_num, "Optional Services (GTM, Search Console, PageSpeed)")
+        gtm_account_id, gtm_container_id = _wizard_gtm_step(oauth_ok, _existing)
+        gsc_site_url = _wizard_gsc_step(oauth_ok, _existing)
+    else:
+        _step_header(step_num, "PageSpeed (optional)")
+    pagespeed_api_key = _prompt(
+        "PageSpeed Insights API key (optional, Enter to skip)",
+        default=_existing("pagespeed", "api_key"),  # type: ignore[operator]
+        required=False,
+    )
+
+    # Reddit Ads: a second ad platform with its own OAuth app and token file.
+    step_num += 1
+    _step_header(step_num, "Reddit Ads" if not use_google else "Reddit Ads (optional)")
+    reddit_values = _wizard_reddit_step(_existing, required=not use_google)
+    _wizard_finish(
+        step_num=step_num,
+        _existing=_existing,
+        credentials_path=credentials_path,
+        project_id=project_id,
+        developer_token=developer_token,
+        login_customer_id=login_customer_id,
+        property_id=property_id,
+        customer_id=customer_id,
+        gtm_account_id=gtm_account_id,
+        gtm_container_id=gtm_container_id,
+        gsc_site_url=gsc_site_url,
+        pagespeed_api_key=pagespeed_api_key,
+        reddit_values=reddit_values,
+    )
+
+
+def _wizard_google_discovery(step_num: int, _existing) -> tuple[bool, str, str, int]:
+    """Google sign-in plus GA4 and Ads account discovery: (oauth_ok, property_id, customer_id, step)."""
+    from adloop.config import load_config
+
     _print("  Signing in with Google (this may open a browser)...")
     _print()
     oauth_ok = False
@@ -797,24 +873,26 @@ def _run_wizard_post_config(
             default=_existing("ads", "customer_id"),  # type: ignore[operator]
         )
 
-    # Optional service pins: GTM / Search Console / PageSpeed. All three
-    # work without config (explicit args or discovery per call) — a pin
-    # just saves the model a lookup and locks tools to the right property.
-    step_num += 1
-    _step_header(step_num, "Optional Services (GTM, Search Console, PageSpeed)")
-    gtm_account_id, gtm_container_id = _wizard_gtm_step(oauth_ok, _existing)
-    gsc_site_url = _wizard_gsc_step(oauth_ok, _existing)
-    pagespeed_api_key = _prompt(
-        "PageSpeed Insights API key (optional, Enter to skip)",
-        default=_existing("pagespeed", "api_key"),  # type: ignore[operator]
-        required=False,
-    )
+    return oauth_ok, property_id, customer_id, step_num
 
-    # Reddit Ads: a second ad platform with its own OAuth app and token file.
-    step_num += 1
-    _step_header(step_num, "Reddit Ads (optional)")
-    reddit_values = _wizard_reddit_step(_existing)
 
+def _wizard_finish(
+    *,
+    step_num: int,
+    _existing,
+    credentials_path: str,
+    project_id: str,
+    developer_token: str,
+    login_customer_id: str,
+    property_id: str,
+    customer_id: str,
+    gtm_account_id: str,
+    gtm_container_id: str,
+    gsc_site_url: str,
+    pagespeed_api_key: str,
+    reddit_values: dict,
+) -> None:
+    """Safety defaults, the final config and the client snippets."""
     # Safety defaults
     step_num += 1
     _step_header(step_num, "Safety Defaults")

{adloop-0.27.0 → adloop-0.27.2}/src/adloop/server.py

@@ -3117,10 +3117,13 @@ def draft_responsive_search_ad(
         ad_group_id: Numeric ID of the ad group that gets the ad.
         headlines: 3-15 headlines, max 30 chars each. Each entry is a plain
             string (unpinned) or {"text": "...", "pinned_field": "HEADLINE_1"};
-            valid pins are HEADLINE_1, HEADLINE_2, HEADLINE_3.
+            valid pins are HEADLINE_1, HEADLINE_2, HEADLINE_3. Keyword or
+            location insertion such as {KeyWord:Drain Cleaning} counts as its
+            default text, which is required.
         descriptions: 2-4 descriptions, max 90 chars each. Each entry is a plain
             string (unpinned) or {"text": "...", "pinned_field": "DESCRIPTION_1"};
-            valid pins are DESCRIPTION_1, DESCRIPTION_2.
+            valid pins are DESCRIPTION_1, DESCRIPTION_2. Insertion tags count
+            as their default text, as for headlines.
         final_url: Landing page URL the ad links to; must be reachable.
         customer_id: Google Ads customer ID (digits, e.g. "1234567890"). Empty
             uses the configured default account.
@@ -3183,11 +3186,13 @@ def update_responsive_search_ad(
             fully swaps in for the existing headlines. Google's RSA constraints
             apply: 3-15 headlines, max 30 chars each, at most 2 per pin slot.
             Each entry is a plain string (unpinned) or {"text": "...",
-            "pinned_field": "HEADLINE_1"} (HEADLINE_1-3).
+            "pinned_field": "HEADLINE_1"} (HEADLINE_1-3). Insertion tags such as
+            {KeyWord:Clogged Drain Service} count as their default text, which
+            is required.
         descriptions: LIST-REPLACE: None or [] means no change; a non-empty list
             fully swaps in. 2-4 descriptions, max 90 chars each, at most 1 per
-            pin slot (DESCRIPTION_1, DESCRIPTION_2). Same entry format as
-            headlines.
+            pin slot (DESCRIPTION_1, DESCRIPTION_2). Same entry format and
+            insertion-tag counting as headlines.
         final_url: Empty means no change; non-empty replaces the final URL and
             is checked for reachability.
         path1: Empty means no change; non-empty sets the first display path