Show the services each provider toolset reaches in the registry

Toolsets became a registry module category without any record of what
they connect to, so a visitor could see that a provider ships nine
toolsets but not that one of them reaches every Airflow connection and
another reads Apache Iceberg tables. Reading the same provider.yaml
field the documentation page reads keeps the two from telling different
stories about the same release.

Author: Lee-W

dev/registry/extract_metadata.py

@@ -376,6 +376,7 @@ class Provider:
     connection_types: list[dict] = field(
         default_factory=list
     )  # {conn_type, hook_class, docs_url, external_services}
+    toolset_services: list[dict] = field(default_factory=list)  # {module, services}
     requires_python: str = ""  # e.g., ">=3.10"
     dependencies: list[str] = field(default_factory=list)  # from pyproject.toml
     optional_extras: dict[str, list[str]] = field(default_factory=dict)  # {extra_name: [deps]}
@@ -795,6 +796,15 @@ def main():
                     }
                 )
 
+        toolset_services = [
+            {
+                "module": entry.get("module", ""),
+                "services": entry.get("services", []),
+            }
+            for toolset in provider_yaml.get("toolsets", [])
+            for entry in toolset.get("external-services", [])
+        ]
+
         # Pre-fetched in parallel before this loop; missing entries fall back
         # to zero-value defaults so a never-published provider doesn't crash.
         pypi_downloads, pypi_dates = pypi_data.get(
@@ -823,6 +833,7 @@ def main():
             pypi_downloads=pypi_downloads,
             categories=[asdict(c) for c in categories],
             connection_types=connection_types,
+            toolset_services=toolset_services,
             requires_python=pyproject_data["requires_python"],
             dependencies=pyproject_data["dependencies"],
             optional_extras=pyproject_data.get("optional_extras", {}),

dev/registry/extract_versions.py

@@ -453,6 +453,15 @@ def extract_version_data(
             }
         )
 
+    toolset_services = [
+        {
+            "module": entry.get("module", ""),
+            "services": entry.get("services", []),
+        }
+        for toolset in provider_yaml.get("toolsets", [])
+        for entry in toolset.get("external-services", [])
+    ]
+
     # Extract modules from source files
     modules = extract_modules_from_yaml(provider_yaml, tag, layout, dir_path, provider_id, version)
     module_counts = count_modules(modules)
@@ -466,6 +475,7 @@ def extract_version_data(
             "dependencies": pyproject_data["dependencies"],
             "optional_extras": pyproject_data["optional_extras"],
             "connection_types": connection_types,
+            "toolset_services": toolset_services,
             "module_counts": module_counts,
             "modules": modules,
         }

dev/registry/registry_contract_models.py

@@ -55,6 +55,13 @@ class ConnectionTypeContract(BaseModel):
     external_services: list[str] = Field(default_factory=list)
 
 
+class ToolsetServicesContract(BaseModel):
+    model_config = ConfigDict(extra="forbid")
+
+    module: str
+    services: list[str] = Field(default_factory=list)
+
+
 class ProviderContract(BaseModel):
     """Top-level provider entry in providers.json."""
 
@@ -73,6 +80,7 @@ class ProviderContract(BaseModel):
     module_counts: dict[str, int] = Field(default_factory=dict)
     categories: list[CategoryContract] = Field(default_factory=list)
     connection_types: list[ConnectionTypeContract] = Field(default_factory=list)
+    toolset_services: list[ToolsetServicesContract] = Field(default_factory=list)
     requires_python: str = ""
     dependencies: list[str] = Field(default_factory=list)
     optional_extras: dict[str, list[str]] = Field(default_factory=dict)
@@ -212,6 +220,7 @@ class ProviderVersionMetadataContract(BaseModel):
     dependencies: list[str]
     optional_extras: dict[str, list[str]]
     connection_types: list[ConnectionTypeContract]
+    toolset_services: list[ToolsetServicesContract] = Field(default_factory=list)
     module_counts: dict[str, int]
     modules: list[ModuleContract]
 

dev/registry/tests/test_extract_metadata.py

@@ -884,3 +884,53 @@ def test_external_services_propagates_to_providers_json(
         written = json.loads((output_dir / "providers.json").read_text())
         provider = next(p for p in written["providers"] if p["id"] == "testprov")
         assert provider["connection_types"][0]["external_services"] == ["openai", "anthropic"]
+
+    @patch("extract_metadata.fetch_provider_inventory", autospec=True, return_value=None)
+    @patch("extract_metadata.fetch_pypi_data_parallel", autospec=True, return_value={})
+    @patch("extract_metadata.load_release_tags", autospec=True, return_value=set())
+    def test_toolset_external_services_propagates_to_providers_json(
+        self, _load_release_tags, _fetch_pypi_data_parallel, _fetch_provider_inventory, tmp_path
+    ):
+        """Same drift-guard as above (`ToolsetServicesContract`, extra="forbid"), for the
+        `toolsets.external-services` sub-key added alongside `python-modules`.
+        """
+        providers_dir = tmp_path / "providers"
+        provider_dir = providers_dir / "testprov"
+        provider_dir.mkdir(parents=True)
+        (provider_dir / "provider.yaml").write_text(
+            textwrap.dedent("""\
+                name: Test Provider
+                description: A test provider.
+                versions:
+                  - 1.0.0
+                toolsets:
+                  - integration-name: Test Provider
+                    python-modules:
+                      - airflow.providers.test.toolsets.hook
+                    external-services:
+                      - module: airflow.providers.test.toolsets.hook
+                        services:
+                          - Any Airflow connection, through its provider hook
+                """)
+        )
+        output_dir = tmp_path / "output"
+        script_dir = tmp_path / "script"
+        output_dir.mkdir()
+        script_dir.mkdir()
+
+        with (
+            patch("extract_metadata.PROVIDERS_DIR", providers_dir),
+            patch("extract_metadata.OUTPUT_DIR", output_dir),
+            patch("extract_metadata.SCRIPT_DIR", script_dir),
+            patch.object(sys, "argv", ["extract_metadata.py"]),
+        ):
+            main()
+
+        written = json.loads((output_dir / "providers.json").read_text())
+        provider = next(p for p in written["providers"] if p["id"] == "testprov")
+        assert provider["toolset_services"] == [
+            {
+                "module": "airflow.providers.test.toolsets.hook",
+                "services": ["Any Airflow connection, through its provider hook"],
+            }
+        ]

dev/registry/tests/test_extract_versions.py

@@ -210,3 +210,45 @@ def test_external_services_propagates_to_version_metadata(
 
         assert result is not None
         assert result["connection_types"][0]["external_services"] == ["openai", "anthropic"]
+
+
+class TestExtractVersionDataToolsetServices:
+    """Same drift-guard as `TestExtractVersionDataConnectionTypes`, for
+    `toolsets.external-services` -- this is the touchpoint memory
+    `reference_registry_connection_field_touchpoints` names as most-missed: skip it and the
+    toolsets table silently disappears once a version is no longer `pv.isLatest`.
+    """
+
+    PROVIDER_YAML = textwrap.dedent("""\
+        name: Test Provider
+        toolsets:
+          - integration-name: Test Provider
+            python-modules:
+              - airflow.providers.test.toolsets.hook
+            external-services:
+              - module: airflow.providers.test.toolsets.hook
+                services:
+                  - Any Airflow connection, through its provider hook
+        """)
+
+    @patch("extract_versions.extract_modules_from_yaml", autospec=True, return_value=[])
+    @patch("extract_versions.fetch_provider_inventory", autospec=True, return_value=None)
+    @patch("extract_versions.git_show", autospec=True)
+    @patch("extract_versions.detect_layout", autospec=True, return_value="new")
+    @patch("extract_versions.git_tag_exists", autospec=True, return_value=True)
+    def test_toolset_external_services_propagates_to_version_metadata(
+        self, _tag_exists, _layout, mock_git_show, _inventory, _modules
+    ):
+        mock_git_show.side_effect = lambda tag, path: (
+            self.PROVIDER_YAML if path.endswith("provider.yaml") else None
+        )
+
+        result = extract_version_data("test", "1.0.0", "test")
+
+        assert result is not None
+        assert result["toolset_services"] == [
+            {
+                "module": "airflow.providers.test.toolsets.hook",
+                "services": ["Any Airflow connection, through its provider hook"],
+            }
+        ]

dev/registry/tests/test_registry_contract_models.py

@@ -22,6 +22,7 @@
 from pydantic import ValidationError
 from registry_contract_models import (
     ConnectionTypeContract,
+    ToolsetServicesContract,
     build_openapi_document,
     validate_modules_catalog,
     validate_provider_parameters,
@@ -119,6 +120,18 @@ def test_connection_type_contract_round_trips_external_services():
     assert validated.external_services == ["openai", "anthropic"]
 
 
+def test_toolset_services_contract_defaults_services_to_empty_list():
+    validated = ToolsetServicesContract.model_validate({"module": "airflow.providers.test.toolsets.hook"})
+    assert validated.services == []
+
+
+def test_toolset_services_contract_rejects_unknown_fields():
+    with pytest.raises(ValidationError):
+        ToolsetServicesContract.model_validate(
+            {"module": "airflow.providers.test.toolsets.hook", "services": [], "unexpected": "x"}
+        )
+
+
 def test_validate_version_metadata_accepts_legacy_version_modules_without_ids():
     payload = {
         "provider_id": "test",

registry/src/css/main.css

@@ -3702,13 +3702,17 @@ main {
   background: rgb(from var(--color-purple-500) r g b / 0.1);
 }
 
-/* Connection Builder Card */
-.provider-detail-page .connections-card {
+/* Connection Builder Card (also shared by the Toolsets card, which has no
+   chip grid / builder panel of its own but reuses the card padding, heading
+   style, and external-services table below). */
+.provider-detail-page .connections-card,
+.provider-detail-page .toolset-services-card {
   padding: var(--space-5);
   margin-bottom: var(--space-6);
 }
 
-.provider-detail-page .connections-card > h3 {
+.provider-detail-page .connections-card > h3,
+.provider-detail-page .toolset-services-card > h3 {
   font-size: var(--text-sm);
   font-weight: var(--font-semibold);
   color: var(--text-primary);
@@ -3718,7 +3722,8 @@ main {
   gap: var(--space-2);
 }
 
-.provider-detail-page .connections-card > h3 svg {
+.provider-detail-page .connections-card > h3 svg,
+.provider-detail-page .toolset-services-card > h3 svg {
   width: 1rem;
   height: 1rem;
   color: var(--color-green-400);
@@ -3761,14 +3766,17 @@ main {
   border-color: var(--color-green-400);
 }
 
-/* Per-connection external services matrix */
-.provider-detail-page .connections-card .conn-external-services-table {
+/* Per-connection external services matrix (also used, unmodified, by the
+   Toolsets card's module -> external-services table). */
+.provider-detail-page .connections-card .conn-external-services-table,
+.provider-detail-page .toolset-services-card .conn-external-services-table {
   width: 100%;
   margin-top: var(--space-4);
   border-collapse: collapse;
 }
 
-.provider-detail-page .connections-card .conn-external-services-header th {
+.provider-detail-page .connections-card .conn-external-services-header th,
+.provider-detail-page .toolset-services-card .conn-external-services-header th {
   padding: var(--space-2) var(--space-3);
   font-size: var(--text-sm);
   font-weight: var(--font-semibold);
@@ -3777,20 +3785,24 @@ main {
   background: var(--bg-tertiary);
 }
 
-.provider-detail-page .connections-card .conn-external-services-row {
+.provider-detail-page .connections-card .conn-external-services-row,
+.provider-detail-page .toolset-services-card .conn-external-services-row {
   border-top: 1px solid var(--border-primary);
 }
 
-.provider-detail-page .connections-card .conn-external-services-row td {
+.provider-detail-page .connections-card .conn-external-services-row td,
+.provider-detail-page .toolset-services-card .conn-external-services-row td {
   padding: var(--space-2) var(--space-3);
   vertical-align: top;
 }
 
-.provider-detail-page .connections-card .conn-external-services-row td:first-child {
+.provider-detail-page .connections-card .conn-external-services-row td:first-child,
+.provider-detail-page .toolset-services-card .conn-external-services-row td:first-child {
   white-space: nowrap;
 }
 
-.provider-detail-page .connections-card .conn-external-services-list {
+.provider-detail-page .connections-card .conn-external-services-list,
+.provider-detail-page .toolset-services-card .conn-external-services-list {
   color: var(--text-secondary);
   font-size: var(--text-sm);
 }

registry/src/provider-version.njk

@@ -18,6 +18,7 @@ eleventyComputed:
   {% set deps = pv.provider.dependencies or [] %}
   {% set extras = pv.provider.optional_extras or {} %}
   {% set conns = pv.provider.connection_types or [] %}
+  {% set toolsetServices = pv.provider.toolset_services or [] %}
   {% set providerModules = pv.modules %}
   {% set currentVersion = pv.provider.version %}
   {% set pythonVersion = pv.provider.requires_python %}
@@ -28,6 +29,7 @@ eleventyComputed:
   {% set deps = pv.versionData.dependencies or [] %}
   {% set extras = pv.versionData.optional_extras or {} %}
   {% set conns = pv.versionData.connection_types or [] %}
+  {% set toolsetServices = pv.versionData.toolset_services or [] %}
   {% set providerModules = pv.versionData.modules or [] %}
   {% set currentVersion = pv.version %}
   {% set pythonVersion = pv.versionData.requires_python %}
@@ -299,6 +301,33 @@ eleventyComputed:
     {% endif %}
   </section>
 
+  {% if toolsetServices.length > 0 %}
+  <section class="toolset-services-card card">
+    <h3>
+      <svg fill="none" stroke="currentColor" viewBox="0 0 24 24" aria-hidden="true">
+        <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5.882V19.24a1.76 1.76 0 01-3.417.592l-2.147-6.15M18 13a3 3 0 100-6M5.436 13.683A4.001 4.001 0 017 6h1.832c4.1 0 7.625-1.234 9.168-3v14c-1.543-1.766-5.067-3-9.168-3H7a3.988 3.988 0 01-1.564-.317z" />
+      </svg>
+      Toolsets ({{ toolsetServices.length }})
+    </h3>
+    <table class="conn-external-services-table">
+      <thead>
+        <tr class="conn-external-services-header">
+          <th>Toolset module</th>
+          <th>External services (examples)</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for entry in toolsetServices %}
+        <tr class="conn-external-services-row">
+          <td><code>{{ entry.module }}</code></td>
+          <td class="conn-external-services-list">{{ entry.services | join(", ") }}</td>
+        </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  </section>
+  {% endif %}
+
   {% if totalModules > 0 %}
   {# Module Type Tabs: sorted by module count (busiest first), overflow into a "More" menu #}
   {% set moduleTabsVisibleCount = 8 %}