Skip to content

LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows

fix: Delete of adapter in use error handled (#231)

Chandrasekharan Ma300a721c867
diff --git a/backend/adapter_processor/adapter_processor.py b/backend/adapter_processor/adapter_processor.py
index 4a5d1737a..5925bbe82 100644
--- a/backend/adapter_processor/adapter_processor.py
+++ b/backend/adapter_processor/adapter_processor.py
@@ -7,7 +7,7 @@ from adapter_processor.constants import AdapterKeys
from adapter_processor.exceptions import (
InternalServiceError,
InValidAdapterId,
- TestAdapterException,
+ TestAdapterError,
)
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
@@ -117,7 +117,7 @@ class AdapterProcessor:
logger.info(f"{adapter_id} test result: {test_result}")
return test_result
except AdapterError as e:
- raise TestAdapterException(str(e))
+ raise TestAdapterError(str(e))
@staticmethod
def __fetch_adapters_by_key_value(key: str, value: Any) -> Adapter:
diff --git a/backend/adapter_processor/exceptions.py b/backend/adapter_processor/exceptions.py
index bcdbb9382..f2eeeb73e 100644
--- a/backend/adapter_processor/exceptions.py
+++ b/backend/adapter_processor/exceptions.py
@@ -1,3 +1,5 @@
+from typing import Optional
+
from rest_framework.exceptions import APIException
from backend.exceptions import UnstractBaseException
@@ -18,11 +20,6 @@ class InValidAdapterId(APIException):
default_detail = "Adapter ID is not Valid."
-class JSONParseException(APIException):
- status_code = 500
- default_detail = "Exception occured while Parsing JSON Schema."
-
-
class InternalServiceError(APIException):
status_code = 500
default_detail = "Internal Service error"
@@ -41,16 +38,23 @@ class UniqueConstraintViolation(APIException):
default_detail = "Unique constraint violated"
-class TestAdapterException(UnstractBaseException):
+class TestAdapterError(UnstractBaseException):
status_code = 500
- default_detail = "Error while testing adapter."
-
-
-class TestAdapterInputException(UnstractBaseException):
- status_code = 400
- default_detail = "Connection test failed using the given configuration data"
-
-
-class ErrorFetchingAdapterData(UnstractBaseException):
- status_code = 400
- default_detail = "Error while fetching adapter data."
+ default_detail = "Error while testing adapter"
+
+
+class DeleteAdapterInUseError(APIException):
+ status_code = 409
+
+ def __init__(
+ self,
+ detail: Optional[str] = None,
+ code: Optional[str] = None,
+ adapter_name: str = "adapter",
+ ):
+ if detail is None:
+ detail = (
+ f"Cannot delete {adapter_name}. "
+ "It is used in a workflow or a prompt studio project"
+ )
+ super().__init__(detail, code)
diff --git a/backend/adapter_processor/views.py b/backend/adapter_processor/views.py
index 4e9a8f521..8025f10d5 100644
--- a/backend/adapter_processor/views.py
+++ b/backend/adapter_processor/views.py
@@ -5,6 +5,7 @@ from adapter_processor.adapter_processor import AdapterProcessor
from adapter_processor.constants import AdapterKeys
from adapter_processor.exceptions import (
CannotDeleteDefaultAdapter,
+ DeleteAdapterInUseError,
IdIsMandatory,
InValidType,
UniqueConstraintViolation,
@@ -18,7 +19,7 @@ from adapter_processor.serializers import (
UserDefaultAdapterSerializer,
)
from django.db import IntegrityError
-from django.db.models import QuerySet
+from django.db.models import ProtectedError, QuerySet
from django.http import HttpRequest
from django.http.response import HttpResponse
from permissions.permission import IsOwner, IsOwnerOrSharedUser
@@ -229,7 +230,17 @@ class AdapterInstanceViewSet(ModelViewSet):
logger.error("Cannot delete a default adapter")
raise CannotDeleteDefaultAdapter()
- super().perform_destroy(adapter_instance)
+ try:
+ super().perform_destroy(adapter_instance)
+ except ProtectedError:
+ logger.error(
+ f"Failed to delete adapter: {adapter_instance.adapter_id}"
+ f" named {adapter_instance.adapter_name}"
+ )
+ # TODO: Provide details of adpter usage with exception object
+ raise DeleteAdapterInUseError(
+ adapter_name=adapter_instance.adapter_name
+ )
return Response(status=status.HTTP_204_NO_CONTENT)
def partial_update(