Merge branch 'v1.6.0' of https://github.com/googleads/google-ads-api-developer-assistant into v1.6.0

Author: bobhancockg

GEMINI.md

@@ -113,6 +113,10 @@ This document outlines mandatory operational guidelines, constraints, and best p
     - Use language-appropriate tooling for formatting and linting where available.
     - Pass `customer_id` as a command-line argument.
     - Use type hints, annotations, or other static typing features if the language supports them.
+
+#### 3.4.1. Python Configuration Loading
+- **Code Generation (to `saved_code/`):** When generating Python code that uses the `google-ads-python` client library and saves it to the `saved_code/` directory, any calls to `GoogleAdsClient.load_from_storage()` MUST NOT include a `path` argument. This ensures that the generated code, when run by the user outside of the Gemini CLI, will look for `google-ads.yaml` in their home directory (or other default locations as per the client library's behavior).
+- **Execution within Gemini CLI:** When executing Python code that uses `GoogleAdsClient.load_from_storage()` within the Gemini CLI, you MUST set the environment variable `GOOGLE_ADS_CONFIGURATION_FILE_PATH` to `config/google-ads.yaml` before running the script. This ensures the script uses the project's configuration file located at `config/google-ads.yaml` during execution within the CLI environment.
 - **Error Handling:** When using the Python client library, catch `GoogleAdsException` and inspect the `error` attribute. For other languages, use the equivalent exception type.
 
 #### 3.5. Troubleshooting

hooks/SessionEnd/cleanup_config.py

@@ -0,0 +1,42 @@
+import os
+import shutil
+import sys
+import datetime
+
+def cleanup():
+    """Removes all files in the config directory."""
+    # Determine paths
+    script_dir = os.path.dirname(os.path.abspath(__file__))
+    # hooks/SessionEnd -> root is 2 levels up
+    root_dir = os.path.abspath(os.path.join(script_dir, "../.."))
+    config_dir = os.path.join(root_dir, "config")
+
+    if not os.path.exists(config_dir):
+        print(f"Config directory {config_dir} does not exist. Nothing to clean.", file=sys.stderr)
+        return
+
+    try:
+        # User requested to remove *all files* in the config directory.
+        # We could also remove the directory itself. Let's remove content.
+        for filename in os.listdir(config_dir):
+            file_path = os.path.join(config_dir, filename)
+            try:
+                if os.path.isfile(file_path) or os.path.islink(file_path):
+                    os.unlink(file_path)
+                elif os.path.isdir(file_path):
+                    shutil.rmtree(file_path)
+            except Exception as e:
+                print(f"Failed to delete {file_path}. Reason: {e}", file=sys.stderr)
+        
+        timestamp = datetime.datetime.now()
+        print(f"SUCCESS: SessionEnd hook cleaned up config directory at {timestamp}", file=sys.stdout)
+
+    except Exception as e:
+        print(f"Error cleaning up config directory: {e}", file=sys.stderr)
+        sys.exit(1)
+
+if __name__ == "__main__":
+    timestamp = datetime.datetime.now()
+    message = f"SUCCESS: SessionEnd hook 'cleanup_config.py' ran at {timestamp}"
+    print(message, file=sys.stderr)
+    cleanup()

hooks/SessionStart/custom_config_python.py

@@ -59,9 +59,4 @@ def configure():
     print(f"export GOOGLE_ADS_CONFIGURATION_FILE_PATH=\"{target_yaml}\"", file=sys.stdout)
 
 if __name__ == "__main__":
-    timestamp = datetime.datetime.now()
-    message = f"SUCCESS: SessionStart hook 'custom_config_python.py' ran at {timestamp}"
-    # Print to standard output (should appear in Gemini CLI console)
-    print(message, file=sys.stdout)
-    print("This message goes to stderr", file=sys.stderr)
     configure()

hooks/hooks.json

@@ -8,6 +8,15 @@
         "description": "Configures Google Ads environment at session start with a custom google-ads.yaml for Python.",
         "timeout": 30000
       }
+    ],
+    "SessionEnd": [
+      {
+        "name": "cleanup-config",
+        "type": "command",
+        "command": "python3 ${extensionPath}/hooks/SessionEnd/cleanup_config.py",
+        "description": "Cleans up the configuration directory at session end.",
+        "timeout": 30000
+      }
     ]
   }
 }