Skip to content

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

FEAT: Refactored Existing Prompt Studio Component to Support Simple Prompt Studio (#437)

Tahier Hussaina8905f833d55
diff --git a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
index 507bf6704..4b0cb5281 100644
--- a/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
+++ b/frontend/src/components/custom-tools/combined-output/CombinedOutput.jsx
@@ -1,4 +1,3 @@
-import Prism from "prismjs";
import "prismjs/components/prism-json";
import "prismjs/plugins/line-numbers/prism-line-numbers.css";
import "prismjs/plugins/line-numbers/prism-line-numbers.js";
@@ -17,7 +16,18 @@ import { useSessionStore } from "../../../store/session-store";
import { SpinnerLoader } from "../../widgets/spinner-loader/SpinnerLoader";
import "./CombinedOutput.css";
import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
-
+import { JsonView } from "./JsonView";
+
+let TableView;
+let promptOutputApiSps;
+try {
+ TableView =
+ require("../../../plugins/simple-prompt-studio/TableView").TableView;
+ promptOutputApiSps =
+ require("../../../plugins/simple-prompt-studio/helper").promptOutputApiSps;
+} catch {
+ // The component will remain null of it is not available
+}
function CombinedOutput({ docId, setFilledFields }) {
const [combinedOutput, setCombinedOutput] = useState({});
const [isOutputLoading, setIsOutputLoading] = useState(false);
@@ -26,6 +36,7 @@ function CombinedOutput({ docId, setFilledFields }) {
defaultLlmProfile,
singlePassExtractMode,
isSinglePassExtractLoading,
+ isSimplePromptStudio,
} = useCustomToolStore();
const { sessionDetails } = useSessionStore();
const { setAlertDetails } = useAlertStore();
@@ -91,14 +102,14 @@ function CombinedOutput({ docId, setFilledFields }) {
});
}, [docId, singlePassExtractMode, isSinglePassExtractLoading]);
- useEffect(() => {
- Prism.highlightAll();
- }, [combinedOutput]);
-
const handleOutputApiRequest = async () => {
+ let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&document_manager=${docId}&is_single_pass_extract=${singlePassExtractMode}`;
+ if (isSimplePromptStudio) {
+ url = promptOutputApiSps(details?.tool_id, null, docId);
+ }
const requestOptions = {
method: "GET",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&document_manager=${docId}&is_single_pass_extract=${singlePassExtractMode}`,
+ url,
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
},
@@ -115,24 +126,11 @@ function CombinedOutput({ docId, setFilledFields }) {
return <SpinnerLoader />;
}
- return (
- <div className="combined-op-layout">
- <div className="combined-op-header">
- <div className="combined-op-segment"></div>
- </div>
- <div className="combined-op-divider" />
- <div className="combined-op-body code-snippet">
- {combinedOutput && (
- <pre className="line-numbers width-100">
- <code className="language-javascript width-100">
- {JSON.stringify(combinedOutput, null, 2)}
- </code>
- </pre>
- )}
- </div>
- <div className="gap" />
- </div>
- );
+ if (isSimplePromptStudio && TableView) {
+ return <TableView combinedOutput={combinedOutput} />;
+ }
+
+ return <JsonView combinedOutput={combinedOutput} />;
}
CombinedOutput.propTypes = {
diff --git a/frontend/src/components/custom-tools/combined-output/JsonView.jsx b/frontend/src/components/custom-tools/combined-output/JsonView.jsx
new file mode 100644
index 000000000..4ad2fa7a1
--- /dev/null
+++ b/frontend/src/components/custom-tools/combined-output/JsonView.jsx
@@ -0,0 +1,34 @@
+import PropTypes from "prop-types";
+import Prism from "prismjs";
+import { useEffect } from "react";
+
+function JsonView({ combinedOutput }) {
+ useEffect(() => {
+ Prism.highlightAll();
+ }, [combinedOutput]);
+
+ return (
+ <div className="combined-op-layout">
+ <div className="combined-op-header">
+ <div className="combined-op-segment"></div>
+ </div>
+ <div className="combined-op-divider" />
+ <div className="combined-op-body code-snippet">
+ {combinedOutput && (
+ <pre className="line-numbers width-100">
+ <code className="language-javascript width-100">
+ {JSON.stringify(combinedOutput, null, 2)}
+ </code>
+ </pre>
+ )}
+ </div>
+ <div className="gap" />
+ </div>
+ );
+}
+
+JsonView.propTypes = {
+ combinedOutput: PropTypes.object.isRequired,
+};
+
+export { JsonView };
diff --git a/frontend/src/components/custom-tools/document-manager/DocumentManager.jsx b/frontend/src/components/custom-tools/document-manager/DocumentManager.jsx
index 59e32d40f..249a34edd 100644
--- a/frontend/src/components/custom-tools/document-manager/DocumentManager.jsx
+++ b/frontend/src/components/custom-tools/document-manager/DocumentManager.jsx
@@ -1,4 +1,9 @@
-import { LeftOutlined, RightOutlined } from "@ant-design/icons";
+import {
+ FilePdfOutlined,
+ FileTextOutlined,
+ LeftOutlined,
+ RightOutlined,
+} from "@ant-design/icons";
import "@react-pdf-viewer/core/lib/styles/index.css";
import "@react-pdf-viewer/default-layout/lib/styles/index.css";
import "@react-pdf-viewer/page-navigation/lib/styles/index.css";
@@ -20,7 +25,7 @@ import usePostHogEvents from "../../../hooks/usePostHogEvents";
const items = [
{
key: "1",
- label: "Doc View",
+ label: "PDF View",
},
{
key: "2",
@@ -33,6 +38,7 @@ const viewTypes = {
extract: "EXTRACT",
};
+// Import components for the summarize feature
let SummarizeView = null;
try {
SummarizeView =
@@ -49,6 +55,15 @@ try {
// The component will remain null of it is not available
}
+// Import component for the simple prompt studio feature
+let getDocumentsSps;
+try {
+ getDocumentsSps =
+ require("../../../plugins/simple-prompt-studio/simple-prompt-studio-api-service").getDocumentsSps;
+} catch {
+ // The component will remain null of it is not available
+}
+
function DocumentManager({ generateIndex, handleUpdateTool, handleDocChange }) {
const [openManageDocsModal, setOpenManageDocsModal] = useState(false);
const [page, setPage] = useState(1);
@@ -69,11 +84,33 @@ function DocumentManager({ generateIndex, handleUpdateTool, handleDocChange }) {
details,
indexDocs,
isSinglePassExtractLoading,
+ isSimplePromptStudio,
} = useCustomToolStore();
const { sessionDetails } = useSessionStore();
const axiosPrivate = useAxiosPrivate();
const { setPostHogCustomEvent } = usePostHogEvents();
+ useEffect(() => {
+ if (isSimplePromptStudio) {
+ items[0] = {
+ key: "1",
+ label: (
+ <Tooltip title="PDF View">
+ <FilePdfOutlined />
+ </Tooltip>
+ ),
+ };
+ items[1] = {
+ key: "2",
+ label: (
+ <Tooltip title="Raw View">
+ <FileTextOutlined />
+ </Tooltip>
+ ),
+ };
+ }
+ }, []);
+
useEffect(() => {
setFileUrl("");
setExtractTxt("");
@@ -127,36 +164,56 @@ function DocumentManager({ generateIndex, handleUpdateTool, handleDocChange }) {
return;
}
- const requestOptions = {
- method: "GET",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/file/${details?.tool_id}?document_id=${selectedDoc?.document_id}&view_type=${viewType}`,
- };
+ if (isSimplePromptStudio && getDocumentsSps) {
+ handleGetDocumentsReq(getDocumentsSps, viewType);
+ } else {
+ handleGetDocumentsReq(getDocuments, viewType);
+ }
+ };
- handleLoadingStateUpdate(viewType, true);
- axiosPrivate(requestOptions)
+ const handleGetDocumentsReq = (getDocsFunc, viewType) => {
+ getDocsFunc(viewType)
.then((res) => {
- const data = res?.data?.data;
- if (viewType === viewTypes.original) {
- const base64String = data || "";
- const blob = base64toBlob(base64String);
- setFileUrl(URL.createObjectURL(blob));
- return;
- }
-
- if (viewType === viewTypes?.extract) {
- setExtractTxt(data);
- }
+ const data = res?.data?.data || "";
+ processGetDocsResponse(data, viewType);
})
.catch((err) => {
- if (err?.response?.status === 404) {
- setErrorMessage(viewType);
- }
+ handleGetDocsError(err, viewType);
})
.finally(() => {
handleLoadingStateUpdate(viewType, false);
});
};
+ const getDocuments = async (viewType) => {
+ const requestOptions = {
+ method: "GET",
+ url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/file/${details?.tool_id}?document_id=${selectedDoc?.document_id}&view_type=${viewType}`,
+ };
+
+ return axiosPrivate(requestOptions)
+ .then((res) => res)
+ .catch((err) => {
+ throw err;
+ });
+ };
+
+ const processGetDocsResponse = (data, viewType) => {
+ if (viewType === viewTypes.original) {
+ const base64String = data || "";
+ const blob = base64toBlob(base64String);
+ setFileUrl(URL.createObjectURL(blob));
+ } else if (viewType === viewTypes.extract) {
+ setExtractTxt(data);
+ }
+ };
+
+ const handleGetDocsError = (err, viewType) => {
+ if (err?.response?.status === 404) {
+ setErrorMessage(viewType);
+ }
+ };
+
const handleLoadingStateUpdate = (viewType, value) => {
if (viewType === viewTypes.original) {
setIsDocLoading(value);
@@ -243,55 +300,57 @@ function DocumentManager({ generateIndex, handleUpdateTool, handleDocChange }) {
moreIcon={<></>}
/>
</div>
- <Space>
- <div className="doc-main-title-div">
- {selectedDoc ? (
- <Tooltip title={selectedDoc?.document_name}>
- <Typography.Text className="doc-main-title" ellipsis>
- {selectedDoc?.document_name}
- </Typography.Text>
+ {!isSimplePromptStudio && (
+ <Space>
+ <div className="doc-main-title-div">
+ {selectedDoc ? (
+ <Tooltip title={selectedDoc?.document_name}>
+ <Typography.Text className="doc-main-title" ellipsis>
+ {selectedDoc?.document_name}
+ </Typography.Text>
+ </Tooltip>
+ ) : null}
+ </div>
+ <div>
+ <Tooltip title="Manage Documents">
+ <Button
+ className="doc-manager-btn"
+ onClick={() => setOpenManageDocsModal(true)}
+ >
+ <Typography.Text ellipsis>Manage Documents</Typography.Text>
+ </Button>
</Tooltip>
- ) : null}
- </div>
- <div>
- <Tooltip title="Manage Documents">
+ </div>
+ <div>
+ <Button
+ type="text"
+ size="small"
+ disabled={
+ !selectedDoc ||
+ disableLlmOrDocChange?.length > 0 ||
+ isSinglePassExtractLoading ||
+ page <= 1
+ }
+ onClick={handlePageLeft}
+ >
+ <LeftOutlined className="doc-manager-paginate-icon" />
+ </Button>
<Button
- className="doc-manager-btn"
- onClick={() => setOpenManageDocsModal(true)}
+ type="text"
+ size="small"
+ disabled={
+ !selectedDoc ||
+ disableLlmOrDocChange?.length > 0 ||
+ isSinglePassExtractLoading ||
+ page >= listOfDocs?.length
+ }
+ onClick={handlePageRight}
>
- <Typography.Text ellipsis>{"Manage Documents"}</Typography.Text>
+ <RightOutlined className="doc-manager-paginate-icon" />
</Button>
- </Tooltip>
- </div>
- <div>
- <Button
- type="text"
- size="small"
- disabled={
- !selectedDoc ||
- disableLlmOrDocChange?.length > 0 ||
- isSinglePassExtractLoading ||
- page <= 1
- }
- onClick={handlePageLeft}
- >
- <LeftOutlined className="doc-manager-paginate-icon" />
- </Button>
- <Button
- type="text"
- size="small"
- disabled={
- !selectedDoc ||
- disableLlmOrDocChange?.length > 0 ||
- isSinglePassExtractLoading ||
- page >= listOfDocs?.length
- }
- onClick={handlePageRight}
- >
- <RightOutlined className="doc-manager-paginate-icon" />
- </Button>
- </div>
- </Space>
+ </div>
+ </Space>
+ )}
</div>
{activeKey === "1" && (
<DocumentViewer
@@ -315,7 +374,7 @@ function DocumentManager({ generateIndex, handleUpdateTool, handleDocChange }) {
<TextViewerPre text={extractTxt} />
</DocumentViewer>
)}
- {SummarizeView && activeKey === "3" && (
+ {SummarizeView && !isSimplePromptStudio && activeKey === "3" && (
<SummarizeView
setOpenManageDocsModal={setOpenManageDocsModal}
currDocIndexStatus={currDocIndexStatus}
diff --git a/frontend/src/components/custom-tools/document-parser/DocumentParser.jsx b/frontend/src/components/custom-tools/document-parser/DocumentParser.jsx
index a98fa81b2..69951a46e 100644
--- a/frontend/src/components/custom-tools/document-parser/DocumentParser.jsx
+++ b/frontend/src/components/custom-tools/document-parser/DocumentParser.jsx
@@ -16,6 +16,14 @@ import { EmptyState } from "../../widgets/empty-state/EmptyState";
import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
import { PromptDnd } from "../prompt-card/PrompDnd";
+let promptPatchApiSps;
+try {
+ promptPatchApiSps =
+ require("../../../plugins/simple-prompt-studio/helper").promptPatchApiSps;
+} catch {
+ // The component will remain null of it is not available
+}
+
function DocumentParser({
addPromptInstance,
scrollToBottom,
@@ -26,7 +34,8 @@ function DocumentParser({
status: null,
});
const bottomRef = useRef(null);
- const { details, updateCustomTool } = useCustomToolStore();
+ const { details, isSimplePromptStudio, updateCustomTool } =
+ useCustomToolStore();
const { sessionDetails } = useSessionStore();
const { setAlertDetails } = useAlertStore();
const axiosPrivate = useAxiosPrivate();
@@ -40,6 +49,10 @@ function DocumentParser({
}
}, [scrollToBottom]);
+ const promptUrl = (urlPath) => {
+ return `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt/${urlPath}`;
+ };
+
const handleChange = async (
event,
promptId,
@@ -98,9 +111,14 @@ function DocumentParser({
const body = {
[`${name}`]: value,
};
+
+ let url = promptUrl(promptDetails?.prompt_id + "/");
+ if (isSimplePromptStudio) {
+ url = promptPatchApiSps(promptDetails?.prompt_id);
+ }
const requestOptions = {
method: "PATCH",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt/${promptDetails?.prompt_id}/`,
+ url,
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
"Content-Type": "application/json",
@@ -177,7 +195,7 @@ function DocumentParser({
const handleDelete = (promptId) => {
const requestOptions = {
method: "DELETE",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt/${promptId}/`,
+ url: promptUrl(promptId + "/"),
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
},
@@ -226,7 +244,7 @@ function DocumentParser({
const requestOptions = {
method: "POST",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt/reorder`,
+ url: promptUrl("reorder"),
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
"Content-Type": "application/json",
diff --git a/frontend/src/components/custom-tools/prompt-card/PrompDnd.jsx b/frontend/src/components/custom-tools/prompt-card/PrompDnd.jsx
index d49f82e9d..feb74b71e 100644
--- a/frontend/src/components/custom-tools/prompt-card/PrompDnd.jsx
+++ b/frontend/src/components/custom-tools/prompt-card/PrompDnd.jsx
@@ -5,6 +5,7 @@ import { useRef } from "react";
import { NotesCard } from "../notes-card/NotesCard";
import { PromptCard } from "./PromptCard";
import { promptType } from "../../../helpers/GetStaticData";
+import { useCustomToolStore } from "../../../store/custom-tool-store";
function PromptDnd({
item,
@@ -15,6 +16,7 @@ function PromptDnd({
moveItem,
}) {
const ref = useRef(null);
+ const { isSimplePromptStudio } = useCustomToolStore();
const [, drop] = useDrop({
accept: "PROMPT_CARD",
@@ -34,7 +36,7 @@ function PromptDnd({
return (
<div ref={ref}>
- {item.prompt_type === promptType.prompt && (
+ {(item.prompt_type === promptType.prompt || isSimplePromptStudio) && (
<PromptCard
promptDetails={item}
handleChange={handleChange}
diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
index 2ef4a9645..a6efe92b1 100644
--- a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
+++ b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
@@ -23,6 +23,17 @@ const getEvalMetrics = (param1, param2) => {
return [];
};
+let promptRunApiSps;
+let promptOutputApiSps;
+try {
+ promptRunApiSps =
+ require("../../../plugins/simple-prompt-studio/helper").promptRunApiSps;
+ promptOutputApiSps =
+ require("../../../plugins/simple-prompt-studio/helper").promptOutputApiSps;
+} catch {
+ // The component will remain null of it is not available
+}
+
function PromptCard({
promptDetails,
handleChange,
@@ -59,6 +70,7 @@ function PromptCard({
summarizeIndexStatus,
singlePassExtractMode,
isSinglePassExtractLoading,
+ isSimplePromptStudio,
} = useCustomToolStore();
const { messages } = useSocketCustomToolStore();
const { sessionDetails } = useSessionStore();
@@ -70,7 +82,7 @@ function PromptCard({
const { getTokenUsage } = useTokenUsage();
useEffect(() => {
- const outputTypeData = getDropdownItems("output_type");
+ const outputTypeData = getDropdownItems("output_type") || {};
const dropdownList1 = Object.keys(outputTypeData).map((item) => {
return { value: outputTypeData[item] };
});
@@ -211,6 +223,9 @@ function PromptCard({
};
const handleDocOutputs = (docId, isLoading, output) => {
+ if (isSimplePromptStudio) {
+ return;
+ }
setDocOutputs((prev) => {
const updatedDocOutputs = { ...prev };
// Update the entry for the provided docId with isLoading and output
@@ -232,7 +247,7 @@ function PromptCard({
// If an error occurs while setting custom posthog event, ignore it and continue
}
- if (!promptDetails?.profile_manager?.length) {
+ if (!promptDetails?.profile_manager?.length && !isSimplePromptStudio) {
setAlertDetails({
type: "error",
content: "LLM Profile is not selected",
@@ -310,7 +325,11 @@ function PromptCard({
);
})
.finally(() => {
- handleStepsAfterRunCompletion();
+ if (isSimplePromptStudio) {
+ setIsCoverageLoading(false);
+ } else {
+ handleStepsAfterRunCompletion();
+ }
});
};
@@ -380,25 +399,33 @@ function PromptCard({
const promptId = promptDetails?.prompt_id;
const runId = generateUUID();
- // Update the token usage state with default token usage for a specific document ID
- const tokenUsageId = promptId + "__" + docId;
- setTokenUsage(tokenUsageId, defaultTokenUsage);
-
- // Set up an interval to fetch token usage data at regular intervals
- const intervalId = setInterval(
- () => getTokenUsage(runId, tokenUsageId),
- 5000 // Fetch token usage data every 5000 milliseconds (5 seconds)
- );
-
const body = {
document_id: docId,
id: promptId,
- run_id: runId,
};
+ let intervalId;
+ let tokenUsageId;
+ let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/fetch_response/${details?.tool_id}`;
+ if (!isSimplePromptStudio) {
+ body["run_id"] = runId;
+ // Update the token usage state with default token usage for a specific document ID
+ tokenUsageId = promptId + "__" + docId;
+ setTokenUsage(tokenUsageId, defaultTokenUsage);
+
+ // Set up an interval to fetch token usage data at regular intervals
+ intervalId = setInterval(
+ () => getTokenUsage(runId, tokenUsageId),
+ 5000 // Fetch token usage data every 5000 milliseconds (5 seconds)
+ );
+ } else {
+ body["sps_id"] = details?.tool_id;
+ url = promptRunApiSps;
+ }
+
const requestOptions = {
method: "POST",
- url: `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/fetch_response/${details?.tool_id}`,
+ url,
headers: {
"X-CSRFToken": sessionDetails?.csrfToken,
"Content-Type": "application/json",
@@ -412,21 +439,27 @@ function PromptCard({
throw err;
})
.finally(() => {
- clearInterval(intervalId);
- getTokenUsage(runId, tokenUsageId);
+ if (!isSimplePromptStudio) {
+ clearInterval(intervalId);
+ getTokenUsage(runId, tokenUsageId);
+ }
});
};
const handleGetOutput = () => {
- if (!selectedDoc || (!singlePassExtractMode && !selectedLlmProfileId)) {
+ setIsRunLoading(true);
+ if (
+ !selectedDoc ||
+ (!singlePassExtractMode && !selectedLlmProfileId && !isSimplePromptStudio)
+ ) {
setResult({
promptOutputId: null,
output: "",
});
+ setIsRunLoading(false);
return;
}
- setIsRunLoading(true);
handleOutputApiRequest(true)
.then((res) => {
const data = res?.data;
@@ -476,11 +509,20 @@ function PromptCard({
};
const handleOutputApiRequest = async (isOutput) => {
- let profileManager = selectedLlmProfileId;
- if (singlePassExtractMode) {
- profileManager = defaultLlmProfile;
+ let url;
+ if (isSimplePromptStudio) {
+ url = promptOutputApiSps(
+ details?.tool_id,
+ promptDetails?.prompt_id,
+ null
+ );
+ } else {
+ let profileManager = selectedLlmProfileId;
+ if (singlePassExtractMode) {
+ profileManager = defaultLlmProfile;
+ }
+ url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&prompt_id=${promptDetails?.prompt_id}&profile_manager=${profileManager}&is_single_pass_extract=${singlePassExtractMode}`;
}
- let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/prompt-output/?tool_id=${details?.tool_id}&prompt_id=${promptDetails?.prompt_id}&profile_manager=${profileManager}&is_single_pass_extract=${singlePassExtractMode}`;
if (isOutput) {
url += `&document_manager=${selectedDoc?.document_id}`;
diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx
index a4888e67e..edfd85842 100644
--- a/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx
+++ b/frontend/src/components/custom-tools/prompt-card/PromptCardItems.jsx
@@ -60,6 +60,7 @@ function PromptCardItems({
singlePassExtractMode,
isSinglePassExtractLoading,
indexDocs,
+ isSimplePromptStudio,
} = useCustomToolStore();
useEffect(() => {
@@ -116,139 +117,145 @@ function PromptCardItems({
/>
</div>
<>
- <Divider className="prompt-card-divider" />
- <Space
- direction="vertical"
- className={`prompt-card-comp-layout ${
- !(isRunLoading || result?.output || result?.output === 0) &&
- "prompt-card-comp-layout-border"
- }`}
- >
- <div className="prompt-card-llm-profiles">
- <Space direction="horizontal">
- {EvalBtn && !singlePassExtractMode && (
- <EvalBtn
- btnText={promptDetails?.evaluate ? "On" : "Off"}
- promptId={promptDetails.prompt_id}
- setOpenEval={setOpenEval}
- />
- )}
- <Button
- size="small"
- type="link"
- className="display-flex-align-center prompt-card-action-button"
- onClick={() => setOpenOutputForDoc(true)}
- >
+ {!isSimplePromptStudio && (
+ <>
+ <Divider className="prompt-card-divider" />
+
+ <Space
+ direction="vertical"
+ className={`prompt-card-comp-layout ${
+ !(isRunLoading || result?.output || result?.output === 0) &&
+ "prompt-card-comp-layout-border"
+ }`}
+ >
+ <div className="prompt-card-llm-profiles">
+ <Space direction="horizontal">
+ {EvalBtn && !singlePassExtractMode && (
+ <EvalBtn
+ btnText={promptDetails?.evaluate ? "On" : "Off"}
+ promptId={promptDetails.prompt_id}
+ setOpenEval={setOpenEval}
+ />
+ )}
+ <Button
+ size="small"
+ type="link"
+ className="display-flex-align-center prompt-card-action-button"
+ onClick={() => setOpenOutputForDoc(true)}
+ >
+ <Space>
+ {isCoverageLoading ? (
+ <SpinnerLoader size="small" />
+ ) : (
+ <SearchOutlined className="font-size-12" />
+ )}
+ <Typography.Link className="font-size-12">
+ Coverage: {coverage} of {listOfDocs?.length || 0}{" "}
+ docs
+ </Typography.Link>
+ </Space>
+ </Button>
+ </Space>
<Space>
- {isCoverageLoading ? (
- <SpinnerLoader size="small" />
- ) : (
- <SearchOutlined className="font-size-12" />
+ {!singlePassExtractMode && (
+ <TokenUsage
+ tokenUsageId={
+ promptDetails?.prompt_id +
+ "__" +
+ selectedDoc?.document_id
+ }
+ />
)}
- <Typography.Link className="font-size-12">
- Coverage: {coverage} of {listOfDocs?.length || 0} docs
- </Typography.Link>
+ <Select
+ className="prompt-card-select-type"
+ size="small"
+ placeholder="Enforce Type"
+ optionFilterProp="children"
+ options={enforceTypeList}
+ value={promptDetails?.enforce_type || null}
+ disabled={
+ disableLlmOrDocChange.includes(
+ promptDetails?.prompt_id
+ ) ||
+ isSinglePassExtractLoading ||
+ indexDocs.includes(selectedDoc?.document_id)
+ }
+ onChange={(value) => handleTypeChange(value)}
+ />
</Space>
- </Button>
- </Space>
- <Space>
- {!singlePassExtractMode && (
- <TokenUsage
- tokenUsageId={
- promptDetails?.prompt_id +
- "__" +
- selectedDoc?.document_id
- }
- />
- )}
- <Select
- className="prompt-card-select-type"
- size="small"
- placeholder="Enforce Type"
- optionFilterProp="children"
- options={enforceTypeList}
- value={promptDetails?.enforce_type || null}
- disabled={
- disableLlmOrDocChange.includes(
- promptDetails?.prompt_id
- ) ||
- isSinglePassExtractLoading ||
- indexDocs.includes(selectedDoc?.document_id)
- }
- onChange={(value) => handleTypeChange(value)}
- />
- </Space>
- </div>
- <div className="prompt-card-llm-profiles">
- {!singlePassExtractMode && (
- <>
- {llmProfiles?.length > 0 &&
- promptDetails?.profile_manager?.length > 0 &&
- selectedLlmProfileId ? (
- <div>
- {llmProfiles
- .filter(
- (profile) =>
- profile.profile_id === selectedLlmProfileId
- )
- .map((profile, index) => (
- <div key={profile?.profile_id}>
- <Tag>{profile.llm}</Tag>
- <Tag>{profile.vector_store}</Tag>
- <Tag>{profile.embedding_model}</Tag>
- <Tag>{profile.x2text}</Tag>
- <Tag>{`${profile.chunk_size}/${profile.chunk_overlap}/${profile.retrieval_strategy}/${profile.similarity_top_k}/${profile.section}`}</Tag>
- </div>
- ))}
- </div>
- ) : (
- <div>
- <Typography.Text className="font-size-12">
- No LLM Profile Selected
- </Typography.Text>
+ </div>
+ <div className="prompt-card-llm-profiles">
+ {!singlePassExtractMode && (
+ <>
+ {llmProfiles?.length > 0 &&
+ promptDetails?.profile_manager?.length > 0 &&
+ selectedLlmProfileId ? (
+ <div>
+ {llmProfiles
+ .filter(
+ (profile) =>
+ profile.profile_id === selectedLlmProfileId
+ )
+ .map((profile, index) => (
+ <div key={profile?.profile_id}>
+ <Tag>{profile.llm}</Tag>
+ <Tag>{profile.vector_store}</Tag>
+ <Tag>{profile.embedding_model}</Tag>
+ <Tag>{profile.x2text}</Tag>
+ <Tag>{`${profile.chunk_size}/${profile.chunk_overlap}/${profile.retrieval_strategy}/${profile.similarity_top_k}/${profile.section}`}</Tag>
+ </div>
+ ))}
+ </div>
+ ) : (
+ <div>
+ <Typography.Text className="font-size-12">
+ No LLM Profile Selected
+ </Typography.Text>
+ </div>
+ )}
+ </>
+ )}
+ {!singlePassExtractMode && (
+ <div className="display-flex-right prompt-card-paginate-div">
+ <Button
+ type="text"
+ size="small"
+ className="prompt-card-action-button"
+ disabled={
+ page <= 1 ||
+ disableLlmOrDocChange.includes(
+ promptDetails?.prompt_id
+ ) ||
+ isSinglePassExtractLoading ||
+ indexDocs.includes(selectedDoc?.document_id)
+ }
+ onClick={handlePageLeft}
+ >
+ <LeftOutlined className="prompt-card-paginate" />
+ </Button>
+ <Button
+ type="text"
+ size="small"
+ className="prompt-card-action-button"
+ disabled={
+ page >= llmProfiles?.length ||
+ disableLlmOrDocChange.includes(
+ promptDetails?.prompt_id
+ ) ||
+ isSinglePassExtractLoading ||
+ indexDocs.includes(selectedDoc?.document_id)
+ }
+ onClick={handlePageRight}
+ >
+ <RightOutlined className="prompt-card-paginate" />
+ </Button>
</div>
)}
- </>
- )}
- {!singlePassExtractMode && (
- <div className="display-flex-right prompt-card-paginate-div">
- <Button
- type="text"
- size="small"
- className="prompt-card-action-button"
- disabled={
- page <= 1 ||
- disableLlmOrDocChange.includes(
- promptDetails?.prompt_id
- ) ||
- isSinglePassExtractLoading ||
- indexDocs.includes(selectedDoc?.document_id)
- }
- onClick={handlePageLeft}
- >
- <LeftOutlined className="prompt-card-paginate" />
- </Button>
- <Button
- type="text"
- size="small"
- className="prompt-card-action-button"
- disabled={
- page >= llmProfiles?.length ||
- disableLlmOrDocChange.includes(
- promptDetails?.prompt_id
- ) ||
- isSinglePassExtractLoading ||
- indexDocs.includes(selectedDoc?.document_id)
- }
- onClick={handlePageRight}
- >
- <RightOutlined className="prompt-card-paginate" />
- </Button>
</div>
- )}
- </div>
- {EvalMetrics && <EvalMetrics result={result} />}
- </Space>
+ {EvalMetrics && <EvalMetrics result={result} />}
+ </Space>
+ </>
+ )}
</>
{(isRunLoading || result?.output || result?.output === 0) && (
<>
diff --git a/frontend/src/components/custom-tools/tools-main/ToolsMain.jsx b/frontend/src/components/custom-tools/tools-main/ToolsMain.jsx
index d32495fb3..7d8953c15 100644
--- a/frontend/src/components/custom-tools/tools-main/ToolsMain.jsx
+++ b/frontend/src/components/custom-tools/tools-main/ToolsMain.jsx
@@ -1,9 +1,8 @@
-import { BarChartOutlined } from "@ant-design/icons";
-import { Button, Space, Tabs, Tooltip } from "antd";
+import { Tabs, Tooltip } from "antd";
import { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { TableOutlined, UnorderedListOutlined } from "@ant-design/icons";
-import { promptType } from "../../../helpers/GetStaticData";
+import { getSequenceNumber, promptType } from "../../../helpers/GetStaticData";
import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
import { useExceptionHandler } from "../../../hooks/useExceptionHandler";
import { useAlertStore } from "../../../store/alert-store";
@@ -14,14 +13,7 @@ import { DocumentParser } from "../document-parser/DocumentParser";
import { Footer } from "../footer/Footer";
import "./ToolsMain.css";
import usePostHogEvents from "../../../hooks/usePostHogEvents";
-
-let RunSinglePassBtn;
-try {
- RunSinglePassBtn =
- require("../../../plugins/run-single-pass-btn/RunSinglePassBtn").RunSinglePassBtn;
-} catch {
- // The variable is remain undefined if the component is not available
-}
+import { ToolsMainActionBtns } from "./ToolsMainActionBtns";
function ToolsMain() {
const [activeKey, setActiveKey] = useState("1");
@@ -34,23 +26,33 @@ function ToolsMain() {
selectedDoc,
updateCustomTool,
disableLlmOrDocChange,
- singlePassExtractMode,
- isSinglePassExtractLoading,
+ isSimplePromptStudio,
} = useCustomToolStore();
const { setAlertDetails } = useAlertStore();
const axiosPrivate = useAxiosPrivate();
const handleException = useExceptionHandler();
- const navigate = useNavigate();
const { setPostHogCustomEvent } = usePostHogEvents();
const items = [
{
key: "1",
- label: "Document Parser",
+ label: isSimplePromptStudio ? (
+ <Tooltip title="Fields">
+ <UnorderedListOutlined />
+ </Tooltip>
+ ) : (
+ "Document Parser"
+ ),
},
{
key: "2",
- label: "Combined Output",
+ label: isSimplePromptStudio ? (
+ <Tooltip title="Combined Output">
+ <TableOutlined />
+ </Tooltip>
+ ) : (
+ "Combined Output"
+ ),
disabled: prompts?.length === 0 || disableLlmOrDocChange?.length > 0,
},
];
@@ -69,24 +71,13 @@ function ToolsMain() {
return getPromptKey(len + 1);
};
- const getSequenceNumber = () => {
- let maxSequenceNumber = 0;
- prompts.forEach((item) => {
- if (item?.sequence_number > maxSequenceNumber) {
- maxSequenceNumber = item?.sequence_number;
- }
- });
-
- return maxSequenceNumber + 1;
- };
-
const defaultPromptInstance = {
prompt_key: getPromptKey(prompts?.length + 1),
prompt: "",
tool_id: details?.tool_id,
prompt_type: promptType.prompt,
profile_manager: defaultLlmProfile,
- sequence_number: getSequenceNumber(),
+ sequence_number: getSequenceNumber(prompts),
};
const defaultNoteInstance = {
@@ -94,7 +85,7 @@ function ToolsMain() {
prompt: "",
tool_id: details?.tool_id,
prompt_type: promptType.notes,
- sequence_number: getSequenceNumber(),
+ sequence_number: getSequenceNumber(prompts),
};
useEffect(() => {
@@ -146,18 +137,6 @@ function ToolsMain() {
});
};
- const handleOutputAnalyzerBtnClick = () => {
- navigate("outputAnalyzer");
-
- try {
- setPostHogCustomEvent("ps_output_analyser_seen", {
- info: "Clicked on 'Output Analyzer' button",
- });
- } catch (err) {
- // If an error occurs while setting custom posthog event, ignore it and continue
- }
- };
-
return (
<div className="tools-main-layout">
<div className="doc-manager-header">
@@ -170,19 +149,7 @@ function ToolsMain() {
/>
</div>
<div className="display-flex-align-center">
- <Space>
- {singlePassExtractMode && RunSinglePassBtn && <RunSinglePassBtn />}
- <Tooltip title="Output Analyzer">
- <Button
- icon={<BarChartOutlined />}
- onClick={handleOutputAnalyzerBtnClick}
- disabled={
- disableLlmOrDocChange?.length > 0 ||
- isSinglePassExtractLoading
- }
- />
- </Tooltip>
- </Space>
+ <ToolsMainActionBtns />
</div>
</div>
<div className="tools-main-body">
@@ -197,9 +164,11 @@ function ToolsMain() {
<CombinedOutput docId={selectedDoc?.document_id} />
)}
</div>
- <div className="tools-main-footer">
- <Footer activeKey={activeKey} addPromptInstance={addPromptInstance} />
- </div>
+ {!isSimplePromptStudio && (
+ <div className="tools-main-footer">
+ <Footer activeKey={activeKey} addPromptInstance={addPromptInstance} />
+ </div>
+ )}
</div>
);
}
diff --git a/frontend/src/components/custom-tools/tools-main/ToolsMainActionBtns.jsx b/frontend/src/components/custom-tools/tools-main/ToolsMainActionBtns.jsx
new file mode 100644
index 000000000..3f0b61229
--- /dev/null
+++ b/frontend/src/components/custom-tools/tools-main/ToolsMainActionBtns.jsx
@@ -0,0 +1,68 @@
+import { BarChartOutlined } from "@ant-design/icons";
+import { Button, Space, Tooltip } from "antd";
+import { useNavigate } from "react-router-dom";
+
+import { useCustomToolStore } from "../../../store/custom-tool-store";
+import usePostHogEvents from "../../../hooks/usePostHogEvents";
+
+// Import single pass related components
+let RunSinglePassBtn;
+try {
+ RunSinglePassBtn =
+ require("../../../plugins/run-single-pass-btn/RunSinglePassBtn").RunSinglePassBtn;
+} catch {
+ // The variable will remain undefined if the component is not available
+}
+
+// Import simple prompt studio related components
+let AddPromptBtn;
+try {
+ AddPromptBtn =
+ require("../../../plugins/simple-prompt-studio/AddPromptBtn").AddPromptBtn;
+} catch {
+ // The variable will remain undefined if the component is not available
+}
+
+function ToolsMainActionBtns() {
+ const {
+ disableLlmOrDocChange,
+ singlePassExtractMode,
+ isSinglePassExtractLoading,
+ isSimplePromptStudio,
+ } = useCustomToolStore();
+ const navigate = useNavigate();
+ const { setPostHogCustomEvent } = usePostHogEvents();
+
+ const handleOutputAnalyzerBtnClick = () => {
+ navigate("outputAnalyzer");
+
+ try {
+ setPostHogCustomEvent("ps_output_analyser_seen", {
+ info: "Clicked on 'Output Analyzer' button",
+ });
+ } catch (err) {
+ // If an error occurs while setting custom posthog event, ignore it and continue
+ }
+ };
+
+ if (isSimplePromptStudio && AddPromptBtn) {
+ return <AddPromptBtn />;
+ }
+
+ return (
+ <Space>
+ {singlePassExtractMode && RunSinglePassBtn && <RunSinglePassBtn />}
+ <Tooltip title="Output Analyzer">
+ <Button
+ icon={<BarChartOutlined />}
+ onClick={handleOutputAnalyzerBtnClick}
+ disabled={
+ disableLlmOrDocChange?.length > 0 || isSinglePassExtractLoading
+ }
+ />
+ </Tooltip>
+ </Space>
+ );
+}
+
+export { ToolsMainActionBtns };
diff --git a/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js b/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js
index 4f52b530f..53f835ae7 100644
--- a/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js
+++ b/frontend/src/components/helpers/custom-tools/CustomToolsHelper.js
@@ -46,6 +46,7 @@ function CustomToolsHelper() {
updatedCusTool["singlePassExtractMode"] =
data?.single_pass_extraction_mode;
selectedDocId = data?.output;
+ updatedCusTool["isSimplePromptStudio"] = false;
const reqOpsDocs = {
method: "GET",
diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js
index b9ac03252..01013cc89 100644
--- a/frontend/src/helpers/GetStaticData.js
+++ b/frontend/src/helpers/GetStaticData.js
@@ -187,6 +187,17 @@ const sourceTypes = {
adapters: ["llm", "vector_db", "embedding"],
};
+const getSequenceNumber = (listOfPrompts) => {
+ let maxSequenceNumber = 0;
+ listOfPrompts.forEach((item) => {
+ if (item?.sequence_number > maxSequenceNumber) {
+ maxSequenceNumber = item?.sequence_number;
+ }
+ });
+
+ return maxSequenceNumber + 1;
+};
+
const deploymentTypes = {
etl: "etl",
task: "task",
@@ -432,6 +443,7 @@ export {
replaceFirstRoute,
setInitialWorkflowInstance,
sourceTypes,
+ getSequenceNumber,
toolIdeOutput,
wfExecutionTypes,
workflowStatus,
diff --git a/frontend/src/index.css b/frontend/src/index.css
index cb1ba31b0..0d13cfa74 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -137,3 +137,25 @@ body {
text-overflow: ellipsis;
white-space: nowrap;
}
+
+.flex-dir-col {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+}
+
+.flex-1 {
+ flex: 1;
+}
+
+.border {
+ border-style: solid;
+}
+
+.overflow-hidden {
+ overflow: hidden;
+}
+
+.overflow-y-auto {
+ overflow-y: auto;
+}
diff --git a/frontend/src/routes/Router.jsx b/frontend/src/routes/Router.jsx
index f707aa75a..ab99fde82 100644
--- a/frontend/src/routes/Router.jsx
+++ b/frontend/src/routes/Router.jsx
@@ -58,15 +58,52 @@ try {
// Do nothing, Not-found Page will be triggered.
}
+// Import pages/components related to Simple Prompt Studio.
+let SimplePromptStudioHelper;
+let SimplePromptStudio;
+let SpsLanding;
+let SpsUpload;
+try {
+ SimplePromptStudioHelper =
+ require("../plugins/simple-prompt-studio/SimplePromptStudioHelper.jsx").SimplePromptStudioHelper;
+ SimplePromptStudio =
+ require("../plugins/simple-prompt-studio/SimplePromptStudio.jsx").SimplePromptStudio;
+ SpsLanding =
+ require("../plugins/simple-prompt-studio/SpsLanding.jsx").SpsLanding;
+ SpsUpload =
+ require("../plugins/simple-prompt-studio/SpsUpload.jsx").SpsUpload;
+} catch (err) {
+ // Do nothing, Not-found Page will be triggered.
+}
+
function Router() {
return (
<Routes>
<Route path="error" element={<GenericError />} />
<Route path="" element={<PersistentLogin />}>
{/* public routes */}
- <Route path="" element={<RequireGuest />}>
- <Route path="landing" element={<LandingPage />} />
+ <Route path="">
+ {/* public routes accessible only to unauthenticated users */}
+ <Route path="" element={<RequireGuest />}>
+ <Route path="landing" element={<LandingPage />} />
+ </Route>
+
+ {/* public routes accessible to both authenticated and unauthenticated users */}
+ {SimplePromptStudioHelper &&
+ SimplePromptStudio &&
+ SpsLanding &&
+ SpsUpload && (
+ <Route
+ path="simple-prompt-studio"
+ element={<SimplePromptStudioHelper />}
+ >
+ <Route path="" element={<SimplePromptStudio />} />
+ <Route path="landing" element={<SpsLanding />} />
+ <Route path="upload" element={<SpsUpload />} />
+ </Route>
+ )}
</Route>
+
{/* protected routes */}
<Route path="setOrg" element={<SetOrgPage />} />
<Route path="" element={<RequireAuth />}>
diff --git a/frontend/src/setupProxy.js b/frontend/src/setupProxy.js
index 6b592e3ae..6ec9ebbda 100644
--- a/frontend/src/setupProxy.js
+++ b/frontend/src/setupProxy.js
@@ -8,4 +8,11 @@ module.exports = (app) => {
changeOrigin: true,
})
);
+ app.use(
+ "/public",
+ createProxyMiddleware({
+ target: process.env.REACT_APP_BACKEND_URL,
+ changeOrigin: true,
+ })
+ );
};
diff --git a/frontend/src/store/custom-tool-store.js b/frontend/src/store/custom-tool-store.js
index 952c9ceb6..f7b94e1c3 100644
--- a/frontend/src/store/custom-tool-store.js
+++ b/frontend/src/store/custom-tool-store.js
@@ -15,6 +15,7 @@ const defaultState = {
summarizeIndexStatus: [],
singlePassExtractMode: false,
isSinglePassExtractLoading: false,
+ isSimplePromptStudio: false,
};
const defaultPromptInstance = {