feat(elasticsearch): simplify search method (#763)

* feat(elasticsearch): simplify search method

* Update unit coverage badge

---------

Co-authored-by: leoguillaume <leoguillaume@users.noreply.github.com>

Author: leoguillaume

.github/README_INTEGRATION_TESTS.md

@@ -72,7 +72,7 @@ To execute a specific test, you can use the following command:
 CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/<path_to_test_file>::<TestClass>::<test_name> --config-file=pyproject.toml
 
 # Example
-CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/test_admin/test_admin_providers.py::TestAdminProviders::test_create_provider_with_text_generation_model --config-file=pyproject.toml
+CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/test_admin/test_create_provider.py::TestAdminProviders::test_create_provider_with_text_generation_model --config-file=pyproject.toml
 ```
 
 To run a group of tests, you can use the following command:
@@ -81,7 +81,7 @@ To run a group of tests, you can use the following command:
 CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/<path_to_test_file> --config-file=pyproject.toml
 
 # Example
-CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/test_admin/test_admin_providers.py --config-file=pyproject.toml
+CONFIG_FILE=api/tests/integ/config.test.yml PYTHONPATH=. pytest api/tests/integ/test_admin/test_create_provider.py --config-file=pyproject.toml
 ```
 
 ## Run with VSCode

api/dependencies.py

@@ -8,7 +8,7 @@
 from api.infrastructure.model import ModelProviderGateway
 from api.infrastructure.postgres import PostgresKeyRepository, PostgresProviderRepository, PostgresRouterRepository, PostgresUserInfoRepository
 from api.schemas.core.context import RequestContext
-from api.use_cases.admin.providers import CreateProviderUseCase
+from api.use_cases.admin.providers import CreateProviderUseCase, DeleteProviderUseCase
 from api.use_cases.admin.routers import CreateRouterUseCase, DeleteRouterUseCase, GetOneRouterUseCase, GetRoutersUseCase
 from api.use_cases.models import GetModelsUseCase
 from api.utils.configuration import configuration
@@ -94,6 +94,13 @@ def delete_router_use_case_factory(postgres_session: AsyncSession = Depends(get_
     )
 
 
+def delete_provider_use_case_factory(postgres_session: AsyncSession = Depends(get_postgres_session)) -> DeleteProviderUseCase:
+    return DeleteProviderUseCase(
+        provider_repository=PostgresProviderRepository(postgres_session=postgres_session),
+        user_info_repository=_user_info_repository(postgres_session),
+    )
+
+
 def get_key_repository(postgres_session: AsyncSession = Depends(get_postgres_session)) -> KeyRepository:
     return PostgresKeyRepository(postgres_session=postgres_session)
 

api/domain/provider/_providerrepository.py

@@ -25,3 +25,10 @@ async def create_provider(
         max_context_length: int,
     ) -> Provider | ProviderAlreadyExistsError:
         pass
+
+    @abstractmethod
+    async def delete_provider(
+        self,
+        provider_id: int,
+    ) -> Provider | None:
+        pass

api/domain/provider/errors.py

@@ -17,3 +17,8 @@ class ProviderAlreadyExistsError:
     model_name: str
     url: str
     router_id: int
+
+
+@dataclass
+class ProviderNotFoundError:
+    provider_id: int

api/endpoints/admin/providers.py

@@ -13,25 +13,6 @@
 from api.utils.variables import EndpointRoute
 
 
-@router.delete(
-    path=EndpointRoute.ADMIN_PROVIDERS + "/{provider}",
-    dependencies=[Security(dependency=AccessController(permissions=[PermissionType.ADMIN, PermissionType.PROVIDE_MODELS]))],
-    status_code=204,
-)
-async def delete_provider(
-    request: Request,
-    provider: int = Path(description="The ID of the provider to delete."),
-    postgres_session: AsyncSession = Depends(get_postgres_session),
-    model_registry: ModelRegistry = Depends(get_model_registry),
-) -> Response:
-    """
-    Delete a router provider.
-    """
-    await model_registry.delete_provider(provider_id=provider, postgres_session=postgres_session)
-
-    return Response(status_code=204)
-
-
 @router.patch(
     path=EndpointRoute.ADMIN_PROVIDERS + "/{provider}",
     dependencies=[Security(dependency=AccessController(permissions=[PermissionType.ADMIN, PermissionType.PROVIDE_MODELS]))],

api/infrastructure/fastapi/endpoints/admin/providers.py

@@ -6,10 +6,10 @@
 from fastapi.responses import JSONResponse, Response
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from api.dependencies import create_provider_use_case_factory, get_request_context
+from api.dependencies import create_provider_use_case_factory, delete_provider_use_case_factory, get_request_context
 from api.domain.model import InconsistentModelMaxContextLengthError, InconsistentModelVectorSizeError
 from api.domain.provider import InvalidProviderTypeError, ProviderNotReachableError
-from api.domain.provider.errors import ProviderAlreadyExistsError
+from api.domain.provider.errors import ProviderAlreadyExistsError, ProviderNotFoundError
 from api.domain.router.errors import RouterNotFoundError
 from api.domain.userinfo.errors import UserIsNotAdminError
 from api.helpers.models import ModelRegistry
@@ -24,11 +24,19 @@
     InvalidProviderTypeHTTPException,
     NotAdminUserHTTPException,
     ProviderAlreadyExistsHTTPException,
+    ProviderNotFoundHTTPException,
     ProviderNotReachableHTTPException,
     RouterNotFoundHTTPException,
 )
 from api.infrastructure.fastapi.schemas.providers import CreateProvider, CreateProviderResponse, Provider, Providers, UpdateProvider
-from api.use_cases.admin.providers import CreateProviderCommand, CreateProviderUseCase, CreateProviderUseCaseSuccess
+from api.use_cases.admin.providers import (
+    CreateProviderCommand,
+    CreateProviderUseCase,
+    CreateProviderUseCaseSuccess,
+    DeleteProviderCommand,
+    DeleteProviderUseCase,
+    DeleteProviderUseCaseSuccess,
+)
 from api.utils.dependencies import get_model_registry, get_postgres_session
 from api.utils.variables import EndpointRoute
 
@@ -107,19 +115,39 @@ async def create_provider(
 
 
 @router.delete(
-    path=EndpointRoute.ADMIN_PROVIDERS + "/{provider}",
+    path=EndpointRoute.ADMIN_PROVIDERS + "/{provider_id}",
     dependencies=[Security(dependency=get_current_key)],
-    status_code=204,
+    status_code=200,
 )
 async def delete_provider(
-    request: Request,
-    provider: int = Path(description="The ID of the provider to delete."),
-    postgres_session: AsyncSession = Depends(get_postgres_session),
-    model_registry: ModelRegistry = Depends(get_model_registry),
-) -> Response:
-    await model_registry.delete_provider(provider_id=provider, postgres_session=postgres_session)
+    provider_id: int = Path(description="The ID of the provider to delete."),
+    delete_provider_use_case: DeleteProviderUseCase = Depends(delete_provider_use_case_factory),
+    request_context: ContextVar[RequestContext] = Depends(get_request_context),
+) -> Provider:
+    command = DeleteProviderCommand(
+        user_id=request_context.get().user_id,
+        provider_id=provider_id,
+    )
+    try:
+        result = await delete_provider_use_case.execute(command)
+    except Exception as e:
+        logger.exception(
+            "Unexpected error while executing delete_provider use case",
+            extra={
+                "user_id": command.user_id,
+                "provider_id": command.provider_id,
+                "error_type": type(e).__name__,
+            },
+        )
+        raise InternalServerHTTPException()
 
-    return Response(status_code=204)
+    match result:
+        case DeleteProviderUseCaseSuccess(deleted_router):
+            return Provider.model_validate(deleted_router, from_attributes=True)
+        case ProviderNotFoundError(provider_id=not_found_id):
+            raise ProviderNotFoundHTTPException(not_found_id)
+        case UserIsNotAdminError():
+            raise NotAdminUserHTTPException()
 
 
 @router.patch(

api/infrastructure/fastapi/endpoints/exceptions.py

@@ -83,6 +83,14 @@ def __init__(self, router_id: int) -> None:
         super().__init__(status_code=self.status_code, detail=f"Model router {router_id} not found.")
 
 
+class ProviderNotFoundHTTPException(HTTPException):
+    status_code = 404
+    detail = "Model provider {provider_id} not found."
+
+    def __init__(self, provider_id: int) -> None:
+        super().__init__(status_code=self.status_code, detail=f"Model provider {provider_id} not found.")
+
+
 # 409
 class RouterAliasAlreadyExistsHTTPException(HTTPException):
     status_code = 409

api/infrastructure/postgres/_postgresproviderrepository.py

@@ -1,4 +1,4 @@
-from sqlalchemy import insert
+from sqlalchemy import delete, insert, select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -13,6 +13,26 @@ class PostgresProviderRepository(ProviderRepository):
     def __init__(self, postgres_session: AsyncSession):
         self.postgres_session = postgres_session
 
+    @staticmethod
+    def _row_to_provider(row) -> Provider:
+        return Provider(
+            router_id=row.router_id,
+            user_id=row.user_id,
+            type=row.type,
+            url=row.url,
+            key=row.key,
+            timeout=row.timeout,
+            model_name=row.model_name,
+            model_hosting_zone=row.model_hosting_zone,
+            model_total_params=row.model_total_params,
+            model_active_params=row.model_active_params,
+            qos_metric=row.qos_metric,
+            qos_limit=row.qos_limit,
+            max_context_length=row.max_context_length,
+            vector_size=row.vector_size,
+            id=row.id,
+        )
+
     async def create_provider(
         self,
         router_id: int,
@@ -75,3 +95,13 @@ async def create_provider(
             if "unique_provider_router_id_url_model_name" in str(e.orig):
                 return ProviderAlreadyExistsError(model_name=model_name, url=url, router_id=router_id)
             raise
+
+    async def delete_provider(self, provider_id: int) -> Provider | None:
+        select_query = select(ProviderTable).where(ProviderTable.id == provider_id)
+        result = await self.postgres_session.execute(select_query)
+        row = result.scalar_one_or_none()
+        if row is None:
+            return None
+        delete_query = delete(ProviderTable).where(ProviderTable.id == provider_id)
+        await self.postgres_session.execute(delete_query)
+        return self._row_to_provider(row)