Skip to content

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

Api fixes for V2 (#777)

alid52a05396786
diff --git a/backend/api_v2/api_deployment_views.py b/backend/api_v2/api_deployment_views.py
index 6530877d2..18654bb6d 100644
--- a/backend/api_v2/api_deployment_views.py
+++ b/backend/api_v2/api_deployment_views.py
@@ -121,7 +121,9 @@ class APIDeploymentViewSet(viewsets.ModelViewSet):
serializer: Serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
self.perform_create(serializer)
- api_key = DeploymentHelper.create_api_key(serializer=serializer)
+ api_key = DeploymentHelper.create_api_key(
+ serializer=serializer, request=request
+ )
response_serializer = DeploymentResponseSerializer(
{"api_key": api_key.api_key, **serializer.data}
)
diff --git a/backend/api_v2/deployment_helper.py b/backend/api_v2/deployment_helper.py
index 9dc0488fb..149f38e1b 100644
--- a/backend/api_v2/deployment_helper.py
+++ b/backend/api_v2/deployment_helper.py
@@ -109,7 +109,7 @@ class DeploymentHelper(BaseAPIKeyValidator):
return None
@staticmethod
- def create_api_key(serializer: Serializer) -> APIKey:
+ def create_api_key(serializer: Serializer, request: Request) -> APIKey:
"""To make API key for an API.
Args:
@@ -120,7 +120,7 @@ class DeploymentHelper(BaseAPIKeyValidator):
"""
api_deployment: APIDeployment = serializer.instance
try:
- api_key: APIKey = KeyHelper.create_api_key(api_deployment)
+ api_key: APIKey = KeyHelper.create_api_key(api_deployment, request)
return api_key
except Exception as error:
logger.error(f"Error while creating API key error: {str(error)}")
diff --git a/backend/api_v2/key_helper.py b/backend/api_v2/key_helper.py
index 15d285ac3..2ff10654c 100644
--- a/backend/api_v2/key_helper.py
+++ b/backend/api_v2/key_helper.py
@@ -5,6 +5,7 @@ from api_v2.exceptions import UnauthorizedKey
from api_v2.models import APIDeployment, APIKey
from api_v2.serializers import APIKeySerializer
from pipeline_v2.models import Pipeline
+from rest_framework.request import Request
from workflow_manager.workflow_v2.workflow_helper import WorkflowHelper
logger = logging.getLogger(__name__)
@@ -68,12 +69,14 @@ class KeyHelper:
WorkflowHelper.get_workflow_by_id(workflow_id)
@staticmethod
- def create_api_key(deployment: Union[APIDeployment, Pipeline]) -> APIKey:
+ def create_api_key(
+ deployment: Union[APIDeployment, Pipeline], request: Request
+ ) -> APIKey:
"""Create an APIKey entity using the data from the provided
APIDeployment or Pipeline instance."""
api_key_serializer = APIKeySerializer(
data=deployment.api_key_data,
- context={"deployment": deployment},
+ context={"deployment": deployment, "request": request},
)
api_key_serializer.is_valid(raise_exception=True)
api_key: APIKey = api_key_serializer.save()
diff --git a/backend/api_v2/models.py b/backend/api_v2/models.py
index 28aef3ff5..c9a58eb8a 100644
--- a/backend/api_v2/models.py
+++ b/backend/api_v2/models.py
@@ -175,7 +175,16 @@ class APIKey(BaseModel):
)
def __str__(self) -> str:
- return f"{self.api.api_name} - {self.id} - {self.api_key}"
+ if self.api:
+ api_name = self.api.api_name
+ elif self.pipeline:
+ api_name = self.pipeline.pipeline_name
+ else:
+ api_name = None
+
+ api_key = self.api_key if self.api_key else None
+
+ return f"{api_name} - {self.id} - {api_key}"
class Meta:
verbose_name = "Api Deployment key"
diff --git a/backend/api_v2/serializers.py b/backend/api_v2/serializers.py
index 4c9a85318..655478e4b 100644
--- a/backend/api_v2/serializers.py
+++ b/backend/api_v2/serializers.py
@@ -144,6 +144,7 @@ class APIKeyListSerializer(ModelSerializer):
"is_active",
"description",
"api",
+ "pipeline",
]
diff --git a/backend/backend/base_urls.py b/backend/backend/base_urls.py
index b0c728867..1d235aad6 100644
--- a/backend/backend/base_urls.py
+++ b/backend/backend/base_urls.py
@@ -18,4 +18,8 @@ urlpatterns = [
),
# API deployment
path(f"{settings.API_DEPLOYMENT_PATH_PREFIX}/", include("api_v2.execution_urls")),
+ path(
+ f"{settings.API_DEPLOYMENT_PATH_PREFIX}/pipeline/",
+ include("pipeline_v2.public_api_urls"),
+ ),
]
diff --git a/backend/pipeline_v2/deployment_helper.py b/backend/pipeline_v2/deployment_helper.py
index f50fd9b3c..6a0413629 100644
--- a/backend/pipeline_v2/deployment_helper.py
+++ b/backend/pipeline_v2/deployment_helper.py
@@ -7,6 +7,7 @@ from api_v2.key_helper import KeyHelper
from pipeline_v2.exceptions import PipelineNotFound
from pipeline_v2.pipeline_processor import PipelineProcessor
from rest_framework.request import Request
+from utils.user_context import UserContext
logger = logging.getLogger(__name__)
@@ -16,8 +17,12 @@ class DeploymentHelper(BaseAPIKeyValidator):
def validate_parameters(request: Request, **kwargs: Any) -> None:
"""Validate pipeline_id for pipeline deployments."""
pipeline_id = kwargs.get("pipeline_id") or request.data.get("pipeline_id")
+ org_name = kwargs.get("org_name") or request.data.get("org_name")
if not pipeline_id:
raise InvalidAPIRequest("Missing params pipeline_id")
+ if not org_name:
+ raise InvalidAPIRequest("Missing params org_name")
+ UserContext.set_organization_identifier(org_name)
@staticmethod
def validate_and_process(
diff --git a/backend/pipeline_v2/views.py b/backend/pipeline_v2/views.py
index fecc23163..1d13e4381 100644
--- a/backend/pipeline_v2/views.py
+++ b/backend/pipeline_v2/views.py
@@ -85,7 +85,7 @@ class PipelineViewSet(viewsets.ModelViewSet):
try:
pipeline_instance = serializer.save()
# Create API key using the created instance
- KeyHelper.create_api_key(pipeline_instance)
+ KeyHelper.create_api_key(pipeline_instance, request)
except IntegrityError:
raise DuplicateData(
f"{PipelineErrors.PIPELINE_EXISTS}, " f"{PipelineErrors.DUPLICATE_API}"