Skip to content

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

Permission fix for adding shared llm adapter in profile manager (#257)

Rahul Johny56ee45bd74db
diff --git a/backend/adapter_processor/models.py b/backend/adapter_processor/models.py
index 48aa60f1b..fd84db17c 100644
--- a/backend/adapter_processor/models.py
+++ b/backend/adapter_processor/models.py
@@ -1,10 +1,15 @@
+import json
import uuid
from typing import Any
from account.models import User
+from cryptography.fernet import Fernet
+from django.conf import settings
from django.db import models
from django.db.models import QuerySet
+from unstract.adapters.adapterkit import Adapterkit
from unstract.adapters.enums import AdapterTypes
+from unstract.adapters.llm.llm_adapter import LLMAdapter
from utils.models.base_model import BaseModel
ADAPTER_NAME_SIZE = 128
@@ -93,6 +98,25 @@ class AdapterInstance(BaseModel):
),
]
+ def get_adapter_meta_data(self) -> Any:
+ encryption_secret: str = settings.ENCRYPTION_KEY
+ f: Fernet = Fernet(encryption_secret.encode("utf-8"))
+
+ adapter_metadata = json.loads(
+ f.decrypt(bytes(self.adapter_metadata_b).decode("utf-8"))
+ )
+ return adapter_metadata
+
+ def get_context_window_size(self) -> int:
+
+ adapter_metadata = self.get_adapter_meta_data()
+ # Get the adapter_instance
+ adapter_class = Adapterkit().get_adapter_class_by_adapter_id(self.adapter_id)
+ adapter_instance = adapter_class(adapter_metadata)
+ if isinstance(adapter_instance, LLMAdapter):
+ return adapter_instance.get_context_window_size()
+ return 0
+
class UserDefaultAdapter(BaseModel):
user = models.OneToOneField(User, on_delete=models.CASCADE)
diff --git a/backend/adapter_processor/serializers.py b/backend/adapter_processor/serializers.py
index ef42ae773..bb570c1bc 100644
--- a/backend/adapter_processor/serializers.py
+++ b/backend/adapter_processor/serializers.py
@@ -8,9 +8,7 @@ from cryptography.fernet import Fernet
from django.conf import settings
from rest_framework import serializers
from rest_framework.serializers import ModelSerializer
-from unstract.adapters.adapterkit import Adapterkit
from unstract.adapters.constants import Common as common
-from unstract.adapters.llm.llm_adapter import LLMAdapter
from backend.constants import FieldLengthConstants as FLC
from backend.serializers import AuditSerializer
@@ -61,26 +59,13 @@ class AdapterInstanceSerializer(BaseAdapterSerializer):
def to_representation(self, instance: AdapterInstance) -> dict[str, str]:
rep: dict[str, str] = super().to_representation(instance)
- encryption_secret: str = settings.ENCRYPTION_KEY
- f: Fernet = Fernet(encryption_secret.encode("utf-8"))
-
rep.pop(AdapterKeys.ADAPTER_METADATA_B)
- adapter_metadata = json.loads(
- f.decrypt(bytes(instance.adapter_metadata_b).decode("utf-8"))
- )
- # Get the adapter_instance
- adapter_class = Adapterkit().get_adapter_class_by_adapter_id(
- instance.adapter_id
- )
- adapter_instance = adapter_class(adapter_metadata)
- # If adapter_instance is a LLM send
- # additional parameter of context_window
- if isinstance(adapter_instance, LLMAdapter):
- adapter_metadata[AdapterKeys.ADAPTER_CONTEXT_WINDOW_SIZE] = (
- adapter_instance.get_context_window_size()
- )
+ adapter_metadata = instance.get_adapter_meta_data()
rep[AdapterKeys.ADAPTER_METADATA] = adapter_metadata
+ adapter_metadata[AdapterKeys.ADAPTER_CONTEXT_WINDOW_SIZE] = (
+ instance.get_context_window_size()
+ )
rep[common.ICON] = AdapterProcessor.get_adapter_data_with_key(
instance.adapter_id, common.ICON
@@ -90,6 +75,25 @@ class AdapterInstanceSerializer(BaseAdapterSerializer):
return rep
+class AdapterInfoSerializer(BaseAdapterSerializer):
+
+ context_window_size = serializers.SerializerMethodField()
+
+ class Meta(BaseAdapterSerializer.Meta):
+ model = AdapterInstance
+ fields = (
+ "id",
+ "adapter_id",
+ "adapter_name",
+ "adapter_type",
+ "created_by",
+ "context_window_size",
+ ) # type: ignore
+
+ def get_context_window_size(self, obj: AdapterInstance) -> int:
+ return obj.get_context_window_size()
+
+
class AdapterListSerializer(BaseAdapterSerializer):
"""Inherits BaseAdapterSerializer.
diff --git a/backend/adapter_processor/urls.py b/backend/adapter_processor/urls.py
index ff2572ce8..215e4e6c9 100644
--- a/backend/adapter_processor/urls.py
+++ b/backend/adapter_processor/urls.py
@@ -23,6 +23,7 @@ adapter_detail = AdapterInstanceViewSet.as_view(
)
adapter_users = AdapterInstanceViewSet.as_view({"get": "list_of_shared_users"})
+adapter_info = AdapterInstanceViewSet.as_view({"get": "adapter_info"})
urlpatterns = format_suffix_patterns(
[
path("adapter_schema/", adapter_schema, name="get_adapter_schema"),
@@ -30,6 +31,7 @@ urlpatterns = format_suffix_patterns(
path("adapter/", adapter_list, name="adapter-list"),
path("adapter/default_triad/", default_triad, name="default_triad"),
path("adapter/<uuid:pk>/", adapter_detail, name="adapter_detail"),
+ path("adapter/info/<uuid:pk>/", adapter_info, name="adapter_info"),
path("test_adapters/", adapter_test, name="adapter-test"),
path(
"adapter/users/<uuid:pk>/",
diff --git a/backend/adapter_processor/views.py b/backend/adapter_processor/views.py
index 650bb5a9d..37ca36886 100644
--- a/backend/adapter_processor/views.py
+++ b/backend/adapter_processor/views.py
@@ -1,4 +1,5 @@
import logging
+import uuid
from typing import Any, Optional
from adapter_processor.adapter_processor import AdapterProcessor
@@ -11,6 +12,7 @@ from adapter_processor.exceptions import (
UniqueConstraintViolation,
)
from adapter_processor.serializers import (
+ AdapterInfoSerializer,
AdapterInstanceSerializer,
AdapterListSerializer,
DefaultAdapterSerializer,
@@ -268,10 +270,17 @@ class AdapterInstanceViewSet(ModelViewSet):
@action(detail=True, methods=["get"])
def list_of_shared_users(self, request: HttpRequest, pk: Any = None) -> Response:
self.permission_classes = [IsOwnerOrSharedUser]
- adapter = (
- self.get_object()
- ) # Assuming you have a get_object method in your viewset
+ adapter = self.get_object()
serialized_instances = SharedUserListSerializer(adapter).data
return Response(serialized_instances)
+
+ @action(detail=True, methods=["get"])
+ def adapter_info(self, request: HttpRequest, pk: uuid) -> Response:
+ self.permission_classes = [IsOwnerOrSharedUser]
+ adapter = self.get_object()
+
+ serialized_instances = AdapterInfoSerializer(adapter).data
+
+ return Response(serialized_instances)
diff --git a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
index 7b0c28fdb..a21cad29c 100644
--- a/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
+++ b/frontend/src/components/custom-tools/add-llm-profile/AddLlmProfile.jsx
@@ -356,7 +356,7 @@ function AddLlmProfile({
}
const requestOptions = {
method: "GET",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/adapter/${value}/`,
+ url: `/api/v1/unstract/${sessionDetails?.orgId}/adapter/info/${value}/`,
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
},
@@ -365,7 +365,7 @@ function AddLlmProfile({
axiosPrivate(requestOptions)
.then((res) => {
const data = res?.data;
- const contextWindowSize = data.adapter_metadata.context_window_size;
+ const contextWindowSize = data.context_window_size;
const chunkSize = form.getFieldValue("chunk_size");
setTokenSize(chunkSize > 0 ? calcTokenSize(chunkSize) : 0);
setMaxTokenSize(contextWindowSize);