Drop the toolset half of the registry External Services card

The provider.yaml schema does not allow `external-services` on a
toolset, so `toolset_services` was empty for every provider.

- Remove `toolset_services` from the extractors, the contract models,
  and the version page template
- Show connection types only, so the "Source type" column is dropped

Author: Lee-W

dev/registry/extract_metadata.py

@@ -373,7 +373,6 @@ class Provider:
         default_factory=list
     )  # {conn_type, hook_class, docs_url, external_services}
     uri_schemes: list[dict] = field(default_factory=list)  # {scheme, filesystem?, asset?, remote_logging?}
-    toolset_services: list[dict] = field(default_factory=list)  # {module, services}
     requires_python: str = ""  # e.g., ">=3.11"
     dependencies: list[str] = field(default_factory=list)  # from pyproject.toml
     optional_extras: dict[str, list[str]] = field(default_factory=dict)  # {extra_name: [deps]}
@@ -805,15 +804,6 @@ 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(
@@ -843,7 +833,6 @@ def main():
             categories=[asdict(c) for c in categories],
             connection_types=connection_types,
             uri_schemes=collect_uri_schemes(provider_yaml, module_source_reader(provider_path)),
-            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

@@ -539,14 +539,6 @@ def extract_version_data(
     uri_schemes = collect_uri_schemes(
         provider_yaml, lambda module_path: git_show(tag, get_source_file_path(layout, dir_path, module_path))
     )
-    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)
@@ -562,7 +554,6 @@ def extract_version_data(
             "optional_extras": pyproject_data["optional_extras"],
             "connection_types": connection_types,
             "uri_schemes": uri_schemes,
-            "toolset_services": toolset_services,
             "module_counts": module_counts,
             "modules": modules,
         }

dev/registry/registry_contract_models.py

@@ -87,13 +87,6 @@ class UriSchemeContract(BaseModel):
     )
 
 
-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."""
 
@@ -113,7 +106,6 @@ class ProviderContract(BaseModel):
     categories: list[CategoryContract] = Field(default_factory=list)
     connection_types: list[ConnectionTypeContract] = Field(default_factory=list)
     uri_schemes: list[UriSchemeContract] = 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)
@@ -258,7 +250,6 @@ class ProviderVersionMetadataContract(BaseModel):
     optional_extras: dict[str, list[str]]
     connection_types: list[ConnectionTypeContract]
     uri_schemes: list[UriSchemeContract] = Field(default_factory=list)
-    toolset_services: list[ToolsetServicesContract] = Field(default_factory=list)
     module_counts: dict[str, int]
     modules: list[ModuleContract]
 

dev/registry/tests/test_extract_metadata.py

@@ -904,56 +904,6 @@ def test_external_services_propagates_to_providers_json(self, tmp_path):
 
         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"],
-            }
-        ]
-
 
 class TestMainUriSchemes:
     """main() must read filesystem schemes from the provider's src/ tree, skip a

dev/registry/tests/test_extract_versions.py

@@ -457,45 +457,3 @@ def test_all_missing_returns_empty_dict(self):
             result = git_cat_file_batch(tag, paths)
 
         assert result == {}
-
-
-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

@@ -23,7 +23,6 @@
 from registry_contract_models import (
     ConnectionTypeContract,
     ModuleContract,
-    ToolsetServicesContract,
     build_openapi_document,
     validate_modules_catalog,
     validate_provider_parameters,
@@ -142,18 +141,6 @@ 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

@@ -3839,7 +3839,6 @@ main {
   vertical-align: top;
 }
 
-.provider-detail-page .external-services-card .external-services-type,
 .provider-detail-page .external-services-card .external-services-name {
   white-space: nowrap;
 }

registry/src/provider-version.njk

@@ -19,7 +19,6 @@ eleventyComputed:
   {% set extras = pv.provider.optional_extras or {} %}
   {% set conns = pv.provider.connection_types or [] %}
   {% set uriSchemes = pv.provider.uri_schemes or [] %}
-  {% set toolsetServices = pv.provider.toolset_services or [] %}
   {% set providerModules = pv.modules %}
   {% set currentVersion = pv.provider.version %}
   {% set pythonVersion = pv.provider.requires_python %}
@@ -31,7 +30,6 @@ eleventyComputed:
   {% set extras = pv.versionData.optional_extras or {} %}
   {% set conns = pv.versionData.connection_types or [] %}
   {% set uriSchemes = pv.versionData.uri_schemes or [] %}
-  {% set toolsetServices = pv.versionData.toolset_services or [] %}
   {% set providerModules = pv.versionData.modules or [] %}
   {% set currentVersion = pv.version %}
   {% set pythonVersion = pv.versionData.requires_python %}
@@ -42,12 +40,7 @@ eleventyComputed:
 {% set externalServiceRows = [] %}
 {% for conn in conns %}
   {% if conn.external_services and conn.external_services.length > 0 %}
-    {% set externalServiceRows = (externalServiceRows.push({sourceType: "Connection", name: conn.conn_type or conn.connection_type, services: conn.external_services}), externalServiceRows) %}
-  {% endif %}
-{% endfor %}
-{% for entry in toolsetServices %}
-  {% if entry.services and entry.services.length > 0 %}
-    {% set externalServiceRows = (externalServiceRows.push({sourceType: "Toolset", name: entry.module, services: entry.services}), externalServiceRows) %}
+    {% set externalServiceRows = (externalServiceRows.push({name: conn.conn_type or conn.connection_type, services: conn.external_services}), externalServiceRows) %}
   {% endif %}
 {% endfor %}
 
@@ -335,15 +328,13 @@ eleventyComputed:
     <table class="external-services-table">
       <thead>
         <tr class="external-services-header">
-          <th>Source type</th>
           <th>Name</th>
           <th>External services (examples)</th>
         </tr>
       </thead>
       <tbody>
         {% for row in externalServiceRows %}
         <tr class="external-services-row">
-          <td class="external-services-type">{{ row.sourceType }}</td>
           <td class="external-services-name"><code>{{ row.name }}</code></td>
           <td class="external-services-list">{{ row.services | join(", ") }}</td>
         </tr>