Merge pull request #607 from adcontextprotocol/EmmaLouise2018/fix-gam-package-id

Fix all adapters to return packages with package_id

Author: EmmaLouise2018

alembic/versions/e38f2f6f395a_add_mock_manual_approval_required.py

@@ -5,32 +5,33 @@
 Create Date: 2025-10-23 20:06:20.766732
 
 """
-from typing import Sequence, Union
 
-from alembic import op
+from collections.abc import Sequence
+
 import sqlalchemy as sa
 
+from alembic import op
 
 # revision identifiers, used by Alembic.
-revision: str = 'e38f2f6f395a'
-down_revision: Union[str, Sequence[str], None] = 'faaed3b71428'
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
+revision: str = "e38f2f6f395a"
+down_revision: str | Sequence[str] | None = "faaed3b71428"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
     """Upgrade schema."""
     # Add mock_manual_approval_required column to adapter_config table
-    op.add_column('adapter_config', sa.Column('mock_manual_approval_required', sa.Boolean(), nullable=True))
+    op.add_column("adapter_config", sa.Column("mock_manual_approval_required", sa.Boolean(), nullable=True))
 
     # Set default value to False for ALL existing rows (not just mock adapters)
     op.execute("UPDATE adapter_config SET mock_manual_approval_required = false")
 
     # Make the column non-nullable after setting defaults
-    op.alter_column('adapter_config', 'mock_manual_approval_required', nullable=False, server_default=sa.false())
+    op.alter_column("adapter_config", "mock_manual_approval_required", nullable=False, server_default=sa.false())
 
 
 def downgrade() -> None:
     """Downgrade schema."""
     # Remove mock_manual_approval_required column
-    op.drop_column('adapter_config', 'mock_manual_approval_required')
+    op.drop_column("adapter_config", "mock_manual_approval_required")

examples/upstream_product_catalog_server.py

@@ -164,15 +164,23 @@ async def match_products(self, brief: str, all_products: list[dict[str, Any]]) -
             prompt = f"""Given this advertising brief: "{brief}"
 
 And these available products:
-{json.dumps([{
-    'id': p['product_id'],
-    'name': p['name'],
-    'description': p['description'],
-    'formats': [f['type'] for f in p['formats']],
-    'targeting': p.get('targeting_template', {}),
-    'price': p.get('cpm') or p.get('price_guidance', {}).get('p50', 'variable'),
-    'special_features': p.get('availability', {})
-} for p in all_products], indent=2)}
+{
+                json.dumps(
+                    [
+                        {
+                            "id": p["product_id"],
+                            "name": p["name"],
+                            "description": p["description"],
+                            "formats": [f["type"] for f in p["formats"]],
+                            "targeting": p.get("targeting_template", {}),
+                            "price": p.get("cpm") or p.get("price_guidance", {}).get("p50", "variable"),
+                            "special_features": p.get("availability", {}),
+                        }
+                        for p in all_products
+                    ],
+                    indent=2,
+                )
+            }
 
 Select the most relevant products (up to 3) and return as JSON:
 {{

scripts/audit_e2e_tests.py

@@ -6,6 +6,7 @@
 3. Redundant tests
 4. Tests with excessive tool calls
 """
+
 import re
 import sys
 from collections import defaultdict

scripts/deploy/fly-proxy.py

@@ -2,6 +2,7 @@
 """
 Simple HTTP proxy for Fly.io deployment to route between MCP server and Admin UI
 """
+
 import asyncio
 import logging
 

scripts/maintenance/audit_all_production_products.py

@@ -45,18 +45,18 @@ def audit_all_products():
             if not data["pricing_options"]:
                 missing_pricing.append(data["product"])
 
-        print(f"\n{'='*80}")
+        print(f"\n{'=' * 80}")
         print("PRODUCTION PRODUCT PRICING AUDIT")
-        print(f"{'='*80}\n")
+        print(f"{'=' * 80}\n")
 
         print(f"Total products in database: {len(products_by_id)}")
         print(f"Products WITH pricing_options: {len(products_by_id) - len(missing_pricing)}")
         print(f"Products MISSING pricing_options: {len(missing_pricing)}")
 
         if missing_pricing:
-            print(f"\n{'='*80}")
+            print(f"\n{'=' * 80}")
             print("⚠️  PRODUCTS MISSING PRICING_OPTIONS (BLOCKING MIGRATION)")
-            print(f"{'='*80}\n")
+            print(f"{'=' * 80}\n")
 
             for product in missing_pricing:
                 print(f"❌ {product.product_id}")
@@ -65,9 +65,9 @@ def audit_all_products():
                 print(f"   Delivery Type: {product.delivery_type}")
                 print()
 
-            print(f"{'='*80}")
+            print(f"{'=' * 80}")
             print("⚠️  ACTION REQUIRED")
-            print(f"{'='*80}\n")
+            print(f"{'=' * 80}\n")
             print("These products MUST have pricing_options added before migration can proceed.")
             print("\nRecommended fix (run in Fly.io SSH console):")
             print("\n```python")

scripts/ops/aggregate_format_metrics.py

@@ -51,7 +51,7 @@ def main():
     args = parser.parse_args()
 
     logger.info(
-        f"Starting format metrics aggregation (period_days={args.period_days}, " f"tenant_id={args.tenant_id or 'all'})"
+        f"Starting format metrics aggregation (period_days={args.period_days}, tenant_id={args.tenant_id or 'all'})"
     )
 
     try:

scripts/ops/gam_helper.py

@@ -122,7 +122,7 @@ def test_gam_connection(tenant_id: str) -> dict:
 
         return {
             "success": True,
-            "message": f'Successfully connected to GAM network: {network["displayName"]} (ID: {network["id"]})',
+            "message": f"Successfully connected to GAM network: {network['displayName']} (ID: {network['id']})",
         }
 
     except Exception as e:

scripts/ops/get_tokens.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 """Quick script to get tokens from the database."""
 
-
 from src.core.database.database_session import get_db_session
 from src.core.database.models import Principal, Tenant
 

scripts/ops/show_principal_mappings.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 """Show detailed platform mappings for all principals in a tenant."""
+
 import json
 import sys
 
@@ -19,7 +20,7 @@ def show_mappings(tenant_name=None):
             principals = session.query(Principal).all()
 
         for principal in principals:
-            print(f"\n{'='*80}")
+            print(f"\n{'=' * 80}")
             print(f"Name: {principal.name}")
             print(f"Principal ID: {principal.principal_id}")
             print(f"Tenant ID: {principal.tenant_id}")

scripts/ops/sync_all_tenants.py

@@ -56,7 +56,7 @@ def sync_all_gam_tenants():
         try:
             # Call sync API
             response = requests.post(
-                f'http://localhost:{os.environ.get("ADMIN_UI_PORT", 8001)}/api/v1/sync/trigger/{tenant_id}',
+                f"http://localhost:{os.environ.get('ADMIN_UI_PORT', 8001)}/api/v1/sync/trigger/{tenant_id}",
                 headers={"X-API-Key": api_key},
                 json={"sync_type": "full"},
                 timeout=300,  # 5 minute timeout per tenant