chore: remove IntegrationList (#186)

Author: mathislucka

src/deepset_mcp/api/integrations/models.py

@@ -42,17 +42,3 @@ class Integration(BaseModel):
     "The integration provider type (e.g., OpenAI, Azure, etc.)"
     provider_domain: str
     "Domain or endpoint URL for the integration provider"
-
-
-class IntegrationList(BaseModel):
-    """Model representing a list of integrations."""
-
-    integrations: list[Integration]
-    "List of available integrations"
-
-    def __len__(self) -> int:
-        """Return the length of the list.
-
-        :returns: Number of integrations.
-        """
-        return len(self.integrations)

src/deepset_mcp/api/integrations/protocols.py

@@ -6,7 +6,7 @@
 
 from typing import TYPE_CHECKING, Protocol
 
-from deepset_mcp.api.integrations.models import Integration, IntegrationList, IntegrationProvider
+from deepset_mcp.api.integrations.models import Integration, IntegrationProvider
 
 if TYPE_CHECKING:
     pass
@@ -15,10 +15,10 @@
 class IntegrationResourceProtocol(Protocol):
     """Protocol for integration resource operations."""
 
-    async def list(self) -> IntegrationList:
+    async def list(self) -> list[Integration]:
         """Retrieve all integrations.
 
-        :returns: IntegrationList containing all available integrations.
+        :returns: list containing all available integrations.
         """
         ...
 

src/deepset_mcp/api/integrations/resource.py

@@ -7,7 +7,7 @@
 import logging
 from typing import TYPE_CHECKING
 
-from deepset_mcp.api.integrations.models import Integration, IntegrationList, IntegrationProvider
+from deepset_mcp.api.integrations.models import Integration, IntegrationProvider
 from deepset_mcp.api.integrations.protocols import IntegrationResourceProtocol
 from deepset_mcp.api.transport import raise_for_status
 
@@ -27,10 +27,10 @@ def __init__(self, client: "AsyncClientProtocol") -> None:
         """
         self._client = client
 
-    async def list(self) -> IntegrationList:
+    async def list(self) -> list[Integration]:
         """Retrieve all integrations.
 
-        :returns: IntegrationList containing all available integrations.
+        :returns: list containing all available integrations.
         """
         resp = await self._client.request(
             endpoint="v1/model_registry_tokens",
@@ -41,9 +41,9 @@ async def list(self) -> IntegrationList:
 
         if resp.json is not None:
             integrations = [Integration.model_validate(item) for item in resp.json]
-            return IntegrationList(integrations=integrations)
+            return integrations
         else:
-            return IntegrationList(integrations=[])
+            return []
 
     async def get(self, provider: IntegrationProvider) -> Integration:
         """Retrieve a specific integration by provider.

src/deepset_mcp/tools/secrets.py

@@ -56,7 +56,7 @@ async def list_secrets(
         # This optimizes performance by skipping the integrations call for subsequent pages
         if after is None:
             integrations_list = await client.integrations().list()
-            for integration in integrations_list.integrations:
+            for integration in integrations_list:
                 env_vars = TOKEN_DOMAIN_MAPPING.get(integration.provider_domain, [])
                 for env_var in env_vars:
                     env_secrets.append(
@@ -98,7 +98,7 @@ async def get_secret(*, client: AsyncClientProtocol, secret_id: str) -> Environm
     except ResourceNotFoundError:
         try:
             integrations_list = await client.integrations().list()
-            for integration in integrations_list.integrations:
+            for integration in integrations_list:
                 if str(integration.model_registry_token_id) == secret_id:
                     env_vars = TOKEN_DOMAIN_MAPPING.get(integration.provider_domain, [])
                     if env_vars:

test/unit/api/integrations/test_integration_resource.py

@@ -9,7 +9,7 @@
 import pytest
 
 from deepset_mcp.api.exceptions import DeepsetAPIError, ResourceNotFoundError
-from deepset_mcp.api.integrations.models import Integration, IntegrationList, IntegrationProvider
+from deepset_mcp.api.integrations.models import Integration, IntegrationProvider
 from deepset_mcp.api.integrations.resource import IntegrationResource
 from deepset_mcp.api.transport import TransportResponse
 from test.unit.conftest import BaseFakeClient
@@ -50,18 +50,18 @@ async def test_list_integrations_success(self) -> None:
         result = await client.integrations().list()
 
         # Assert
-        assert isinstance(result, IntegrationList)
+        assert isinstance(result, list)
         assert len(result) == 2
 
-        assert result.integrations[0].invalid is False
-        assert result.integrations[0].model_registry_token_id == UUID("3fa85f64-5717-4562-b3fc-2c963f66afa6")
-        assert result.integrations[0].provider == IntegrationProvider.AWS_BEDROCK
-        assert result.integrations[0].provider_domain == "us-east-1"
+        assert result[0].invalid is False
+        assert result[0].model_registry_token_id == UUID("3fa85f64-5717-4562-b3fc-2c963f66afa6")
+        assert result[0].provider == IntegrationProvider.AWS_BEDROCK
+        assert result[0].provider_domain == "us-east-1"
 
-        assert result.integrations[1].invalid is True
-        assert result.integrations[1].model_registry_token_id == UUID("4fa85f64-5717-4562-b3fc-2c963f66afa7")
-        assert result.integrations[1].provider == IntegrationProvider.OPENAI
-        assert result.integrations[1].provider_domain == "api.openai.com"
+        assert result[1].invalid is True
+        assert result[1].model_registry_token_id == UUID("4fa85f64-5717-4562-b3fc-2c963f66afa7")
+        assert result[1].provider == IntegrationProvider.OPENAI
+        assert result[1].provider_domain == "api.openai.com"
 
     async def test_list_integrations_empty_response(self) -> None:
         """Test listing integrations with empty response."""
@@ -72,9 +72,8 @@ async def test_list_integrations_empty_response(self) -> None:
         result = await client.integrations().list()
 
         # Assert
-        assert isinstance(result, IntegrationList)
+        assert isinstance(result, list)
         assert len(result) == 0
-        assert result.integrations == []
 
     async def test_list_integrations_none_response(self) -> None:
         """Test listing integrations with None response."""
@@ -87,9 +86,8 @@ async def test_list_integrations_none_response(self) -> None:
         result = await client.integrations().list()
 
         # Assert
-        assert isinstance(result, IntegrationList)
+        assert isinstance(result, list)
         assert len(result) == 0
-        assert result.integrations == []
 
     async def test_list_integrations_api_error(self) -> None:
         """Test listing integrations with API error."""

test/unit/tools/test_secrets.py

@@ -7,7 +7,7 @@
 import pytest
 
 from deepset_mcp.api.exceptions import ResourceNotFoundError, UnexpectedAPIError
-from deepset_mcp.api.integrations.models import Integration, IntegrationList, IntegrationProvider
+from deepset_mcp.api.integrations.models import Integration, IntegrationProvider
 from deepset_mcp.api.integrations.protocols import IntegrationResourceProtocol
 from deepset_mcp.api.secrets.models import Secret
 from deepset_mcp.api.secrets.protocols import SecretResourceProtocol
@@ -63,7 +63,7 @@ async def delete(self, secret_id: str) -> NoContentResponse:
 class FakeIntegrationResource(IntegrationResourceProtocol):
     def __init__(
         self,
-        list_response: IntegrationList | None = None,
+        list_response: list[Integration] | None = None,
         get_response: Integration | None = None,
         list_exception: Exception | None = None,
         get_exception: Exception | None = None,
@@ -73,11 +73,11 @@ def __init__(
         self.list_exception = list_exception
         self.get_exception = get_exception
 
-    async def list(self) -> IntegrationList:
+    async def list(self) -> list[Integration]:
         if self.list_exception:
             raise self.list_exception
         if self.list_response is None:
-            return IntegrationList(integrations=[])
+            return []
         return self.list_response
 
     async def get(self, provider: IntegrationProvider) -> Integration:
@@ -112,15 +112,14 @@ async def test_list_secrets_and_integrations() -> None:
     secret_list = PaginatedResponse[Secret](data=secrets_data, has_more=False, total=1)
 
     integration_id = uuid.uuid4()
-    integrations_data = [
+    integration_list = [
         Integration(
             invalid=False,
             model_registry_token_id=integration_id,
             provider=IntegrationProvider.OPENAI,
             provider_domain="api.openai.com",
         )
     ]
-    integration_list = IntegrationList(integrations=integrations_data)
 
     client = FakeClient(
         secret_resource=FakeSecretResource(list_response=secret_list),
@@ -169,15 +168,14 @@ async def test_list_secrets_only() -> None:
 async def test_list_integrations_only() -> None:
     """Test listing only integrations when no secrets exist."""
     integration_id = uuid.uuid4()
-    integrations_data = [
+    integration_list = [
         Integration(
             invalid=True,
             model_registry_token_id=integration_id,
             provider=IntegrationProvider.COHERE,
             provider_domain="api.cohere.ai",
         )
     ]
-    integration_list = IntegrationList(integrations=integrations_data)
     client = FakeClient(integration_resource=FakeIntegrationResource(list_response=integration_list))
 
     result = await list_secrets(client=client)
@@ -238,15 +236,14 @@ async def test_get_secret_by_id_success() -> None:
 async def test_get_integration_by_id_success() -> None:
     """Test successful retrieval of an integration by its ID."""
     integration_id = uuid.uuid4()
-    integrations_data = [
+    integration_list = [
         Integration(
             invalid=False,
             model_registry_token_id=integration_id,
             provider=IntegrationProvider.OPENAI,
             provider_domain="api.openai.com",
         )
     ]
-    integration_list = IntegrationList(integrations=integrations_data)
 
     client = FakeClient(
         secret_resource=FakeSecretResource(get_exception=ResourceNotFoundError("Not found")),