Skip to content

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

Fix/prompt studio bug fixes (#44)

Tahier Hussain0cabd505fb50
diff --git a/backend/prompt_studio/prompt_studio/migrations/0005_alter_toolstudioprompt_enforce_type.py b/backend/prompt_studio/prompt_studio/migrations/0005_alter_toolstudioprompt_enforce_type.py
new file mode 100644
index 000000000..12f6fa9d1
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio/migrations/0005_alter_toolstudioprompt_enforce_type.py
@@ -0,0 +1,29 @@
+# Generated by Django 4.2.1 on 2024-02-29 10:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("prompt_studio", "0004_alter_toolstudioprompt_prompt"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="toolstudioprompt",
+ name="enforce_type",
+ field=models.TextField(
+ blank=True,
+ choices=[
+ ("Text", "Response sent as Text"),
+ ("number", "Response sent as number"),
+ ("email", "Response sent as email"),
+ ("date", "Response sent as date"),
+ ("boolean", "Response sent as boolean"),
+ ("json", "Response sent as json"),
+ ],
+ db_comment="Field to store the type in which the response to be returned.",
+ default="Text",
+ ),
+ ),
+ ]
diff --git a/backend/prompt_studio/prompt_studio/models.py b/backend/prompt_studio/prompt_studio/models.py
index 2e783b692..6772223fc 100644
--- a/backend/prompt_studio/prompt_studio/models.py
+++ b/backend/prompt_studio/prompt_studio/models.py
@@ -41,6 +41,7 @@ class ToolStudioPrompt(BaseModel):
db_comment="Field to store the type in \
which the response to be returned.",
choices=EnforceType.choices,
+ default=EnforceType.TEXT,
)
prompt = models.TextField(
blank=True, db_comment="Field to store the prompt", unique=False
diff --git a/backend/prompt_studio/prompt_studio_core/migrations/0006_alter_customtool_summarize_as_source_and_more.py b/backend/prompt_studio/prompt_studio_core/migrations/0006_alter_customtool_summarize_as_source_and_more.py
new file mode 100644
index 000000000..566fee5b3
--- /dev/null
+++ b/backend/prompt_studio/prompt_studio_core/migrations/0006_alter_customtool_summarize_as_source_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.1 on 2024-03-02 07:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("prompt_studio_core", "0005_alter_customtool_default_profile_and_more"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="customtool",
+ name="summarize_as_source",
+ field=models.BooleanField(
+ db_comment="Flag to use summarized content as source", default=False
+ ),
+ ),
+ migrations.AlterField(
+ model_name="customtool",
+ name="summarize_context",
+ field=models.BooleanField(
+ db_comment="Flag to summarize content", default=False
+ ),
+ ),
+ ]
diff --git a/backend/prompt_studio/prompt_studio_core/models.py b/backend/prompt_studio/prompt_studio_core/models.py
index 82d41948f..9ef5127ab 100644
--- a/backend/prompt_studio/prompt_studio_core/models.py
+++ b/backend/prompt_studio/prompt_studio_core/models.py
@@ -55,10 +55,10 @@ class CustomTool(BaseModel):
db_comment="LLM Profile used for summarize",
)
summarize_context = models.BooleanField(
- default=True, db_comment="Flag to summarize content"
+ default=False, db_comment="Flag to summarize content"
)
summarize_as_source = models.BooleanField(
- default=True, db_comment="Flag to use summarized content as source"
+ default=False, db_comment="Flag to use summarized content as source"
)
summarize_prompt = models.TextField(
blank=True,
diff --git a/frontend/src/components/custom-tools/add-llm-profile-modal/AddLlmProfileModal.jsx b/frontend/src/components/custom-tools/add-llm-profile-modal/AddLlmProfileModal.jsx
index 4d742a70b..addf4b11c 100644
--- a/frontend/src/components/custom-tools/add-llm-profile-modal/AddLlmProfileModal.jsx
+++ b/frontend/src/components/custom-tools/add-llm-profile-modal/AddLlmProfileModal.jsx
@@ -15,7 +15,10 @@ import {
import PropTypes from "prop-types";
import { useEffect, useState } from "react";
-import { handleException } from "../../../helpers/GetStaticData";
+import {
+ getBackendErrorDetail,
+ handleException,
+} from "../../../helpers/GetStaticData";
import { useAxiosPrivate } from "../../../hooks/useAxiosPrivate";
import { useAlertStore } from "../../../store/alert-store";
import { useCustomToolStore } from "../../../store/custom-tool-store";
@@ -30,17 +33,10 @@ function AddLlmProfileModal({
editLlmProfileId,
setEditLlmProfileId,
}) {
- const [name, setName] = useState("");
- const [llm, setLlm] = useState("");
- const [chunkSize, setChunkSize] = useState(1024);
- const [vectorDb, setVectorDb] = useState("");
- const [chunkOverlap, setChunkOverlap] = useState(128);
- const [embeddingModel, setEmbeddingModel] = useState("");
- const [x2TextService, setX2TextService] = useState("");
- const [retrievalStrategy, setRetrievalStrategy] = useState("");
- const [similarityTopK, setSimilarityTopK] = useState(1);
- const [section, setSection] = useState("Default");
- const [reIndex, setReIndex] = useState(false);
+ const [form] = Form.useForm();
+ const [formDetails, setFormDetails] = useState({});
+ const [resetForm, setResetForm] = useState(false);
+ const [backendErrors, setBackendErrors] = useState(null);
const [retrievalItems, setRetrievalItems] = useState([]);
const [llmItems, setLlmItems] = useState([]);
const [vectorDbItems, setVectorDbItems] = useState([]);
@@ -72,21 +68,25 @@ function AddLlmProfileModal({
}, []);
useEffect(() => {
- if (open) {
+ if (!open) {
return;
}
- setName("");
- setLlm("");
- setChunkSize(1024);
- setVectorDb("");
- setChunkOverlap(128);
- setEmbeddingModel("");
- setX2TextService("");
- setRetrievalStrategy("");
- setSimilarityTopK(1);
- setSection("Default");
- setReIndex(false);
+ setResetForm(true);
+ setFormDetails({
+ profile_name: "",
+ llm: "",
+ chunk_size: 1024,
+ vector_store: "",
+ chunk_overlap: 128,
+ embedding_model: "",
+ x2text: "",
+ retrieval_strategy: "simple",
+ similarity_top_k: 1,
+ section: "Default",
+ reindex: false,
+ });
+
setEditLlmProfileId(null);
setActiveKey(false);
}, [open]);
@@ -116,20 +116,57 @@ function AddLlmProfileModal({
(item) => item?.label === llmProfileDetails?.x2text
);
- setName(llmProfileDetails?.profile_name);
- setLlm(llmItem?.value || null);
- setChunkSize(llmProfileDetails?.chunk_size);
- setVectorDb(vectorDbItem?.value || null);
- setChunkOverlap(llmProfileDetails?.chunk_overlap);
- setEmbeddingModel(embeddingItem?.value || null);
- setX2TextService(x2TextItem?.value || null);
- setRetrievalStrategy(llmProfileDetails?.retrieval_strategy);
- setSimilarityTopK(llmProfileDetails?.similarity_top_k);
- setSection(llmProfileDetails?.section);
- setReIndex(llmProfileDetails?.reindex);
+ setResetForm(true);
+ setFormDetails({
+ profile_name: llmProfileDetails?.profile_name,
+ llm: llmItem?.value || null,
+ chunk_size: llmProfileDetails?.chunk_size,
+ vector_store: vectorDbItem?.value || null,
+ chunk_overlap: llmProfileDetails?.chunk_overlap,
+ embedding_model: embeddingItem?.value || null,
+ x2text: x2TextItem?.value || null,
+ retrieval_strategy: llmProfileDetails?.retrieval_strategy,
+ similarity_top_k: llmProfileDetails?.similarity_top_k,
+ section: llmProfileDetails?.section,
+ reindex: llmProfileDetails?.reindex,
+ });
setActiveKey(true);
}, [editLlmProfileId]);
+ useEffect(() => {
+ if (resetForm) {
+ form.resetFields();
+ setResetForm(false);
+ }
+ }, [formDetails]);
+
+ const validateEmptyOrWhitespace = (_, value) => {
+ if (value && value.trim() === "") {
+ return Promise.reject(new Error("Please enter a non-whitespace value"));
+ }
+ return Promise.resolve(); // Resolve if value is empty or contains only whitespaces
+ };
+
+ const handleInputChange = (changedValues, allValues) => {
+ setFormDetails({ ...formDetails, ...allValues });
+ const changedFieldName = Object.keys(changedValues)[0];
+ form.setFields([
+ {
+ name: changedFieldName,
+ errors: [],
+ },
+ ]);
+ setBackendErrors((prevErrors) => {
+ if (prevErrors) {
+ const updatedErrors = prevErrors.errors.filter(
+ (error) => error.attr !== changedFieldName
+ );
+ return { ...prevErrors, errors: updatedErrors };
+ }
+ return null;
+ });
+ };
+
const setAdaptorProfilesDropdown = () => {
const requestOptions = {
method: "GET",
@@ -199,34 +236,44 @@ function AddLlmProfileModal({
label: "Advanced Settings",
children: (
<div>
- <Form.Item label="Retrieval Strategy">
- <Select
- options={retrievalItems}
- value={retrievalStrategy}
- onChange={(value) => setRetrievalStrategy(value)}
- />
+ <Form.Item
+ label="Retrieval Strategy"
+ name="retrieval_strategy"
+ validateStatus={
+ getBackendErrorDetail("retrieval_strategy", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("retrieval_strategy", backendErrors)}
+ >
+ <Select options={retrievalItems} />
</Form.Item>
- <Form.Item label="Matching count limit (similarity top-k)">
- <Input
- type="number"
- value={similarityTopK}
- onChange={(e) => setSimilarityTopK(e.target.value)}
- />
+ <Form.Item
+ label="Matching count limit (similarity top-k)"
+ name="similarity_top_k"
+ validateStatus={
+ getBackendErrorDetail("similarity_top_k", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("similarity_top_k", backendErrors)}
+ >
+ <Input type="number" />
</Form.Item>
- <Form.Item label="Limit-to Section">
- <Select
- options={[{ value: "Default" }]}
- value={section}
- onChange={(value) => setSection(value)}
- />
+ <Form.Item
+ label="Limit-to Section"
+ name="section"
+ validateStatus={
+ getBackendErrorDetail("section", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("section", backendErrors)}
+ >
+ <Select options={[{ value: "Default" }]} />
</Form.Item>
<Row className="add-llm-profile-row">
<Col span={5}>
<Form.Item label="Re-Index">
- <Checkbox
- checked={reIndex}
- onClick={() => setReIndex(!reIndex)}
- />
+ <Checkbox />
</Form.Item>
</Col>
</Row>
@@ -237,20 +284,6 @@ function AddLlmProfileModal({
];
const handleSubmit = () => {
- const body = {
- profile_name: name,
- llm,
- vector_store: vectorDb,
- embedding_model: embeddingModel,
- x2text: x2TextService,
- chunk_size: chunkSize,
- chunk_overlap: chunkOverlap,
- retrieval_strategy: retrievalStrategy,
- similarity_top_k: similarityTopK,
- section,
- reindex: reIndex,
- };
-
let method = "POST";
let url = `/api/v1/unstract/${sessionDetails?.orgId}/prompt-studio/profile-manager/`;
@@ -266,7 +299,7 @@ function AddLlmProfileModal({
"X-CSRFToken": sessionDetails?.csrfToken,
"Content-Type": "application/json",
},
- data: body,
+ data: formDetails,
};
axiosPrivate(requestOptions)
@@ -312,7 +345,13 @@ function AddLlmProfileModal({
centered
footer={null}
>
- <Form layout="vertical" onFinish={handleSubmit}>
+ <Form
+ form={form}
+ layout="vertical"
+ initialValues={formDetails}
+ onValuesChange={handleInputChange}
+ onFinish={handleSubmit}
+ >
<div className="pre-post-amble-body">
<SpaceWrapper>
<div>
@@ -321,64 +360,143 @@ function AddLlmProfileModal({
</Typography.Text>
</div>
<div>
- <Form.Item label="Name">
- <Input value={name} onChange={(e) => setName(e.target.value)} />
+ <Form.Item
+ label="Name"
+ name="profile_name"
+ rules={[
+ {
+ required: true,
+ message: "Please enter the name",
+ },
+ { validator: validateEmptyOrWhitespace },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("profile_name", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("profile_name", backendErrors)}
+ >
+ <Input />
</Form.Item>
<Row className="add-llm-profile-row">
<Col span={15}>
- <Form.Item label="LLM">
- <Select
- options={llmItems}
- value={llm}
- onChange={(value) => setLlm(value)}
- />
+ <Form.Item
+ label="LLM"
+ name="llm"
+ rules={[
+ { required: true, message: "Please enter the LLM" },
+ { validator: validateEmptyOrWhitespace },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("llm", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("llm", backendErrors)}
+ >
+ <Select options={llmItems} />
</Form.Item>
</Col>
<Col span={1} />
<Col span={8}>
- <Form.Item label="Chunk Size">
- <Input
- type="number"
- value={chunkSize}
- onChange={(e) => setChunkSize(e.target.value)}
- />
+ <Form.Item
+ label="Chunk Size"
+ name="chunk_size"
+ rules={[
+ {
+ required: true,
+ message: "Please enter the chunk size",
+ },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("chunk_size", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("chunk_size", backendErrors)}
+ >
+ <Input type="number" />
</Form.Item>
</Col>
</Row>
<Row className="add-llm-profile-row">
<Col span={15}>
- <Form.Item label="Vector Database">
- <Select
- options={vectorDbItems}
- value={vectorDb}
- onChange={(value) => setVectorDb(value)}
- />
+ <Form.Item
+ label="Vector Database"
+ name="vector_store"
+ rules={[
+ {
+ required: true,
+ message: "Please select the vector store",
+ },
+ { validator: validateEmptyOrWhitespace },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("vector_store", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("vector_store", backendErrors)}
+ >
+ <Select options={vectorDbItems} />
</Form.Item>
</Col>
<Col span={1} />
<Col span={8}>
- <Form.Item label="Overlap">
- <Input
- type="number"
- value={chunkOverlap}
- onChange={(e) => setChunkOverlap(e.target.value)}
- />
+ <Form.Item
+ label="Overlap"
+ name="chunk_overlap"
+ rules={[
+ {
+ required: true,
+ message: "Please enter the overlap",
+ },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("chunk_overlap", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("chunk_overlap", backendErrors)}
+ >
+ <Input type="number" />
</Form.Item>
</Col>
</Row>
- <Form.Item label="Embedding Model">
- <Select
- options={embeddingItems}
- value={embeddingModel}
- onChange={(value) => setEmbeddingModel(value)}
- />
+ <Form.Item
+ label="Embedding Model"
+ name="embedding_model"
+ rules={[
+ {
+ required: true,
+ message: "Please select the embedding model",
+ },
+ { validator: validateEmptyOrWhitespace },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("embedding_model", backendErrors)
+ ? "error"
+ : ""
+ }
+ help={getBackendErrorDetail("embedding_model", backendErrors)}
+ >
+ <Select options={embeddingItems} />
</Form.Item>
- <Form.Item label="Text Extractor">
- <Select
- options={x2TextItems}
- value={x2TextService}
- onChange={(value) => setX2TextService(value)}
- />
+ <Form.Item
+ label="Text Extractor"
+ name="x2text"
+ rules={[
+ {
+ required: true,
+ message: "Please select the text extractor",
+ },
+ { validator: validateEmptyOrWhitespace },
+ ]}
+ validateStatus={
+ getBackendErrorDetail("x2text", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("x2text", backendErrors)}
+ >
+ <Select options={x2TextItems} />
</Form.Item>
<Collapse
expandIcon={({ isActive }) => handleCaretIcon(isActive)}
diff --git a/frontend/src/components/custom-tools/editable-text/EditableText.jsx b/frontend/src/components/custom-tools/editable-text/EditableText.jsx
index 6ba422c94..6a4e568bd 100644
--- a/frontend/src/components/custom-tools/editable-text/EditableText.jsx
+++ b/frontend/src/components/custom-tools/editable-text/EditableText.jsx
@@ -9,12 +9,13 @@ import { useCustomToolStore } from "../../../store/custom-tool-store";
function EditableText({
isEditing,
setIsEditing,
+ text,
+ setText,
promptId,
defaultText,
handleChange,
isTextarea,
}) {
- const [text, setText] = useState("");
const name = isTextarea ? "prompt" : "prompt_key";
const [triggerHandleChange, setTriggerHandleChange] = useState(false);
const [isHovered, setIsHovered] = useState(false);
@@ -111,6 +112,8 @@ function EditableText({
EditableText.propTypes = {
isEditing: PropTypes.bool.isRequired,
setIsEditing: PropTypes.func.isRequired,
+ text: PropTypes.string,
+ setText: PropTypes.func.isRequired,
promptId: PropTypes.string.isRequired,
defaultText: PropTypes.string.isRequired,
handleChange: PropTypes.func.isRequired,
diff --git a/frontend/src/components/custom-tools/header/Header.css b/frontend/src/components/custom-tools/header/Header.css
index a451ce0d3..fd9ed84d1 100644
--- a/frontend/src/components/custom-tools/header/Header.css
+++ b/frontend/src/components/custom-tools/header/Header.css
@@ -28,4 +28,8 @@
border-right: 1px #D9D9D9 solid;
padding: 0;
margin: 0px 5px;
+}
+
+.select-llm-pro-header {
+ padding: 20px 0px 0px 20px;
}
\ No newline at end of file
diff --git a/frontend/src/components/custom-tools/header/Header.jsx b/frontend/src/components/custom-tools/header/Header.jsx
index 355e7de10..35fd8cc66 100644
--- a/frontend/src/components/custom-tools/header/Header.jsx
+++ b/frontend/src/components/custom-tools/header/Header.jsx
@@ -41,7 +41,7 @@ function Header({
useEffect(() => {
getLlmProfilesDropdown();
- }, []);
+ }, [llmProfiles]);
const handleOpenPreOrPostAmbleModal = (type) => {
setOpenPreOrPostAmbleModal(true);
diff --git a/frontend/src/components/custom-tools/list-of-tools/ListOfTools.jsx b/frontend/src/components/custom-tools/list-of-tools/ListOfTools.jsx
index 9a5ec279b..84f3fb1c5 100644
--- a/frontend/src/components/custom-tools/list-of-tools/ListOfTools.jsx
+++ b/frontend/src/components/custom-tools/list-of-tools/ListOfTools.jsx
@@ -210,6 +210,7 @@ function ListOfTools() {
<ViewTools
isLoading={isListLoading}
viewType={viewType}
+ isEmpty={!listOfTools?.length}
listOfTools={filteredListOfTools}
setOpenAddTool={setOpenAddTool}
handleEdit={handleEdit}
diff --git a/frontend/src/components/custom-tools/manage-llm-profiles-modal/ManageLlmProfilesModal.jsx b/frontend/src/components/custom-tools/manage-llm-profiles-modal/ManageLlmProfilesModal.jsx
index b9075562c..8aefc28f5 100644
--- a/frontend/src/components/custom-tools/manage-llm-profiles-modal/ManageLlmProfilesModal.jsx
+++ b/frontend/src/components/custom-tools/manage-llm-profiles-modal/ManageLlmProfilesModal.jsx
@@ -15,7 +15,7 @@ function ManageLlmProfilesModal({
onCancel={() => setOpen(false)}
centered
footer={null}
- width={800}
+ width={1000}
maskClosable={false}
>
<ManageLlmProfiles
diff --git a/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx b/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
index 5b294ef1a..110e3eb21 100644
--- a/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
+++ b/frontend/src/components/custom-tools/manage-llm-profiles/ManageLlmProfiles.jsx
@@ -34,6 +34,11 @@ const columns = [
dataIndex: "vector_db",
key: "vector_db",
},
+ {
+ title: "Text Extractor",
+ dataIndex: "text_extractor",
+ key: "text_extractor",
+ },
{
title: "",
dataIndex: "delete",
@@ -101,6 +106,7 @@ function ManageLlmProfiles({ setOpen, setOpenLlm, setEditLlmProfileId }) {
llm: item?.llm || "",
embedding_model: item?.embedding_model || "",
vector_db: item?.vector_store || "",
+ text_extractor: item?.x2text || "",
delete: (
<ConfirmModal
handleConfirm={() => handleDelete(item?.profile_id)}
diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCard.css b/frontend/src/components/custom-tools/prompt-card/PromptCard.css
index 40ce1bc0e..035fd4594 100644
--- a/frontend/src/components/custom-tools/prompt-card/PromptCard.css
+++ b/frontend/src/components/custom-tools/prompt-card/PromptCard.css
@@ -38,6 +38,10 @@
margin: 0px 0px;
}
+.prompt-card-paginate-div {
+ min-width: 80px;
+}
+
.prompt-card-paginate {
font-size: 12px;
}
diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
index 4b6af7cbc..bd0e4a80c 100644
--- a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
+++ b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
@@ -59,6 +59,8 @@ function PromptCard({
const [isRunLoading, setIsRunLoading] = useState(false);
const [displayAssertion, setDisplayAssertion] = useState(false);
const [openEval, setOpenEval] = useState(false);
+ const [promptKey, setPromptKey] = useState("");
+ const [promptText, setPromptText] = useState("");
const [isEditingTitle, setIsEditingTitle] = useState(false);
const [isEditingPrompt, setIsEditingPrompt] = useState(false);
const [selectedLlmProfileId, setSelectedLlmProfileId] = useState(null);
@@ -238,6 +240,22 @@ function PromptCard({
return;
}
+ if (!promptKey) {
+ setAlertDetails({
+ type: "error",
+ content: "Prompt key cannot be empty",
+ });
+ return;
+ }
+
+ if (!promptText) {
+ setAlertDetails({
+ type: "error",
+ content: "Prompt cannot be empty",
+ });
+ return;
+ }
+
setIsRunLoading(true);
setIsCoverageLoading(true);
setCoverage(0);
@@ -357,8 +375,12 @@ function PromptCard({
method,
url
) => {
+ let output = outputValue;
+ if (output !== null && typeof output !== "string") {
+ output = JSON.stringify(output);
+ }
const body = {
- output: outputValue !== null ? JSON.stringify(outputValue) : null,
+ output: output !== null ? output : null,
tool_id: details?.tool_id,
prompt_id: promptDetails?.prompt_id,
profile_manager: promptDetails?.profile_manager,
@@ -580,6 +602,8 @@ function PromptCard({
<EditableText
isEditing={isEditingTitle}
setIsEditing={setIsEditingTitle}
+ text={promptKey}
+ setText={setPromptKey}
promptId={promptDetails?.prompt_id}
defaultText={promptDetails?.prompt_key}
handleChange={handleChange}
@@ -638,9 +662,7 @@ function PromptCard({
type="text"
className="display-flex-align-center"
onClick={() => setDisplayAssertion(!displayAssertion)}
- disabled={disableLlmOrDocChange.includes(
- promptDetails?.prompt_id
- )}
+ disabled={true}
>
<AssertionIcon className="prompt-card-actions-head" />
</Button>
@@ -681,6 +703,8 @@ function PromptCard({
<EditableText
isEditing={isEditingPrompt}
setIsEditing={setIsEditingPrompt}
+ text={promptText}
+ setText={setPromptText}
promptId={promptDetails?.prompt_id}
defaultText={promptDetails.prompt}
handleChange={handleChange}
@@ -753,6 +777,7 @@ function PromptCard({
<Tag>{llmProfiles[page - 1]?.llm}</Tag>
<Tag>{llmProfiles[page - 1]?.vector_store}</Tag>
<Tag>{llmProfiles[page - 1]?.embedding_model}</Tag>
+ <Tag>{llmProfiles[page - 1]?.x2text}</Tag>
<Tag>{`${llmProfiles[page - 1]?.chunk_size}/${
llmProfiles[page - 1]?.chunk_overlap
}/${llmProfiles[page - 1]?.retrieval_strategy}/${
@@ -766,7 +791,7 @@ function PromptCard({
</Typography.Text>
</div>
)}
- <div>
+ <div className="display-flex-right prompt-card-paginate-div">
<Button
type="text"
size="small"
diff --git a/frontend/src/components/custom-tools/select-llm-profile-modal/SelectLlmProfileModal.jsx b/frontend/src/components/custom-tools/select-llm-profile-modal/SelectLlmProfileModal.jsx
index 64c1c9d3d..845ebd69c 100644
--- a/frontend/src/components/custom-tools/select-llm-profile-modal/SelectLlmProfileModal.jsx
+++ b/frontend/src/components/custom-tools/select-llm-profile-modal/SelectLlmProfileModal.jsx
@@ -1,4 +1,5 @@
import {
+ Button,
Checkbox,
Form,
Input,
@@ -15,6 +16,7 @@ import debounce from "lodash/debounce";
import { useCustomToolStore } from "../../../store/custom-tool-store";
import { handleException } from "../../../helpers/GetStaticData";
import { useAlertStore } from "../../../store/alert-store";
+import { CustomButton } from "../../widgets/custom-button/CustomButton";
const fieldNames = {
SUMMARIZE_LLM_PROFILE: "summarize_llm_profile",
@@ -33,10 +35,12 @@ function SelectLlmProfileModal({
const [prompt, setPrompt] = useState("");
const [isContext, setIsContext] = useState(false);
const [isSource, setIsSource] = useState(false);
+ const [isModified, setIsModified] = useState(false);
const { details } = useCustomToolStore();
const { setAlertDetails } = useAlertStore();
useEffect(() => {
+ setPrompt(details?.summarize_prompt);
setIsContext(details?.summarize_context);
setIsSource(details?.summarize_as_source);
}, []);
@@ -44,24 +48,21 @@ function SelectLlmProfileModal({
useEffect(() => {
if (!selectedLlm) {
setBtnText("");
-
- // If the LLM is not selected, the context needs to be set to false and disabled in the UI
- if (isContext) {
- handleLlmProfileChange(fieldNames.SUMMARIZE_CONTEXT, false);
- }
- return;
}
-
- const llmItem = [...llmItems].find((item) => item?.value === selectedLlm);
- setBtnText(llmItem?.label || "");
}, [selectedLlm]);
useEffect(() => {
if (llmItems?.length) {
setSelectedLlm(details?.summarize_llm_profile);
+ handleBtnText(details?.summarize_llm_profile);
}
}, [llmItems]);
+ const handleBtnText = (llm) => {
+ const llmItem = [...llmItems].find((item) => item?.value === llm);
+ setBtnText(llmItem?.label || "");
+ };
+
const handleStateUpdate = (fieldName, value) => {
if (fieldName === fieldNames.SUMMARIZE_LLM_PROFILE) {
setSelectedLlm(value);
@@ -73,30 +74,34 @@ function SelectLlmProfileModal({
if (fieldName === fieldNames.SUMMARIZE_CONTEXT) {
setIsContext(value);
+ setIsSource(value ? isSource : false);
}
if (fieldName === fieldNames.SUMMARIZE_AS_SOURCE) {
setIsSource(value);
}
+
+ if (!isModified) {
+ setIsModified(true);
+ }
};
- const handleLlmProfileChange = (fieldName, value) => {
- handleStateUpdate(fieldName, value);
+ const handleSave = () => {
const body = {
- [fieldName]: value,
+ [fieldNames.SUMMARIZE_LLM_PROFILE]: selectedLlm,
+ [fieldNames.SUMMARIZE_PROMPT]: prompt,
+ [fieldNames.SUMMARIZE_CONTEXT]: isContext,
+ [fieldNames.SUMMARIZE_AS_SOURCE]: isSource,
};
- if (fieldName === fieldNames.SUMMARIZE_CONTEXT && !value) {
- body[fieldNames.SUMMARIZE_AS_SOURCE] = false;
- handleStateUpdate(fieldNames.SUMMARIZE_AS_SOURCE, false);
- }
-
handleUpdateTool(body)
.then(() => {
+ handleBtnText(selectedLlm);
setAlertDetails({
type: "success",
content: "Successfully updated the LLM profile",
});
+ setIsModified(false);
})
.catch((err) => {
setAlertDetails(
@@ -107,7 +112,7 @@ function SelectLlmProfileModal({
const onSearchDebounce = useCallback(
debounce((event) => {
- handleLlmProfileChange(event.target.name, event.target.value);
+ handleStateUpdate(event.target.name, event.target.value);
}, 1000),
[]
);
@@ -121,62 +126,77 @@ function SelectLlmProfileModal({
centered
footer={null}
>
- <div className="pre-post-amble-body">
- <div>
+ <div>
+ <div className="select-llm-pro-header">
<Typography.Text strong className="pre-post-amble-title">
Summarize Manager
</Typography.Text>
</div>
- <Form layout="vertical" size="small">
- <Form.Item label="Select LLM Profile">
- <Select
- placeholder="Select Eval LLM"
- defaultValue={selectedLlm}
- options={llmItems}
- onChange={(value) =>
- handleLlmProfileChange(fieldNames.SUMMARIZE_LLM_PROFILE, value)
- }
- />
- </Form.Item>
- <Form.Item label="Prompt">
- <Input.TextArea
- rows={3}
- placeholder="Enter Prompt"
- name={fieldNames.SUMMARIZE_PROMPT}
- defaultValue={prompt}
- onChange={onSearchDebounce}
- />
- </Form.Item>
- <Form.Item>
- <Space>
- <Switch
- defaultValue={isContext}
- disabled={!selectedLlm}
- size="small"
+ <Form layout="vertical">
+ <div className="pre-post-amble-body">
+ <Form.Item label="Select LLM Profile">
+ <Select
+ placeholder="Select Eval LLM"
+ defaultValue={selectedLlm}
+ options={llmItems}
onChange={(value) =>
- handleLlmProfileChange(fieldNames.SUMMARIZE_CONTEXT, value)
+ handleStateUpdate(fieldNames.SUMMARIZE_LLM_PROFILE, value)
}
/>
- <Typography.Text>Summarize Context</Typography.Text>
- </Space>
- </Form.Item>
- <div style={{ margin: "10px 0px" }} />
- <Form.Item>
- <Space>
- <Checkbox
- checked={isSource}
- disabled={!isContext || !selectedLlm}
- size="small"
- onChange={(e) =>
- handleLlmProfileChange(
- fieldNames.SUMMARIZE_AS_SOURCE,
- e.target.checked
- )
- }
+ </Form.Item>
+ <Form.Item label="Prompt">
+ <Input.TextArea
+ rows={3}
+ placeholder="Enter Prompt"
+ name={fieldNames.SUMMARIZE_PROMPT}
+ defaultValue={prompt}
+ onChange={onSearchDebounce}
/>
- <Typography.Text>Use summarize context as source</Typography.Text>
+ </Form.Item>
+ <Form.Item>
+ <Space>
+ <Switch
+ defaultValue={isContext}
+ disabled={!selectedLlm}
+ size="small"
+ onChange={(value) =>
+ handleStateUpdate(fieldNames.SUMMARIZE_CONTEXT, value)
+ }
+ />
+ <Typography.Text>Summarize Context</Typography.Text>
+ </Space>
+ </Form.Item>
+ <Form.Item>
+ <Space>
+ <Checkbox
+ checked={isSource}
+ disabled={!isContext || !selectedLlm}
+ size="small"
+ onChange={(e) =>
+ handleStateUpdate(
+ fieldNames.SUMMARIZE_AS_SOURCE,
+ e.target.checked
+ )
+ }
+ />
+ <Typography.Text>
+ Use summarize context as source
+ </Typography.Text>
+ </Space>
+ </Form.Item>
+ </div>
+ <div className="pre-post-amble-footer display-flex-right">
+ <Space>
+ <Button onClick={() => setOpen(null)}>Cancel</Button>
+ <CustomButton
+ type="primary"
+ onClick={handleSave}
+ disabled={!isModified}
+ >
+ Save
+ </CustomButton>
</Space>
- </Form.Item>
+ </div>
</Form>
</div>
</Modal>
diff --git a/frontend/src/components/custom-tools/view-tools/ViewTools.jsx b/frontend/src/components/custom-tools/view-tools/ViewTools.jsx
index 23b9203f8..cb9d678f5 100644
--- a/frontend/src/components/custom-tools/view-tools/ViewTools.jsx
+++ b/frontend/src/components/custom-tools/view-tools/ViewTools.jsx
@@ -5,10 +5,12 @@ import { ListView } from "../../widgets/list-view/ListView";
import { SpinnerLoader } from "../../widgets/spinner-loader/SpinnerLoader.jsx";
import "./ViewTools.css";
import { EmptyState } from "../../widgets/empty-state/EmptyState.jsx";
+import { Typography } from "antd";
function ViewTools({
isLoading,
viewType,
+ isEmpty,
listOfTools,
setOpenAddTool,
handleEdit,
@@ -18,7 +20,7 @@ function ViewTools({
return <SpinnerLoader />;
}
- if (!listOfTools?.length || !viewType?.length) {
+ if (isEmpty) {
return (
<EmptyState
text="No tools available"
@@ -28,6 +30,16 @@ function ViewTools({
);
}
+ if (!listOfTools?.length || !viewType?.length) {
+ return (
+ <div className="center">
+ <Typography.Title level={5}>
+ No results found for this search
+ </Typography.Title>
+ </div>
+ );
+ }
+
if (viewType === "grid") {
return (
<GridView
@@ -50,6 +62,7 @@ function ViewTools({
ViewTools.propTypes = {
isLoading: PropTypes.bool.isRequired,
viewType: PropTypes.string.isRequired,
+ isEmpty: PropTypes.bool.isRequired,
listOfTools: PropTypes.array,
setOpenAddTool: PropTypes.func,
handleEdit: PropTypes.func.isRequired,
diff --git a/frontend/src/components/deployments/create-api-deployment-modal/CreateApiDeploymentModal.jsx b/frontend/src/components/deployments/create-api-deployment-modal/CreateApiDeploymentModal.jsx
index 6d4526a07..0dbec8f8f 100644
--- a/frontend/src/components/deployments/create-api-deployment-modal/CreateApiDeploymentModal.jsx
+++ b/frontend/src/components/deployments/create-api-deployment-modal/CreateApiDeploymentModal.jsx
@@ -2,7 +2,10 @@ import { Form, Input, Modal, Select } from "antd";
import PropTypes from "prop-types";
import { useEffect, useState } from "react";
-import { handleException } from "../../../helpers/GetStaticData.js";
+import {
+ getBackendErrorDetail,
+ handleException,
+} from "../../../helpers/GetStaticData.js";
import { useAlertStore } from "../../../store/alert-store";
import { apiDeploymentsService } from "../../deployments/api-deployment/api-deployments-service.js";
@@ -36,14 +39,6 @@ const CreateApiDeploymentModal = ({
const [backendErrors, setBackendErrors] = useState(null);
const [isFormChanged, setIsFormChanged] = useState(false);
- const getBackendErrorDetail = (attr) => {
- if (backendErrors) {
- const error = backendErrors?.errors.find((error) => error?.attr === attr);
- return error ? error?.detail : null;
- }
- return null;
- };
-
const handleInputChange = (changedValues, allValues) => {
setIsFormChanged(true);
setFormDetails({ ...formDetails, ...allValues });
@@ -171,8 +166,10 @@ const CreateApiDeploymentModal = ({
label="Display Name"
name="display_name"
rules={[{ required: true, message: "Please enter display name" }]}
- validateStatus={getBackendErrorDetail("display_name") ? "error" : ""}
- help={getBackendErrorDetail("display_name")}
+ validateStatus={
+ getBackendErrorDetail("display_name", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("display_name", backendErrors)}
>
<Input />
</Form.Item>
@@ -181,8 +178,10 @@ const CreateApiDeploymentModal = ({
label="Description"
name="description"
rules={[{ required: true, message: "Please enter description" }]}
- validateStatus={getBackendErrorDetail("description") ? "error" : ""}
- help={getBackendErrorDetail("description")}
+ validateStatus={
+ getBackendErrorDetail("description", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("description", backendErrors)}
>
<Input />
</Form.Item>
@@ -202,8 +201,10 @@ const CreateApiDeploymentModal = ({
message: "Maximum 30 characters only allowed",
},
]}
- validateStatus={getBackendErrorDetail("api_name") ? "error" : ""}
- help={getBackendErrorDetail("api_name")}
+ validateStatus={
+ getBackendErrorDetail("api_name", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("api_name", backendErrors)}
>
<Input />
</Form.Item>
@@ -213,8 +214,10 @@ const CreateApiDeploymentModal = ({
label="Workflow"
name="workflow"
rules={[{ required: true, message: "Please select an workflow" }]}
- validateStatus={getBackendErrorDetail("workflow") ? "error" : ""}
- help={getBackendErrorDetail("workflow")}
+ validateStatus={
+ getBackendErrorDetail("workflow", backendErrors) ? "error" : ""
+ }
+ help={getBackendErrorDetail("workflow", backendErrors)}
>
<Select>
{workflowEndpointList.map((endpoint) => {
diff --git a/frontend/src/helpers/GetStaticData.js b/frontend/src/helpers/GetStaticData.js
index 3e2769411..7e72776e2 100644
--- a/frontend/src/helpers/GetStaticData.js
+++ b/frontend/src/helpers/GetStaticData.js
@@ -327,6 +327,14 @@ const onboardCompleted = (adaptersList) => {
return MANDATORY_ADAPTERS.every((value) => adaptersList.includes(value));
};
+const getBackendErrorDetail = (attr, backendErrors) => {
+ if (backendErrors) {
+ const error = backendErrors?.errors.find((error) => error?.attr === attr);
+ return error ? error?.detail : null;
+ }
+ return null;
+};
+
export {
CONNECTOR_TYPE_MAP,
O_AUTH_PROVIDERS,
@@ -356,4 +364,5 @@ export {
removeFileExtension,
isJson,
displayPromptResult,
+ getBackendErrorDetail,
};