Skip to content

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

FIX - Refactor Code to Persist Prompt Results (#153)

Tahier Hussaind7a2aff7442b
diff --git a/backend/prompt_studio/prompt_studio_core/prompt_studio_helper.py b/backend/prompt_studio/prompt_studio_core/prompt_studio_helper.py
index 46a3bd529..71926139d 100644
--- a/backend/prompt_studio/prompt_studio_core/prompt_studio_helper.py
+++ b/backend/prompt_studio/prompt_studio_core/prompt_studio_helper.py
@@ -30,6 +30,9 @@ from prompt_studio.prompt_studio_core.prompt_ide_base_tool import (
from prompt_studio.prompt_studio_index_manager.prompt_studio_index_helper import ( # noqa: E501
PromptStudioIndexHelper,
)
+from prompt_studio.prompt_studio_output_manager.output_manager_helper import (
+ OutputManagerHelper,
+)
from unstract.sdk.constants import LogLevel
from unstract.sdk.exceptions import SdkError
from unstract.sdk.index import ToolIndex
@@ -336,6 +339,13 @@ class PromptStudioHelper:
org_id=org_id,
document_id=document_id,
)
+
+ OutputManagerHelper.handle_prompt_output_update(
+ prompts=prompts,
+ outputs=response,
+ document_id=document_id,
+ is_single_pass_extract=False
+ )
except PermissionError as e:
raise e
except Exception as exc:
@@ -384,6 +394,13 @@ class PromptStudioHelper:
org_id=org_id,
document_id=document_id,
)
+
+ OutputManagerHelper.handle_prompt_output_update(
+ prompts=prompts,
+ outputs=response,
+ document_id=document_id,
+ is_single_pass_extract=True
+ )
except PermissionError as e:
raise e
except Exception as e:
@@ -638,7 +655,8 @@ class PromptStudioHelper:
if prompt_grammar:
for word, synonyms in prompt_grammar.items():
- grammar.append({TSPKeys.WORD: word, TSPKeys.SYNONYMS: synonyms})
+ grammar.append(
+ {TSPKeys.WORD: word, TSPKeys.SYNONYMS: synonyms})
if not default_profile:
raise DefaultProfileError()
diff --git a/backend/prompt_studio/prompt_studio_output_manager/constants.py b/backend/prompt_studio/prompt_studio_output_manager/constants.py
index 7308aab97..1caf8a66f 100644
--- a/backend/prompt_studio/prompt_studio_output_manager/constants.py
+++ b/backend/prompt_studio/prompt_studio_output_manager/constants.py
@@ -3,3 +3,4 @@ class PromptStudioOutputManagerKeys:
PROMPT_ID = "prompt_id"
PROFILE_MANAGER = "profile_manager"
DOCUMENT_MANAGER = "document_manager"
+ IS_SINGLE_PASS_EXTRACT = "is_single_pass_extract"
diff --git a/backend/prompt_studio/prompt_studio_output_manager/migrations/0010_delete_duplicate_rows.py b/backend/prompt_studio/prompt_studio_output_manager/migrations/0010_delete_duplicate_rows.py
new file mode 100644
index 000000000..1c23c1138
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_output_manager/migrations/0010_delete_duplicate_rows.py
@@ -0,0 +1,52 @@
+# Generated by Django 4.2.1 on 2024-03-22 11:19
+
+from django.db import migrations, models
+
+
+def delete_duplicates_and_nulls(apps, schema_editor):
+ prompt_studio_output_manager = apps.get_model(
+ "prompt_studio_output_manager", "PromptStudioOutputManager")
+
+ # Delete rows where prompt_id, document_manager, profile_manager, or tool_id is NULL
+ prompt_studio_output_manager.objects.filter(
+ models.Q(prompt_id=None) |
+ models.Q(document_manager=None) |
+ models.Q(profile_manager=None) |
+ models.Q(tool_id=None)
+ ).delete()
+
+ # Find duplicate rows based on unique constraint fields and count their occurrences
+ duplicates = prompt_studio_output_manager.objects.values(
+ 'prompt_id', 'document_manager', 'profile_manager', 'tool_id'
+ ).annotate(
+ count=models.Count('prompt_output_id')
+ ).filter(
+ count__gt=1 # Filter to only get rows that have duplicates
+ )
+
+ # Iterate over each set of duplicates found
+ for duplicate in duplicates:
+ # Find all instances of duplicates for the current set
+ pks = prompt_studio_output_manager.objects.filter(
+ prompt_id=duplicate['prompt_id'],
+ document_manager=duplicate['document_manager'],
+ profile_manager=duplicate['profile_manager'],
+ tool_id=duplicate['tool_id']
+ ).order_by('-created_at').values_list('pk')[1:] # Order by created_at descending and skip the first one (keep the latest)
+
+ # Delete the duplicate rows
+ prompt_studio_output_manager.objects.filter(pk__in=pks).delete()
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ (
+ "prompt_studio_output_manager",
+ "0009_remove_promptstudiooutputmanager_doc_name_and_more",
+ ),
+ ]
+
+ operations = [
+ migrations.RunPython(delete_duplicates_and_nulls,
+ reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/backend/prompt_studio/prompt_studio_output_manager/migrations/0011_promptstudiooutputmanager_is_single_pass_extract_and_more.py b/backend/prompt_studio/prompt_studio_output_manager/migrations/0011_promptstudiooutputmanager_is_single_pass_extract_and_more.py
new file mode 100644
index 000000000..e81ee2ab6
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_output_manager/migrations/0011_promptstudiooutputmanager_is_single_pass_extract_and_more.py
@@ -0,0 +1,63 @@
+# Generated by Django 4.2.1 on 2024-03-23 08:12
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("prompt_studio_core", "0008_customtool_exclude_failed_customtool_monitor_llm"),
+ ("prompt_profile_manager", "0009_alter_profilemanager_prompt_studio_tool"),
+ ("prompt_studio", "0006_alter_toolstudioprompt_prompt_key_and_more"),
+ ("prompt_studio_output_manager", "0010_delete_duplicate_rows"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="promptstudiooutputmanager",
+ name="is_single_pass_extract",
+ field=models.BooleanField(
+ db_comment="Is the single pass extraction mode active", default=False
+ ),
+ ),
+ migrations.AlterField(
+ model_name="promptstudiooutputmanager",
+ name="profile_manager",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="prompt_output_linked_prompt",
+ to="prompt_profile_manager.profilemanager",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="promptstudiooutputmanager",
+ name="prompt_id",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="prompt_output_linked_prompt",
+ to="prompt_studio.toolstudioprompt",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="promptstudiooutputmanager",
+ name="tool_id",
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="prompt_ouput_linked_tool",
+ to="prompt_studio_core.customtool",
+ ),
+ ),
+ migrations.AddConstraint(
+ model_name="promptstudiooutputmanager",
+ constraint=models.UniqueConstraint(
+ fields=(
+ "prompt_id",
+ "document_manager",
+ "profile_manager",
+ "tool_id",
+ "is_single_pass_extract",
+ ),
+ name="unique_prompt_output",
+ ),
+ ),
+ ]
diff --git a/backend/prompt_studio/prompt_studio_output_manager/models.py b/backend/prompt_studio/prompt_studio_output_manager/models.py
index 6b2c3eee3..f4380334d 100644
--- a/backend/prompt_studio/prompt_studio_output_manager/models.py
+++ b/backend/prompt_studio/prompt_studio_output_manager/models.py
@@ -4,8 +4,8 @@ from account.models import User
from django.db import models
from prompt_studio.prompt_profile_manager.models import ProfileManager
from prompt_studio.prompt_studio.models import ToolStudioPrompt
-from prompt_studio.prompt_studio_document_manager.models import DocumentManager
from prompt_studio.prompt_studio_core.models import CustomTool
+from prompt_studio.prompt_studio_document_manager.models import DocumentManager
from utils.models.base_model import BaseModel
@@ -21,12 +21,6 @@ class PromptStudioOutputManager(BaseModel):
output = models.CharField(
db_comment="Field to store output", editable=True, null=True, blank=True
)
- document_manager = models.ForeignKey(
- DocumentManager,
- on_delete=models.CASCADE,
- related_name="prompt_output_linked_document_manager",
- editable=True,
- )
eval_metrics = models.JSONField(
db_column="eval_metrics",
null=False,
@@ -34,28 +28,30 @@ class PromptStudioOutputManager(BaseModel):
default=list,
db_comment="Field to store the evaluation metrics",
)
- tool_id = models.ForeignKey(
- CustomTool,
- on_delete=models.CASCADE,
- related_name="prompt_ouput_linked_tool",
- null=True,
- blank=True,
+ is_single_pass_extract = models.BooleanField(
+ default=False,
+ db_comment="Is the single pass extraction mode active",
)
prompt_id = models.ForeignKey(
ToolStudioPrompt,
on_delete=models.CASCADE,
related_name="prompt_output_linked_prompt",
- null=True,
- blank=True,
+ )
+ document_manager = models.ForeignKey(
+ DocumentManager,
+ on_delete=models.CASCADE,
+ related_name="prompt_output_linked_document_manager",
)
profile_manager = models.ForeignKey(
ProfileManager,
on_delete=models.CASCADE,
related_name="prompt_output_linked_prompt",
- null=True,
- blank=True,
)
-
+ tool_id = models.ForeignKey(
+ CustomTool,
+ on_delete=models.CASCADE,
+ related_name="prompt_ouput_linked_tool",
+ )
created_by = models.ForeignKey(
User,
on_delete=models.SET_NULL,
@@ -72,3 +68,12 @@ class PromptStudioOutputManager(BaseModel):
blank=True,
editable=False,
)
+
+ class Meta:
+ constraints = [
+ models.UniqueConstraint(
+ fields=["prompt_id", "document_manager", "profile_manager",
+ "tool_id", "is_single_pass_extract"],
+ name="unique_prompt_output",
+ ),
+ ]
diff --git a/backend/prompt_studio/prompt_studio_output_manager/output_manager_helper.py b/backend/prompt_studio/prompt_studio_output_manager/output_manager_helper.py
new file mode 100644
index 000000000..9a0b608a4
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_output_manager/output_manager_helper.py
@@ -0,0 +1,50 @@
+import json
+from typing import Any
+
+from prompt_studio.prompt_studio.models import ToolStudioPrompt
+from prompt_studio.prompt_studio_document_manager.models import DocumentManager
+from prompt_studio.prompt_studio_output_manager.models import (
+ PromptStudioOutputManager,
+)
+
+
+class OutputManagerHelper:
+ @staticmethod
+ def handle_prompt_output_update(
+ prompts: list[ToolStudioPrompt],
+ outputs: Any,
+ document_id: str,
+ is_single_pass_extract: bool
+ ) -> None:
+ """Handles updating prompt outputs in the database.
+
+ Args:
+ prompts (list[ToolStudioPrompt]): List of prompts to update.
+ outputs (Any): Outputs corresponding to the prompts.
+ document_id (str): ID of the document.
+ is_single_pass_extract (bool):
+ Flag indicating if single pass extract is active.
+ """
+ # Check if prompts list is empty
+ if not prompts:
+ return # Return early if prompts list is empty
+
+ tool = prompts[0].tool_id
+ document_manager = DocumentManager.objects.get(pk=document_id)
+
+ # Iterate through each prompt in the list
+ for prompt in prompts:
+ profile_manager = prompt.profile_manager
+ output = json.dumps(outputs.get(prompt.prompt_key))
+
+ # Attempt to update an existing output manager,
+ # for the given criteria,
+ # or create a new one if it doesn't exist
+ PromptStudioOutputManager.objects.update_or_create(
+ document_manager=document_manager,
+ tool_id=tool,
+ profile_manager=profile_manager,
+ prompt_id=prompt,
+ is_single_pass_extract=is_single_pass_extract,
+ defaults={'output': output}
+ )
diff --git a/backend/prompt_studio/prompt_studio_output_manager/urls.py b/backend/prompt_studio/prompt_studio_output_manager/urls.py
index 5f6f76ca7..45af0ccee 100644
--- a/backend/prompt_studio/prompt_studio_output_manager/urls.py
+++ b/backend/prompt_studio/prompt_studio_output_manager/urls.py
@@ -3,15 +3,10 @@ from rest_framework.urlpatterns import format_suffix_patterns
from .views import PromptStudioOutputView
-prompt_doc_list = PromptStudioOutputView.as_view({"get": "list", "post": "create"})
-prompt_doc_detail = PromptStudioOutputView.as_view(
- {"get": "retrieve", "put": "update", "patch": "partial_update", "delete": "destroy"}
-)
+prompt_doc_list = PromptStudioOutputView.as_view({"get": "list"})
urlpatterns = format_suffix_patterns(
[
path("prompt-output/", prompt_doc_list, name="prompt-doc-list"),
- path("prompt-output/<uuid:pk>/", prompt_doc_detail, name="prompt-doc-detail"),
-
]
)
diff --git a/backend/prompt_studio/prompt_studio_output_manager/views.py b/backend/prompt_studio/prompt_studio_output_manager/views.py
index f87a31ebe..7c5dc3264 100644
--- a/backend/prompt_studio/prompt_studio_output_manager/views.py
+++ b/backend/prompt_studio/prompt_studio_output_manager/views.py
@@ -10,6 +10,7 @@ from prompt_studio.prompt_studio_output_manager.serializers import (
)
from rest_framework import viewsets
from rest_framework.versioning import URLPathVersioning
+from utils.common_utils import CommonUtils
from utils.filtering import FilterHelper
from .models import PromptStudioOutputManager
@@ -29,9 +30,26 @@ class PromptStudioOutputView(viewsets.ModelViewSet):
PromptStudioOutputManagerKeys.PROMPT_ID,
PromptStudioOutputManagerKeys.PROFILE_MANAGER,
PromptStudioOutputManagerKeys.DOCUMENT_MANAGER,
+ PromptStudioOutputManagerKeys.IS_SINGLE_PASS_EXTRACT,
)
+
+ # Get the query parameter for "is_single_pass_extract"
+ is_single_pass_extract_param = (
+ self.request.GET.get(
+ PromptStudioOutputManagerKeys.IS_SINGLE_PASS_EXTRACT, "false")
+ )
+
+ # Convert the string representation to a boolean value
+ is_single_pass_extract = CommonUtils.str_to_bool(
+ is_single_pass_extract_param)
+
+ filter_args[
+ PromptStudioOutputManagerKeys.IS_SINGLE_PASS_EXTRACT
+ ] = (
+ is_single_pass_extract
+ )
+
if filter_args:
queryset = PromptStudioOutputManager.objects.filter(**filter_args)
- else:
- queryset = PromptStudioOutputManager.objects.all()
+
return queryset
diff --git a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
index 9711eaf9f..9cc8313f0 100644
--- a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
+++ b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
@@ -6,7 +6,10 @@ import "prismjs/themes/prism.css";
import { useEffect, useState } from "react";
import PropTypes from "prop-types";
-import { promptType } from "../../../helpers/GetStaticData";
+import {
+ displayPromptResult,
+ promptType,
+} from "../../../helpers/GetStaticData";
import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
import { useAlertStore } from "../../../store/alert-store";
import { useCustomToolStore } from "../../../store/custom-tool-store";
@@ -65,11 +68,10 @@ function CombinedOutput({
return;
}
- try {
- output[item?.prompt_key] = JSON.parse(outputDetails?.output);
- } catch (err) {
- output[item?.prompt_key] = outputDetails?.output || "";
- }
+ output[item?.prompt_key] = displayPromptResult(
+ outputDetails?.output,
+ false
+ );
if (outputDetails?.output?.length > 0) {
filledFields++;
diff --git a/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx b/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx
index 3602cccf7..63218961c 100644
--- a/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx
+++ b/frontend/src/components/custom-tools/output-for-doc-modal/OutputForDocModal.jsx
@@ -172,7 +172,9 @@ function OutputForDocModal({
<CloseCircleFilled style={{ color: "#FF4D4F" }} />
)}
</span>{" "}
- {isSuccess ? displayPromptResult(output?.output) : "Failed"}
+ {isSuccess
+ ? displayPromptResult(output?.output, true)
+ : "Failed"}
</Typography.Text>
)}
</>
diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
index c1df0774d..ab3a40024 100644
--- a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
+++ b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
@@ -50,9 +50,6 @@ import { useSocketCustomToolStore } from "../../../store/socket-custom-tool";
let EvalBtn = null;
let EvalMetrics = null;
let EvalModal = null;
-let sortEvalMetricsByType = (param) => {
- return [];
-};
let getEvalMetrics = (param1, param2, param3) => {
return [];
};
@@ -61,8 +58,6 @@ try {
EvalMetrics =
require("../../../plugins/eval-metrics/EvalMetrics").EvalMetrics;
EvalModal = require("../../../plugins/eval-modal/EvalModal").EvalModal;
- sortEvalMetricsByType =
- require("../../../plugins/eval-helper/EvalHelper").sortEvalMetricsByType;
getEvalMetrics =
require("../../../plugins/eval-helper/EvalHelper").getEvalMetrics;
} catch {
@@ -90,7 +85,6 @@ function PromptCard({
promptOutputId: null,
output: "",
});
- const [outputIds, setOutputIds] = useState([]);
const [coverage, setCoverage] = useState(0);
const [coverageTotal, setCoverageTotal] = useState(0);
const [isCoverageLoading, setIsCoverageLoading] = useState(false);
@@ -318,13 +312,6 @@ function PromptCard({
setCoverageTotal(0);
const docId = selectedDoc?.document_id;
- let method = "POST";
- let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/`;
- if (result?.promptOutputId) {
- method = "PATCH";
- url += `${result?.promptOutputId}/`;
- }
-
const isSummaryIndexed = [...summarizeIndexStatus].find(
(item) => item?.docId === docId && item?.isIndexed === true
);
@@ -335,7 +322,6 @@ function PromptCard({
details?.summarize_llm_profile
) {
// Summary needs to be indexed before running the prompt
- handleUpdateOutput(null, docId, [], method, url);
handleStepsAfterRunCompletion();
setAlertDetails({
type: "error",
@@ -352,20 +338,12 @@ function PromptCard({
if (value || value === 0) {
setCoverage((prev) => prev + 1);
}
-
- // Handle Eval
- const evalMetrics = getEvalMetrics(
- promptDetails?.evaluate,
- promptDetails?.prompt_key,
- data
- );
-
handleDocOutputs(docId, false, value);
- handleUpdateOutput(value, docId, evalMetrics, method, url);
+ handleGetOutput();
})
.catch((err) => {
+ setIsRunLoading(false);
handleDocOutputs(docId, false, null);
- handleUpdateOutput(null, docId, [], method, url);
setAlertDetails(
handleException(err, `Failed to generate output for ${docId}`)
);
@@ -376,7 +354,6 @@ function PromptCard({
};
const handleStepsAfterRunCompletion = () => {
- setIsRunLoading(false);
setCoverageTotal(1);
handleCoverage();
};
@@ -395,14 +372,6 @@ function PromptCard({
let totalCoverageValue = 1;
listOfDocsToProcess.forEach((item) => {
const docId = item?.document_id;
- let method = "POST";
- let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/`;
- const outputId = outputIds.find((output) => output?.docId === docId);
- if (outputId?.promptOutputId?.length) {
- method = "PATCH";
- url += `${outputId?.promptOutputId}/`;
- }
-
const isSummaryIndexed = [...summarizeIndexStatus].find(
(indexStatus) =>
indexStatus?.docId === docId && indexStatus?.isIndexed === true
@@ -414,7 +383,6 @@ function PromptCard({
details?.summarize_llm_profile
) {
// Summary needs to be indexed before running the prompt
- handleUpdateOutput(null, docId, [], method, url);
totalCoverageValue++;
setCoverageTotal(totalCoverageValue);
setAlertDetails({
@@ -432,20 +400,10 @@ function PromptCard({
if (outputValue || outputValue === 0) {
setCoverage((prev) => prev + 1);
}
-
- // Handle Eval
- const evalMetrics = getEvalMetrics(
- promptDetails?.evaluate,
- promptDetails?.prompt_key,
- data
- );
-
handleDocOutputs(docId, false, outputValue);
- handleUpdateOutput(outputValue, docId, evalMetrics, method, url);
})
.catch((err) => {
handleDocOutputs(docId, false, null);
- handleUpdateOutput(null, docId, [], method, url);
setAlertDetails(
handleException(err, `Failed to generate output for ${docId}`)
);
@@ -483,56 +441,6 @@ function PromptCard({
});
};
- const handleUpdateOutput = (outputValue, docId, evalMetrics, method, url) => {
- let output = outputValue;
- if (output !== null && typeof output !== "string") {
- output = JSON.stringify(output);
- }
- const body = {
- output: output !== null ? output : null,
- tool_id: details?.tool_id,
- prompt_id: promptDetails?.prompt_id,
- profile_manager: promptDetails?.profile_manager,
- document_manager: docId,
- eval_metrics: evalMetrics,
- };
-
- const requestOptions = {
- method,
- url,
- headers: {
- "X-CSRFToken": sessionDetails?.csrfToken,
- "Content-Type": "application/json",
- },
- data: body,
- };
-
- axiosPrivate(requestOptions)
- .then((res) => {
- const data = res?.data;
- const promptOutputId = data?.prompt_output_id || null;
- if (docId === selectedDoc?.document_id) {
- setResult({
- promptOutputId: promptOutputId,
- output: data?.output,
- evalMetrics: sortEvalMetricsByType(data?.eval_metrics || []),
- });
- }
-
- const isOutputIdAvailable = outputIds.find(
- (item) => item?.promptOutputId === promptOutputId
- );
- if (!isOutputIdAvailable) {
- const listOfOutputIds = [...outputIds];
- listOfOutputIds.push({ promptOutputId, docId });
- setOutputIds(listOfOutputIds);
- }
- })
- .catch((err) => {
- setAlertDetails(handleException(err, "Failed to persist the result"));
- });
- };
-
const handleGetOutput = () => {
if (!selectedDoc || !selectedLlmProfileId) {
setResult({
@@ -544,7 +452,8 @@ function PromptCard({
setIsRunLoading(true);
handleOutputApiRequest(true)
- .then((data) => {
+ .then((res) => {
+ const data = res?.data;
if (!data || data?.length === 0) {
setResult({
promptOutputId: null,
@@ -557,11 +466,15 @@ function PromptCard({
setResult({
promptOutputId: outputResult?.prompt_output_id,
output: outputResult?.output,
- evalMetrics: sortEvalMetricsByType(outputResult?.eval_metrics || []),
+ evalMetrics: getEvalMetrics(
+ promptDetails?.evaluate,
+ promptDetails?.prompt_key,
+ outputResult?.eval_metrics || []
+ ),
});
})
.catch((err) => {
- setAlertDetails(handleException(err, "Failed to generate the output"));
+ setAlertDetails(handleException(err, "Failed to generate the result"));
})
.finally(() => {
setIsRunLoading(false);
@@ -574,21 +487,27 @@ function PromptCard({
}
setCoverage(0);
- handleOutputApiRequest()
- .then((data) => {
+ handleOutputApiRequest(false)
+ .then((res) => {
+ const data = res?.data;
handleGetCoverageData(data);
})
.catch((err) => {
- setAlertDetails(handleException(err, "Failed to generate result"));
+ setAlertDetails(handleException(err, "Failed to generate the result"));
});
};
const handleOutputApiRequest = async (isOutput) => {
- let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&prompt_id=${promptDetails?.prompt_id}&profile_manager=${selectedLlmProfileId}`;
+ let url = `/api/v1/unstract/${
+ sessionDetails?.orgId
+ }/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&prompt_id=${
+ promptDetails?.prompt_id
+ }&profile_manager=${selectedLlmProfileId}&is_single_pass_extract=${false}`;
if (isOutput) {
url += `&document_manager=${selectedDoc?.document_id}`;
}
+
const requestOptions = {
method: "GET",
url,
@@ -598,47 +517,20 @@ function PromptCard({
};
return axiosPrivate(requestOptions)
- .then((res) => {
- const data = res?.data;
- data.sort((a, b) => {
- return new Date(b.modified_at) - new Date(a.modified_at);
- });
- return data;
- })
+ .then((res) => res)
.catch((err) => {
throw err;
});
};
const handleGetCoverageData = (data) => {
- const ids = [];
- let coverageValue = 0;
- data.forEach((item) => {
- const isOutputAdded = ids.findIndex(
- (output) => output?.docId === item?.document_manager
- );
-
- if (isOutputAdded > -1) {
- return;
+ const coverageValue = data.reduce((acc, item) => {
+ if (item?.output || item?.output === 0) {
+ return acc + 1;
+ } else {
+ return acc;
}
-
- if (
- item?.output !== undefined &&
- [...listOfDocs].find(
- (doc) => doc?.document_id === item?.document_manager
- )
- ) {
- ids.push({
- promptOutputId: item?.prompt_output_id,
- docId: item?.document_manager,
- });
-
- if (item?.output || item?.output === 0) {
- coverageValue++;
- }
- }
- });
- setOutputIds(ids);
+ }, 0);
setCoverage(coverageValue);
};
@@ -855,10 +747,8 @@ function PromptCard({
<Space
direction="vertical"
className={`prompt-card-comp-layout ${
- !(
- isRunLoading ||
- (result?.output !== undefined && outputIds?.length > 0)
- ) && "prompt-card-comp-layout-border"
+ !(isRunLoading || result?.output || result?.output === 0) &&
+ "prompt-card-comp-layout-border"
}`}
>
<div className="prompt-card-llm-profiles">
@@ -875,7 +765,6 @@ function PromptCard({
type="link"
className="display-flex-align-center"
onClick={() => setOpenOutputForDoc(true)}
- disabled={outputIds?.length === 0}
>
<Space>
{isCoverageLoading ? (
@@ -961,8 +850,7 @@ function PromptCard({
{EvalMetrics && <EvalMetrics result={result} />}
</Space>
</>
- {(isRunLoading ||
- (result?.output !== undefined && outputIds?.length > 0)) && (
+ {(isRunLoading || result?.output || result?.output === 0) && (
<>
<Divider className="prompt-card-divider" />
<div className="prompt-card-result prompt-card-div">
@@ -970,7 +858,7 @@ function PromptCard({
<Spin indicator={<SpinnerLoader size="small" />} />
) : (
<Typography.Paragraph className="prompt-card-res font-size-12">
- <div>{displayPromptResult(result?.output)}</div>
+ <div>{displayPromptResult(result?.output, true)}</div>
</Typography.Paragraph>
)}
</div>
diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js
index 6a6861999..40f7082b5 100644
--- a/frontend/src/helpers/GetStaticData.js
+++ b/frontend/src/helpers/GetStaticData.js
@@ -299,14 +299,13 @@ const isJson = (text) => {
}
};
-const displayPromptResult = (output) => {
+const displayPromptResult = (output, isFormat = false) => {
try {
- if (isJson(output)) {
- return JSON.stringify(JSON.parse(output), null, 4);
+ const parsedData = JSON.parse(output.replace(/'/g, '"'));
+ if (Array.isArray(parsedData) || typeof parsedData === "object") {
+ return isFormat ? JSON.stringify(parsedData, null, 4) : parsedData;
}
-
- const outputParsed = JSON.parse(output);
- return outputParsed;
+ return output;
} catch (err) {
return output;
}