Merge branch 'main' into feat/UN-1451-pdm-lock-automation

Zipstack · Jul 30, 2024 · e9617d0 · e9617d0
2 parents 3c81df4 + 4c97569
commit e9617d0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/docker/scripts/merge_env.py b/docker/scripts/merge_env.py
@@ -10,7 +10,10 @@
 #
 import sys
 
-PREFERRED_BASE_ENV_KEYS = []
+PREFERRED_BASE_ENV_KEYS = [
+    "STRUCTURE_TOOL_IMAGE_URL",
+    "STRUCTURE_TOOL_IMAGE_TAG",
+]
 DEFAULT_AUTH_KEY = "unstract"
 DEFAULT_ADMIN_KEY = "admin"
 SET_DEFAULT_KEYS = {

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
@@ -82,7 +82,7 @@ function OutputForDocModal({
   }, [open, singlePassExtractMode, isSinglePassExtractLoading]);
 
   useEffect(() => {
-    updatePromptOutput();
+    updatePromptOutput(docOutputs);
   }, [docOutputs]);
 
   useEffect(() => {
@@ -118,7 +118,7 @@ function OutputForDocModal({
 
   const updatePromptOutput = (data) => {
     setPromptOutputs((prev) => {
-      const updatedPromptOutput = getUpdatedPromptOutput(data, prev);
+      const updatedPromptOutput = data || [...prev];
       const keys = Object.keys(docOutputs);
 
       keys.forEach((key) => {
@@ -130,10 +130,6 @@ function OutputForDocModal({
     });
   };
 
-  const getUpdatedPromptOutput = (data, prev) => {
-    return data || [...prev];
-  };
-
   const updatePromptOutputInstance = (updatedPromptOutput, docId, key) => {
     const index = findPromptOutputIndex(updatedPromptOutput, docId);
     const promptOutputInstance = createOrUpdatePromptOutputInstance(
@@ -221,10 +217,17 @@ function OutputForDocModal({
     const rowsData = [];
     const docs = moveSelectedDocToTop();
     docs.forEach((item) => {
-      const output = data.find(
-        (outputValue) => outputValue?.document_manager === item?.document_id
-      );
-      const key = `${output?.prompt_id}__${output?.document_manager}__${output?.profile_manager}`;
+      const output = data.find((outputValue) => {
+        const docId =
+          outputValue?.document_manager ||
+          (outputValue?.key && getDocIdFromKey(outputValue?.key)) ||
+          null;
+        return docId === item?.document_id;
+      });
+      const key = `${promptId}__${item?.document_id}__${
+        selectedProfile || profileManagerId
+      }`;
+
       let status = outputStatus.fail;
       let message = displayPromptResult(output?.output, true);
 

diff --git a/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx b/frontend/src/components/custom-tools/prompt-card/PromptCard.jsx
@@ -318,7 +318,7 @@ function PromptCard({
 
     if (runAllLLM) {
       let selectedProfiles = llmProfiles;
-      if (!coverAllDoc && selectedLlmProfiles?.length > 0) {
+      if (selectedLlmProfiles?.length) {
         selectedProfiles = llmProfiles.filter((profile) =>
           selectedLlmProfiles.includes(profile?.profile_id)
         );