feat!: Migrate to datamodel-code-generator for type generation

.github/workflows/ci.yml

@@ -113,7 +113,7 @@ jobs:
         run: python scripts/fix_schema_refs.py
 
       - name: Generate models
-        run: python scripts/generate_models_simple.py
+        run: python scripts/generate_types.py
 
       - name: Validate generated code syntax
         run: |

.gitignore

@@ -145,3 +145,6 @@ Thumbs.db
 # Environment variables
 .env
 uv.lock
+
+# Temporary schema processing directory
+.schema_temp/

.pre-commit-config.yaml

@@ -1,35 +1,34 @@
 # Pre-commit hooks for AdCP Python client
 # See https://pre-commit.com for more information
-# Installation: pip install pre-commit && pre-commit install
+# Installation: uv add --dev pre-commit && uv run pre-commit install
 
 repos:
   # Black code formatting
   - repo: https://github.com/psf/black
     rev: 24.10.0
     hooks:
       - id: black
-        language_version: python3.10
+        language_version: python3.11
         args: [--line-length=100]
 
-  # Ruff linting
+  # Ruff linting (ignoring line-length for now - black handles it)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.9.2
     hooks:
       - id: ruff
-        args: [--fix, --exit-non-zero-on-fix]
-        exclude: ^src/adcp/types/generated\.py$
+        args: [--fix, --exit-non-zero-on-fix, --ignore=E501]
+        exclude: ^src/adcp/types/generated_poc/
 
-  # Mypy type checking
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.14.0
+  # Mypy type checking (local hook to use project dependencies)
+  - repo: local
     hooks:
       - id: mypy
-        additional_dependencies:
-          - pydantic>=2.0.0
-          - types-requests
-        args: [--config-file=pyproject.toml]
-        files: ^src/adcp/
-        exclude: ^src/adcp/types/generated\.py$
+        name: mypy
+        entry: uv run mypy
+        language: system
+        types: [python]
+        pass_filenames: false
+        args: [src/adcp]
 
   # Basic file checks
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -48,28 +47,9 @@ repos:
       - id: check-case-conflict
       - id: detect-private-key
 
-  # Validate generated code after schema changes
-  - repo: local
-    hooks:
-      - id: validate-generated-code
-        name: Validate generated Pydantic models
-        entry: python -m py_compile
-        language: system
-        files: ^src/adcp/types/generated\.py$
-        pass_filenames: true
-        description: Ensures generated code is syntactically valid Python
-
-      - id: test-code-generation
-        name: Test code generator
-        entry: pytest tests/test_code_generation.py -v --tb=short
-        language: system
-        files: ^scripts/generate_models_simple\.py$
-        pass_filenames: false
-        description: Run code generation tests when generator changes
-
 # Configuration
 default_language_version:
-  python: python3.10
+  python: python3.11
 
 # Run hooks on all files during manual runs
 fail_fast: false

CLAUDE.md

@@ -17,6 +17,53 @@ FormatId = str
 PackageRequest = dict[str, Any]
 ```
 
+**NEVER Modify Generated Files Directly**
+
+Files in `src/adcp/types/generated_poc/` are auto-generated by `scripts/generate_types.py`. Any manual edits will be lost on regeneration.
+
+**Post-Generation Fix System:**
+
+We use `scripts/post_generate_fixes.py` which runs automatically after type generation to apply necessary modifications that can't be generated.
+
+**Type Name Collisions:**
+
+The upstream AdCP schemas define multiple types with the same name (e.g., `Contact`, `Asset`, `Status`) in different schema files. These are **genuinely different types** with different fields, not duplicates.
+
+When consolidating exports in `generated.py`, we use a "first wins" strategy (alphabetical by module name) and warn about collisions. Users can still access all versions via module-qualified imports:
+
+```python
+# Access the "winning" version
+from adcp.types.generated import Asset
+
+# Access specific versions
+from adcp.types.generated_poc.brand_manifest import Asset as BrandAsset
+from adcp.types.generated_poc.format import Asset as FormatAsset
+```
+
+**Upstream Issue:** This should ideally be fixed in the AdCP schema definitions by either:
+- Using unique names (e.g., `BrandAsset` vs `FormatAsset`)
+- Sharing common types via `$ref`
+- Using discriminated unions where appropriate
+
+**Current fixes applied:**
+1. **Model validators** - Injects `@model_validator` decorators into:
+   - `PublisherProperty.validate_mutual_exclusivity()` - enforces property_ids/property_tags mutual exclusivity
+   - `Product.validate_publisher_properties_items()` - validates all publisher_properties items
+
+2. **Self-referential types** - Fixes `preview_render.py` if it contains module-qualified self-references
+
+3. **Forward references** - Fixes BrandManifest imports in:
+   - `promoted_offerings.py`
+   - `create_media_buy_request.py`
+   - `get_products_request.py`
+
+**To add new post-generation fixes:**
+Edit `scripts/post_generate_fixes.py` and add a new function. The script:
+- Runs automatically via `generate_types.py`
+- Is idempotent (safe to run multiple times)
+- Validates fixes were successfully applied
+- Fails loudly if schema changes break the fix patterns
+
 **Type Checking Best Practices**
 - Use `TYPE_CHECKING` for optional dependencies to avoid runtime import errors
 - Use `cast()` for JSON deserialization to satisfy mypy's `no-any-return` checks

examples/adagents_validation.py

@@ -140,7 +140,10 @@ def example_manual_verification():
 
     print("\nScenario 4: Agent with empty properties = authorized for all")
     result = verify_agent_authorization(
-        adagents_data, "https://another-agent.com", "website", [{"type": "domain", "value": "any.com"}]
+        adagents_data,
+        "https://another-agent.com",
+        "website",
+        [{"type": "domain", "value": "any.com"}],
     )
     print(f"   Result: {result}")
 
@@ -225,7 +228,9 @@ def example_domain_matching():
     print(f"   example.com == example.com: {domain_matches('example.com', 'example.com')}")
 
     print("\n2. Common subdomains (www, m) match bare domain:")
-    print(f"   www.example.com matches example.com: {domain_matches('www.example.com', 'example.com')}")
+    print(
+        f"   www.example.com matches example.com: {domain_matches('www.example.com', 'example.com')}"
+    )
     print(f"   m.example.com matches example.com: {domain_matches('m.example.com', 'example.com')}")
 
     print("\n3. Other subdomains DON'T match bare domain:")
@@ -262,7 +267,8 @@ async def main():
     print("\n\n" + "=" * 60)
     print("Summary")
     print("=" * 60)
-    print("""
+    print(
+        """
 Key Functions:
 1. fetch_adagents(domain) - Fetch and validate adagents.json
 2. verify_agent_authorization(data, agent_url, ...) - Check authorization
@@ -279,7 +285,8 @@ async def main():
 - Developer tools: Build validators and testing utilities
 
 See the full API documentation for more details.
-    """)
+    """
+    )
 
 
 if __name__ == "__main__":

examples/basic_usage.py

@@ -8,6 +8,7 @@
 """
 
 import asyncio
+
 from adcp import ADCPClient
 from adcp.types import AgentConfig, Protocol
 

examples/fetch_preview_urls.py

@@ -62,21 +62,23 @@ async def main():
                 print(f"   Expires: {preview.get('expires_at', 'N/A')}")
                 print()
 
-                preview_data.append({
-                    "format_id": format_id,
-                    "name": name,
-                    "preview_url": preview_url,
-                    "width": 300,
-                    "height": 400,
-                })
+                preview_data.append(
+                    {
+                        "format_id": format_id,
+                        "name": name,
+                        "preview_url": preview_url,
+                        "width": 300,
+                        "height": 400,
+                    }
+                )
 
         # Save to JSON for the web component demo
         output_file = Path(__file__).parent / "preview_urls.json"
         with open(output_file, "w") as f:
             json.dump(preview_data, f, indent=2)
 
         print(f"💾 Saved preview URLs to: {output_file}")
-        print(f"\n🌐 Open examples/web_component_demo.html in a browser to see the previews!")
+        print("\n🌐 Open examples/web_component_demo.html in a browser to see the previews!")
 
     except Exception as e:
         print(f"❌ Error: {e}")

examples/multi_agent.py

@@ -8,6 +8,7 @@
 """
 
 import asyncio
+
 from adcp import ADCPMultiAgentClient
 from adcp.types import AgentConfig, Protocol
 
@@ -53,7 +54,7 @@ async def main():
         sync_count = sum(1 for r in results if r.status == "completed")
         async_count = sum(1 for r in results if r.status == "submitted")
 
-        print(f"\n📊 Results:")
+        print("\n📊 Results:")
         print(f"  ✅ Sync completions: {sync_count}")
         print(f"  ⏳ Async (webhooks pending): {async_count}")
 

examples/preview_urls.json

@@ -20,4 +20,4 @@
     "width": 160,
     "height": 600
   }
-]
+]

examples/test_helpers_demo.py

@@ -13,7 +13,6 @@
     create_test_agent,
     test_agent,
     test_agent_a2a,
-    test_agent_a2a_no_auth,
     test_agent_client,
     test_agent_no_auth,
 )
@@ -219,9 +218,7 @@ async def various_operations() -> None:
 
         # List creative formats
         print("2. Listing creative formats...")
-        formats = await test_agent.list_creative_formats(
-            ListCreativeFormatsRequest()
-        )
+        formats = await test_agent.list_creative_formats(ListCreativeFormatsRequest())
         success = "✅" if formats.success else "❌"
         count = len(formats.data.formats) if formats.data else 0
         print(f"   {success} Formats: {count}")

pyproject.toml

@@ -44,6 +44,8 @@ dev = [
     "mypy>=1.0.0",
     "black>=23.0.0",
     "ruff>=0.1.0",
+    "datamodel-code-generator[http]>=0.35.0",
+    "email-validator>=2.0.0",
 ]
 
 [project.urls]
@@ -63,7 +65,11 @@ extend-exclude = "/(generated|tasks)\\.py$"
 [tool.ruff]
 line-length = 100
 target-version = "py310"
-extend-exclude = ["src/adcp/types/generated.py", "src/adcp/types/tasks.py"]
+extend-exclude = [
+    "src/adcp/types/generated.py",
+    "src/adcp/types/tasks.py",
+    "src/adcp/types/generated_poc/",
+]
 
 [tool.ruff.lint]
 select = ["E", "F", "I", "N", "W", "UP"]
@@ -86,3 +92,9 @@ ignore_errors = true
 [tool.pytest.ini_options]
 testpaths = ["tests"]
 asyncio_mode = "auto"
+
+[dependency-groups]
+dev = [
+    "datamodel-code-generator>=0.35.0",
+    "pre-commit>=4.4.0",
+]