Skip to content

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

fix: Error handling improvements: Unsaved classifier config and duplicate adapter name (#543)

Chandrasekharan Mb7a4f5443b70
diff --git a/.gitignore b/.gitignore
index f539896ae..3e3155237 100644
--- a/.gitignore
+++ b/.gitignore
@@ -643,7 +643,6 @@ backend/backend/settings/*
!backend/backend/settings/test.py
# Local Dependencies for docker testing
-unstract/unstract-adapters/
unstract/unstract-sdk/
# BE pluggable-apps
diff --git a/backend/adapter_processor/adapter_processor.py b/backend/adapter_processor/adapter_processor.py
index 9abebd3da..2cf188b98 100644
--- a/backend/adapter_processor/adapter_processor.py
+++ b/backend/adapter_processor/adapter_processor.py
@@ -33,13 +33,9 @@ class AdapterProcessor:
AdapterKeys.ID, adapter_id
)
if len(updated_adapters) != 0:
- try:
- schema_details[AdapterKeys.JSON_SCHEMA] = json.loads(
- updated_adapters[0].get(AdapterKeys.JSON_SCHEMA)
- )
- except Exception as exc:
- logger.error(f"Error occured while parsing JSON Schema : {exc}")
- raise InternalServiceError()
+ schema_details[AdapterKeys.JSON_SCHEMA] = json.loads(
+ updated_adapters[0].get(AdapterKeys.JSON_SCHEMA)
+ )
else:
logger.error(
f"Invalid adapter Id : {adapter_id} while fetching JSON Schema"
@@ -257,8 +253,5 @@ class AdapterProcessor:
except ObjectDoesNotExist as e:
logger.error(f"No default adapters found: {e}")
raise InternalServiceError(
- "No default adapters found, " "configure them through Platform Settings"
+ "No default adapters found, configure them through Platform Settings"
)
- except Exception as e:
- logger.error(f"Error occurred while fetching default adapters: {e}")
- raise InternalServiceError("Error fetching default adapters")
diff --git a/backend/adapter_processor/constants.py b/backend/adapter_processor/constants.py
index 4c263bd4a..6557491b9 100644
--- a/backend/adapter_processor/constants.py
+++ b/backend/adapter_processor/constants.py
@@ -24,5 +24,6 @@ class AdapterKeys:
"Configuration with this name already exists within your organisation. "
"Please try with a different name."
)
+ ADAPTER_NAME = "adapter_name"
ADAPTER_CREATED_BY = "created_by_email"
ADAPTER_CONTEXT_WINDOW_SIZE = "context_window_size"
diff --git a/backend/adapter_processor/exceptions.py b/backend/adapter_processor/exceptions.py
index 5e1bbf948..a0f18febc 100644
--- a/backend/adapter_processor/exceptions.py
+++ b/backend/adapter_processor/exceptions.py
@@ -1,5 +1,6 @@
from typing import Optional
+from adapter_processor.constants import AdapterKeys
from rest_framework.exceptions import APIException
@@ -39,9 +40,19 @@ class CannotDeleteDefaultAdapter(APIException):
)
-class UniqueConstraintViolation(APIException):
+class DuplicateAdapterNameError(APIException):
status_code = 400
- default_detail = "Unique constraint violated"
+ default_detail: str = AdapterKeys.ADAPTER_NAME_EXISTS
+
+ def __init__(
+ self,
+ name: Optional[str] = None,
+ detail: Optional[str] = None,
+ code: Optional[str] = None,
+ ) -> None:
+ if name:
+ detail = self.default_detail.replace("this name", f"name '{name}'")
+ super().__init__(detail, code)
class TestAdapterError(APIException):
@@ -64,6 +75,8 @@ class DeleteAdapterInUseError(APIException):
adapter_name: str = "adapter",
):
if detail is None:
+ if adapter_name != "adapter":
+ adapter_name = f"'{adapter_name}'"
detail = (
f"Cannot delete {adapter_name}. "
"It is used in a workflow or a prompt studio project"
diff --git a/backend/adapter_processor/views.py b/backend/adapter_processor/views.py
index 162e4aaf0..b262dd04d 100644
--- a/backend/adapter_processor/views.py
+++ b/backend/adapter_processor/views.py
@@ -7,9 +7,9 @@ from adapter_processor.constants import AdapterKeys
from adapter_processor.exceptions import (
CannotDeleteDefaultAdapter,
DeleteAdapterInUseError,
+ DuplicateAdapterNameError,
IdIsMandatory,
InValidType,
- UniqueConstraintViolation,
)
from adapter_processor.serializers import (
AdapterInfoSerializer,
@@ -40,7 +40,6 @@ from rest_framework.viewsets import GenericViewSet, ModelViewSet
from utils.filtering import FilterHelper
from .constants import AdapterKeys as constant
-from .exceptions import InternalServiceError
from .models import AdapterInstance, UserDefaultAdapter
logger = logging.getLogger(__name__)
@@ -197,10 +196,9 @@ class AdapterInstanceViewSet(ModelViewSet):
user_default_adapter.save()
except IntegrityError:
- raise UniqueConstraintViolation(f"{AdapterKeys.ADAPTER_NAME_EXISTS}")
- except Exception as e:
- logger.error(f"Error saving adapter to DB: {e}")
- raise InternalServiceError
+ raise DuplicateAdapterNameError(
+ name=serializer.validated_data.get(AdapterKeys.ADAPTER_NAME)
+ )
headers = self.get_success_headers(serializer.data)
return Response(
serializer.data, status=status.HTTP_201_CREATED, headers=headers
diff --git a/backend/tool_instance/tool_instance_helper.py b/backend/tool_instance/tool_instance_helper.py
index 201f0dfad..b9d92c8c4 100644
--- a/backend/tool_instance/tool_instance_helper.py
+++ b/backend/tool_instance/tool_instance_helper.py
@@ -360,6 +360,18 @@ class ToolInstanceHelper:
required_prop = e.schema.get("properties").get(validator_val)
required_display_name = required_prop.get("title")
err_msg = err_msg.replace(validator_val, required_display_name)
+ elif e.validator == "minItems":
+ validated_entity_display_name = e.schema.get("title")
+ err_msg = (
+ f"'{validated_entity_display_name}' requires atleast"
+ f" {e.validator_value} values."
+ )
+ elif e.validator == "maxItems":
+ validated_entity_display_name = e.schema.get("title")
+ err_msg = (
+ f"'{validated_entity_display_name}' requires atmost"
+ f" {e.validator_value} values."
+ )
else:
logger.warning(f"Unformatted exception sent to user: {err_msg}")
raise ToolSettingValidationError(