Merge branch 'main' into feat/MultiTenancyV2-PromptStudo-Document-Ind…

…ex-Output-Managers

backend/adapter_processor/adapter_processor.py

@@ -8,6 +8,7 @@
     InternalServiceError,
     InValidAdapterId,
     TestAdapterError,
+    TestAdapterInputError,
 )
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -97,6 +98,12 @@ def test_adapter(adapter_id: str, adapter_metadata: dict[str, Any]) -> bool:
             test_result: bool = adapter_instance.test_connection()
             logger.info(f"{adapter_id} test result: {test_result}")
             return test_result
+        # HACK: Remove after error is explicitly handled in VertexAI adapter
+        except json.JSONDecodeError:
+            raise TestAdapterInputError(
+                "Credentials is not a valid service account JSON, "
+                "please provide a valid JSON."
+            )
         except AdapterError as e:
             raise TestAdapterError(str(e))
 

backend/adapter_processor/exceptions.py

@@ -2,8 +2,6 @@
 
 from rest_framework.exceptions import APIException
 
-from backend.exceptions import UnstractBaseException
-
 
 class IdIsMandatory(APIException):
     status_code = 400
@@ -46,11 +44,16 @@ class UniqueConstraintViolation(APIException):
     default_detail = "Unique constraint violated"
 
 
-class TestAdapterError(UnstractBaseException):
+class TestAdapterError(APIException):
     status_code = 500
     default_detail = "Error while testing adapter"
 
 
+class TestAdapterInputError(APIException):
+    status_code = 400
+    default_detail = "Error while testing adapter, please check the configuration."
+
+
 class DeleteAdapterInUseError(APIException):
     status_code = 409
 

backend/adapter_processor/views.py

@@ -115,17 +115,13 @@ def test(self, request: Request) -> Response:
         adapter_metadata[AdapterKeys.ADAPTER_TYPE] = serializer.validated_data.get(
             AdapterKeys.ADAPTER_TYPE
         )
-        try:
-            test_result = AdapterProcessor.test_adapter(
-                adapter_id=adapter_id, adapter_metadata=adapter_metadata
-            )
-            return Response(
-                {AdapterKeys.IS_VALID: test_result},
-                status=status.HTTP_200_OK,
-            )
-        except Exception as e:
-            logger.error(f"Error testing adapter : {str(e)}")
-            raise e
+        test_result = AdapterProcessor.test_adapter(
+            adapter_id=adapter_id, adapter_metadata=adapter_metadata
+        )
+        return Response(
+            {AdapterKeys.IS_VALID: test_result},
+            status=status.HTTP_200_OK,
+        )
 
 
 class AdapterInstanceViewSet(ModelViewSet):

backend/adapter_processor_v2/adapter_processor.py

@@ -0,0 +1,257 @@
+import json
+import logging
+from typing import Any, Optional
+
+from account_v2.models import User
+from adapter_processor_v2.constants import AdapterKeys
+from adapter_processor_v2.exceptions import (
+    InternalServiceError,
+    InValidAdapterId,
+    TestAdapterError,
+)
+from django.conf import settings
+from django.core.exceptions import ObjectDoesNotExist
+from platform_settings_v2.platform_auth_service import PlatformAuthenticationService
+from unstract.adapters.adapterkit import Adapterkit
+from unstract.adapters.base import Adapter
+from unstract.adapters.enums import AdapterTypes
+from unstract.adapters.exceptions import AdapterError
+from unstract.adapters.x2text.constants import X2TextConstants
+
+from .models import AdapterInstance, UserDefaultAdapter
+
+logger = logging.getLogger(__name__)
+
+
+class AdapterProcessor:
+    @staticmethod
+    def get_json_schema(adapter_id: str) -> dict[str, Any]:
+        """Function to return JSON Schema for Adapters."""
+        schema_details: dict[str, Any] = {}
+        updated_adapters = AdapterProcessor.__fetch_adapters_by_key_value(
+            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()
+        else:
+            logger.error(
+                f"Invalid adapter Id : {adapter_id} while fetching JSON Schema"
+            )
+            raise InValidAdapterId()
+        return schema_details
+
+    @staticmethod
+    def get_all_supported_adapters(type: str) -> list[dict[Any, Any]]:
+        """Function to return list of all supported adapters."""
+        supported_adapters = []
+        updated_adapters = []
+        updated_adapters = AdapterProcessor.__fetch_adapters_by_key_value(
+            AdapterKeys.ADAPTER_TYPE, type
+        )
+        for each_adapter in updated_adapters:
+            supported_adapters.append(
+                {
+                    AdapterKeys.ID: each_adapter.get(AdapterKeys.ID),
+                    AdapterKeys.NAME: each_adapter.get(AdapterKeys.NAME),
+                    AdapterKeys.DESCRIPTION: each_adapter.get(AdapterKeys.DESCRIPTION),
+                    AdapterKeys.ICON: each_adapter.get(AdapterKeys.ICON),
+                    AdapterKeys.ADAPTER_TYPE: each_adapter.get(
+                        AdapterKeys.ADAPTER_TYPE
+                    ),
+                }
+            )
+        return supported_adapters
+
+    @staticmethod
+    def get_adapter_data_with_key(adapter_id: str, key_value: str) -> Any:
+        """Generic Function to get adapter data with provided key."""
+        updated_adapters = AdapterProcessor.__fetch_adapters_by_key_value(
+            "id", adapter_id
+        )
+        if len(updated_adapters) == 0:
+            logger.error(f"Invalid adapter ID {adapter_id} while invoking utility")
+            raise InValidAdapterId()
+        return updated_adapters[0].get(key_value)
+
+    @staticmethod
+    def test_adapter(adapter_id: str, adapter_metadata: dict[str, Any]) -> bool:
+        logger.info(f"Testing adapter: {adapter_id}")
+        try:
+            adapter_class = Adapterkit().get_adapter_class_by_adapter_id(adapter_id)
+
+            if adapter_metadata.pop(AdapterKeys.ADAPTER_TYPE) == AdapterKeys.X2TEXT:
+                adapter_metadata[X2TextConstants.X2TEXT_HOST] = settings.X2TEXT_HOST
+                adapter_metadata[X2TextConstants.X2TEXT_PORT] = settings.X2TEXT_PORT
+                platform_key = PlatformAuthenticationService.get_active_platform_key()
+                adapter_metadata[X2TextConstants.PLATFORM_SERVICE_API_KEY] = str(
+                    platform_key.key
+                )
+
+            adapter_instance = adapter_class(adapter_metadata)
+            test_result: bool = adapter_instance.test_connection()
+            logger.info(f"{adapter_id} test result: {test_result}")
+            return test_result
+        except AdapterError as e:
+            raise TestAdapterError(str(e))
+
+    @staticmethod
+    def __fetch_adapters_by_key_value(key: str, value: Any) -> Adapter:
+        """Fetches a list of adapters that have an attribute matching key and
+        value."""
+        logger.info(f"Fetching adapter list for {key} with {value}")
+        adapter_kit = Adapterkit()
+        adapters = adapter_kit.get_adapters_list()
+        return [iterate for iterate in adapters if iterate[key] == value]
+
+    @staticmethod
+    def set_default_triad(default_triad: dict[str, str], user: User) -> None:
+        try:
+            (
+                user_default_adapter,
+                created,
+            ) = UserDefaultAdapter.objects.get_or_create(user=user)
+
+            if default_triad.get(AdapterKeys.LLM_DEFAULT, None):
+                user_default_adapter.default_llm_adapter = AdapterInstance.objects.get(
+                    pk=default_triad[AdapterKeys.LLM_DEFAULT]
+                )
+            if default_triad.get(AdapterKeys.EMBEDDING_DEFAULT, None):
+                user_default_adapter.default_embedding_adapter = (
+                    AdapterInstance.objects.get(
+                        pk=default_triad[AdapterKeys.EMBEDDING_DEFAULT]
+                    )
+                )
+
+            if default_triad.get(AdapterKeys.VECTOR_DB_DEFAULT, None):
+                user_default_adapter.default_vector_db_adapter = (
+                    AdapterInstance.objects.get(
+                        pk=default_triad[AdapterKeys.VECTOR_DB_DEFAULT]
+                    )
+                )
+
+            if default_triad.get(AdapterKeys.X2TEXT_DEFAULT, None):
+                user_default_adapter.default_x2text_adapter = (
+                    AdapterInstance.objects.get(
+                        pk=default_triad[AdapterKeys.X2TEXT_DEFAULT]
+                    )
+                )
+
+            user_default_adapter.save()
+
+            logger.info("Changed defaults successfully")
+        except Exception as e:
+            logger.error(f"Unable to save defaults because: {e}")
+            if isinstance(e, InValidAdapterId):
+                raise e
+            else:
+                raise InternalServiceError()
+
+    @staticmethod
+    def get_adapter_instance_by_id(adapter_instance_id: str) -> Adapter:
+        """Get the adapter instance by its ID.
+
+        Parameters:
+        - adapter_instance_id (str): The ID of the adapter instance.
+
+        Returns:
+        - Adapter: The adapter instance with the specified ID.
+
+        Raises:
+        - Exception: If there is an error while fetching the adapter instance.
+        """
+        try:
+            adapter = AdapterInstance.objects.get(id=adapter_instance_id)
+        except Exception as e:
+            logger.error(f"Unable to fetch adapter: {e}")
+        if not adapter:
+            logger.error("Unable to fetch adapter")
+        return adapter.adapter_name
+
+    @staticmethod
+    def get_adapters_by_type(
+        adapter_type: AdapterTypes, user: User
+    ) -> list[AdapterInstance]:
+        """Get a list of adapters by their type.
+
+        Parameters:
+        - adapter_type (AdapterTypes): The type of adapters to retrieve.
+        - user: Logged in User
+
+        Returns:
+        - list[AdapterInstance]: A list of AdapterInstance objects that match
+            the specified adapter type.
+        """
+
+        adapters: list[AdapterInstance] = AdapterInstance.objects.for_user(user).filter(
+            adapter_type=adapter_type.value,
+        )
+        return adapters
+
+    @staticmethod
+    def get_adapter_by_name_and_type(
+        adapter_type: AdapterTypes,
+        adapter_name: Optional[str] = None,
+    ) -> Optional[AdapterInstance]:
+        """Get the adapter instance by its name and type.
+
+        Parameters:
+        - adapter_name (str): The name of the adapter instance.
+        - adapter_type (AdapterTypes): The type of the adapter instance.
+
+        Returns:
+        - AdapterInstance: The adapter with the specified name and type.
+        """
+        if adapter_name:
+            adapter: AdapterInstance = AdapterInstance.objects.get(
+                adapter_name=adapter_name, adapter_type=adapter_type.value
+            )
+        else:
+            try:
+                adapter = AdapterInstance.objects.get(
+                    adapter_type=adapter_type.value, is_default=True
+                )
+            except AdapterInstance.DoesNotExist:
+                return None
+        return adapter
+
+    @staticmethod
+    def get_default_adapters(user: User) -> list[AdapterInstance]:
+        """Retrieve a list of default adapter instances. This method queries
+        the database to fetch all adapter instances marked as default.
+
+        Raises:
+            InternalServiceError: If an unexpected error occurs during
+            the database query.
+
+        Returns:
+            list[AdapterInstance]: A list of AdapterInstance objects that are
+            marked as default.
+        """
+        try:
+            adapters: list[AdapterInstance] = []
+            default_adapter = UserDefaultAdapter.objects.get(user=user)
+
+            if default_adapter.default_embedding_adapter:
+                adapters.append(default_adapter.default_embedding_adapter)
+            if default_adapter.default_llm_adapter:
+                adapters.append(default_adapter.default_llm_adapter)
+            if default_adapter.default_vector_db_adapter:
+                adapters.append(default_adapter.default_vector_db_adapter)
+            if default_adapter.default_x2text_adapter:
+                adapters.append(default_adapter.default_x2text_adapter)
+
+            return adapters
+        except ObjectDoesNotExist as e:
+            logger.error(f"No default adapters found: {e}")
+            raise InternalServiceError(
+                "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")

backend/adapter_processor_v2/constants.py

@@ -0,0 +1,28 @@
+class AdapterKeys:
+    JSON_SCHEMA = "json_schema"
+    ADAPTER_TYPE = "adapter_type"
+    IS_DEFAULT = "is_default"
+    LLM = "LLM"
+    X2TEXT = "X2TEXT"
+    OCR = "OCR"
+    VECTOR_DB = "VECTOR_DB"
+    EMBEDDING = "EMBEDDING"
+    NAME = "name"
+    DESCRIPTION = "description"
+    ICON = "icon"
+    ADAPTER_ID = "adapter_id"
+    ADAPTER_METADATA = "adapter_metadata"
+    ADAPTER_METADATA_B = "adapter_metadata_b"
+    ID = "id"
+    IS_VALID = "is_valid"
+    LLM_DEFAULT = "llm_default"
+    VECTOR_DB_DEFAULT = "vector_db_default"
+    EMBEDDING_DEFAULT = "embedding_default"
+    X2TEXT_DEFAULT = "x2text_default"
+    SHARED_USERS = "shared_users"
+    ADAPTER_NAME_EXISTS = (
+        "Configuration with this Name already exists. "
+        "Please try with a different Name"
+    )
+    ADAPTER_CREATED_BY = "created_by_email"
+    ADAPTER_CONTEXT_WINDOW_SIZE = "context_window_size"